Merge branch '3.4' into 4.1

* 3.4: fix compatibility with Twig >= 2.6.1 [Form] SA fix fix compatibility with PHPUnit 4.8 remove return type hint for PHP 5 compatibility 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

Author: xabbuh

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)
  {