Statamic 5 Support

Stillat · May 11, 2024 · 2e693a2 · 2e693a2
1 parent b59d46d
commit 2e693a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -12,8 +12,8 @@
     "require": {
         "php": "^8.1",
         "ext-dom": "*",
-        "statamic/cms": "^4",
-        "stillat/statamic-attribute-renderer": "^1"
+        "statamic/cms": "^4 || ^5",
+        "stillat/statamic-attribute-renderer": "^1.1"
     },
     "extra": {
         "statamic": {
@@ -28,7 +28,7 @@
     },
     "require-dev": {
         "pestphp/pest": "^2.24",
-        "orchestra/testbench": "^8.14",
+        "orchestra/testbench": "^8.14 || ^9",
         "pestphp/pest-plugin-laravel": "^2.2",
         "laravel/pint": "^1.13"
     },

diff --git a/tests/Feature/MetadataCleanerTest.php b/tests/Feature/MetadataCleanerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Statamic\View\Antlers\Language\Utilities\StringUtilities;
+
 function cleanMetadata(string $input): string
 {
     $cleaner = new \Stillat\StatamicSiteEssentials\Metadata\MetadataCleaner();
@@ -30,7 +32,7 @@ function cleanMetadata(string $input): string
 <meta property="og:locale:alternate" content="fr_FR">
 EOT;
 
-    expect(cleanMetadata($input))->toBe($input);
+    expect(StringUtilities::normalizeLineEndings(cleanMetadata($input)))->toBe(StringUtilities::normalizeLineEndings($input));
 });
 
 test('casing is ignored', function () {
@@ -44,7 +46,7 @@ function cleanMetadata(string $input): string
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 EOT;
 
-    expect(cleanMetadata($input))->toBe($output);
+    expect(StringUtilities::normalizeLineEndings(cleanMetadata($input)))->toBe(StringUtilities::normalizeLineEndings($output));
 });
 
 test('extra tags are removed', function () {
@@ -61,7 +63,7 @@ function cleanMetadata(string $input): string
 <meta property="og:locale:alternate" content="fr_FR">
 EOT;
 
-    expect(cleanMetadata($input.$input.$input))->toBe($input);
+    expect(StringUtilities::normalizeLineEndings(cleanMetadata($input.$input.$input)))->toBe(StringUtilities::normalizeLineEndings($input));
 });
 
 test('test multiple meta tags', function () {
@@ -88,8 +90,8 @@ function cleanMetadata(string $input): string
 <link rel="manifest" crossorigin="anonymous" href="/site.webmanifest">
 EOT;
 
-    expect(cleanMetadata($input))->toBe($input);
-    expect(cleanMetadata($input.$input))->toBe($input);
+    expect(StringUtilities::normalizeLineEndings(cleanMetadata($input)))->toBe(StringUtilities::normalizeLineEndings($input));
+    expect(StringUtilities::normalizeLineEndings(cleanMetadata($input.$input)))->toBe(StringUtilities::normalizeLineEndings($input));
 });
 
 test('only one robots tag is preserved', function () {
@@ -114,7 +116,7 @@ function cleanMetadata(string $input): string
 <meta http-equiv="refresh" content="two">
 EOT;
 
-    expect(cleanMetadata($input))->toBe($expected);
+    expect(StringUtilities::normalizeLineEndings(cleanMetadata($input)))->toBe(StringUtilities::normalizeLineEndings($expected));
 });
 
 test('charset meta tag should appear only once and the last one should be preserved', function () {