Merge branch '2.8' into 3.4

* 2.8:
  [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/DependencyInjection/Compiler/AddCacheWarmerPassTest.php

@@ -24,57 +24,43 @@ class AddCacheWarmerPassTest extends TestCase
     public function testThatCacheWarmersAreProcessedInPriorityOrder()
     {
         $container = new ContainerBuilder();
-
-        $definition = $container->register('cache_warmer')->addArgument(null);
+        $cacheWarmerDefinition = $container->register('cache_warmer')->addArgument(array());
         $container->register('my_cache_warmer_service1')->addTag('kernel.cache_warmer', array('priority' => 100));
         $container->register('my_cache_warmer_service2')->addTag('kernel.cache_warmer', array('priority' => 200));
         $container->register('my_cache_warmer_service3')->addTag('kernel.cache_warmer');
 
         $addCacheWarmerPass = new AddCacheWarmerPass();
         $addCacheWarmerPass->process($container);
 
-        $expected = array(
-            new Reference('my_cache_warmer_service2'),
-            new Reference('my_cache_warmer_service1'),
-            new Reference('my_cache_warmer_service3'),
+        $this->assertEquals(
+            array(
+                new Reference('my_cache_warmer_service2'),
+                new Reference('my_cache_warmer_service1'),
+                new Reference('my_cache_warmer_service3'),
+            ),
+            $cacheWarmerDefinition->getArgument(0)
         );
-        $this->assertEquals($expected, $definition->getArgument(0));
     }
 
     public function testThatCompilerPassIsIgnoredIfThereIsNoCacheWarmerDefinition()
     {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
-
-        $container->expects($this->never())->method('findTaggedServiceIds');
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with('cache_warmer')
-            ->will($this->returnValue(false));
-        $definition->expects($this->never())->method('replaceArgument');
+        $container = new ContainerBuilder();
 
         $addCacheWarmerPass = new AddCacheWarmerPass();
         $addCacheWarmerPass->process($container);
+
+        // we just check that the pass does not break if no cache warmer is registered
+        $this->addToAssertionCount(1);
     }
 
     public function testThatCacheWarmersMightBeNotDefined()
     {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
-
-        $container->expects($this->atLeastOnce())
-            ->method('findTaggedServiceIds')
-            ->will($this->returnValue(array()));
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with('cache_warmer')
-            ->will($this->returnValue(true));
-
-        $definition->expects($this->never())->method('replaceArgument');
+        $container = new ContainerBuilder();
+        $cacheWarmerDefinition = $container->register('cache_warmer')->addArgument(array());
 
         $addCacheWarmerPass = new AddCacheWarmerPass();
         $addCacheWarmerPass->process($container);
+
+        $this->assertSame(array(), $cacheWarmerDefinition->getArgument(0));
     }
 }

Tests/DependencyInjection/Compiler/AddConstraintValidatorsPassTest.php

@@ -66,18 +66,10 @@ public function testAbstractConstraintValidator()
 
     public function testThatCompilerPassIsIgnoredIfThereIsNoConstraintValidatorFactoryDefinition()
     {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'findTaggedServiceIds', 'getDefinition'))->getMock();
-
-        $container->expects($this->never())->method('findTaggedServiceIds');
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with('validator.validator_factory')
-            ->will($this->returnValue(false));
-        $definition->expects($this->never())->method('replaceArgument');
-
         $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
-        $addConstraintValidatorsPass->process($container);
+        $addConstraintValidatorsPass->process(new ContainerBuilder());
+
+        // we just check that the pass does not fail if no constraint validator factory is registered
+        $this->addToAssertionCount(1);
     }
 }

Tests/DependencyInjection/Compiler/ProfilerPassTest.php

@@ -12,82 +12,47 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
 
 class ProfilerPassTest extends TestCase
 {
-    private $profilerDefinition;
-
-    protected function setUp()
-    {
-        $this->profilerDefinition = new Definition('ProfilerClass');
-    }
-
     /**
      * Tests that collectors that specify a template but no "id" will throw
      * an exception (both are needed if the template is specified).
      *
      * Thus, a fully-valid tag looks something like this:
      *
      *     <tag name="data_collector" template="YourBundle:Collector:templatename" id="your_collector_name" />
+     *
+     * @expectedException \InvalidArgumentException
      */
     public function testTemplateNoIdThrowsException()
     {
-        // one service, with a template key, but no id
-        $services = array(
-            'my_collector_service' => array(0 => array('template' => 'foo')),
-        );
-
-        $builder = $this->createContainerMock($services);
-
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
+        $builder = new ContainerBuilder();
+        $builder->register('profiler', 'ProfilerClass');
+        $builder->register('my_collector_service')
+            ->addTag('data_collector', array('template' => 'foo'));
 
         $profilerPass = new ProfilerPass();
         $profilerPass->process($builder);
     }
 
     public function testValidCollector()
     {
-        // one service, with a template key, but no id
-        $services = array(
-            'my_collector_service' => array(0 => array('template' => 'foo', 'id' => 'my_collector')),
-        );
-
-        $container = $this->createContainerMock($services);
-
-        // fake the getDefinition() to return a Profiler definition
-        $container->expects($this->atLeastOnce())
-            ->method('getDefinition');
-
-        // assert that the data_collector.templates parameter should be set
-        $container->expects($this->once())
-            ->method('setParameter')
-            ->with('data_collector.templates', array('my_collector_service' => array('my_collector', 'foo')));
+        $container = new ContainerBuilder();
+        $profilerDefinition = $container->register('profiler', 'ProfilerClass');
+        $container->register('my_collector_service')
+            ->addTag('data_collector', array('template' => 'foo', 'id' => 'my_collector'));
 
         $profilerPass = new ProfilerPass();
         $profilerPass->process($container);
 
+        $this->assertSame(array('my_collector_service' => array('my_collector', 'foo')), $container->getParameter('data_collector.templates'));
+
         // grab the method calls off of the "profiler" definition
-        $methodCalls = $this->profilerDefinition->getMethodCalls();
+        $methodCalls = $profilerDefinition->getMethodCalls();
         $this->assertCount(1, $methodCalls);
         $this->assertEquals('add', $methodCalls[0][0]); // grab the method part of the first call
     }
-
-    private function createContainerMock($services)
-    {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('hasDefinition', 'getDefinition', 'findTaggedServiceIds', 'setParameter'))->getMock();
-        $container->expects($this->any())
-            ->method('hasDefinition')
-            ->with($this->equalTo('profiler'))
-            ->will($this->returnValue(true));
-        $container->expects($this->any())
-            ->method('getDefinition')
-            ->will($this->returnValue($this->profilerDefinition));
-        $container->expects($this->atLeastOnce())
-            ->method('findTaggedServiceIds')
-            ->will($this->returnValue($services));
-
-        return $container;
-    }
 }