Merge branch '2.7' into 2.8

* 2.7:
  [Bridge\PhpUnit] Exit as late as possible
  Update Repository Symlink Helper
  Document explicitly that dotfiles and vcs files are ignored by default
  do not mock the container builder in tests

Author: nicolas-grekas

Tests/Compiler/ExtensionCompilerPassTest.php

@@ -12,7 +12,10 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ExtensionCompilerPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 
 /**
  * @author Wouter J <wouter@wouterj.nl>
@@ -24,33 +27,52 @@ class ExtensionCompilerPassTest extends TestCase
 
     protected function setUp()
     {
-        $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
+        $this->container = new ContainerBuilder();
         $this->pass = new ExtensionCompilerPass();
     }
 
     public function testProcess()
     {
-        $extension1 = $this->createExtensionMock(true);
-        $extension1->expects($this->once())->method('process');
-        $extension2 = $this->createExtensionMock(false);
-        $extension3 = $this->createExtensionMock(false);
-        $extension4 = $this->createExtensionMock(true);
-        $extension4->expects($this->once())->method('process');
-
-        $this->container->expects($this->any())
-            ->method('getExtensions')
-            ->will($this->returnValue(array($extension1, $extension2, $extension3, $extension4)))
-        ;
+        $extension1 = new CompilerPassExtension('extension1');
+        $extension2 = new DummyExtension('extension2');
+        $extension3 = new DummyExtension('extension3');
+        $extension4 = new CompilerPassExtension('extension4');
+
+        $this->container->registerExtension($extension1);
+        $this->container->registerExtension($extension2);
+        $this->container->registerExtension($extension3);
+        $this->container->registerExtension($extension4);
 
         $this->pass->process($this->container);
+
+        $this->assertCount(2, $this->container->getDefinitions());
     }
+}
+
+class DummyExtension extends Extension
+{
+    private $alias;
 
-    private function createExtensionMock($hasInlineCompile)
+    public function __construct($alias)
     {
-        return $this->getMockBuilder('Symfony\Component\DependencyInjection\\'.(
-            $hasInlineCompile
-            ? 'Compiler\CompilerPassInterface'
-            : 'Extension\ExtensionInterface'
-        ))->getMock();
+        $this->alias = $alias;
     }
+
+    public function getAlias()
+    {
+        return $this->alias;
+    }
+
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        $container->register($this->alias);
+    }
+}
+
+class CompilerPassExtension extends DummyExtension implements CompilerPassInterface
+{
 }

Tests/Extension/ExtensionTest.php

@@ -12,6 +12,8 @@
 namespace Symfony\Component\DependencyInjection\Tests\Extension;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
 
 class ExtensionTest extends TestCase
 {
@@ -20,36 +22,8 @@ class ExtensionTest extends TestCase
      */
     public function testIsConfigEnabledReturnsTheResolvedValue($enabled)
     {
-        $pb = $this->getMockBuilder('Symfony\Component\DependencyInjection\ParameterBag\ParameterBag')
-            ->setMethods(array('resolveValue'))
-            ->getMock()
-        ;
-
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
-            ->setMethods(array('getParameterBag'))
-            ->getMock()
-        ;
-
-        $pb->expects($this->once())
-            ->method('resolveValue')
-            ->with($this->equalTo($enabled))
-            ->will($this->returnValue($enabled))
-        ;
-
-        $container->expects($this->once())
-            ->method('getParameterBag')
-            ->will($this->returnValue($pb))
-        ;
-
-        $extension = $this->getMockBuilder('Symfony\Component\DependencyInjection\Extension\Extension')
-            ->setMethods(array())
-            ->getMockForAbstractClass()
-        ;
-
-        $r = new \ReflectionMethod('Symfony\Component\DependencyInjection\Extension\Extension', 'isConfigEnabled');
-        $r->setAccessible(true);
-
-        $r->invoke($extension, $container, array('enabled' => $enabled));
+        $extension = new EnableableExtension();
+        $this->assertSame($enabled, $extension->isConfigEnabled(new ContainerBuilder(), array('enabled' => $enabled)));
     }
 
     public function getResolvedEnabledFixtures()
@@ -66,18 +40,20 @@ public function getResolvedEnabledFixtures()
      */
     public function testIsConfigEnabledOnNonEnableableConfig()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')
-            ->getMock()
-        ;
+        $extension = new EnableableExtension();
 
-        $extension = $this->getMockBuilder('Symfony\Component\DependencyInjection\Extension\Extension')
-            ->setMethods(array())
-            ->getMockForAbstractClass()
-        ;
+        $extension->isConfigEnabled(new ContainerBuilder(), array());
+    }
+}
 
-        $r = new \ReflectionMethod('Symfony\Component\DependencyInjection\Extension\Extension', 'isConfigEnabled');
-        $r->setAccessible(true);
+class EnableableExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
 
-        $r->invoke($extension, $container, array());
+    public function isConfigEnabled(ContainerBuilder $container, array $config)
+    {
+        return parent::isConfigEnabled($container, $config);
     }
 }