fixed a bug when container matches interface handler but it is does not have key zero

Author: thunderer

src/HydratorContainer/FallbackHydratorContainer.php

@@ -61,7 +61,7 @@ public function getHandler($class)
                 throw new \RuntimeException(sprintf('Class %s implements interfaces with colliding handlers!', $class));
             }
 
-            return $this->interfaces[$interfaces[0]];
+            return $this->interfaces[array_shift($interfaces)];
         }
 
         return null;

src/NormalizerContainer/FallbackNormalizerContainer.php

@@ -61,7 +61,7 @@ public function getHandler($class)
                 throw new \RuntimeException(sprintf('Class %s implements interfaces with colliding handlers!', $class));
             }
 
-            return $this->interfaces[$interfaces[0]];
+            return $this->interfaces[array_shift($interfaces)];
         }
 
         return null;

tests/NormalizerContainerTest.php

@@ -10,37 +10,37 @@ class NormalizerContainerTest extends \PHPUnit_Framework_TestCase
 {
     public function testAlias()
     {
-        $handlers = new FallbackNormalizerContainer();
-        $handlers->add('stdClass', 'std', function() { return 'value'; });
-        $handlers->addAlias('DateTime', 'stdClass');
+        $normalizers = new FallbackNormalizerContainer();
+        $normalizers->add('stdClass', 'std', function() { return 'value'; });
+        $normalizers->addAlias('DateTime', 'stdClass');
 
-        $this->assertSame('value', call_user_func_array($handlers->getHandler('stdClass'), array()));
-        $this->assertSame('value', call_user_func_array($handlers->getHandler('DateTime'), array()));
+        $this->assertSame('value', call_user_func_array($normalizers->getHandler('stdClass'), array()));
+        $this->assertSame('value', call_user_func_array($normalizers->getHandler('DateTime'), array()));
     }
 
     public function testInterface()
     {
-        $hydrators = new FallbackNormalizerContainer();
+        $normalizers = new FallbackNormalizerContainer();
         $interfaceName = 'Thunder\Serializard\Tests\Fake\Interfaces\TypeInterface';
         $interfaceTypeA = 'Thunder\Serializard\Tests\Fake\Interfaces\TypeA';
         $interfaceTypeB = 'Thunder\Serializard\Tests\Fake\Interfaces\TypeB';
-        $hydrators->add($interfaceName, 'type', function() { return 'type'; });
+        $normalizers->add($interfaceName, 'type', function() { return 'type'; });
 
-        $this->assertSame('type', call_user_func_array($hydrators->getHandler($interfaceTypeA), array()));
-        $this->assertSame('type', call_user_func_array($hydrators->getHandler($interfaceTypeB), array()));
+        $this->assertSame('type', call_user_func_array($normalizers->getHandler($interfaceTypeA), array()));
+        $this->assertSame('type', call_user_func_array($normalizers->getHandler($interfaceTypeB), array()));
     }
 
     public function testInheritance()
     {
-        $hydrators = new FallbackNormalizerContainer();
+        $normalizers = new FallbackNormalizerContainer();
         $ancestorName = 'Thunder\Serializard\Tests\Fake\FakeUserParentParent';
         $parentName = 'Thunder\Serializard\Tests\Fake\FakeUserParent';
         $userName = 'Thunder\Serializard\Tests\Fake\FakeUser';
-        $hydrators->add($ancestorName, 'type', function() { return 'ancestor'; });
+        $normalizers->add($ancestorName, 'type', function() { return 'ancestor'; });
 
-        $this->assertSame('ancestor', call_user_func_array($hydrators->getHandler($ancestorName), array()));
-        $this->assertSame('ancestor', call_user_func_array($hydrators->getHandler($parentName), array()));
-        $this->assertSame('ancestor', call_user_func_array($hydrators->getHandler($userName), array()));
+        $this->assertSame('ancestor', call_user_func_array($normalizers->getHandler($ancestorName), array()));
+        $this->assertSame('ancestor', call_user_func_array($normalizers->getHandler($parentName), array()));
+        $this->assertSame('ancestor', call_user_func_array($normalizers->getHandler($userName), array()));
     }
 
     public function testMultipleInterfacesException()
@@ -49,32 +49,32 @@ public function testMultipleInterfacesException()
         $typeAnother = 'Thunder\Serializard\Tests\Fake\Interfaces\AnotherTypeInterface';
         $typeMultiple = 'Thunder\Serializard\Tests\Fake\Interfaces\TypeMultiple';
 
-        $hydrators = new FallbackNormalizerContainer();
-        $hydrators->add($typeInterface, 'type', function() { return 'multiple'; });
-        $hydrators->add($typeAnother, 'type', function() { return 'multiple'; });
+        $normalizers = new FallbackNormalizerContainer();
+        $normalizers->add($typeInterface, 'type', function() { return 'multiple'; });
+        $normalizers->add($typeAnother, 'type', function() { return 'multiple'; });
 
         $this->setExpectedException('RuntimeException');
-        $hydrators->getHandler($typeMultiple);
+        $normalizers->getHandler($typeMultiple);
     }
 
     public function testInvalidClassOrInterfaceName()
     {
-        $handlers = new FallbackNormalizerContainer();
+        $normalizers = new FallbackNormalizerContainer();
         $this->setExpectedException('RuntimeException');
-        $handlers->add('invalid', 'root', function() {});
+        $normalizers->add('invalid', 'root', function() {});
     }
 
     public function testAliasForInvalidClass()
     {
-        $handlers = new FallbackNormalizerContainer();
+        $normalizers = new FallbackNormalizerContainer();
         $this->setExpectedException('RuntimeException');
-        $handlers->addAlias('stdClass', 'DateTime');
+        $normalizers->addAlias('stdClass', 'DateTime');
     }
 
     public function testInvalidHandler()
     {
-        $handlers = new FallbackNormalizerContainer();
+        $normalizers = new FallbackNormalizerContainer();
         $this->setExpectedException('RuntimeException');
-        $handlers->add('stdClass', 'name', 'invalid');
+        $normalizers->add('stdClass', 'name', 'invalid');
     }
 }