Support Statamic v4 (#142)

Co-authored-by: Jason Varga <[email protected]>

Author: ryanmitchell

.github/workflows/tests.yml

@@ -12,9 +12,12 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1]
-        laravel: [8.*, 9.*]
+        php: [8.0, 8.1, 8.2]
+        laravel: [9.*, 10.*]
         dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - php: 8.0
+            laravel: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -29,10 +32,6 @@ jobs:
           extension-csv: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
           coverage: none
 
-      - name: Set PHP 8.1 Testbench
-        run: composer require "orchestra/testbench ^6.22.0" --no-interaction --no-update
-        if: matrix.laravel == '8.*' && matrix.php >= 8.1
-
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update

composer.json

@@ -24,11 +24,11 @@
     },
     "require": {
         "php": "^8.0",
-        "statamic/cms": "^3.3.51 || 3.4.*"
+        "statamic/cms": "^4.0.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.3",
-        "orchestra/testbench": "^6.7.0 || ^7.0",
+        "orchestra/testbench": "^7.0 || ^8.0",
         "phpunit/phpunit": "^9.4"
     },
     "scripts": {
@@ -38,5 +38,7 @@
         "allow-plugins": {
             "pixelfear/composer-dist-plugin": true
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/Collections/Collection.php

@@ -20,7 +20,6 @@ public static function fromModel(Model $model)
             ->titleFormats($model->settings['title_formats'] ?? null)
             ->mount($model->settings['mount'] ?? null)
             ->dated($model->settings['dated'] ?? null)
-            ->ampable($model->settings['ampable'] ?? null)
             ->sites($model->settings['sites'] ?? null)
             ->template($model->settings['template'] ?? null)
             ->layout($model->settings['layout'] ?? null)
@@ -58,7 +57,6 @@ public static function makeModelFromContract(Contract $source)
                 'title_formats'        => collect($source->titleFormats())->filter(),
                 'mount'                => $source->mount,
                 'dated'                => $source->dated,
-                'ampable'              => $source->ampable,
                 'sites'                => $source->sites,
                 'template'             => $source->template,
                 'layout'               => $source->layout,

src/Collections/CollectionModel.php

@@ -20,6 +20,5 @@ class CollectionModel extends BaseModel
         'settings.revisions'             => 'boolean',
         'settings.dated'                 => 'boolean',
         'settings.default_publish_state' => 'boolean',
-        'settings.ampable'               => 'boolean',
     ];
 }

src/Commands/ImportBlueprints.php

@@ -72,13 +72,23 @@ private function importBlueprints()
 
             $contents = YAML::file($path)->parse();
             // Ensure sections are ordered correctly.
-            if (isset($contents['sections']) && is_array($contents['sections'])) {
+            if (isset($contents['tabs']) && is_array($contents['tabs'])) {
                 $count = 0;
-                $contents['sections'] = collect($contents['sections'])
-                    ->map(function ($section) use (&$count) {
-                        $section['__count'] = $count++;
+                $contents['tabs'] = collect($contents['tabs'])
+                    ->map(function ($tab) use (&$count) {
+                        $tab['__count'] = $count++;
 
-                        return $section;
+                        if (isset($tab['sections']) && is_array($tab['sections'])) {
+                            $sectionCount = 0;
+                            $tab['sections'] = collect($tab['sections'])
+                                ->map(function ($section) use (&$sectionCount) {
+                                    $section['__count'] = $sectionCount++;
+
+                                    return $section;
+                                });
+                        }
+
+                        return $tab;
                     })
                     ->toArray();
             }

src/Entries/Entry.php

@@ -17,13 +17,16 @@ public static function fromModel(Model $model)
             ->origin($model->origin_id)
             ->locale($model->site)
             ->slug($model->slug)
-            ->date($model->date)
             ->collection($model->collection)
             ->data($model->data)
             ->blueprint($model->data['blueprint'] ?? null)
             ->published($model->published)
             ->model($model);
 
+        if ($model->date && $entry->collection()->dated()) {
+            $entry->date($model->date);
+        }
+
         if (config('statamic.system.track_last_update')) {
             $entry->set('updated_at', $model->updated_at ?? $model->created_at);
         }

src/Fields/BlueprintRepository.php

@@ -83,7 +83,7 @@ protected function filesIn($namespace)
         return Blink::store(self::BLINK_NAMESPACE_PATHS)->once($namespace ?? 'none', function () use ($namespace) {
             $namespace = str_replace('/', '.', $namespace);
 
-            if (count(($blueprintModels = BlueprintModel::where('namespace', $namespace)->get())) == 0) {
+            if (count($blueprintModels = BlueprintModel::where('namespace', $namespace)->get()) == 0) {
                 return collect();
             }
 
@@ -139,11 +139,21 @@ public function deleteModel($blueprint)
     private function addOrderToBlueprintSections($contents)
     {
         $count = 0;
-        $contents['sections'] = collect($contents['sections'] ?? [])
-            ->map(function ($section) use (&$count) {
-                $section['__count'] = $count++;
+        $contents['tabs'] = collect($contents['tabs'] ?? [])
+            ->map(function ($tab) use (&$count) {
+                $tab['__count'] = $count++;
 
-                return $section;
+                if (isset($tab['sections']) && is_array($tab['sections'])) {
+                    $sectionCount = 0;
+                    $tab['sections'] = collect($tab['sections'])
+                        ->map(function ($section) use (&$sectionCount) {
+                            $section['__count'] = $sectionCount++;
+
+                            return $section;
+                        });
+                }
+
+                return $tab;
             })
             ->toArray();
 
@@ -152,12 +162,23 @@ private function addOrderToBlueprintSections($contents)
 
     private function updateOrderFromBlueprintSections($contents)
     {
-        $contents['sections'] = collect($contents['sections'] ?? [])
+        $contents['tabs'] = collect($contents['tabs'] ?? [])
             ->sortBy('__count')
-            ->map(function ($section) {
-                unset($section['__count']);
+            ->map(function ($tab) {
+                unset($tab['__count']);
+
+                if (isset($tab['sections']) && is_array($tab['sections'])) {
+                    $tab['sections'] = collect($tab['sections'])
+                        ->sortBy('__count')
+                        ->map(function ($section) use (&$sectionCount) {
+                            unset($section['__count']);
+
+                            return $section;
+                        })
+                        ->toArray();
+                }
 
-                return $section;
+                return $tab;
             })
             ->toArray();
 

tests/Factories/EntryFactory.php

@@ -94,10 +94,13 @@ public function make()
             ->collection($this->createCollection())
             ->slug($this->slug)
             ->data($this->data)
-            ->date($this->date)
             ->origin($this->origin)
             ->published($this->published);
 
+        if ($this->date) {
+            $entry->date($this->date);
+        }
+
         if ($this->id) {
             $entry->id($this->id);
         }