Merge branch '4.0'

* 4.0:
  [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

src/Symfony/Bridge/PhpUnit/CoverageListener.php

@@ -11,34 +11,10 @@
 
 namespace Symfony\Bridge\PhpUnit;
 
-use PHPUnit\Framework\BaseTestListener;
-use PHPUnit\Framework\Test;
-use Symfony\Bridge\PhpUnit\Legacy\CoverageListenerTrait;
-
 if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
-    class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListener', 'Symfony\Bridge\PhpUnit\CoverageListener');
-// Using an early return instead of a else does not work when using the PHPUnit
-// phar due to some weird PHP behavior (the class gets defined without executing
-// the code before it and so the definition is not properly conditional)
+    class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListenerForV5', 'Symfony\Bridge\PhpUnit\CoverageListener');
+} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
+    class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListenerForV6', 'Symfony\Bridge\PhpUnit\CoverageListener');
 } else {
-    /**
-     * CoverageListener adds `@covers <className>` on each test suite when possible
-     * to make the code coverage more accurate.
-     *
-     * @author Grégoire Pineau <[email protected]>
-     */
-    class CoverageListener extends BaseTestListener
-    {
-        private $trait;
-
-        public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
-        {
-            $this->trait = new CoverageListenerTrait($sutFqcnResolver, $warningOnSutNotFound);
-        }
-
-        public function startTest(Test $test)
-        {
-            $this->trait->startTest($test);
-        }
-    }
+    class_alias('Symfony\Bridge\PhpUnit\Legacy\CoverageListenerForV7', 'Symfony\Bridge\PhpUnit\CoverageListener');
 }

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListener.php renamed to src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV5.php

@@ -19,7 +19,7 @@
  *
  * @internal
  */
-class CoverageListener extends \PHPUnit_Framework_BaseTestListener
+class CoverageListenerForV5 extends \PHPUnit_Framework_BaseTestListener
 {
     private $trait;
 

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV6.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+use PHPUnit\Framework\BaseTestListener;
+use PHPUnit\Framework\Test;
+
+/**
+ * CoverageListener adds `@covers <className>` on each test suite when possible
+ * to make the code coverage more accurate.
+ *
+ * @author Grégoire Pineau <[email protected]>
+ *
+ * @internal
+ */
+class CoverageListenerForV6 extends BaseTestListener
+{
+    private $trait;
+
+    public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
+    {
+        $this->trait = new CoverageListenerTrait($sutFqcnResolver, $warningOnSutNotFound);
+    }
+
+    public function startTest(Test $test)
+    {
+        $this->trait->startTest($test);
+    }
+}

src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+use PHPUnit\Framework\TestListener;
+use PHPUnit\Framework\TestListenerDefaultImplementation;
+use PHPUnit\Framework\TestSuite;
+
+/**
+ * CoverageListener adds `@covers <className>` on each test suite when possible
+ * to make the code coverage more accurate.
+ *
+ * @author Grégoire Pineau <[email protected]>
+ *
+ * @internal
+ */
+class CoverageListenerForV7 implements TestListener
+{
+    use TestListenerDefaultImplementation;
+
+    private $trait;
+
+    public function __construct(callable $sutFqcnResolver = null, $warningOnSutNotFound = false)
+    {
+        $this->trait = new CoverageListenerTrait($sutFqcnResolver, $warningOnSutNotFound);
+    }
+
+    public function startTestSuite(TestSuite $suite): void
+    {
+        $this->trait->startTest($test);
+    }
+}

src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php

@@ -12,7 +12,9 @@ public function test()
             $this->markTestSkipped('This test cannot be run on Windows.');
         }
 
