bug #32910 [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter …

…1 to be int or float, string given (Aleksandr Dankovtsev) This PR was merged into the 3.4 branch. Discussion ---------- [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? |no | BC breaks? | no | Deprecations? |no | Tests pass? | yes | License | MIT In additional for PR: symfony/symfony#32862 Commits ------- faef73888e [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given
symfony · Aug 3, 2019 · 090881c · 090881c
2 parents a551af1 + 59ee8f4
commit 090881c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/Parser.php b/Parser.php
@@ -715,7 +715,7 @@ private function parseValue($value, $flags, $context)
         if (self::preg_match('/^(?:'.self::TAG_PATTERN.' +)?'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
             $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
 
-            $data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
+            $data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs((int) $modifiers));
 
             if ('' !== $matches['tag']) {
                 if ('!!binary' === $matches['tag']) {

diff --git a/Tests/ParserTest.php b/Tests/ParserTest.php
@@ -2267,6 +2267,48 @@ public function testMultiLineComment()
 
         $this->assertSame(['parameters' => 'abc'], $this->parser->parse($yaml));
     }
+
+    public function testParseValueWithModifiers()
+    {
+        $yaml = <<<YAML
+parameters:
+    abc: |+5 # plus five spaces indent
+         one
+         two
+         three
+         four
+         five
+YAML;
+        $this->assertSame(
+            [
+                'parameters' => [
+                    'abc' => implode("\n", ['one', 'two', 'three', 'four', 'five']),
+                ],
+            ],
+            $this->parser->parse($yaml)
+        );
+    }
+
+    public function testParseValueWithNegativeModifiers()
+    {
+        $yaml = <<<YAML
+parameters:
+    abc: |-3 # minus
+       one
+       two
+       three
+       four
+       five
+YAML;
+        $this->assertSame(
+            [
+                'parameters' => [
+                    'abc' => implode("\n", ['one', 'two', 'three', 'four', 'five']),
+                ],
+            ],
+            $this->parser->parse($yaml)
+        );
+    }
 }
 
 class B