Merge branch '4.4' into 5.1

* 4.4:
  Use ::class keyword when possible

Author: fabpot

Tests/ExpressionFunctionTest.php

@@ -23,14 +23,14 @@ class ExpressionFunctionTest extends TestCase
 {
     public function testFunctionDoesNotExist()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('PHP function "fn_does_not_exist" does not exist.');
         ExpressionFunction::fromPhp('fn_does_not_exist');
     }
 
     public function testFunctionNamespaced()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.');
         ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\fn_namespaced');
     }

Tests/ExpressionLanguageTest.php

@@ -21,8 +21,8 @@ class ExpressionLanguageTest extends TestCase
 {
     public function testCachedParse()
     {
-        $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
-        $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
+        $cacheMock = $this->getMockBuilder(\Psr\Cache\CacheItemPoolInterface::class)->getMock();
+        $cacheItemMock = $this->getMockBuilder(\Psr\Cache\CacheItemInterface::class)->getMock();
         $savedParsedExpression = null;
         $expressionLanguage = new ExpressionLanguage($cacheMock);
 
@@ -107,15 +107,15 @@ public function testShortCircuitOperatorsCompile($expression, array $names, $exp
 
     public function testParseThrowsInsteadOfNotice()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
         $this->expectExceptionMessage('Unexpected end of expression around position 6 for expression `node.`.');
         $expressionLanguage = new ExpressionLanguage();
         $expressionLanguage->parse('node.', ['node']);
     }
 
     public function shortCircuitProviderEvaluate()
     {
-        $object = $this->getMockBuilder('stdClass')->setMethods(['foo'])->getMock();
+        $object = $this->getMockBuilder(\stdClass::class)->setMethods(['foo'])->getMock();
         $object->expects($this->never())->method('foo');
 
         return [
@@ -155,8 +155,8 @@ public function testStrictEquality()
 
     public function testCachingWithDifferentNamesOrder()
     {
-        $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
-        $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
+        $cacheMock = $this->getMockBuilder(\Psr\Cache\CacheItemPoolInterface::class)->getMock();
+        $cacheItemMock = $this->getMockBuilder(\Psr\Cache\CacheItemInterface::class)->getMock();
         $expressionLanguage = new ExpressionLanguage($cacheMock);
         $savedParsedExpression = null;
 
@@ -211,7 +211,7 @@ public function testOperatorCollisions()
      */
     public function testRegisterAfterParse($registerCallback)
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $el = new ExpressionLanguage();
         $el->parse('1 + 1', []);
         $registerCallback($el);
@@ -222,15 +222,15 @@ public function testRegisterAfterParse($registerCallback)
      */
     public function testRegisterAfterEval($registerCallback)
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $el = new ExpressionLanguage();
         $el->evaluate('1 + 1');
         $registerCallback($el);
     }
 
     public function testCallBadCallable()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessageMatches('/Unable to call method "\w+" of object "\w+"./');
         $el = new ExpressionLanguage();
         $el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
@@ -241,7 +241,7 @@ public function testCallBadCallable()
      */
     public function testRegisterAfterCompile($registerCallback)
     {
-        $this->expectException('LogicException');
+        $this->expectException(\LogicException::class);
         $el = new ExpressionLanguage();
         $el->compile('1 + 1');
         $registerCallback($el);

Tests/LexerTest.php

@@ -39,15 +39,15 @@ public function testTokenize($tokens, $expression)
 
     public function testTokenizeThrowsErrorWithMessage()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\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');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\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');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\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');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\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');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\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');
+        $this->expectException(\Symfony\Component\ExpressionLanguage\SyntaxError::class);
         $this->expectExceptionMessage('Did you mean "baz"?');
         $lexer = new Lexer();
         $parser = new Parser([]);