minor symfony#22325 [ExpressionLanguage] Avoid ExpressionLanguage dependency on ctype (nijel)

fabpot · fabpot · commit 0eed69067996 · 2017-04-07T09:40:12.000-07:00
This PR was submitted for the 3.2 branch but it was merged into the 2.7 branch instead (closes symfony#22325). Discussion ---------- [ExpressionLanguage] Avoid ExpressionLanguage dependency on ctype | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none | License | MIT | Doc PR | none There is undocumented dependency on ctype extension in ExpressionLanguage. I've chosen to remove it rather than document as we're using ExpressionLanguage in phpMyAdmin and this is only dependency which needs ctype. I'm submitting this against 3.2 to get this fix to released version sooner, but it can be without problems applied to master as well. Commits ------- 81de5fe [ExpressionLanguage] Avoid dependency on ctype
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -45,7 +45,7 @@ public function tokenize($expression)
             if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, null, $cursor)) {
                 // numbers
                 $number = (float) $match[0];  // floats
-                if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {
+                if (preg_match('/^[0-9]+$/', $match[0]) && $number <= PHP_INT_MAX) {
                     $number = (int) $match[0]; // integers lower than the maximum
                 }
                 $tokens[] = new Token(Token::NUMBER_TYPE, $number, $cursor + 1);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function tokenize($expression)`
`45`	`45`	`if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, null, $cursor)) {`
`46`	`46`	`// numbers`
`47`	`47`	`$number = (float) $match[0]; // floats`
`48`		`- if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {`
	`48`	`+ if (preg_match('/^[0-9]+$/', $match[0]) && $number <= PHP_INT_MAX) {`
`49`	`49`	`$number = (int) $match[0]; // integers lower than the maximum`
`50`	`50`	`}`
`51`	`51`	`$tokens[] = new Token(Token::NUMBER_TYPE, $number, $cursor + 1);`