Merge pull request #81 from symfony-cmf/description/sub_classes

Also support sub classes in admin descriptor

Author: dbu

src/Description/SonataEnhancer.php

@@ -39,6 +39,8 @@ class SonataEnhancer implements DescriptionEnhancerInterface
      */
     private $urlGenerator;
 
+    private $adminMap = [];
+
     /**
      * @param Pool                  $pool
      * @param UrlGeneratorInterface $urlGenerator
@@ -58,7 +60,7 @@ public function enhance(Description $description)
 
         // sonata has dependency on ClassUtils so this is fine.
         $class = ClassUtils::getClass($object);
-        $admin = $this->pool->getAdminByClass($class);
+        $admin = $this->getAdminByClass($class);
 
         $links = [];
 
@@ -118,6 +120,22 @@ public function supports(PuliResource $resource)
         // sonata has dependency on ClassUtils so this is fine.
         $class = ClassUtils::getClass($payload);
 
-        return $this->pool->hasAdminByClass($class);
+        return null !== $this->getAdminByClass($class);
+    }
+
+    private function getAdminByClass($class)
+    {
+        if (array_key_exists($class, $this->adminMap)) {
+            return $this->adminMap[$class];
+        }
+
+        $_class = $class;
+        while ($_class && !$this->pool->hasAdminByClass($_class)) {
+            $_class = get_parent_class($_class);
+        }
+
+        $this->adminMap[$class] = $_class ? $this->pool->getAdminByClass($_class) : null;
+
+        return $this->adminMap[$class];
     }
 }

tests/Unit/Description/SonataEnhancerTest.php

@@ -40,6 +40,7 @@ public function setUp()
         $this->pool = new Pool($this->container, 'Test', 'logo');
         $this->pool->setAdminClasses([
             'stdClass' => ['std_class_admin'],
+            'Exception' => ['std_class_admin'],
         ]);
         $this->pool->setAdminServiceIds(['std_class_admin']);
 
@@ -58,11 +59,11 @@ public function setUp()
     }
 
     /**
-     * It should provide a description.
+     * @dataProvider provideDescriptionData
      */
-    public function testDescriptionProvide()
+    public function testDescriptionProvide($class)
     {
-        $this->resource->getPayload()->willReturn(new \stdClass());
+        $this->resource->getPayload()->willReturn($class);
 
         $this->generator->generate(Argument::cetera())->will(function ($args) {
             return '/'.$args[0];
@@ -77,6 +78,14 @@ public function testDescriptionProvide()
         $this->assertEquals('/std_class_show', $description->get(Descriptor::LINK_SHOW_HTML));
         $this->assertEquals('/std_class_delete', $description->get(Descriptor::LINK_REMOVE_HTML));
     }
+
+    public function provideDescriptionData()
+    {
+        return [
+            [new \stdClass()],
+            [new \LogicException()],
+        ];
+    }
 }
 
 class TestAdmin extends AbstractAdmin