Allow AdminExtractor to be used for abstract admins (#8118)

sonata-project · Oct 18, 2023 · 2334082 · 2334082
1 parent 2a65e55
commit 2334082
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Translator/Extractor/AdminExtractor.php b/src/Translator/Extractor/AdminExtractor.php
@@ -13,6 +13,7 @@
 
 namespace Sonata\AdminBundle\Translator\Extractor;
 
+use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\BreadcrumbsBuilderInterface;
 use Sonata\AdminBundle\Admin\Pool;
 use Sonata\AdminBundle\Translator\LabelTranslatorStrategyInterface;
@@ -70,6 +71,10 @@ public function extract($resource, MessageCatalogue $catalogue): void
         foreach ($this->adminPool->getAdminServiceCodes() as $code) {
             $admin = $this->adminPool->getInstance($code);
 
+            if (!$this->isValidAdmin($admin)) {
+                continue;
+            }
+
             $this->labelStrategy = $admin->getLabelTranslatorStrategy();
             $this->domain = $admin->getTranslationDomain();
 
@@ -79,6 +84,7 @@ public function extract($resource, MessageCatalogue $catalogue): void
             }
 
             $admin->setLabelTranslatorStrategy($this);
+
             $admin->setSubject($admin->getNewInstance());
 
             foreach (self::PUBLIC_ADMIN_METHODS as $method) {
@@ -117,4 +123,18 @@ public function getLabel(string $label, string $context = '', string $type = '')
 
         return $label;
     }
+
+    /**
+     * @param AdminInterface<object> $admin
+     */
+    private function isValidAdmin(AdminInterface $admin): bool
+    {
+        $class = $admin->getClass();
+
+        if (!class_exists($class)) {
+            return false;
+        }
+
+        return !(new \ReflectionClass($class))->isAbstract();
+    }
 }
diff --git a/tests/Translator/Extractor/AdminExtractorTest.php b/tests/Translator/Extractor/AdminExtractorTest.php
@@ -51,8 +51,14 @@ protected function setUp(): void
 
         $this->fooAdmin->method('getShow')->willReturn(new FieldDescriptionCollection());
         $this->fooAdmin->method('getList')->willReturn(new FieldDescriptionCollection());
+        $this->fooAdmin
+            ->method('getClass')
+            ->willReturn(\stdClass::class);
         $this->barAdmin->method('getShow')->willReturn(new FieldDescriptionCollection());
         $this->barAdmin->method('getList')->willReturn(new FieldDescriptionCollection());
+        $this->barAdmin
+            ->method('getClass')
+            ->willReturn(\stdClass::class);
 
         $container = new Container();
         $container->set('foo_admin', $this->fooAdmin);