Merge pull request #260 from brambaud/fix/parent-service-with-grandparent-override

Fail to map a service with a parent which overrides its parent too

Author: mglaman

src/Drupal/ServiceMap.php

@@ -70,7 +70,7 @@ private function resolveParentDefinition(string $parentId, array $serviceDefinit
                 return $serviceDefinition;
             }
 
-            return $this->resolveParentDefinition($parentDefinition['parent'], $drupalServices[$parentDefinition['parent']], $drupalServices);
+            $parentDefinition = $this->resolveParentDefinition($parentDefinition['parent'], $drupalServices[$parentDefinition['parent']], $drupalServices);
         }
 
         if (isset($parentDefinition['class']) && !isset($serviceDefinition['class'])) {

tests/fixtures/drupal/modules/service_map/service_map.services.yml

@@ -21,3 +21,15 @@ services:
     parent: service_map.abstract_service_private
     class: Drupal\service_map\Override
     public: true
+  service_map.base:
+    class: Drupal\service_map\Base
+    public: false
+    abstract: true
+  service_map.second_base:
+    parent: service_map.base
+    class: Drupal\service_map\SecondBase
+    abstract: true
+  service_map.concrete_overriding_its_parent_which_has_a_parent:
+    parent: service_map.second_base
+    class: Drupal\service_map\Concrete
+    public: true

tests/fixtures/drupal/modules/service_map/src/Base.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\service_map;
+
+abstract class Base
+{
+
+}

tests/fixtures/drupal/modules/service_map/src/Concrete.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\service_map;
+
+final class Concrete extends SecondBase
+{
+
+}

tests/fixtures/drupal/modules/service_map/src/SecondBase.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\service_map;
+
+abstract class SecondBase extends Base
+{
+
+}

tests/src/ServiceMapFactoryTest.php

@@ -65,6 +65,21 @@ public function testFactory(string $id, callable $validator): void
                 'class' => 'Drupal\service_map\Override',
                 'public' => false,
             ],
+            'service_map.base' => [
+                'class' => 'Drupal\service_map\Base',
+                'public' => false,
+                'abstract' => true,
+            ],
+            'service_map.second_base' => [
+                'parent' => 'service_map.base',
+                'class' => 'Drupal\service_map\SecondBase',
+                'abstract' => true,
+            ],
+            'service_map.concrete_overriding_its_parent_which_has_a_parent' => [
+                'parent' => 'service_map.second_base',
+                'class' => 'Drupal\service_map\Concrete',
+                'public' => true,
+            ],
         ]);
         $validator($service->getService($id));
     }
@@ -141,7 +156,6 @@ function (?DrupalServiceDefinition $service): void {
                 self::assertNull($service);
             }
         ];
-
         yield [
             'service_with_unknown_parent_overriding_definition_of_its_parent',
             function (DrupalServiceDefinition $service): void {
@@ -151,6 +165,33 @@ function (DrupalServiceDefinition $service): void {
                 self::assertNull($service->getAlias());
             }
         ];
+        yield [
+            'service_map.base',
+            function (DrupalServiceDefinition $service): void {
+                self::assertEquals('service_map.base', $service->getId());
+                self::assertEquals('Drupal\service_map\Base', $service->getClass());
+                self::assertFalse($service->isPublic());
+                self::assertNull($service->getAlias());
+            }
+        ];
+        yield [
+            'service_map.second_base',
+            function (DrupalServiceDefinition $service): void {
+                self::assertEquals('service_map.second_base', $service->getId());
+                self::assertEquals('Drupal\service_map\SecondBase', $service->getClass());
+                self::assertFalse($service->isPublic());
+                self::assertNull($service->getAlias());
+            }
+        ];
+        yield [
+            'service_map.concrete_overriding_its_parent_which_has_a_parent',
+            function (DrupalServiceDefinition $service): void {
+                self::assertEquals('service_map.concrete_overriding_its_parent_which_has_a_parent', $service->getId());
+                self::assertEquals('Drupal\service_map\Concrete', $service->getClass());
+                self::assertTrue($service->isPublic());
+                self::assertNull($service->getAlias());
+            }
+        ];
     }
 
 }

tests/src/Type/data/container.php

@@ -2,6 +2,8 @@
 
 namespace DrupalContainerStatic;
 
+use Drupal\service_map\AgainAnotherMyService;
+use Drupal\service_map\Concrete;
 use Drupal\service_map\MyService;
 use Drupal\service_map\Override;
 use function PHPStan\Testing\assertType;
@@ -14,3 +16,4 @@
 assertType(MyService::class, $container->get('service_map.concrete_service'));
 assertType(MyService::class, $container->get('service_map.concrete_service_with_a_parent_which_has_a_parent'));
 assertType(Override::class, $container->get('service_map.concrete_service_overriding_definition_of_its_parent'));
+assertType(Concrete::class, $container->get('service_map.concrete_overriding_its_parent_which_has_a_parent'));