Merge branch 'sw-25250/5.6/fix-plugin-resources' into '5.6'

SW-25250 - Fix plugin resource registration

See merge request shopware/5/product/shopware!279

Author: shyim

UPGRADE-5.6.md

@@ -2,6 +2,14 @@
 
 This changelog references changes done in Shopware 5.6 patch versions.
 
+## 5.6.6
+
+[View all changes from v5.6.5...v5.6.6](https://github.com/shopware/shopware/compare/v5.6.5...v5.6.6)
+
+### Changes
+
+* Changed `\Shopware\Components\DependencyInjection\Compiler\PluginResourceCompilerPass` to work correctly with multiple plugins
+
 ## 5.6.5
 
 [View all changes from v5.6.4...v5.6.5](https://github.com/shopware/shopware/compare/v5.6.4...v5.6.5)

engine/Shopware/Components/DependencyInjection/Compiler/PluginResourceCompilerPass.php

@@ -84,7 +84,7 @@ public function process(ContainerBuilder $container): void
             }
 
             if (!$definition->hasTag('shopware.event_listener')) {
-                return;
+                continue;
             }
 
             $container->setDefinition($plugin->getContainerPrefix() . '.internal.resource_subscriber', $definition);

tests/Unit/Components/Plugin/PluginResourceCompilerPassTest.php

@@ -27,6 +27,7 @@
 use PHPUnit\Framework\TestCase;
 use Shopware\Components\DependencyInjection\Compiler\PluginResourceCompilerPass;
 use Shopware\Components\Plugin;
+use Shopware\Components\Plugin\ResourceSubscriber;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class PluginResourceCompilerPassTest extends TestCase
@@ -107,4 +108,39 @@ public function testWithEnabledAutoload(): void
         // JS, CSS, LESS, FRONTEND TPL, BACKEND TPL
         static::assertCount(5, $tags);
     }
+
+    public function testTwoPlugins(): void
+    {
+        $emptyPlugin = $this->createMock(Plugin::class);
+        $emptyPlugin->method('getPath')
+            ->willReturn(__DIR__ . '/examples/EmptyPlugin');
+
+        $emptyPlugin
+            ->method('hasAutoloadViews')
+            ->willReturn(true);
+
+        $emptyPlugin
+            ->method('getContainerPrefix')
+            ->willReturn('empty_plugin');
+
+        $filledPlugin = $this->createMock(Plugin::class);
+        $filledPlugin->method('getPath')
+            ->willReturn(__DIR__ . '/examples/TestPlugin');
+
+        $filledPlugin
+            ->method('hasAutoloadViews')
+            ->willReturn(true);
+
+        $filledPlugin
+            ->method('getContainerPrefix')
+            ->willReturn('filled_plugin');
+
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new PluginResourceCompilerPass([$emptyPlugin, $filledPlugin]));
+        $container->compile();
+
+        static::assertCount(2, $container->getDefinitions());
+
+        static::assertInstanceOf(ResourceSubscriber::class, $container->get('filled_plugin.internal.resource_subscriber'));
+    }
 }