Merge pull request #55 from renoki-co/shift-build-2349

Laravel 9.x

.github/workflows/ci.yml

@@ -15,22 +15,22 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         php:
-          - '7.3'
-          - '7.4'
           - '8.0'
+          - '8.1'
         laravel:
-          - 7.*
           - 8.*
+          - 9.*
         prefer:
           - 'prefer-lowest'
           - 'prefer-stable'
         include:
-          - laravel: '7.*'
-            testbench: '5.*'
           - laravel: '8.*'
             testbench: '6.*'
+          - laravel: '9.*'
+            testbench: '7.*'
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} --${{ matrix.prefer }}
 

composer.json

@@ -21,15 +21,17 @@
         }
     ],
     "require": {
-        "illuminate/database": "^7.30|^8.23",
-        "illuminate/support": "^7.30|^8.23"
+        "illuminate/database": "^8.83|^9.0.1",
+        "illuminate/support": "^8.83|^9.0.1"
     },
     "require-dev": {
         "doctrine/dbal": "^2.8|^3.0",
         "laravel/legacy-factories": "^1.3",
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^6.24.0",
-        "orchestra/database": "^5.0|^6.0"
+        "orchestra/database": "^6.28|^7.0",
+        "orchestra/testbench": "^6.28|^7.0",
+        "orchestra/testbench-core": "^6.28|^7.0",
+        "phpunit/phpunit": "^9.5.13"
     },
     "autoload": {
         "psr-4": {

src/Traits/HasSettings.php

@@ -36,7 +36,7 @@ public function getSetting(string $key)
     public function getSettingValue(string $key, ?string $castType = null)
     {
         $setting = $this->getSetting($key);
-        $value = optional($setting)->value;
+        $value = $setting?->value;
 
         if (is_null($value)) {
             return null;

tests/SettingsTest.php

@@ -6,7 +6,7 @@ class SettingsTest extends TestCase
 {
     protected $user;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/TestCase.php

@@ -13,7 +13,7 @@ abstract class TestCase extends Orchestra
      *
      * @return void
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();