Removed usage of the deprecated each function (#412)

* Removed usage of the deprecated `each` function

Getting routes by key in the collection does not allow to check their
ordering. Calling `next` on an iterator produce the same behavior
as using the deprecated `each` function on an array.

* Fixed style issues

Author: damienflament

src/Form/Type/RouteTypeType.php

@@ -18,6 +18,7 @@
 class RouteTypeType extends AbstractType
 {
     protected $routeTypes = [];
+
     protected $translator;
 
     /**

tests/Functional/Doctrine/Phpcr/RouteProviderTest.php

@@ -66,16 +66,21 @@ public function testGetRouteCollectionForRequest()
         $this->assertCount(3, $routes);
         $this->assertContainsOnlyInstancesOf(RouteObjectInterface::class, $routes);
 
-        $routes = $routes->all();
-        list($key, $child) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT.'/testroute/noroute/child', $key);
-        $this->assertEquals('json', $child->getDefault('_format'));
-        list($key, $testroute) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT.'/testroute', $key);
-        $this->assertEquals('html', $testroute->getDefault('_format'));
-        list($key, $root) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT, $key);
-        $this->assertNull($root->getDefault('_format'));
+        $iterator = $routes->getIterator();
+
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT.'/testroute/noroute/child', $iterator->key());
+        $this->assertEquals('json', $iterator->current()->getDefault('_format'));
+
+        $iterator->next();
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT.'/testroute', $iterator->key());
+        $this->assertEquals('html', $iterator->current()->getDefault('_format'));
+
+        $iterator->next();
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT, $iterator->key());
+        $this->assertNull($iterator->current()->getDefault('_format'));
     }
 
     public function testGetRouteCollectionForRequestFormat()
@@ -86,29 +91,36 @@ public function testGetRouteCollectionForRequestFormat()
         $this->assertCount(3, $routes);
         $this->assertContainsOnlyInstancesOf(RouteObjectInterface::class, $routes);
 
-        $routes = $routes->all();
-        list($key, $child) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT.'/testroute/noroute/child', $key);
-        $this->assertEquals('json', $child->getDefault('_format'));
-        list($key, $testroute) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT.'/testroute', $key);
-        $this->assertEquals('html', $testroute->getDefault('_format'));
-        list($key, $root) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT, $key);
-        $this->assertNull($root->getDefault('_format'));
+        $iterator = $routes->getIterator();
+
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT.'/testroute/noroute/child', $iterator->key());
+        $this->assertEquals('json', $iterator->current()->getDefault('_format'));
+
+        $iterator->next();
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT.'/testroute', $iterator->key());
+        $this->assertEquals('html', $iterator->current()->getDefault('_format'));
+
+        $iterator->next();
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT, $iterator->key());
+        $this->assertNull($iterator->current()->getDefault('_format'));
     }
 
     /**
      * The root route will always be found.
      */
     public function testGetRouteCollectionForRequestNonPhpcrUrl()
     {
-        $collection = $this->repository->getRouteCollectionForRequest(Request::create('http:///'));
-        $this->assertInstanceOf(RouteCollection::class, $collection);
-        $this->assertCount(1, $collection);
-        $routes = $collection->all();
-        list($key, $route) = each($routes);
-        $this->assertEquals(self::ROUTE_ROOT, $key);
+        $routes = $this->repository->getRouteCollectionForRequest(Request::create('http:///'));
+        $this->assertInstanceOf(RouteCollection::class, $routes);
+        $this->assertCount(1, $routes);
+
+        $iterator = $routes->getIterator();
+
+        $this->assertTrue($iterator->valid());
+        $this->assertEquals(self::ROUTE_ROOT, $iterator->key());
     }
 
     /**

tests/Functional/Routing/DynamicRouterTest.php

@@ -33,6 +33,7 @@ class DynamicRouterTest extends BaseTestCase
      * @var ChainRouter
      */
     protected $router;
+
     protected $routeNamePrefix;
 
     const ROUTE_ROOT = '/test/routing';

tests/Unit/DependencyInjection/XmlSchemaTest.php

@@ -16,6 +16,7 @@
 class XmlSchemaTest extends XmlSchemaTestCase
 {
     protected $fixturesPath;
+
     protected $schemaPath;
 
     public function setUp()

tests/Unit/Doctrine/Orm/ContentRepositoryTest.php

@@ -19,8 +19,11 @@
 class ContentRepositoryTest extends \PHPUnit_Framework_TestCase
 {
     private $document;
+
     private $managerRegistry;
+
     private $objectManager;
+
     private $objectRepository;
 
     public function setUp()

tests/Unit/Doctrine/Phpcr/ContentRepositoryTest.php

@@ -20,9 +20,13 @@
 class ContentRepositoryTest extends \PHPUnit_Framework_TestCase
 {
     private $document;
+
     private $document2;
+
     private $objectManager;
+
     private $objectManager2;
+
     private $managerRegistry;
 
     public function setUp()

tests/Unit/Doctrine/Phpcr/RouteProviderTest.php

@@ -41,6 +41,7 @@ class RouteProviderTest extends \PHPUnit_Framework_TestCase
      * @var DocumentManager|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $dmMock;
+
     /**
      * @var DocumentManager|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -50,6 +51,7 @@ class RouteProviderTest extends \PHPUnit_Framework_TestCase
      * @var Route|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $routeMock;
+
     /**
      * @var Route|\PHPUnit_Framework_MockObject_MockObject
      */

tests/Unit/Doctrine/Phpcr/RouteTest.php

@@ -17,6 +17,7 @@ class RouteTest extends \PHPUnit_Framework_TestCase
 {
     /** @var Route */
     private $route;
+
     private $childRoute1;
 
     public function setUp()

tests/Unit/Routing/DynamicRouterTest.php

@@ -26,18 +26,25 @@
 class DynamicRouterTest extends \PHPUnit_Framework_TestCase
 {
     protected $matcher;
+
     protected $generator;
+
     /** @var DynamicRouter */
     protected $router;
+
     protected $context;
+
     /** @var Request */
     protected $request;
+
     /**
      * @var RequestStack
      */
     private $requestStack;
+
     /** @var EventDispatcherInterface */
     protected $eventDispatcher;
+
     protected $container;
 
     public function setUp()

tests/Unit/Validator/Constraints/RouteDefaultsValidatorTest.php

@@ -31,6 +31,7 @@ abstract class HackBaseClass extends ConstraintValidatorTestCase
 abstract class RouteDefaultsValidatorTest extends HackBaseClass
 {
     protected $controllerResolver;
+
     protected $engine;
 
     public function testCorrectControllerPath()