Merge branch 'master' into feature/composer-update-for-wpcs-3

WordPress · Oct 1, 2024 · 285896c · 285896c
2 parents 6de1c35 + ee9fe18
commit 285896c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true
-        }
+        },
+        "lock": false
     }
 }
diff --git a/phpunit/tests/parser.php b/phpunit/tests/parser.php
@@ -235,7 +235,7 @@ public function test_blank_lines_in_content() {
 			$result  = $parser->parse( $file );
 
 			// Check the number of new lines characters
-			$this->assertSame( 3, substr_count( $result['posts'][0]['post_content'], PHP_EOL ), $message );
+			$this->assertSame( 3, substr_count( $result['posts'][0]['post_content'], "\n" ), $message );
 		}
 	}