Normalize line endings

swissspidy · swissspidy · commit 0288e88ea2b0 · 2026-03-29T12:17:04.000+02:00
diff --git a/tests/phpunit/JsonManipulatorTest.php b/tests/phpunit/JsonManipulatorTest.php
@@ -2171,7 +2171,7 @@ public function testAddMainKeyWithContentHavingDollarSignFollowedByDigit2()
     "foo": "$1bar"
 }
 ';
-        $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $manipulator->getContents() ) );
+        $this->assertEquals( preg_replace( '/\R/', "\n", $expected ), preg_replace( '/\R/', "\n", $manipulator->getContents() ) );
     }
 
     public function testUpdateMainKey()
@@ -2305,7 +2305,7 @@ public function testRemoveMainKey()
         $expected = '{
 }
 ';
-        $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $manipulator->getContents() ) );
+        $this->assertEquals( preg_replace( '/\R/', "\n", $expected ), preg_replace( '/\R/', "\n", $manipulator->getContents() ) );
     }
 
     public function testIndentDetection()

Original file line number	Diff line number	Diff line change
`@@ -2171,7 +2171,7 @@ public function testAddMainKeyWithContentHavingDollarSignFollowedByDigit2()`
`2171`	`2171`	`"foo": "$1bar"`
`2172`	`2172`	`}`
`2173`	`2173`	`';`
`2174`		`- $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $manipulator->getContents() ) );`
	`2174`	`+ $this->assertEquals( preg_replace( '/\R/', "\n", $expected ), preg_replace( '/\R/', "\n", $manipulator->getContents() ) );`
`2175`	`2175`	`}`
`2176`	`2176`
`2177`	`2177`	`public function testUpdateMainKey()`
`@@ -2305,7 +2305,7 @@ public function testRemoveMainKey()`
`2305`	`2305`	`$expected = '{`
`2306`	`2306`	`}`
`2307`	`2307`	`';`
`2308`		`- $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $manipulator->getContents() ) );`
	`2308`	`+ $this->assertEquals( preg_replace( '/\R/', "\n", $expected ), preg_replace( '/\R/', "\n", $manipulator->getContents() ) );`
`2309`	`2309`	`}`
`2310`	`2310`
`2311`	`2311`	`public function testIndentDetection()`