Merge branch '3.4' into 4.0

* 3.4:
  [Serializer] optims and cleanup
  do not mock the container builder in tests
  [PhpUnitBridge] Added support for PHPUnit 7 in Coverage Listener
  fix accessing request values
  Avoid running the remove command without any packages
  [Form] Add translations for Tagalog

Author: nicolas-grekas

Tests/DependencyInjection/TranslationDumperPassTest.php

@@ -12,55 +12,37 @@
 namespace Symfony\Component\Translation\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Translation\DependencyInjection\TranslationDumperPass;
 
 class TranslationDumperPassTest extends TestCase
 {
     public function testProcess()
     {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->disableOriginalConstructor()->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->disableOriginalConstructor()->getMock();
-
-        $container->expects($this->once())
-            ->method('hasDefinition')
-            ->with('translation.writer')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->once())
-            ->method('getDefinition')
-            ->with('translation.writer')
-            ->will($this->returnValue($definition));
-
-        $valueTaggedServiceIdsFound = array(
-            'foo.id' => array(
-                array('alias' => 'bar.alias'),
-            ),
-        );
-        $container->expects($this->once())
-            ->method('findTaggedServiceIds')
-            ->with('translation.dumper', true)
-            ->will($this->returnValue($valueTaggedServiceIdsFound));
-
-        $definition->expects($this->once())->method('addMethodCall')->with('addDumper', array('bar.alias', new Reference('foo.id')));
+        $container = new ContainerBuilder();
+        $writerDefinition = $container->register('translation.writer');
+        $container->register('foo.id')
+            ->addTag('translation.dumper', array('alias' => 'bar.alias'));
 
         $translationDumperPass = new TranslationDumperPass();
         $translationDumperPass->process($container);
+
+        $this->assertEquals(array(array('addDumper', array('bar.alias', new Reference('foo.id')))), $writerDefinition->getMethodCalls());
     }
 
     public function testProcessNoDefinitionFound()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->disableOriginalConstructor()->getMock();
-
-        $container->expects($this->once())
-            ->method('hasDefinition')
-            ->with('translation.writer')
-            ->will($this->returnValue(false));
+        $container = new ContainerBuilder();
 
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->never())->method('findTaggedServiceIds');
+        $definitionsBefore = count($container->getDefinitions());
+        $aliasesBefore = count($container->getAliases());
 
         $translationDumperPass = new TranslationDumperPass();
         $translationDumperPass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
     }
 }

Tests/DependencyInjection/TranslationExtractorPassTest.php

@@ -12,56 +12,38 @@
 namespace Symfony\Component\Translation\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass;
 
 class TranslationExtractorPassTest extends TestCase
 {
     public function testProcess()
     {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->disableOriginalConstructor()->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->disableOriginalConstructor()->getMock();
-
-        $container->expects($this->once())
-            ->method('hasDefinition')
-            ->with('translation.extractor')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->once())
-            ->method('getDefinition')
-            ->with('translation.extractor')
-            ->will($this->returnValue($definition));
-
-        $valueTaggedServiceIdsFound = array(
-            'foo.id' => array(
-                array('alias' => 'bar.alias'),
-            ),
-        );
-        $container->expects($this->once())
-            ->method('findTaggedServiceIds')
-            ->with('translation.extractor', true)
-            ->will($this->returnValue($valueTaggedServiceIdsFound));
-
-        $definition->expects($this->once())->method('addMethodCall')->with('addExtractor', array('bar.alias', new Reference('foo.id')));
+        $container = new ContainerBuilder();
+        $extractorDefinition = $container->register('translation.extractor');
+        $container->register('foo.id')
+            ->addTag('translation.extractor', array('alias' => 'bar.alias'));
 
         $translationDumperPass = new TranslationExtractorPass();
         $translationDumperPass->process($container);
+
+        $this->assertEquals(array(array('addExtractor', array('bar.alias', new Reference('foo.id')))), $extractorDefinition->getMethodCalls());
     }
 
     public function testProcessNoDefinitionFound()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->disableOriginalConstructor()->getMock();
+        $container = new ContainerBuilder();
 
-        $container->expects($this->once())
-            ->method('hasDefinition')
-            ->with('translation.extractor')
-            ->will($this->returnValue(false));
-
-        $container->expects($this->never())->method('getDefinition');
-        $container->expects($this->never())->method('findTaggedServiceIds');
+        $definitionsBefore = count($container->getDefinitions());
+        $aliasesBefore = count($container->getAliases());
 
         $translationDumperPass = new TranslationExtractorPass();
         $translationDumperPass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
     }
 
     /**
@@ -71,25 +53,10 @@ public function testProcessNoDefinitionFound()
     public function testProcessMissingAlias()
     {
         $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->disableOriginalConstructor()->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->disableOriginalConstructor()->getMock();
-
-        $container->expects($this->once())
-            ->method('hasDefinition')
-            ->with('translation.extractor')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->once())
-            ->method('getDefinition')
-            ->with('translation.extractor')
-            ->will($this->returnValue($definition));
-
-        $valueTaggedServiceIdsFound = array(
-            'foo.id' => array(),
-        );
-        $container->expects($this->once())
-            ->method('findTaggedServiceIds')
-            ->with('translation.extractor', true)
-            ->will($this->returnValue($valueTaggedServiceIdsFound));
+        $container = new ContainerBuilder();
+        $container->register('translation.extractor');
+        $container->register('foo.id')
+            ->addTag('translation.extractor', array());
 
         $definition->expects($this->never())->method('addMethodCall');