Merge branch '4.4' into 5.1

* 4.4:
  Use createMock() and use import instead of FQCN

Author: nicolas-grekas

Tests/CssSelectorConverterTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\CssSelector\CssSelectorConverter;
+use Symfony\Component\CssSelector\Exception\ParseException;
 
 class CssSelectorConverterTest extends TestCase
 {
@@ -45,7 +46,7 @@ public function testCssToXPathXml()
 
     public function testParseExceptions()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ParseException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage('Expected identifier, but <eof at 3> found.');
         $converter = new CssSelectorConverter();
         $converter->toXPath('h1:');

Tests/Parser/TokenStreamTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\CssSelector\Tests\Parser;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\TokenStream;
 
@@ -53,7 +54,7 @@ public function testGetNextIdentifier()
 
     public function testFailToGetNextIdentifier()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\SyntaxErrorException::class);
+        $this->expectException(SyntaxErrorException::class);
 
         $stream = new TokenStream();
         $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
@@ -73,7 +74,7 @@ public function testGetNextIdentifierOrStar()
 
     public function testFailToGetNextIdentifierOrStar()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\SyntaxErrorException::class);
+        $this->expectException(SyntaxErrorException::class);
 
         $stream = new TokenStream();
         $stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));

Tests/XPath/TranslatorTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\CssSelector\Tests\XPath;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\CssSelector\Exception\ExpressionErrorException;
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\FunctionNode;
 use Symfony\Component\CssSelector\Parser\Parser;
@@ -37,23 +38,23 @@ public function testCssToXPath($css, $xpath)
 
     public function testCssToXPathPseudoElement()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ExpressionErrorException::class);
+        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $translator->cssToXPath('e::first-line');
     }
 
     public function testGetExtensionNotExistsExtension()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ExpressionErrorException::class);
+        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $translator->getExtension('fake');
     }
 
     public function testAddCombinationNotExistsExtension()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ExpressionErrorException::class);
+        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $parser = new Parser();
@@ -64,7 +65,7 @@ public function testAddCombinationNotExistsExtension()
 
     public function testAddFunctionNotExistsFunction()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ExpressionErrorException::class);
+        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $xpath = new XPathExpr();
@@ -74,7 +75,7 @@ public function testAddFunctionNotExistsFunction()
 
     public function testAddPseudoClassNotExistsClass()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ExpressionErrorException::class);
+        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $xpath = new XPathExpr();
@@ -83,7 +84,7 @@ public function testAddPseudoClassNotExistsClass()
 
     public function testAddAttributeMatchingClassNotExistsClass()
     {
-        $this->expectException(\Symfony\Component\CssSelector\Exception\ExpressionErrorException::class);
+        $this->expectException(ExpressionErrorException::class);
         $translator = new Translator();
         $translator->registerExtension(new HtmlExtension($translator));
         $xpath = new XPathExpr();