From 18f0fc594d039a7f87fed5ee28053dba348319b1 Mon Sep 17 00:00:00 2001 From: Jeremiah VALERIE Date: Thu, 9 Nov 2017 15:39:19 +0100 Subject: [PATCH] [ExpressionLanguage] Fix PhpDoc type-hints on Token value Also added tests to cover number parser BC --- .../ExpressionLanguage/Tests/ExpressionLanguageTest.php | 8 ++++++++ src/Symfony/Component/ExpressionLanguage/Token.php | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php index 0ef278c901..50a0eb5e95 100644 --- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php +++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php @@ -116,6 +116,14 @@ class ExpressionLanguageTest extends TestCase $this->assertSame('($a + $B)', $result); } + public function testStrictEquality() + { + $expressionLanguage = new ExpressionLanguage(); + $expression = '123 === a'; + $result = $expressionLanguage->compile($expression, array('a')); + $this->assertSame('(123 === $a)', $result); + } + public function testCachingWithDifferentNamesOrder() { $cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock(); diff --git a/src/Symfony/Component/ExpressionLanguage/Token.php b/src/Symfony/Component/ExpressionLanguage/Token.php index b231bc25e7..4517335bbc 100644 --- a/src/Symfony/Component/ExpressionLanguage/Token.php +++ b/src/Symfony/Component/ExpressionLanguage/Token.php @@ -30,9 +30,9 @@ class Token const PUNCTUATION_TYPE = 'punctuation'; /** - * @param string $type The type of the token (self::*_TYPE) - * @param string $value The token value - * @param int $cursor The cursor position in the source + * @param string $type The type of the token (self::*_TYPE) + * @param string|int|float|null $value The token value + * @param int $cursor The cursor position in the source */ public function __construct($type, $value, $cursor) {