Merge pull request #51 from symfony-cmf/extend_bug

Fix bug while extending classes

Author: dbu

Mapping/ClassMetadata.php

@@ -32,7 +32,7 @@ class ClassMetadata extends MergeableClassMetadata
      */
     protected $tokenProviders = array();
 
-    /** 
+    /**
      * @var array
      */
     protected $conflictResolver = array('name' => 'throw_exception', 'options' => array());
@@ -184,7 +184,7 @@ public function getClassName()
      * The URL schema will be overriden, you can use {parent} to refer to the
      * previous URL schema.
      *
-     * @param ClassMetadata $metadata
+     * @param MergeableInterface $metadata
      */
     public function merge(MergeableInterface $metadata)
     {

Mapping/MetadataFactory.php

@@ -23,7 +23,7 @@
  */
 class MetadataFactory implements \IteratorAggregate, MetadataFactoryInterface
 {
-    /** 
+    /**
      * @var ClassMetadata[]
      */
     protected $metadatas = array();
@@ -115,7 +115,7 @@ protected function resolveMetadata($class)
         $metadata = null;
         foreach ($metadatas as $data) {
             if (null === $metadata) {
-                $metadata = $data;
+                $metadata = clone $data;
             } else {
                 $metadata->merge($data);
             }
@@ -142,6 +142,7 @@ protected function doResolve($classFqn, array &$addedClasses)
                     $metadatas[] = $extendData;
                 }
             }
+
             $metadatas[] = $this->metadatas[$classFqn];
         }
 

Tests/Unit/Mapping/MetadataFactoryTest.php

@@ -36,7 +36,7 @@ public function testStoreAndGetClassMetadata()
 
         $this->factory->addMetadatas(array($classMetadata));
 
-        $this->assertSame($classMetadata, $this->factory->getMetadataForClass('stdClass'));
+        $this->assertEquals($classMetadata, $this->factory->getMetadataForClass('stdClass'));
     }
 
     public function provideTestMerge()
@@ -148,15 +148,20 @@ public function testMergeExtendedClass()
         $parentMetadata->setExtendedClass('Symfony\Cmf\Component\RoutingAuto\Tests\Resources\Fixtures\Parent1Class');
 
         $parent1Metadata = new ClassMetadata('Symfony\Cmf\Component\RoutingAuto\Tests\Resources\Fixtures\Parent1Class');
+        $parent1Metadata->setUriSchema('{category}/{title}');
         $parent1TokenProvider = $this->createTokenProvider('provider1');
         $parent1Metadata->addTokenProvider('title', $parent1TokenProvider);
+        $parent1Metadata->addTokenProvider('category', $this->createTokenProvider('provider11'));
 
         $this->factory->addMetadatas(array($parentMetadata, $parent1Metadata));
 
         $resolvedMetadata = $this->factory->getMetadataForClass('Symfony\Cmf\Component\RoutingAuto\Tests\Resources\Fixtures\ParentClass');
         $resolvedProviders = $resolvedMetadata->getTokenProviders();
         $this->assertSame($parent1TokenProvider, $resolvedProviders['title']);
         $this->assertEquals('{title}', $resolvedMetadata->getUriSchema());
+
+        $resolved1Metadata = $this->factory->getMetadataForClass('Symfony\Cmf\Component\RoutingAuto\Tests\Resources\Fixtures\Parent1Class');
+        $this->assertEquals('{category}/{title}', $resolved1Metadata->getUriSchema());
     }
 
     /**