Upgrade to 3.8.0

kirby/src/Data/Yaml.php

@@ -18,35 +18,15 @@ class Yaml extends Handler
 {
 	/**
 	 * Converts an array to an encoded YAML string
-	 *
-	 * @param mixed $data
-	 * @return string
 	 */
 	public static function encode($data): string
 	{
-		// TODO: The locale magic should no longer be
-		//       necessary when support for PHP 7.x is dropped
-
-		// fetch the current locale setting for numbers
-		$locale = setlocale(LC_NUMERIC, 0);
-
-		// change to english numerics to avoid issues with floats
-		setlocale(LC_NUMERIC, 'C');
-
 		// $data, $indent, $wordwrap, $no_opening_dashes
-		$yaml = Spyc::YAMLDump($data, false, false, true);
-
-		// restore the previous locale settings
-		setlocale(LC_NUMERIC, $locale);
-
-		return $yaml;
+		return Spyc::YAMLDump($data, false, false, true);
 	}
 
 	/**
 	 * Parses an encoded YAML string and returns a multi-dimensional array
-	 *
-	 * @param mixed $string
-	 * @return array
 	 */
 	public static function decode($string): array
 	{
@@ -66,12 +46,12 @@ class Yaml extends Handler
 		$string = str_replace("\xEF\xBB\xBF", '', $string);
 		$result = Spyc::YAMLLoadString($string);
 
-		if (is_array($result)) {
+		if (is_array($result) === true) {
 			return $result;
-		} else {
-			// apparently Spyc always returns an array, even for invalid YAML syntax
-			// so this Exception should currently never be thrown
-			throw new InvalidArgumentException('The YAML data cannot be parsed'); // @codeCoverageIgnore
 		}
+
+		// apparently Spyc always returns an array, even for invalid YAML syntax
+		// so this Exception should currently never be thrown
+		throw new InvalidArgumentException('The YAML data cannot be parsed'); // @codeCoverageIgnore
 	}
 }