Merge branch 'statamic-5' of github.com:statamic/migrator into statam…

…ic-5
statamic · May 3, 2024 · 04d3546 · 04d3546
2 parents 0f63110 + 9d6c3bf
commit 04d3546
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "statamic/migrator",
     "type": "statamic-addon",
     "require": {
-        "friendsofphp/php-cs-fixer": "^3.16.0",
+        "friendsofphp/php-cs-fixer": "^3.54.0",
         "league/flysystem-aws-s3-v3": "~1.0 || ~3.0",
         "mustangostang/spyc": "dev-master#dfd9aadc1f5224065d55b42b712c7e99a50a3f4d"
     },

diff --git a/tests/MigrateSettingsTest.php b/tests/MigrateSettingsTest.php
@@ -165,7 +165,7 @@ public function it_migrates_system_settings()
     {
         $this->artisan('statamic:migrate:settings', ['handle' => 'system']);
 
-        $this->assertSame(File::get(resource_path('sites.yaml')),
+        $this->assertSameWithNormalizedLineEndings(File::get(resource_path('sites.yaml')),
             'default:
   name: English
   locale: en_US
@@ -191,7 +191,7 @@ public function it_migrates_multiple_locales_with_env_references()
 
         $this->artisan('statamic:migrate:settings', ['handle' => 'system']);
 
-        $this->assertSame(File::get(resource_path('sites.yaml')),
+        $this->assertSameWithNormalizedLineEndings(File::get(resource_path('sites.yaml')),
             "default:
   name: English
   locale: en_US
@@ -210,7 +210,7 @@ public function it_migrates_missing_locales_using_v2_default()
 
         $this->artisan('statamic:migrate:settings', ['handle' => 'system']);
 
-        $this->assertSame(File::get(resource_path('sites.yaml')),
+        $this->assertSameWithNormalizedLineEndings(File::get(resource_path('sites.yaml')),
             'default:
   name: English
   locale: en_US

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -154,6 +154,18 @@ public static function assertStringContainsStringWithNormalizedLineEndings($need
         );
     }
 
+    /**
+     * Normalize line endings before performing assertion in windows.
+     */
+    public static function assertSameWithNormalizedLineEndings($needle, $haystack, $message = ''): void
+    {
+        static::assertSame(
+            static::normalizeMultilineString($needle),
+            static::normalizeMultilineString($haystack),
+            $message
+        );
+    }
+
     /**
      * @deprecated
      */