support php 8.1 & laravel 9 with removed bensampo/laravel-enum package requirement

Author: devsrv

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

.gitattributes

@@ -0,0 +1,19 @@
+# Path-based git attributes
+# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+
+# Ignore all test and documentation with "export-ignore".
+/.github            export-ignore
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/phpunit.xml.dist   export-ignore
+/art                export-ignore
+/docs               export-ignore
+/tests              export-ignore
+/.editorconfig      export-ignore
+/.php_cs.dist.php   export-ignore
+/psalm.xml          export-ignore
+/psalm.xml.dist     export-ignore
+/testbench.yaml     export-ignore
+/UPGRADING.md       export-ignore
+/phpstan.neon.dist  export-ignore
+/phpstan-baseline.neon  export-ignore

.github/workflows/test.yaml

@@ -14,20 +14,21 @@ jobs:
             matrix:
                 php: [8.0, 7.4]
                 laravel: [8.*]
-                os: [ubuntu-latest]
+                os: [ubuntu-latest, windows-latest]
+                stability: [prefer-lowest, prefer-stable]
                 include:
                     - laravel: 8.*
                       testbench: 6.*
                       enum: 3.*
 
-        name: PHP ${{ matrix.php }} with Laravel ${{ matrix.laravel }} - ${{ matrix.os }}
+        name: PHP ${{ matrix.php }} with Laravel ${{ matrix.laravel }} -${{ matrix.stability }} - ${{ matrix.os }}
 
         steps:
             - name: Checkout code
               uses: actions/checkout@v2
 
             - name: Setup PHP
-              uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
+              uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, fileinfo
@@ -36,7 +37,7 @@ jobs:
             - name: Install dependencies
               run: |
                   composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "bensampo/laravel-enum:${{ matrix.enum }}" --no-interaction --no-update
-                  composer update --prefer-dist --no-interaction --no-suggest
+                  composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest
 
             - name: Execute pest tests
               run: vendor/bin/pest

.gitignore

@@ -1,9 +1,14 @@
-/.idea
-/vendor
-/node_modules
-package-lock.json
-composer.phar
-composer.lock
+.idea
+.php_cs
+.php_cs.cache
 .phpunit.result.cache
-.DS_Store
-Thumbs.db
+build
+composer.lock
+coverage
+docs
+phpunit.xml
+phpstan.neon
+testbench.yaml
+vendor
+node_modules
+.php-cs-fixer.cache

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v2.0.0 - 2022-24-02
+
+### removed
+- php 7 and php < 8.1 no longer supported minimum php requirement is 8.1
+
 ## v2.0.0 - 2021-12-05
 
 ### BREAKING CHANGES INTRODUCTED

composer.json

@@ -16,14 +16,13 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/config": "^7.0|^8.0",
-        "illuminate/database": "^7.0|^8.0",
-        "illuminate/support": "^7.0|^8.0",
-        "bensampo/laravel-enum": "^3.4"
+        "php": "^8.1",
+        "illuminate/database": "^7.0|^8.0|^9.0",
+        "illuminate/support": "^7.0|^8.0|^9.0",
+        "nesbot/carbon": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.23",
+        "orchestra/testbench": "^6.0|^7.0",
         "pestphp/pest": "^1.21"
     },
     "autoload": {

database/migrations/create_actions_table.php.stub

@@ -19,7 +19,7 @@ class CreateActionsTable extends Migration
             $table->morphs('actionable');
             $table->string('action', 20);
             $table->json('properties')->nullable();
-            $table->enum('status', Status::getValues())->default(Status::PENDING);  //TODO swap to native implementation
+            $table->enum('status', Status::getValues())->default(Status::PENDING->value);  //TODO swap to native implementation
             $table->date('act_date');
             $table->time('act_time');
             $table->timestamp('finished_at')->nullable();

src/Enums/Status.php

@@ -2,12 +2,14 @@
 
 namespace Devsrv\ScheduledAction\Enums;
 
-use BenSampo\Enum\Enum;
-
-final class Status extends Enum
+enum Status: string
 {
-    const PENDING = 'PENDING';
-    const FINISHED = 'FINISHED';
-    const CANCELLED = 'CANCELLED';
-    const DISPATCHED = 'DISPATCHED';
+    case PENDING = 'PENDING';
+    case FINISHED = 'FINISHED';
+    case CANCELLED = 'CANCELLED';
+    case DISPATCHED = 'DISPATCHED';
+
+    public static function getValues() {
+        return array_map(fn($v) => $v->value, static::cases());
+    }
 }

src/Models/ModelAction.php

@@ -6,7 +6,7 @@
 use Database\Factories\ActionFactory;
 use Illuminate\Database\Eloquent\Model;
 use Devsrv\ScheduledAction\Enums\Status;
-use Illuminate\Support\{Arr, Collection};
+use Illuminate\Support\Arr;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Devsrv\ScheduledAction\Traits\{ActionStatus, FluentUpdate, FluentCreate};