Merge pull request #545 from akomm/0.11

fix #543

Author: akomm

src/Config/Processor/InheritanceProcessor.php

@@ -88,6 +88,10 @@ private static function inheritsTypeConfig($child, array $parents, array $config
             unset($mergedParentsConfig['resolveType']);
         }
 
+        if (isset($mergedParentsConfig['interfaces'], $childType['config']['interfaces'])) {
+            $childType['config']['interfaces'] = \array_merge($mergedParentsConfig['interfaces'], $childType['config']['interfaces']);
+        }
+
         $configs = \array_replace_recursive(['config' => $mergedParentsConfig], $childType);
 
         return $configs;

tests/Functional/App/config/inheritance/mapping/Decorators.types.yaml

@@ -13,3 +13,38 @@ QueryFooDecorator:
         fields:
             period:
                 type: Period
+
+InterfaceA:
+    type: interface
+    config:
+        fields:
+            a:
+                type: String
+
+InterfaceB:
+    type: interface
+    config:
+        fields:
+            b:
+                type: String
+
+DecoratorA:
+    type: object
+    decorator: true
+    config:
+        interfaces:
+            - InterfaceA
+        fields:
+            a:
+                type: String
+
+AandB:
+    type: object
+    inherits:
+        - DecoratorA
+    config:
+        interfaces:
+            - InterfaceB
+        fields:
+            b:
+                type: String

tests/Functional/Inheritance/InheritanceTest.php

@@ -78,4 +78,32 @@ public function testDecoratorTypeShouldRemovedFromFinalConfig()
         $this->assertArrayNotHasKey('QueryBarDecorator', $this->config);
         $this->assertArrayNotHasKey('QueryFooDecorator', $this->config);
     }
+
+    public function testDecoratorInterfacesShouldMerge()
+    {
+        $this->assertArrayHasKey('AandB', $this->config);
+        $this->assertSame(
+            [
+                'type' => 'object',
+                InheritanceProcessor::INHERITS_KEY => ['DecoratorA'],
+                'class_name' => 'AandBType',
+                'decorator' => false,
+                'config' => [
+                    'interfaces' => ['InterfaceA', 'InterfaceB'],
+                    'fields' => [
+                        'a' => [
+                            'type' => 'String',
+                            'args' => [],
+                        ],
+                        'b' => [
+                            'type' => 'String',
+                            'args' => [],
+                        ],
+                    ],
+                    'name' => 'AandB',
+                ],
+            ],
+            $this->config['AandB']
+        );
+    }
 }