call substr() with integer offsets

symfony · Apr 23, 2024 · bc780e1 · bc780e1
1 parent a38ba0b
commit bc780e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Parser.php b/Parser.php
@@ -653,12 +653,12 @@ private function getNextEmbedBlock(?int $indentation = null, bool $inSequence =
             }
 
             if ($this->isCurrentLineBlank()) {
-                $data[] = substr($this->currentLine, $newIndent);
+                $data[] = substr($this->currentLine, $newIndent ?? 0);
                 continue;
             }
 
             if ($indent >= $newIndent) {
-                $data[] = substr($this->currentLine, $newIndent);
+                $data[] = substr($this->currentLine, $newIndent ?? 0);
             } elseif ($this->isCurrentLineComment()) {
                 $data[] = $this->currentLine;
             } elseif (0 == $indent) {

diff --git a/Tests/ParserTest.php b/Tests/ParserTest.php
@@ -1476,13 +1476,13 @@ public static function getBinaryData()
 data: !!binary |
     SGVsbG8gd29ybGQ=
 EOT
-    ],
+            ],
             'containing spaces in block scalar' => [
                 <<<'EOT'
 data: !!binary |
     SGVs bG8gd 29ybGQ=
 EOT
-    ],
+            ],
         ];
     }
 
@@ -2949,6 +2949,11 @@ public function testParseIdeographicSpaces()
         ], $this->parser->parse($expected));
     }
 
+    public function testSkipBlankLines()
+    {
+        $this->assertSame(['foo' => [null]], (new Parser())->parse("foo:\n-\n\n"));
+    }
+
     private function assertSameData($expected, $actual)
     {
         $this->assertEquals($expected, $actual);