Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 6041dfe74af6 · 2021-06-02T12:10:31.000+02:00
* 5.4:
  [Yaml] Leverage array_is_list()
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -203,19 +203,7 @@ public static function dump($value, int $flags = 0): string
      */
     public static function isHash(array|\ArrayObject|\stdClass $value): bool
     {
-        if ($value instanceof \stdClass || $value instanceof \ArrayObject) {
-            return true;
-        }
-
-        $expectedKey = 0;
-
-        foreach ($value as $key => $val) {
-            if ($key !== $expectedKey++) {
-                return true;
-            }
-        }
-
-        return false;
+        return !\is_array($value) || !array_is_list($value);
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json
@@ -18,7 +18,8 @@
     "require": {
         "php": ">=8.0.2",
         "symfony/deprecation-contracts": "^2.1",
-        "symfony/polyfill-ctype": "~1.8"
+        "symfony/polyfill-ctype": "^1.8",
+        "symfony/polyfill-php81": "^1.22"
     },
     "require-dev": {
         "symfony/console": "^5.4|^6.0"
