Merge pull request #97 from vhenzl/win-eol-fix

sebastiandedeyne · web-flow · commit 08a9953fa537 · 2020-05-11T15:37:10.000+02:00
Fix inconsistent line endings in JSON snapshots
diff --git a/.gitattributes b/.gitattributes
@@ -9,3 +9,9 @@
 /.scrutinizer.yml   export-ignore
 /tests              export-ignore
 /example            export-ignore
+
+# All test snapshots and text stubs must have LF line endings
+tests/**/__snapshots__/**   text eol=lf
+tests/**/stubs/**           text eol=lf
+tests/**/stubs/**/*.jpg     binary
+tests/**/stubs/**/*.png     binary
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         php: [7.4]
         dependency-version: [prefer-lowest, prefer-stable]
 
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit"
+        "test": "phpunit"
     },
     "config": {
         "sort-packages": true
diff --git a/src/Drivers/JsonDriver.php b/src/Drivers/JsonDriver.php
@@ -18,7 +18,7 @@ public function serialize($data): string
             throw new CantBeSerialized('Resources can not be serialized to json');
         }
 
-        return json_encode($data, JSON_PRETTY_PRINT).PHP_EOL;
+        return json_encode($data, JSON_PRETTY_PRINT)."\n";
     }
 
     public function extension(): string
