Merge branch '5.1'

nicolas-grekas · nicolas-grekas · commit 677ed3f55f26 · 2020-05-23T15:10:26.000+02:00
* 5.1: (33 commits) [Cache] $lifetime cannot be null [Serializer] minor cleanup fix merge Run PHP 8 as 7.4.99 Remove calls to deprecated ReflectionParameter::getClass(). [VarDumper] fix PHP 8 support Removed "services" prototype node from "custom_authenticator" Add php 8 to travis. [Cache] Accessing undefined constants raises an Error in php8 [Cache] allow DBAL v3 Skip Doctrine DBAL on php 8 until we have a compatible version. [DomCrawler] Catch expected ValueError. Made method signatures compatible with their corresponding traits. [ErrorHandler] Apply php8 fixes from Debug component. [DomCrawler] Catch expected ValueError. [Validator] Catch expected ValueError. [VarDumper] ReflectionFunction::isDisabled() is deprecated. [BrowserKit] Raw body with custom Content-Type header Revert symfony/symfony#34986 Make ExpressionLanguageSyntax validator usable with annotation ...
diff --git a/Constraints/ExpressionLanguageSyntax.php b/Constraints/ExpressionLanguageSyntax.php
@@ -37,6 +37,6 @@ class ExpressionLanguageSyntax extends Constraint
      */
     public function validatedBy()
     {
-        return $this->service;
+        return $this->service ?? static::class.'Validator';
     }
 }
diff --git a/Constraints/ExpressionLanguageSyntaxValidator.php b/Constraints/ExpressionLanguageSyntaxValidator.php
@@ -24,7 +24,7 @@ class ExpressionLanguageSyntaxValidator extends ConstraintValidator
 {
     private $expressionLanguage;
 
-    public function __construct(ExpressionLanguage $expressionLanguage)
+    public function __construct(ExpressionLanguage $expressionLanguage = null)
     {
         $this->expressionLanguage = $expressionLanguage;
     }
@@ -42,6 +42,10 @@ public function validate($expression, Constraint $constraint): void
             throw new UnexpectedTypeException($expression, 'string');
         }
 
+        if (null === $this->expressionLanguage) {
+            $this->expressionLanguage = new ExpressionLanguage();
+        }
+
         try {
             $this->expressionLanguage->lint($expression, ($constraint->validateNames ? ($constraint->names ?? []) : null));
         } catch (SyntaxError $exception) {
diff --git a/Constraints/LengthValidator.php b/Constraints/LengthValidator.php
@@ -44,8 +44,14 @@ public function validate($value, Constraint $constraint)
             $stringValue = ($constraint->normalizer)($stringValue);
         }
 
-        if (!$invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset)) {
-            $length = mb_strlen($stringValue, $constraint->charset);
+        try {
+            $invalidCharset = !@mb_check_encoding($stringValue, $constraint->charset);
+        } catch (\ValueError $e) {
+            if (!str_starts_with($e->getMessage(), 'mb_check_encoding(): Argument #2 ($encoding) must be a valid encoding')) {
+                throw $e;
+            }
+
+            $invalidCharset = true;
         }
 
         if ($invalidCharset) {
@@ -59,6 +65,8 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
+        $length = mb_strlen($stringValue, $constraint->charset);
+
         if (null !== $constraint->max && $length > $constraint->max) {
             $this->context->buildViolation($constraint->min == $constraint->max ? $constraint->exactMessage : $constraint->maxMessage)
                 ->setParameter('{{ value }}', $this->formatValue($stringValue))

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ class ExpressionLanguageSyntax extends Constraint`
`37`	`37`	`*/`
`38`	`38`	`public function validatedBy()`
`39`	`39`	`{`
`40`		`- return $this->service;`
	`40`	`+ return $this->service ?? static::class.'Validator';`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ExpressionLanguageSyntaxValidator extends ConstraintValidator`
`24`	`24`	`{`
`25`	`25`	`private $expressionLanguage;`
`26`	`26`
`27`		`- public function __construct(ExpressionLanguage $expressionLanguage)`
	`27`	`+ public function __construct(ExpressionLanguage $expressionLanguage = null)`
`28`	`28`	`{`
`29`	`29`	`$this->expressionLanguage = $expressionLanguage;`
`30`	`30`	`}`
`@@ -42,6 +42,10 @@ public function validate($expression, Constraint $constraint): void`
`42`	`42`	`throw new UnexpectedTypeException($expression, 'string');`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ if (null === $this->expressionLanguage) {`
	`46`	`+ $this->expressionLanguage = new ExpressionLanguage();`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`try {`
`46`	`50`	`$this->expressionLanguage->lint($expression, ($constraint->validateNames ? ($constraint->names ?? []) : null));`
`47`	`51`	`} catch (SyntaxError $exception) {`