Implemented support for PrependExtensionInterface in AbstractExtensionTestCase::load()

Author: TheCelavi

PhpUnit/AbstractExtensionTestCase.php

@@ -48,41 +48,28 @@ protected function setUp()
         }
     }
 
-    /**
-     * Call this method (optionally) form within your test after you have (optionally) modified the ContainerBuilder
-     * for this test ($this->container), but BEFORE you call load method ($this->load()) - if your extension(s) implements
-     * \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface
-     *
-     * @see http://symfony.com/doc/current/bundles/prepend_extension.html
-     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface
-     */
-    protected function prepend()
-    {
-        if ($this->loadMethodInvoked) {
-            throw new \LogicException(sprintf('Method "prepend()" from "%s" must not be invoked after "load()" method.', PrependExtensionInterface::class));
-        }
-
-        foreach ($this->container->getExtensions() as $extension) {
-
-            if ($extension instanceof PrependExtensionInterface) {
-                $extension->prepend($this->container);
-            }
-        }
-    }
-
     /**
      * Call this method from within your test after you have (optionally) modified the ContainerBuilder for this test
      * ($this->container).
      *
-     * @param array $specificConfiguration
+     * If your extension(s) implements \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface, you may
+     * set $withPrependInvocation to TRUE to invoke prepend() method prior to load() method of your extension.
+     *
+     * @param array $configurationValues
+     * @param bool $withPrependInvocation
      */
-    protected function load(array $configurationValues = array())
+    protected function load(array $configurationValues = array(), $withPrependInvocation = false)
     {
         $this->loadMethodInvoked = true;
 
         $configs = array($this->getMinimalConfiguration(), $configurationValues);
 
         foreach ($this->container->getExtensions() as $extension) {
+
+            if ($withPrependInvocation && $extension instanceof PrependExtensionInterface) {
+                $extension->prepend($this->container);
+            }
+
             $extension->load($configs, $this->container);
         }
     }

Tests/PhpUnit/AbstractExtensionTestCaseTest.php

@@ -49,35 +49,6 @@ public function if_load_is_successful_it_does_not_fail()
         // check for existence of manually created arguments, not checking values.
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('manual_service_id', 0);
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('manual_service_id', 1);
-
-        // manually defined parameter in prepend service
-        $this->assertContainerBuilderHasParameter('manual_parameter', 'parameter value');
-
-        // prepend method is not invoked before load method, it must be invoked manually
-        $this->assertFalse($this->container->hasParameter('prepend_extension_interface.successfully_invoked'));
-    }
-
-    /**
-     * @test
-     */
-    public function if_prepend_is_invoked_before_load_it_does_not_fail()
-    {
-        $this->prepend();
-        $this->load();
-
-        // prepend method modifies container builder
-        $this->assertContainerBuilderHasParameter('prepend_extension_interface.successfully_invoked', 'prepended value');
-    }
-
-    /**
-     * @test
-     */
-    public function if_prepend_is_invoked_after_load_it_fails()
-    {
-        $this->expectException(\LogicException::class);
-
-        $this->load();
-        $this->prepend();
     }
 
     /**

Tests/PhpUnit/AbstractPrependExtensionTestCaseTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Matthias\DependencyInjectionTests\Test\DependencyInjection;
+
+use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
+use Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures\MatthiasDependencyInjectionTestExtension;
+use PHPUnit\Framework\ExpectationFailedException;
+
+class AbstractPrependExtensionTestCaseTest extends AbstractExtensionTestCase
+{
+    protected function getContainerExtensions()
+    {
+        return array(
+            new MatthiasDependencyInjectionTestExtension()
+        );
+    }
+
+    /**
+     * @test
+     */
+    public function if_prepend_invoked_it_does_not_fails()
+    {
+        $this->load([], true);
+
+        $this->assertContainerBuilderHasParameter('prepend_extension_interface.successfully_invoked', 'prepended value');
+    }
+
+    /**
+     * @test
+     */
+    public function if_prepend_is_not_invoked_it_does_not_fails()
+    {
+        $this->load();
+
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('prepend_extension_interface.successfully_invoked');
+
+        $this->assertContainerBuilderHasParameter('prepend_extension_interface.successfully_invoked', 'prepended value');
+    }
+}