Merge branch '4.4' into 5.2

* 4.4: Leverage str_contains/str_starts_with Leverage str_ends_with
symfony · Jul 21, 2021 · 261d7d1 · 261d7d1
2 parents eb067d2 + d7ba2d8
commit 261d7d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -996,7 +996,7 @@ public function offsetGet($option, bool $triggerDeprecation = true)
                 $fmtAllowedTypes = implode('" or "', $this->allowedTypes[$option]);
                 $fmtProvidedTypes = implode('|', array_keys($invalidTypes));
                 $allowedContainsArrayType = \count(array_filter($this->allowedTypes[$option], static function ($item) {
-                    return '[]' === substr($item, -2);
+                    return str_ends_with($item, '[]');
                 })) > 0;
 
                 if (\is_array($value) && $allowedContainsArrayType) {

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1",
         "symfony/polyfill-php73": "~1.0",
-        "symfony/polyfill-php80": "^1.15"
+        "symfony/polyfill-php80": "^1.16"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\OptionsResolver\\": "" },