Merge pull request #41 from Stillat/v5-support

V5 support
Stillat · May 11, 2024 · ed2c717 · ed2c717
2 parents 2d23af9 + f88a565
commit ed2c717
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,24 +13,21 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1]
-        laravel: [9.*, 10.*]
+        php: [8.2]
+        laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
         include:
-          - laravel: 9.*
           - laravel: 10.*
+          - laravel: 11.*
           - os: windows-latest
-            php: 8.1
-            laravel: 9.*
+            php: 8.2
+            laravel: 10.*
             stability: prefer-stable
           - os: windows-latest
-            php: 8.1
-            laravel: 10.*
+            php: 8.2
+            laravel: 11.*
             stability: prefer-stable
-        exclude:
-          - laravel: 9.*
-            php: 7.4
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -17,11 +17,11 @@
     ],
     "require": {
         "php": "^8.0",
-        "statamic/cms": "^4.16"
+        "statamic/cms": "^4.16 || ^5"
     },
     "require-dev": {
         "mockery/mockery": "^1.2.3",
-        "orchestra/testbench": "^7.0 || ^8.0"
+        "orchestra/testbench": "^7.0 || ^8.0 || ^9"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -74,7 +74,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('statamic.sites', [
             'default' => 'en',
             'sites' => [
-                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://localhost/'],
+                'default' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://localhost/'],
             ],
         ]);
         $app['config']->set('auth.providers.users.driver', 'statamic');

diff --git a/tests/Factories/EntryFactory.php b/tests/Factories/EntryFactory.php
@@ -2,9 +2,11 @@
 
 namespace Tests\Factories;
 
+use Illuminate\Support\Str;
 use Statamic\Contracts\Entries\Collection as StatamicCollection;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Statamic;
 
 class EntryFactory
 {
@@ -110,18 +112,19 @@ protected function createCollection()
 
         return Collection::findByHandle($this->collection)
             ?? Collection::make($this->collection)
-                ->sites(['en'])
+                ->sites(['default'])
                 ->save();
     }
 
     private function reset()
     {
+
         $this->id = null;
         $this->slug = null;
         $this->data = [];
         $this->published = true;
         $this->order = null;
-        $this->locale = 'en';
+        $this->locale = 'default';
         $this->origin = null;
         $this->collection = null;
     }

diff --git a/tests/PreventSavingStacheItemsToDisk.php b/tests/PreventSavingStacheItemsToDisk.php
@@ -4,6 +4,7 @@
 
 use Statamic\Facades\Path;
 use Statamic\Facades\Stache;
+use Illuminate\Support\Str;
 
 trait PreventSavingStacheItemsToDisk
 {
@@ -15,7 +16,7 @@ protected function preventSavingStacheItemsToDisk()
 
         Stache::stores()->each(function ($store) {
             $dir = Path::tidy(__DIR__.'/__fixtures__');
-            $relative = str_after(str_after($store->directory(), $dir), '/');
+            $relative = Str::after(Str::after($store->directory(), $dir), '/');
             $store->directory($this->fakeStacheDirectory.'/'.$relative);
         });
     }