Merge branch '4.4' into 5.1

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

Author: nicolas-grekas

Tests/ExpressionLanguageTest.php

@@ -12,17 +12,20 @@
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Cache\CacheItemInterface;
+use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
+use Symfony\Component\ExpressionLanguage\SyntaxError;
 use Symfony\Component\ExpressionLanguage\Tests\Fixtures\TestProvider;
 
 class ExpressionLanguageTest extends TestCase
 {
     public function testCachedParse()
     {
-        $cacheMock = $this->getMockBuilder(\Psr\Cache\CacheItemPoolInterface::class)->getMock();
-        $cacheItemMock = $this->getMockBuilder(\Psr\Cache\CacheItemInterface::class)->getMock();
+        $cacheMock = $this->createMock(CacheItemPoolInterface::class);
+        $cacheItemMock = $this->createMock(CacheItemInterface::class);
         $savedParsedExpression = null;
         $expressionLanguage = new ExpressionLanguage($cacheMock);
 
@@ -107,7 +110,7 @@ public function testShortCircuitOperatorsCompile($expression, array $names, $exp
 
     public function testParseThrowsInsteadOfNotice()
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $this->expectExceptionMessage('Unexpected end of expression around position 6 for expression `node.`.');
         $expressionLanguage = new ExpressionLanguage();
         $expressionLanguage->parse('node.', ['node']);
@@ -155,8 +158,8 @@ public function testStrictEquality()
 
     public function testCachingWithDifferentNamesOrder()
     {
-        $cacheMock = $this->getMockBuilder(\Psr\Cache\CacheItemPoolInterface::class)->getMock();
-        $cacheItemMock = $this->getMockBuilder(\Psr\Cache\CacheItemInterface::class)->getMock();
+        $cacheMock = $this->createMock(CacheItemPoolInterface::class);
+        $cacheItemMock = $this->createMock(CacheItemInterface::class);
         $expressionLanguage = new ExpressionLanguage($cacheMock);
         $savedParsedExpression = null;
 

Tests/LexerTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\Lexer;
+use Symfony\Component\ExpressionLanguage\SyntaxError;
 use Symfony\Component\ExpressionLanguage\Token;
 use Symfony\Component\ExpressionLanguage\TokenStream;
 
@@ -39,15 +40,15 @@ public function testTokenize($tokens, $expression)
 
     public function testTokenizeThrowsErrorWithMessage()
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $this->expectExceptionMessage('Unexpected character "\'" around position 33 for expression `service(faulty.expression.example\').dummyMethod()`.');
         $expression = "service(faulty.expression.example').dummyMethod()";
         $this->lexer->tokenize($expression);
     }
 
     public function testTokenizeThrowsErrorOnUnclosedBrace()
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $this->expectExceptionMessage('Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.');
         $expression = 'service(unclosed.expression.dummyMethod()';
         $this->lexer->tokenize($expression);

Tests/ParserTest.php

@@ -21,7 +21,7 @@ class ParserTest extends TestCase
 {
     public function testParseWithInvalidName()
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
         $lexer = new Lexer();
         $parser = new Parser([]);
@@ -30,7 +30,7 @@ public function testParseWithInvalidName()
 
     public function testParseWithZeroInNames()
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
         $lexer = new Lexer();
         $parser = new Parser([]);
@@ -198,7 +198,7 @@ private function createGetAttrNode($node, $item, $type)
      */
     public function testParseWithInvalidPostfixData($expr, $names = [])
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $lexer = new Lexer();
         $parser = new Parser([]);
         $parser->parse($lexer->tokenize($expr), $names);
@@ -228,7 +228,7 @@ public function getInvalidPostfixData()
 
     public function testNameProposal()
     {
-        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
+        $this->expectException(SyntaxError::class);
         $this->expectExceptionMessage('Did you mean "baz"?');
         $lexer = new Lexer();
         $parser = new Parser([]);