Merge branch '2.7' into 2.8

fabpot · fabpot · commit 895b12341319 · 2017-06-08T16:53:01.000-07:00
* 2.7:
  bumped Symfony version to 2.7.30
  Cache ipCheck
  updated VERSION for 2.7.29
  update CONTRIBUTORS for 2.7.29
  updated CHANGELOG for 2.7.29
  show unique inherited roles
diff --git a/CHANGELOG-2.7.md b/CHANGELOG-2.7.md
@@ -7,6 +7,15 @@ in 2.7 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
 
+* 2.7.29 (2017-06-07)
+
+ * bug #23069 [SecurityBundle] Show unique Inherited roles in profile panel (yceruto)
+ * bug #23073 [TwigBridge] Fix namespaced classes (ogizanagi)
+ * bug #22936 [Form] Mix attr option between guessed options and user options (yceruto)
+ * bug #23024 [EventDispatcher] Fix ContainerAwareEventDispatcher::hasListeners(null) (nicolas-grekas)
+ * bug #22996 [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 (romainneutron)
+ * bug #22994 Harden the debugging of Twig filters and functions (stof)
+
 * 2.7.28 (2017-05-29)
 
  * bug #22847 [Console] ChoiceQuestion must have choices (ro0NL)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -20,13 +20,13 @@ Symfony is the result of the work of many people who made the code better
  - Javier Eguiluz (javier.eguiluz)
  - Hugo Hamon (hhamon)
  - Abdellatif Ait boudad (aitboudad)
+ - Romain Neutron (romain)
  - Pascal Borreli (pborreli)
  - Wouter De Jong (wouterj)
- - Romain Neutron (romain)
- - Grégoire Pineau (lyrixx)
  - Robin Chalas (chalas_r)
- - Joseph Bielawski (stloyd)
  - Maxime Steinhausser (ogizanagi)
+ - Grégoire Pineau (lyrixx)
+ - Joseph Bielawski (stloyd)
  - Karma Dordrak (drak)
  - Lukas Kahwe Smith (lsmith)
  - Martin Hasoň (hason)
@@ -72,8 +72,8 @@ Symfony is the result of the work of many people who made the code better
  - Dariusz Górecki (canni)
  - Titouan Galopin (tgalopin)
  - Douglas Greenshields (shieldo)
- - Konstantin Myakshin (koc)
  - Jáchym Toušek (enumag)
+ - Konstantin Myakshin (koc)
  - Lee McDermott
  - Brandon Turner
  - Luis Cordova (cordoval)
@@ -112,10 +112,10 @@ Symfony is the result of the work of many people who made the code better
  - Jacob Dreesen (jdreesen)
  - Tobias Nyholm (tobias)
  - Tomáš Votruba (tomas_votruba)
+ - Yonel Ceruto González (yonelceruto)
  - Fabien Pennequin (fabienpennequin)
  - Gordon Franke (gimler)
  - Eric GELOEN (gelo)
- - Yonel Ceruto González (yonelceruto)
  - Daniel Wehner (dawehner)
  - Tugdual Saunier (tucksaun)
  - Théo FIDRY (theofidry)
@@ -130,6 +130,7 @@ Symfony is the result of the work of many people who made the code better
  - Daniel Gomes (danielcsgomes)
  - Hidenori Goto (hidenorigoto)
  - Guilherme Blanco (guilhermeblanco)
+ - Vincent AUBERT (vincent)
  - Pablo Godel (pgodel)
  - Jérémie Augustin (jaugustin)
  - Andréia Bohner (andreia)
@@ -140,18 +141,17 @@ Symfony is the result of the work of many people who made the code better
  - Joel Wurtz (brouznouf)
  - Philipp Wahala (hifi)
  - Vyacheslav Pavlov
+ - Richard van Laak (rvanlaak)
  - Javier Spagnoletti (phansys)
  - Richard Shank (iampersistent)
  - Thomas Rabaix (rande)