-        if (\PHP_VERSION_ID >= 70000) {
+        exec('type phpdbg', $output, $returnCode);
+
+        if (\PHP_VERSION_ID >= 70000 && 0 === $returnCode) {
             $php = 'phpdbg -qrr';
         } else {
             exec('php --ri xdebug -d zend_extension=xdebug.so 2> /dev/null', $output, $returnCode);

src/Symfony/Bridge/PhpUnit/Tests/Fixtures/coverage/tests/bootstrap.php

@@ -13,7 +13,13 @@
 require __DIR__.'/../src/FooCov.php';
 
 require __DIR__.'/../../../../Legacy/CoverageListenerTrait.php';
+
 if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Version::id(), '6.0.0', '<')) {
-    require __DIR__.'/../../../../Legacy/CoverageListener.php';
+    require_once __DIR__.'/../../../../Legacy/CoverageListenerForV5.php';
+} elseif (version_compare(\PHPUnit\Runner\Version::id(), '7.0.0', '<')) {
+    require_once __DIR__.'/../../../../Legacy/CoverageListenerForV6.php';
+} else {
+    require_once __DIR__.'/../../../../Legacy/CoverageListenerForV7.php';
 }
+
 require __DIR__.'/../../../../CoverageListener.php';

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

@@ -77,7 +77,9 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     $zip->extractTo(getcwd());
     $zip->close();
     chdir("phpunit-$PHPUNIT_VERSION");
