[ExpressionLanguage] Remove type-hints on Token

mcg-web · mcg-web · commit 85ac69069db8 · 2017-11-10T08:46:04.000+01:00
Added type-hints on Token break Parser when treating numbers (`object === 123` compile as `$object === "123"`)
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -137,6 +137,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('Psr\Cache\CacheItemPoolInterface')->getMock();
diff --git a/src/Symfony/Component/ExpressionLanguage/Token.php b/src/Symfony/Component/ExpressionLanguage/Token.php
@@ -30,11 +30,11 @@ 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 $value  The token value
+     * @param int              $cursor The cursor position in the source
      */
-    public function __construct(string $type, ?string $value, ?int $cursor)
+    public function __construct(string $type, $value, ?int $cursor)
     {
         $this->type = $type;
         $this->value = $value;

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,14 @@ public function testCachingForOverriddenVariableNames()`
`137`	`137`	`$this->assertSame('($a + $B)', $result);`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ public function testStrictEquality()`
	`141`	`+ {`
	`142`	`+ $expressionLanguage = new ExpressionLanguage();`
	`143`	`+ $expression = '123 === a';`
	`144`	`+ $result = $expressionLanguage->compile($expression, array('a'));`
	`145`	`+ $this->assertSame('(123 === $a)', $result);`
	`146`	`+ }`
	`147`	`+`
`140`	`148`	`public function testCachingWithDifferentNamesOrder()`
`141`	`149`	`{`
`142`	`150`	`$cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();`