Ensure empty marker lines are excluded in src/wp-admin/includes/misc.php

Author: Paul Bearne

src/wp-admin/includes/misc.php

@@ -86,7 +86,9 @@ function extract_from_markers( $filename, $marker ) {
 				continue;
 			}
 
-			$result[] = $markerline;
+			if ( '' !== $markerline ) {
+				$result[] = $markerline;
+			}
 		}
 
 		if ( str_contains( $markerline, '# BEGIN ' . $marker ) ) {

tests/phpunit/tests/admin/includes/misc/extractFromMarkers.php

@@ -44,11 +44,17 @@ public function test_extract_from_markers( $expected, $content, $marker ) {
 		$this->assertSame( $expected, extract_from_markers( $this->temp_file, $marker ) );
 	}
 
-	/**
-	 * Data provider for test_extract_from_markers.
-	 *
-	 * @return array[]
-	 */
+ /**
+  * Data provider for test_extract_from_markers.
+  *
+  * @return array[]
+  *
+  * @phpstan-return array<string, array{
+  *     expected: string[],
+  *     content:  string,
+  *     marker:   string,
+  * }>
+  */
 	public function data_extract_from_markers() {
 		return array(
 			'Empty file'                          => array(