-    passthru("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
+    if ($SYMFONY_PHPUNIT_REMOVE) {
+        passthru("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
+    }
     if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
         passthru("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
     }

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolPrunerPassTest.php

@@ -44,27 +44,17 @@ public function testCompilerPassReplacesCommandArgument()
 
     public function testCompilePassIsIgnoredIfCommandDoesNotExist()
     {
-        $container = $this
-            ->getMockBuilder(ContainerBuilder::class)
-            ->setMethods(array('hasDefinition', 'getDefinition', 'findTaggedServiceIds'))
-            ->getMock();
-
-        $container
-            ->expects($this->atLeastOnce())
-            ->method('hasDefinition')
-            ->with(CachePoolPruneCommand::class)
-            ->will($this->returnValue(false));
-
-        $container
-            ->expects($this->never())
-            ->method('getDefinition');
+        $container = new ContainerBuilder();
 
-        $container
-            ->expects($this->never())
-            ->method('findTaggedServiceIds');
+        $definitionsBefore = count($container->getDefinitions());
+        $aliasesBefore = count($container->getAliases());
 
         $pass = new CachePoolPrunerPass();
         $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
     }
 
     /**

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/LoggingTranslatorPassTest.php

@@ -13,96 +13,69 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 class LoggingTranslatorPassTest extends TestCase
 {
     public function testProcess()
     {
-        $definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->getMock();
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
-        $parameterBag = $this->getMockBuilder('Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface')->getMock();
-
-        $container->expects($this->exactly(2))
-            ->method('hasAlias')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->once())
-            ->method('getParameter')
-            ->will($this->returnValue(true));
-
-        $container->expects($this->once())
-            ->method('getAlias')
-            ->will($this->returnValue('translation.default'));
-
-        $container->expects($this->exactly(3))
-            ->method('getDefinition')
-            ->will($this->returnValue($definition));
-
-        $container->expects($this->once())
-            ->method('hasParameter')
-            ->with('translator.logging')
-            ->will($this->returnValue(true));
-
-        $definition->expects($this->once())
-            ->method('getClass')
-            ->will($this->returnValue('Symfony\Bundle\FrameworkBundle\Translation\Translator'));
-
-        $parameterBag->expects($this->once())
-            ->method('resolveValue')
-            ->will($this->returnValue("Symfony\Bundle\FrameworkBundle\Translation\Translator"));
-
-        $container->expects($this->once())
-            ->method('getParameterBag')
-            ->will($this->returnValue($parameterBag));
-
-        $container->expects($this->once())
-            ->method('getReflectionClass')
-            ->with('Symfony\Bundle\FrameworkBundle\Translation\Translator')
-            ->will($this->returnValue(new \ReflectionClass('Symfony\Bundle\FrameworkBundle\Translation\Translator')));
-
-        $definition->expects($this->once())
-            ->method('getTag')
-            ->with('container.service_subscriber')
-            ->willReturn(array(array('id' => 'translator'), array('id' => 'foo')));
-
-        $definition->expects($this->once())
-            ->method('clearTag')
-            ->with('container.service_subscriber');
-
-        $definition->expects($this->any())
-            ->method('addTag')
-            ->withConsecutive(
-                array('container.service_subscriber', array('id' => 'foo')),
-                array('container.service_subscriber', array('key' => 'translator', 'id' => 'translator.logging.inner'))
-            );
+        $container = new ContainerBuilder();
+        $container->setParameter('translator.logging', true);
+        $container->setParameter('translator.class', 'Symfony\Component\Translation\Translator');
+        $container->register('monolog.logger');
+        $container->setAlias('logger', 'monolog.logger');
+        $container->register('translator.default', '%translator.class%');
+        $container->register('translator.logging', '%translator.class%');
+        $container->setAlias('translator', 'translator.default');
+        $translationWarmerDefinition = $container->register('translation.warmer')
+            ->addArgument(new Reference('translator'))
+            ->addTag('container.service_subscriber', array('id' => 'translator'))
+            ->addTag('container.service_subscriber', array('id' => 'foo'));
 
         $pass = new LoggingTranslatorPass();
         $pass->process($container);
+
+        $this->assertEquals(
+            array('container.service_subscriber' => array(
+                array('id' => 'foo'),
+                array('key' => 'translator', 'id' => 'translator.logging.inner'),
+            )),
+            $translationWarmerDefinition->getTags()
+        );
     }
 
     public function testThatCompilerPassIsIgnoredIfThereIsNotLoggerDefinition()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
-        $container->expects($this->once())
-            ->method('hasAlias')
-            ->will($this->returnValue(false));
+        $container = new ContainerBuilder();
+        $container->register('identity_translator');
+        $container->setAlias('translator', 'identity_translator');
+
+        $definitionsBefore = count($container->getDefinitions());
+        $aliasesBefore = count($container->getAliases());
 
         $pass = new LoggingTranslatorPass();
         $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
     }
 
     public function testThatCompilerPassIsIgnoredIfThereIsNotTranslatorDefinition()
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->getMock();
-        $container->expects($this->at(0))
-            ->method('hasAlias')
-            ->will($this->returnValue(true));
+        $container = new ContainerBuilder();
+        $container->register('monolog.logger');
+        $container->setAlias('logger', 'monolog.logger');
 
-        $container->expects($this->at(0))
-            ->method('hasAlias')
-            ->will($this->returnValue(false));
+        $definitionsBefore = count($container->getDefinitions());
+        $aliasesBefore = count($container->getAliases());
 
         $pass = new LoggingTranslatorPass();
         $pass->process($container);
+
+        // the container is untouched (i.e. no new definitions or aliases)
+        $this->assertCount($definitionsBefore, $container->getDefinitions());
+        $this->assertCount($aliasesBefore, $container->getAliases());
     }
 }

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php

@@ -13,31 +13,22 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class UnusedTagsPassTest extends TestCase
 {
     public function testProcess()
     {
         $pass = new UnusedTagsPass();
 
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder')->setMethods(array('findTaggedServiceIds', 'findUnusedTags', 'findTags', 'log'))->getMock();
-        $container->expects($this->once())
-            ->method('log')
-            ->with($pass, 'Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?');
-        $container->expects($this->once())
-            ->method('findTags')
-            ->will($this->returnValue(array('kenrel.event_subscriber')));
-        $container->expects($this->once())
-            ->method('findUnusedTags')
-            ->will($this->returnValue(array('kenrel.event_subscriber', 'form.type')));
-        $container->expects($this->once())
-            ->method('findTaggedServiceIds')
-            ->with('kenrel.event_subscriber')
-            ->will($this->returnValue(array(
-                'foo' => array(),
-                'bar' => array(),
-            )));
+        $container = new ContainerBuilder();
+        $container->register('foo')
+            ->addTag('kenrel.event_subscriber');
+        $container->register('bar')
+            ->addTag('kenrel.event_subscriber');
 
         $pass->process($container);
+
+        $this->assertSame(array(sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)), $container->getCompiler()->getLog());
     }
 }