Merge branch '4.2'

* 4.2: bump required Twig version fix compatibility with Twig >= 2.6.1 [Form] SA fix fix compatibility with PHPUnit 4.8 remove return type hint for PHP 5 compatibility SCA: minor code tweaks Component CssSelector tests [DebugClassLoader] Readd findFile() method [Console] Fix composer.json suggest/provide Revert "bug #29597 [DI] fix reporting bindings on overriden services as unused (nicolas-grekas)" Fixed exception wording Fix SwiftMailerHandler to support Monolog's latest reset functionality
symfony · Jan 14, 2019 · 508602d · 508602d
2 parents cdbf40b + 6d37740
commit 508602d
Show file tree

Hide file tree

Showing 18 changed files with 125 additions and 82 deletions.
diff --git a/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/SwiftMailerHandler.php
@@ -59,6 +59,14 @@ protected function send($content, array $records)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->flushMemorySpool();
+    }
+
     /**
      * Flushes the mail queue if a memory spool is used.
      */

diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php
@@ -72,7 +72,7 @@ public function parse(Token $token)
         $body = $this->parser->subparse(array($this, 'decideTransChoiceFork'), true);
 
         if (!$body instanceof TextNode && !$body instanceof AbstractExpression) {
-            throw new SyntaxError('A message inside a transchoice tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext()->getName());
+            throw new SyntaxError('A message inside a transchoice tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext());
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);

diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
@@ -67,7 +67,7 @@ public function parse(Token $token)
                 $stream->next();
                 $locale = $this->parser->getExpressionParser()->parseExpression();
             } elseif (!$stream->test(Token::BLOCK_END_TYPE)) {
-                throw new SyntaxError('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getSourceContext()->getName());
+                throw new SyntaxError('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
             }
         }
 
@@ -76,7 +76,7 @@ public function parse(Token $token)
         $body = $this->parser->subparse(array($this, 'decideTransFork'), true);
 
         if (!$body instanceof TextNode && !$body instanceof AbstractExpression) {
-            throw new SyntaxError('A message inside a trans tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext()->getName());
+            throw new SyntaxError('A message inside a trans tag must be a simple text.', $body->getTemplateLine(), $stream->getSourceContext());
         }
 
         $stream->expect(Token::BLOCK_END_TYPE);

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "symfony/contracts": "^1.0.2",
-        "twig/twig": "^1.36.1|^2.6.1"
+        "twig/twig": "^1.37.1|^2.6.2"
     },
     "require-dev": {
         "symfony/asset": "~3.4|~4.0",

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -585,9 +585,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $metadataStoreDefinition->replaceArgument(2, $transitionsMetadataDefinition);
 
             // Create places
-            $places = array_map(function (array $place) {
-                return $place['name'];
-            }, $workflow['places']);
+            $places = array_column($workflow['places'], 'name');
 
             // Create a Definition
             $definitionDefinition = new Definition(Workflow\Definition::class);

diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -28,11 +28,14 @@
         "symfony/process": "~3.4|~4.0",
         "psr/log": "~1.0"
     },
+    "provide": {
+        "psr/log-implementation": "1.0"
+    },
     "suggest": {
         "symfony/event-dispatcher": "",
         "symfony/lock": "",
         "symfony/process": "",
-        "psr/log-implementation": "For using the console logger"
+        "psr/log": "For using the console logger"
     },
     "conflict": {
         "symfony/dependency-injection": "<3.4",

diff --git a/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php b/src/Symfony/Component/CssSelector/Tests/XPath/TranslatorTest.php
@@ -12,8 +12,12 @@
 namespace Symfony\Component\CssSelector\Tests\XPath;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Node\ElementNode;
+use Symfony\Component\CssSelector\Node\FunctionNode;
+use Symfony\Component\CssSelector\Parser\Parser;
 use Symfony\Component\CssSelector\XPath\Extension\HtmlExtension;
 use Symfony\Component\CssSelector\XPath\Translator;
+use Symfony\Component\CssSelector\XPath\XPathExpr;
 
 class TranslatorTest extends TestCase
 {
@@ -31,6 +35,73 @@ public function testCssToXPath($css, $xpath)
         $this->assertEquals($xpath, $translator->cssToXPath($css, ''));
     }
 
+    /**
+     * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
+     */
+    public function testCssToXPathPseudoElement()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $translator->cssToXPath('e::first-line');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
+     */
+    public function testGetExtensionNotExistsExtension()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $translator->getExtension('fake');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
+     */
+    public function testAddCombinationNotExistsExtension()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $parser = new Parser();
+        $xpath = $parser->parse('*')[0];
+        $combinedXpath = $parser->parse('*')[0];
+        $translator->addCombination('fake', $xpath, $combinedXpath);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
+     */
+    public function testAddFunctionNotExistsFunction()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $xpath = new XPathExpr();
+        $function = new FunctionNode(new ElementNode(), 'fake');
+        $translator->addFunction($xpath, $function);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
+     */
+    public function testAddPseudoClassNotExistsClass()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $xpath = new XPathExpr();
+        $translator->addPseudoClass($xpath, 'fake');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\CssSelector\Exception\ExpressionErrorException
+     */
+    public function testAddAttributeMatchingClassNotExistsClass()
+    {
+        $translator = new Translator();
+        $translator->registerExtension(new HtmlExtension($translator));
+        $xpath = new XPathExpr();
+        $translator->addAttributeMatching($xpath, '', '', '');
+    }
+
     /** @dataProvider getXmlLangTestData */
     public function testXmlLang($css, array $elementsId)
     {

diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -128,6 +128,14 @@ public static function disable()
         }
     }
 
+    /**
+     * @return string|null
+     */
+    public function findFile($class)
+    {
+        return $this->isFinder ? $this->classLoader[0]->findFile($class) ?: null : null;
+    }
+
     /**
      * Loads the given class or interface.
      *

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -34,8 +34,6 @@ class ResolveBindingsPass extends AbstractRecursivePass
      */
     public function process(ContainerBuilder $container)
     {
-        $this->usedBindings = $container->getRemovedBindingIds();
-
         try {
             parent::process($container);
 

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -124,8 +124,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
     private $removedIds = array();
 
-    private $removedBindingIds = array();
-
     private static $internalTypes = array(
         'int' => true,
         'float' => true,
@@ -502,8 +500,7 @@ public function set($id, $service)
             throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
         }
 
-        $this->removeId($id);
-        unset($this->removedIds[$id]);
+        unset($this->definitions[$id], $this->aliasDefinitions[$id], $this->removedIds[$id]);
 
         parent::set($id, $service);
     }
@@ -516,7 +513,8 @@ public function set($id, $service)
     public function removeDefinition($id)
     {
         if (isset($this->definitions[$id = (string) $id])) {
-            $this->removeId($id);
+            unset($this->definitions[$id]);
+            $this->removedIds[$id] = true;
         }
     }
 
@@ -838,8 +836,7 @@ public function setAlias($alias, $id)
             throw new InvalidArgumentException(sprintf('An alias can not reference itself, got a circular reference on "%s".', $alias));
         }
 
-        $this->removeId($alias);
-        unset($this->removedIds[$alias]);
+        unset($this->definitions[$alias], $this->removedIds[$alias]);
 
         return $this->aliasDefinitions[$alias] = $id;
     }
@@ -852,7 +849,8 @@ public function setAlias($alias, $id)
     public function removeAlias($alias)
     {
         if (isset($this->aliasDefinitions[$alias = (string) $alias])) {
-            $this->removeId($alias);
+            unset($this->aliasDefinitions[$alias]);
+            $this->removedIds[$alias] = true;
         }
     }
 
@@ -981,8 +979,7 @@ public function setDefinition($id, Definition $definition)
 
         $id = (string) $id;
 
-        $this->removeId($id);
-        unset($this->removedIds[$id]);
+        unset($this->aliasDefinitions[$id], $this->removedIds[$id]);
 
         return $this->definitions[$id] = $definition;
     }
