Skip to content

Commit c46362f

Browse files
Merge branch '2.8' into 3.3
* 2.8: [Console] Fix traversable autocomplete values [ExpressionLanguage] Fix PhpDoc type-hints on Token value bumped Symfony version to 2.8.30 updated VERSION for 2.8.29 updated CHANGELOG for 2.8.29 bumped Symfony version to 2.7.37 updated VERSION for 2.7.36 update CONTRIBUTORS for 2.7.36 updated CHANGELOG for 2.7.36
2 parents 01aee0c + bb51295 commit c46362f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Tests/ExpressionLanguageTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,14 @@ public function testCachingForOverriddenVariableNames()
178178
$this->assertSame('($a + $B)', $result);
179179
}
180180

181+
public function testStrictEquality()
182+
{
183+
$expressionLanguage = new ExpressionLanguage();
184+
$expression = '123 === a';
185+
$result = $expressionLanguage->compile($expression, array('a'));
186+
$this->assertSame('(123 === $a)', $result);
187+
}
188+
181189
public function testCachingWithDifferentNamesOrder()
182190
{
183191
$cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();

Token.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ class Token
3030
const PUNCTUATION_TYPE = 'punctuation';
3131

3232
/**
33-
* @param string $type The type of the token (self::*_TYPE)
34-
* @param string $value The token value
35-
* @param int $cursor The cursor position in the source
33+
* @param string $type The type of the token (self::*_TYPE)
34+
* @param string|int|float|null $value The token value
35+
* @param int $cursor The cursor position in the source
3636
*/
3737
public function __construct($type, $value, $cursor)
3838
{

0 commit comments

Comments
 (0)