fix unmapped subclass of a mapped super class problem issue #39 #186 #228

.gitignore

@@ -1,2 +1,2 @@
 vendor
-composer.lock
+composer.lock

Metadata/Driver/AnnotationDriver.php

@@ -224,10 +224,6 @@ public function loadMetadataForClass(\ReflectionClass $class)
             }
         }
 
-        if (null == $metadata->id && !$hasInjection) {
-            return null;
-        }
-
         return $metadata;
     }
 

Tests/Functional/Bundle/TestBundle/Inheritance/MappedSuperClass.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Inheritance;
+
+use JMS\DiExtraBundle\Annotation as DI;
+
+class MappedSuperClass
+{
+    private $foo;
+    private $bar;
+
+    /**
+     * @DI\InjectParams
+     *
+     * @param stdClass $foo
+     * @param stdClass $bar
+     */
+    public function __construct($foo, $bar)
+    {
+        $this->foo = $foo;
+        $this->bar = $bar;
+    }
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}

Tests/Functional/Bundle/TestBundle/Inheritance/UnmapedSubClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Inheritance;
+
+use JMS\DiExtraBundle\Annotation as DI;
+
+class UnmapedSubClass extends MappedSuperClass
+{
+    public function getFoo()
+    {
+        return new \ArrayObject([]);
+    }
+}

Tests/Functional/MetadataFactoryTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional;
+
+use Metadata\MetadataFactory;
+
+class MetadataFactoryTest extends BaseTestCase
+{
+    /**
+     * @runInSeparateProcess
+     */
+    public function testGetMetadataFromMappedSuperClass()
+    {
+        $metadataFactory = $this->getMetadataFactory();
+
+        $this->assertInstanceOf('\Metadata\MetadataFactory', $metadataFactory);
+
+        $metadata = $metadataFactory->getMetadataForClass(
+            'JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Inheritance\UnmapedSubClass'
+        );
+
+        $this->assertCount(2, $metadata->classMetadata);
+        $this->assertEquals(
+            'JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Inheritance\UnmapedSubClass', 
+            $metadata->getOutsideClassMetadata()->name
+        );
+    }
+
+    /**
+     * @return MetadataFactory
+     */
+    private function getMetadataFactory()
+    {
+        return $this->createClient()->getContainer()->get('jms_di_extra.metadata.metadata_factory');
+    }
+}

Tests/Functional/config/framework.yml

@@ -9,7 +9,7 @@ framework:
         enabled: true
         enable_annotations: true
     router:
-        resource: %kernel.root_dir%/config/routing.yml
+        resource: "%kernel.root_dir%/config/routing.yml"
 
 services:
     logger:

Tests/Functional/config/twig.yml

@@ -3,5 +3,5 @@ framework:
         engines: [twig, php]
 
 twig:
-    debug:            %kernel.debug%
-    strict_variables: %kernel.debug%
+    debug:            "%kernel.debug%"
+    strict_variables: "%kernel.debug%"