@@ -29,7 +29,7 @@ public function extension(): string
     public function match($expected, $actual)
     {
         if (is_array($actual)) {
-            $actual = json_encode($actual, JSON_PRETTY_PRINT).PHP_EOL;
+            $actual = json_encode($actual, JSON_PRETTY_PRINT)."\n";
         }
 
         Assert::assertJsonStringEqualsJsonString($expected, $actual);
diff --git a/tests/Unit/Drivers/HtmlDriverTest.php b/tests/Unit/Drivers/HtmlDriverTest.php
@@ -13,7 +13,7 @@ public function it_can_serialize_a_html_string_to_pretty_html()
     {
         $driver = new HtmlDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '<!DOCTYPE html>',
             '<html lang="en">',
             '<head></head>',
diff --git a/tests/Unit/Drivers/JsonDriverTest.php b/tests/Unit/Drivers/JsonDriverTest.php
@@ -13,7 +13,7 @@ public function it_can_serialize_a_json_string_to_pretty_json()
     {
         $driver = new JsonDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '{',
             '    "foo": "bar"',
             '}',
@@ -28,7 +28,7 @@ public function it_can_serialize_a_json_hash_to_pretty_json()
     {
         $driver = new JsonDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '{',
             '    "foo": "FOO",',
             '    "bar": "BAR",',
@@ -42,7 +42,7 @@ public function it_can_serialize_a_json_hash_to_pretty_json()
             'baz' => 'BAZ',
         ]));
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '{',
             '    "foo": "FOO",',
             '    "bar": "BAR",',
@@ -74,7 +74,7 @@ public function it_can_serialize_a_json_array_to_pretty_json()
     {
         $driver = new JsonDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '[',
             '    "foo",',
             '    "bar",',
@@ -91,7 +91,7 @@ public function it_can_serialize_a_empty_json_object_to_pretty_json()
     {
         $driver = new JsonDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '{',
             '    "foo": {',
             '        "bar": true',
@@ -116,7 +116,7 @@ public function it_can_not_serialize_resources()
 
         $this->expectException(CantBeSerialized::class);
 
-        $resource = fopen('.', 'r');
+        $resource = tmpfile();
 
         $driver->serialize($resource);
     }
diff --git a/tests/Unit/Drivers/ObjectDriverTest.php b/tests/Unit/Drivers/ObjectDriverTest.php
@@ -36,11 +36,11 @@ public function it_can_serialize_an_associative_array()
     {
         $driver = new ObjectDriver();
 
-        $expected = <<<'YAML'
-foo:
-    bar: baz
-
-YAML;
+        $expected = implode("\n", [
+            'foo:',
+            '    bar: baz',
+            '',
+        ]);
 
         $this->assertEquals($expected, $driver->serialize(['foo' => ['bar' => 'baz']]));
     }
@@ -50,11 +50,11 @@ public function it_can_serialize_an_indexed_array_without_keys()
     {
         $driver = new ObjectDriver();
 
-        $expected = <<<'YAML'
-- foo
-- bar
-
-YAML;
+        $expected = implode("\n", [
+            '- foo',
+            '- bar',
+            '',
+        ]);
 
         $this->assertEquals($expected, $driver->serialize(['foo', 'bar']));
     }
@@ -64,10 +64,10 @@ public function it_can_serialize_a_simple_object()
     {
         $driver = new ObjectDriver();
 
-        $expected = <<<'YAML'
-foo: bar
-
-YAML;
+        $expected = implode("\n", [
+            'foo: bar',
+            '',
+        ]);
 
         $this->assertEquals($expected, $driver->serialize((object) ['foo' => 'bar']));
     }
@@ -77,13 +77,13 @@ public function it_can_serialize_a_class_instance()
     {
         $driver = new ObjectDriver();
 
-        $expected = <<<'YAML'
-name: 'My name'
-valid: true
-dateTime: '2020-01-01T15:00:00+01:00'
-public: public
-
-YAML;
+        $expected = implode("\n", [
+            'name: \'My name\'',
+            'valid: true',
+            'dateTime: \'2020-01-01T15:00:00+01:00\'',
+            'public: public',
+            '',
+        ]);
 
         $this->assertEquals($expected, $driver->serialize(new Obj()));
     }
diff --git a/tests/Unit/Drivers/XmlDriverTest.php b/tests/Unit/Drivers/XmlDriverTest.php
@@ -13,7 +13,7 @@ public function it_can_serialize_a_xml_string_to_pretty_xml()
     {
         $driver = new XmlDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             '<?xml version="1.0"?>',
             '<foo>',
             '  <bar>baz</bar>',
diff --git a/tests/Unit/Drivers/YamlDriverTest.php b/tests/Unit/Drivers/YamlDriverTest.php
@@ -12,7 +12,7 @@ public function it_can_serialize_a_yaml_string()
     {
         $driver = new YamlDriver();
 
-        $yamlString = implode(PHP_EOL, [
+        $yamlString = implode("\n", [
             'foo: bar',
             'baz: qux',
             '',
@@ -26,7 +26,7 @@ public function it_can_serialize_a_yaml_array()
     {
         $driver = new YamlDriver();
 
-        $expected = implode(PHP_EOL, [
+        $expected = implode("\n", [
             'foo: bar',
             'baz: qux',
             '',

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`}`
`43`	`43`	`},`
`44`	`44`	`"scripts": {`
`45`		`- "test": "vendor/bin/phpunit"`
	`45`	`+ "test": "phpunit"`
`46`	`46`	`},`
`47`	`47`	`"config": {`
`48`	`48`	`"sort-packages": true`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function serialize($data): string`
`18`	`18`	`throw new CantBeSerialized('Resources can not be serialized to json');`
`19`	`19`	`}`
`20`	`20`
`21`		`- return json_encode($data, JSON_PRETTY_PRINT).PHP_EOL;`
	`21`	`+ return json_encode($data, JSON_PRETTY_PRINT)."\n";`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function extension(): string`
`@@ -29,7 +29,7 @@ public function extension(): string`
`29`	`29`	`public function match($expected, $actual)`
`30`	`30`	`{`
`31`	`31`	`if (is_array($actual)) {`
`32`		`- $actual = json_encode($actual, JSON_PRETTY_PRINT).PHP_EOL;`
	`32`	`+ $actual = json_encode($actual, JSON_PRETTY_PRINT)."\n";`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`Assert::assertJsonStringEqualsJsonString($expected, $actual);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function it_can_serialize_a_html_string_to_pretty_html()`
`13`	`13`	`{`
`14`	`14`	`$driver = new HtmlDriver();`
`15`	`15`
`16`		`- $expected = implode(PHP_EOL, [`
	`16`	`+ $expected = implode("\n", [`
`17`	`17`	`'<!DOCTYPE html>',`
`18`	`18`	`'<html lang="en">',`
`19`	`19`	`'<head></head>',`