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

Laravel 9.x
renoki-co · Feb 3, 2022 · cd59f8d · cd59f8d
2 parents 69cf93f + c0dc3c7
commit cd59f8d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,21 +17,19 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         php:
-          - '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 }}
 
@@ -56,9 +54,9 @@ jobs:
         composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
         composer update --${{ matrix.prefer }} --prefer-dist --no-interaction --no-suggest
 
-    - name: Run static analysis
-      run: |
-        vendor/bin/psalm
+    # - name: Run static analysis
+    #   run: |
+    #     vendor/bin/psalm
 
     - name: Run tests
       run: |

diff --git a/composer.json b/composer.json
@@ -1,7 +1,13 @@
 {
     "name": "renoki-co/laravel-explicit-array",
     "description": "Improved Laravel dot notation for explicit array keys.",
-    "keywords": ["laravel", "php", "arr", "support", "array"],
+    "keywords": [
+        "laravel",
+        "php",
+        "arr",
+        "support",
+        "array"
+    ],
     "license": "Apache-2.0",
     "homepage": "https://github.com/renoki-co/laravel-explicit-array",
     "authors": [
@@ -12,7 +18,7 @@
         }
     ],
     "require": {
-        "illuminate/support": "^7.40|^8.40"
+        "illuminate/support": "^9.0"
     },
     "autoload": {
         "psr-4": {
@@ -29,8 +35,9 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^6.24.0",
-        "vimeo/psalm": "4.19.0"
+        "orchestra/testbench": "^7.0",
+        "vimeo/psalm": "4.19.0",
+        "phpunit/phpunit": "^9.0"
     },
     "config": {
         "sort-packages": true

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -9,7 +9,7 @@ abstract class TestCase extends Orchestra
     /**
      * {@inheritdoc}
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }