minor #24884 [ExpressionLanguage] Fixed PhpDoc type-hints on Token value (mcg-web)

fabpot · fabpot · commit cf78277f93d4 · 2017-11-12T07:39:34.000-08:00
This PR was merged into the 2.7 branch. Discussion ---------- [ExpressionLanguage] Fixed PhpDoc type-hints on Token value | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none Fixed PhpDoc type-hints on Token value and added test to prevent BC with Parser when treating numbers (example `a === 123` compile as `$a === "123"`) Commits ------- 18f0fc5 [ExpressionLanguage] Fix PhpDoc type-hints on Token value
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -116,6 +116,14 @@ public function testCachingForOverriddenVariableNames()
         $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
@@ -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)
     {

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,14 @@ public function testCachingForOverriddenVariableNames()`
`116`	`116`	`$this->assertSame('($a + $B)', $result);`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ public function testStrictEquality()`
	`120`	`+ {`
	`121`	`+ $expressionLanguage = new ExpressionLanguage();`
	`122`	`+ $expression = '123 === a';`
	`123`	`+ $result = $expressionLanguage->compile($expression, array('a'));`
	`124`	`+ $this->assertSame('(123 === $a)', $result);`
	`125`	`+ }`
	`126`	`+`
`119`	`127`	`public function testCachingWithDifferentNamesOrder()`
`120`	`128`	`{`
`121`	`129`	`$cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();`