- - Vincent AUBERT (vincent)
  - Rouven Weßling (realityking)
  - Teoh Han Hui (teohhanhui)
  - Jérôme Vasseur (jvasseur)
  - Clemens Tolboom
  - Helmer Aaviksoo
  - Grégoire Paris (greg0ire)
  - Hiromi Hishida (77web)
- - Richard van Laak (rvanlaak)
  - Matthieu Ouellette-Vachon (maoueh)
  - Michał Pipa (michal.pipa)
  - Amal Raghav (kertz)
@@ -242,6 +242,7 @@ Symfony is the result of the work of many people who made the code better
  - Uwe Jäger (uwej711)
  - Eugene Leonovich (rybakit)
  - Filippo Tessarotto
+ - Oleg Voronkovich
  - Joseph Rouff (rouffj)
  - Félix Labrecque (woodspire)
  - GordonsLondon
@@ -277,7 +278,6 @@ Symfony is the result of the work of many people who made the code better
  - Jordan Samouh (jordansamouh)
  - Chris Smith (cs278)
  - Florian Klein (docteurklein)
- - Oleg Voronkovich
  - Manuel Kiessling (manuelkiessling)
  - Atsuhiro KUBO (iteman)
  - Andrew Moore (finewolf)
@@ -387,6 +387,7 @@ Symfony is the result of the work of many people who made the code better
  - Emanuele Gaspari (inmarelibero)
  - Sébastien Santoro (dereckson)
  - Brian King
+ - Frank de Jonge (frenkynet)
  - Michel Salib (michelsalib)
  - geoffrey
  - Steffen Roßkamp
@@ -523,7 +524,6 @@ Symfony is the result of the work of many people who made the code better
  - Romain Pierre (romain-pierre)
  - Jan Behrens
  - Mantas Var (mvar)
- - Frank de Jonge (frenkynet)
  - Sebastian Krebs
  - Jean-Christophe Cuvelier [Artack]
  - Christopher Davis (chrisguitarguy)
@@ -1278,6 +1278,7 @@ Symfony is the result of the work of many people who made the code better
  - ged15
  - Daan van Renterghem
  - Nicole Cordes
+ - Martin Kirilov
  - Bram Van der Sype (brammm)
  - Christopher Hertel (chertel)
  - Guile (guile)
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -100,7 +100,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 'logout_url' => $logoutUrl,
                 'user' => $token->getUsername(),
                 'roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $assignedRoles),
-                'inherited_roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles),
+                'inherited_roles' => array_unique(array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles)),
                 'supports_role_hierarchy' => null !== $this->roleHierarchy,
             );
         }
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
@@ -111,13 +111,19 @@ public function provideRoles()
                 array('ROLE_ADMIN'),
                 array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
             ),
