fix Yaml parser for PHP 8.1

with code from FriendsOfSymfony1/symfony1#266 to bring Propel sfYaml*.php files in sync

Author: mentalstring

runtime/lib/parser/yaml/sfYamlInline.php

@@ -33,12 +33,14 @@ public static function load($value)
   {
     $value = trim($value);
 
-    if (0 == strlen($value)) {
+    if ('' === $value) {
       return '';
     }
 
-    $mbEncoding = mb_internal_encoding();
-    mb_internal_encoding('ASCII');
+    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
+      $mbEncoding = mb_internal_encoding();
+      mb_internal_encoding('ASCII');
+    }
 
     switch ($value[0]) {
       case '[':
@@ -77,7 +79,8 @@ public static function dump($value)
 
     switch (true) {
       case is_resource($value):
-        throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
+        return stream_get_contents($value);
+        // throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
       case is_object($value):
         return '!!php/object:'.serialize($value);
       case is_array($value):
@@ -88,10 +91,10 @@ public static function dump($value)
         return 'true';
       case false === $value:
         return 'false';
-      case ctype_digit($value):
+      case (is_string($value) && ctype_digit($value)):
         return is_string($value) ? "'$value'" : (int) $value;
-      case is_numeric($value):
-        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
+      case is_numeric($value) && false === strpbrk($value, "\f\n\r\t\v"):
+        return is_infinite($value) ? str_ireplace('INF', '.Inf', (string) $value) : (is_string($value) ? "'$value'" : $value);
       case false !== strpos($value, "\n") || false !== strpos($value, "\r"):
         return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value));
       case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
@@ -122,8 +125,11 @@ protected static function dumpArray($value)
   {
     // array
     $keys = array_keys($value);
-    
-    if (count($value) > 0 && array_values($value) === $value)
+
+    if (
+      (1 == count($keys) && '0' == $keys[0])
+      ||
+      (count($keys) > 1 && array_sum(array_map('intval', $keys)) == count($keys) * (count($keys) - 1) / 2))
     {
       $output = array();
       foreach ($value as $val) {
@@ -353,27 +359,33 @@ protected static function evaluateScalar($scalar)
       case 0 === strpos($scalar, '!str'):
         return (string) substr($scalar, 5);
       case 0 === strpos($scalar, '! '):
-        return intval(self::parseScalar(substr($scalar, 2)));
+        return (int) self::parseScalar(substr($scalar, 2));
       case 0 === strpos($scalar, '!!php/object:'):
         return unserialize(substr($scalar, 13));
       case ctype_digit($scalar):
         $raw = $scalar;
-        $cast = intval($scalar);
+        $cast = (int) $scalar;
 
         return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
       case in_array(strtolower($scalar), $trueValues):
         return true;
       case in_array(strtolower($scalar), $falseValues):
         return false;
+      case 0 === strpos($scalar, '0x'):
+        return hexdec($scalar);
       case is_numeric($scalar):
-        return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar);
+        return floatval($scalar);
       case 0 == strcasecmp($scalar, '.inf'):
       case 0 == strcasecmp($scalar, '.NaN'):
         return -log(0);
       case 0 == strcasecmp($scalar, '-.inf'):
         return log(0);
-      case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
-        return floatval(str_replace(',', '', $scalar));
+      case preg_match('/^(-|\+)?[0-9,]+(\.\d+)?$/', $scalar):
+        $replaced = str_replace(',', '', $scalar);
+        $replaced = str_replace('+', '', $replaced);
+        $floatval = floatval($replaced);
+        $intval = intval($replaced);
+        return $floatval == $intval ? $intval : $floatval;
       case preg_match(self::getTimestampRegex(), $scalar):
         return strtotime($scalar);
       default:

runtime/lib/parser/yaml/sfYamlParser.php

@@ -371,7 +371,7 @@ protected function parseFoldedScalar($separator, $indicator = '', $indentation =
       $this->moveToNextLine();
 
       if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches)) {
-        if (' ' == $separator && $previousIndent != $matches['indent']) {
+        if (' ' == $separator && ($previousIndent && $previousIndent != $matches['indent'])) {
           $text = substr($text, 0, -1)."\n";
         }
         $previousIndent = $matches['indent'];