Fix merging of routes for subclasses (#1)

* Fix merging of routes for subclasses

* Fix PHPUnit 5.x deprecation warnings

composer.json

@@ -26,5 +26,12 @@
         "psr-0": {
             "JMS": "src/"
         }
+    },
+
+    "autoload-dev": {
+        "psr-0": {
+            "JMS\\Tests": "tests/"
+        }
     }
+
 }

src/JMS/ObjectRouting/Metadata/ClassMetadata.php

@@ -19,6 +19,7 @@
 namespace JMS\ObjectRouting\Metadata;
 
 use Metadata\MergeableClassMetadata;
+use Metadata\MergeableInterface;
 
 class ClassMetadata extends MergeableClassMetadata
 {
@@ -32,6 +33,12 @@ public function addRoute($type, $name, array $params = array())
         );
     }
 
+    public function merge(MergeableInterface $object)
+    {
+        parent::merge($object);
+        $this->routes = array_merge($this->routes, $object->routes);
+    }
+
     public function serialize()
     {
         return serialize(
@@ -52,4 +59,4 @@ public function unserialize($str)
         parent::unserialize($parentStr);
     }
 
-}
+}

tests/JMS/Tests/ObjectRouting/Metadata/ClassMetadataTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace JMS\Tests\ObjectRouting\Metadata;
+
+use JMS\ObjectRouting\Metadata\ClassMetadata;
+
+class ClassMetadataTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMerge()
+    {
+        $base = new ClassMetadata(\PHPUnit_Framework_TestCase::class);
+        $base->addRoute('test', 'base-route');
+
+        $merged = new ClassMetadata(self::class);
+        $merged->addRoute('test', 'merged-route');
+
+        $base->merge($merged);
+
+        $this->assertEquals(self::class, $base->name);
+        $this->assertEquals(['test' => ['name' => 'merged-route', 'params' => []]], $base->routes);
+    }
+}

tests/JMS/Tests/ObjectRouting/ObjectRouterTest.php

@@ -84,8 +84,8 @@ public function testGenerateNoMetadata()
     protected function setUp()
     {
         $this->router = new ObjectRouter(
-            $this->adapter = $this->getMock('JMS\ObjectRouting\RouterInterface'),
-            $this->factory = $this->getMock('Metadata\MetadataFactoryInterface')
+            $this->adapter = $this->createMock('JMS\ObjectRouting\RouterInterface'),
+            $this->factory = $this->createMock('Metadata\MetadataFactoryInterface')
         );
     }
 }

tests/JMS/Tests/ObjectRouting/Symfony/Symfony22AdapterTest.php

@@ -24,7 +24,7 @@ public function testGenerate()
     protected function setUp()
     {
         $this->adapter = new Symfony22Adapter(
-            $this->router = $this->getMock('Symfony\Component\Routing\RouterInterface')
+            $this->router = $this->createMock('Symfony\Component\Routing\RouterInterface')
         );
     }
 }