Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 4d3c74bbe7d6 · 2017-05-21T19:39:15.000+02:00
* 3.4:
  [Finder] Deprecate FilterIterator
  forward compatibility with Symfony 4
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -1,6 +1,13 @@
 UPGRADE FROM 3.3 to 3.4
 =======================
 
+Finder
+------
+
+ * The `Symfony\Component\Finder\Iterator\FilterIterator` class has been
+   deprecated and will be removed in 4.0 as it used to fix a bug which existed 
+   before version 5.5.23/5.6.7
+
 Validator
 ---------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -145,6 +145,8 @@ Finder
 ------
 
  * The `ExceptionInterface` has been removed.
+ * The `Symfony\Component\Finder\Iterator\FilterIterator` class has been
+   removed as it used to fix a bug which existed before version 5.5.23/5.6.7
 
 Form
 ----
diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\SecurityBundle\DataCollector;
 
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Role\RoleHierarchyInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -110,15 +111,23 @@ public function collect(Request $request, Response $response, \Exception $except
                 // fail silently when the logout URL cannot be generated
             }
 
+            $extractRoles = function ($role) {
+                if (!$role instanceof RoleInterface && !$role instanceof Role) {
+                    throw new \InvalidArgumentException(sprintf('Roles must be instances of %s or %s (%s given).', RoleInterface::class, Role::class, is_object($role) ? get_class($role) : gettype($role)));
+                }
+
+                return $role->getRole();
+            };
+
             $this->data = array(
                 'enabled' => true,
                 'authenticated' => $token->isAuthenticated(),
                 'token' => $token,
                 'token_class' => $this->hasVarDumper ? new ClassStub(get_class($token)) : get_class($token),
                 '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),
+                'roles' => array_map($extractRoles, $assignedRoles),
+                'inherited_roles' => array_map($extractRoles, $inheritedRoles),
                 'supports_role_hierarchy' => null !== $this->roleHierarchy,
             );
         }
diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md
@@ -6,6 +6,11 @@ CHANGELOG
 
  * removed `ExceptionInterface`
 
+3.4.0
+-----
+
+ * deprecated `Symfony\Component\Finder\Iterator\FilterIterator`
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Component/Finder/Iterator/FilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilterIterator.php
@@ -18,6 +18,8 @@
  * @see https://bugs.php.net/68557
  *
  * @author Alex Bogomazov
+ *
+ * @deprecated since 3.4, to be removed in 4.0.
  */
 abstract class FilterIterator extends \FilterIterator
 {
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Alex Bogomazov
+ *
+ * @group legacy
  */
 class FilterIteratorTest extends RealIteratorTestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`* @see https://bugs.php.net/68557`
`19`	`19`	`*`
`20`	`20`	`* @author Alex Bogomazov`
	`21`	`+ *`
	`22`	`+ * @deprecated since 3.4, to be removed in 4.0.`
`21`	`23`	`*/`
`22`	`24`	`abstract class FilterIterator extends \FilterIterator`
`23`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @author Alex Bogomazov`
	`16`	`+ *`
	`17`	`+ * @group legacy`
`16`	`18`	`*/`
`17`	`19`	`class FilterIteratorTest extends RealIteratorTestCase`
`18`	`20`	`{`