laravel 7,8

Author: ryancco

.travis.yml

@@ -6,33 +6,23 @@ cache:
 
 matrix:
   include:
-    - php: 7.2
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.2
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.3
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.3
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.4snapshot
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.4snapshot
-      env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.2
-      env: LARAVEL='^6.0' TESTBENCH='^4.0' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.2
-      env: LARAVEL='^6.0' TESTBENCH='^4.0' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.3
-      env: LARAVEL='^6.0' TESTBENCH='^4.0' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.3
-      env: LARAVEL='^6.0' TESTBENCH='^4.0' COMPOSER_FLAGS='--prefer-stable'
-    - php: 7.4snapshot
-      env: LARAVEL='^6.0' TESTBENCH='^4.0' COMPOSER_FLAGS='--prefer-lowest'
-    - php: 7.4snapshot
-      env: LARAVEL='^6.0' TESTBENCH='^4.0' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.4
+      env: LARAVEL='^7.0' TESTBENCH='^5.0' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.4
+      env: LARAVEL='^7.0' TESTBENCH='^5.0' COMPOSER_FLAGS='--prefer-stable'
+    - php: 8.0
+      env: LARAVEL='^7.0' TESTBENCH='^5.0' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 8.0
+      env: LARAVEL='^7.0' TESTBENCH='^5.0' COMPOSER_FLAGS='--prefer-stable'
+    - php: 7.4
+      env: LARAVEL='^8.0' TESTBENCH='^6.0' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 7.4
+      env: LARAVEL='^8.0' TESTBENCH='^6.0' COMPOSER_FLAGS='--prefer-stable'
+    - php: 8.0
+      env: LARAVEL='^8.0' TESTBENCH='^6.0' COMPOSER_FLAGS='--prefer-lowest'
+    - php: 8.0
+      env: LARAVEL='^8.0' TESTBENCH='^6.0' COMPOSER_FLAGS='--prefer-stable'
   fast_finish: true
-  allow_failures:
-    - php: 7.4snapshot
 
 before_install:
   - composer config discard-changes true

composer.json

@@ -14,8 +14,8 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "moontoast/math": "^1.1"
+        "php": "^7.4|^8",
+        "illuminate/support": "^7|^8"
     },
     "autoload": {
         "psr-4": {
@@ -28,7 +28,7 @@
         }
     },
     "require-dev": {
-        "orchestra/testbench": "^3.8",
-        "phpunit/phpunit": "^8.3"
+        "orchestra/testbench": "^6",
+        "phpunit/phpunit": "^9"
     }
 }

phpunit.xml

@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          verbose="true">
-
-    <testsuites>
-        <testsuite name="default">
-            <directory suffix="Test.php">tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
-    <php>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-    </php>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="default">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+  </php>
 </phpunit>

src/HasUuidRouteKey.php

@@ -2,7 +2,6 @@
 
 namespace Ryancco\HasUuidRouteKey;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 use Ramsey\Uuid\Exception\InvalidUuidStringException;
 use Ramsey\Uuid\Uuid;
@@ -21,7 +20,7 @@ public function getUuidAttribute(): ?UuidInterface
     {
         $attribute = $this->attributes[$this->getRouteKeyName()] ?? null;
 
-        return !$attribute ? null : Uuid::fromString($attribute);
+        return ! $attribute ? null : Uuid::fromString($attribute);
     }
 
     /**
@@ -31,7 +30,7 @@ public function getUuidAttribute(): ?UuidInterface
      */
     public function setUuidAttribute($uuid): void
     {
-        if (!$uuid instanceof UuidInterface) {
+        if (! $uuid instanceof UuidInterface) {
             $uuid = Uuid::fromString($uuid);
         }