+            array(
+                array('ROLE_ADMIN', 'ROLE_OPERATOR'),
+                array('ROLE_ADMIN', 'ROLE_OPERATOR'),
+                array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
+            ),
         );
     }
 
     private function getRoleHierarchy()
     {
         return new RoleHierarchy(array(
             'ROLE_ADMIN' => array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),
+            'ROLE_OPERATOR' => array('ROLE_USER'),
         ));
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -18,6 +18,8 @@
  */
 class IpUtils
 {
+    private static $checkedIps = array();
+
     /**
      * This class should not be instantiated.
      */
@@ -61,26 +63,31 @@ public static function checkIp($requestIp, $ips)
      */
     public static function checkIp4($requestIp, $ip)
     {
+        $cacheKey = $requestIp.'-'.$ip;
+        if (isset(self::$checkedIps[$cacheKey])) {
+            return self::$checkedIps[$cacheKey];
+        }
+
         if (!filter_var($requestIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            return false;
+            return self::$checkedIps[$cacheKey] = false;
         }
 
         if (false !== strpos($ip, '/')) {
             list($address, $netmask) = explode('/', $ip, 2);
 
             if ($netmask === '0') {
-                return filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
+                return self::$checkedIps[$cacheKey] = filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
             }
 
             if ($netmask < 0 || $netmask > 32) {
-                return false;
+                return self::$checkedIps[$cacheKey] = false;
             }
         } else {
             $address = $ip;
             $netmask = 32;
         }
 
-        return 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
+        return self::$checkedIps[$cacheKey] = 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);
     }
 
     /**
@@ -100,6 +107,11 @@ public static function checkIp4($requestIp, $ip)
      */
     public static function checkIp6($requestIp, $ip)
     {
+        $cacheKey = $requestIp.'-'.$ip;
+        if (isset(self::$checkedIps[$cacheKey])) {
+            return self::$checkedIps[$cacheKey];
+        }
+
         if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) {
             throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
         }
@@ -108,7 +120,7 @@ public static function checkIp6($requestIp, $ip)
             list($address, $netmask) = explode('/', $ip, 2);
 
             if ($netmask < 1 || $netmask > 128) {
-                return false;
+                return self::$checkedIps[$cacheKey] = false;
             }
         } else {
             $address = $ip;
@@ -119,18 +131,18 @@ public static function checkIp6($requestIp, $ip)
         $bytesTest = unpack('n*', @inet_pton($requestIp));
 
         if (!$bytesAddr || !$bytesTest) {
-            return false;
+            return self::$checkedIps[$cacheKey] = false;
         }
 
         for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {
             $left = $netmask - 16 * ($i - 1);
             $left = ($left <= 16) ? $left : 16;
             $mask = ~(0xffff >> $left) & 0xffff;
             if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {
-                return false;
+                return self::$checkedIps[$cacheKey] = false;
             }
         }
 
-        return true;
+        return self::$checkedIps[$cacheKey] = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`100`	`100`	`'logout_url' => $logoutUrl,`
`101`	`101`	`'user' => $token->getUsername(),`
`102`	`102`	`'roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $assignedRoles),`
`103`		`- 'inherited_roles' => array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles),`
	`103`	`+ 'inherited_roles' => array_unique(array_map(function (RoleInterface $role) { return $role->getRole(); }, $inheritedRoles)),`
`104`	`104`	`'supports_role_hierarchy' => null !== $this->roleHierarchy,`
`105`	`105`	`);`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,19 @@ public function provideRoles()`
`111`	`111`	`array('ROLE_ADMIN'),`
`112`	`112`	`array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),`
`113`	`113`	`),`
	`114`	`+ array(`
	`115`	`+ array('ROLE_ADMIN', 'ROLE_OPERATOR'),`
	`116`	`+ array('ROLE_ADMIN', 'ROLE_OPERATOR'),`
	`117`	`+ array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),`
	`118`	`+ ),`
`114`	`119`	`);`
`115`	`120`	`}`
`116`	`121`
`117`	`122`	`private function getRoleHierarchy()`
`118`	`123`	`{`
`119`	`124`	`return new RoleHierarchy(array(`
`120`	`125`	`'ROLE_ADMIN' => array('ROLE_USER', 'ROLE_ALLOWED_TO_SWITCH'),`
	`126`	`+ 'ROLE_OPERATOR' => array('ROLE_USER'),`
`121`	`127`	`));`
`122`	`128`	`}`
`123`	`129`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`*/`
`19`	`19`	`class IpUtils`
`20`	`20`	`{`
	`21`	`+ private static $checkedIps = array();`
	`22`	`+`
`21`	`23`	`/**`
`22`	`24`	`* This class should not be instantiated.`
`23`	`25`	`*/`
`@@ -61,26 +63,31 @@ public static function checkIp($requestIp, $ips)`
`61`	`63`	`*/`
`62`	`64`	`public static function checkIp4($requestIp, $ip)`
`63`	`65`	`{`
	`66`	`+ $cacheKey = $requestIp.'-'.$ip;`
	`67`	`+ if (isset(self::$checkedIps[$cacheKey])) {`
	`68`	`+ return self::$checkedIps[$cacheKey];`
	`69`	`+ }`
	`70`	`+`
`64`	`71`	`if (!filter_var($requestIp, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {`
`65`		`- return false;`
	`72`	`+ return self::$checkedIps[$cacheKey] = false;`
`66`	`73`	`}`
`67`	`74`
`68`	`75`	`if (false !== strpos($ip, '/')) {`
`69`	`76`	`list($address, $netmask) = explode('/', $ip, 2);`
`70`	`77`
`71`	`78`	`if ($netmask === '0') {`
`72`		`- return filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);`
	`79`	`+ return self::$checkedIps[$cacheKey] = filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);`
`73`	`80`	`}`
`74`	`81`
`75`	`82`	`if ($netmask < 0 \|\| $netmask > 32) {`
`76`		`- return false;`
	`83`	`+ return self::$checkedIps[$cacheKey] = false;`
`77`	`84`	`}`
`78`	`85`	`} else {`
`79`	`86`	`$address = $ip;`
`80`	`87`	`$netmask = 32;`
`81`	`88`	`}`
`82`	`89`
`83`		`- return 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);`
	`90`	`+ return self::$checkedIps[$cacheKey] = 0 === substr_compare(sprintf('%032b', ip2long($requestIp)), sprintf('%032b', ip2long($address)), 0, $netmask);`
`84`	`91`	`}`
`85`	`92`
`86`	`93`	`/**`
`@@ -100,6 +107,11 @@ public static function checkIp4($requestIp, $ip)`
`100`	`107`	`*/`
`101`	`108`	`public static function checkIp6($requestIp, $ip)`
`102`	`109`	`{`
	`110`	`+ $cacheKey = $requestIp.'-'.$ip;`
	`111`	`+ if (isset(self::$checkedIps[$cacheKey])) {`
	`112`	`+ return self::$checkedIps[$cacheKey];`
	`113`	`+ }`
	`114`	`+`
`103`	`115`	`if (!((extension_loaded('sockets') && defined('AF_INET6')) \|\| @inet_pton('::1'))) {`
`104`	`116`	`throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');`
`105`	`117`	`}`
`@@ -108,7 +120,7 @@ public static function checkIp6($requestIp, $ip)`
`108`	`120`	`list($address, $netmask) = explode('/', $ip, 2);`
`109`	`121`
`110`	`122`	`if ($netmask < 1 \|\| $netmask > 128) {`
`111`		`- return false;`
	`123`	`+ return self::$checkedIps[$cacheKey] = false;`
`112`	`124`	`}`
`113`	`125`	`} else {`
`114`	`126`	`$address = $ip;`
`@@ -119,18 +131,18 @@ public static function checkIp6($requestIp, $ip)`
`119`	`131`	`$bytesTest = unpack('n*', @inet_pton($requestIp));`
`120`	`132`
`121`	`133`	`if (!$bytesAddr \|\| !$bytesTest) {`
`122`		`- return false;`
	`134`	`+ return self::$checkedIps[$cacheKey] = false;`
`123`	`135`	`}`
`124`	`136`
`125`	`137`	`for ($i = 1, $ceil = ceil($netmask / 16); $i <= $ceil; ++$i) {`
`126`	`138`	`$left = $netmask - 16 * ($i - 1);`
`127`	`139`	`$left = ($left <= 16) ? $left : 16;`
`128`	`140`	`$mask = ~(0xffff >> $left) & 0xffff;`
`129`	`141`	`if (($bytesAddr[$i] & $mask) != ($bytesTest[$i] & $mask)) {`
`130`		`- return false;`
	`142`	`+ return self::$checkedIps[$cacheKey] = false;`
`131`	`143`	`}`
`132`	`144`	`}`
`133`	`145`
`134`		`- return true;`
	`146`	`+ return self::$checkedIps[$cacheKey] = true;`
`135`	`147`	`}`
`136`	`148`	`}`