@@ -1511,18 +1508,6 @@ public static function getInitializedConditionals($value)
         return $services;
     }
 
-    /**
-     * Gets removed binding ids.
-     *
-     * @return array
-     *
-     * @internal
-     */
-    public function getRemovedBindingIds()
-    {
-        return $this->removedBindingIds;
-    }
-
     /**
      * Computes a reasonably unique hash of a value.
      *
@@ -1631,21 +1616,4 @@ private function inVendors($path)
 
         return false;
     }
-
-    private function removeId($id)
-    {
-        $this->removedIds[$id] = true;
-        unset($this->aliasDefinitions[$id]);
-
-        if (!isset($this->definitions[$id])) {
-            return;
-        }
-
-        foreach ($this->definitions[$id]->getBindings() as $binding) {
-            list(, $identifier) = $binding->getValues();
-            $this->removedBindingIds[$identifier] = true;
-        }
-
-        unset($this->definitions[$id]);
-    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -112,24 +112,6 @@ public function testScalarSetter()
         $this->assertEquals(array(array('setDefaultLocale', array('fr'))), $definition->getMethodCalls());
     }
 
-    public function testOverriddenBindings()
-    {
-        $container = new ContainerBuilder();
-
-        $binding = new BoundArgument('bar');
-
-        $container->register('foo', 'stdClass')
-            ->setBindings(array('$foo' => clone $binding));
-        $container->register('bar', 'stdClass')
-            ->setBindings(array('$foo' => clone $binding));
-
-        $container->register('foo', 'stdClass');
-
-        (new ResolveBindingsPass())->process($container);
-
-        $this->assertInstanceOf('stdClass', $container->get('foo'));
-    }
-
     public function testTupleBinding()
     {
         $container = new ContainerBuilder();

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -399,7 +399,7 @@ protected function process(ContainerBuilder $container)
 
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
-     * @expectedExceptionMessageRegExp /^Circular reference detected for service "a", path: "a -> c -> b -> a"./
+     * @expectedExceptionMessageRegExp /^Circular reference detected for service "c", path: "c -> b -> a -> c"./
      */
     public function testProcessDetectsChildDefinitionIndirectCircularReference()
     {

diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -559,7 +559,7 @@ public function testMerge()
         $config->setDefinition('baz', new Definition('BazClass'));
         $config->setAlias('alias_for_foo', 'foo');
         $container->merge($config);
-        $this->assertEquals(array('foo', 'bar', 'service_container', 'baz'), array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
+        $this->assertEquals(array('service_container', 'foo', 'bar', 'baz'), array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
 
         $aliases = $container->getAliases();
         $this->assertArrayHasKey('alias_for_foo', $aliases);

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/instanceof.expected.yml
@@ -4,9 +4,6 @@ services:
         class: Symfony\Component\DependencyInjection\ContainerInterface
         public: true
         synthetic: true
-    foo:
-        class: App\FooService
-        public: true
     Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
         class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
         public: true
@@ -19,3 +16,6 @@ services:
 
         shared: false
         configurator: c
+    foo:
+        class: App\FooService
+        public: true
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype.expected.yml
@@ -4,22 +4,22 @@ services:
         class: Symfony\Component\DependencyInjection\ContainerInterface
         public: true
         synthetic: true
-    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar:
-        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
         public: true
         tags:
             - { name: foo }
             - { name: baz }
         deprecated: '%service_id%'
-        lazy: true
         arguments: [1]
         factory: f
-    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
-        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar
         public: true
         tags:
             - { name: foo }
             - { name: baz }
         deprecated: '%service_id%'
+        lazy: true
         arguments: [1]
         factory: f