Skip to content

Commit fe696e2

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Remove polyfills from ExpressionLanguage Update validators.tr.xlf [Form] fix typo in Danish translation Remove broken test case [PropertyInfo] Support for the never return type Show nice CLI output in Psalm action
2 parents d4367d3 + 78a0147 commit fe696e2

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Lexer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public function tokenize(string $expression)
4848
}
4949
$tokens[] = new Token(Token::NUMBER_TYPE, $number, $cursor + 1);
5050
$cursor += \strlen($match[0]);
51-
} elseif (str_contains('([{', $expression[$cursor])) {
51+
} elseif (false !== strpos('([{', $expression[$cursor])) {
5252
// opening bracket
5353
$brackets[] = [$expression[$cursor], $cursor];
5454

5555
$tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
5656
++$cursor;
57-
} elseif (str_contains(')]}', $expression[$cursor])) {
57+
} elseif (false !== strpos(')]}', $expression[$cursor])) {
5858
// closing bracket
5959
if (empty($brackets)) {
6060
throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression);
@@ -75,7 +75,7 @@ public function tokenize(string $expression)
7575
// operators
7676
$tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
7777
$cursor += \strlen($match[0]);
78-
} elseif (str_contains('.,?:', $expression[$cursor])) {
78+
} elseif (false !== strpos('.,?:', $expression[$cursor])) {
7979
// punctuation
8080
$tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
8181
++$cursor;

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"require": {
1919
"php": ">=7.2.5",
2020
"symfony/cache": "^4.4|^5.0",
21-
"symfony/polyfill-php80": "^1.16",
2221
"symfony/service-contracts": "^1.1|^2"
2322
},
2423
"autoload": {

0 commit comments

Comments
 (0)