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

Laravel 9.x
renoki-co · Feb 9, 2022 · 32fc475 · 32fc475
2 parents 90fe7fe + 82ce7cd
commit 32fc475
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,22 +17,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 }}
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,19 @@
 {
     "name": "renoki-co/hej",
     "description": "Hej! is a simple authentication boilerplate for Socialite.",
-    "keywords": ["laravel", "php", "social", "login", "register", "socialite", "facebook", "github", "twitter", "gitlab", "google"],
+    "keywords": [
+        "laravel",
+        "php",
+        "social",
+        "login",
+        "register",
+        "socialite",
+        "facebook",
+        "github",
+        "twitter",
+        "gitlab",
+        "google"
+    ],
     "license": "Apache-2.0",
     "homepage": "https://github.com/renoki-co/hej",
     "authors": [
@@ -12,9 +24,9 @@
         }
     ],
     "require": {
-        "illuminate/database": "^7.30|^8.24",
-        "illuminate/support": "^7.30|^8.24",
-        "laravel/socialite": "^5.0"
+        "illuminate/database": "^8.83|^9.0.1",
+        "illuminate/support": "^8.83|^9.0.1",
+        "laravel/socialite": "^5.3"
     },
     "autoload": {
         "psr-4": {
@@ -32,9 +44,11 @@
     "require-dev": {
         "laravel/legacy-factories": "^1.3",
         "mockery/mockery": "^1.5",
-        "orchestra/database": "^5.0|^6.0",
-        "orchestra/testbench": "^6.24.0",
-        "orchestra/testbench-browser-kit": "^6.17.2"
+        "orchestra/database": "^6.28|^7.0",
+        "orchestra/testbench": "^6.28|^7.0",
+        "orchestra/testbench-browser-kit": "^6.28|^7.0",
+        "orchestra/testbench-core": "^6.28|^7.0",
+        "phpunit/phpunit": "^9.5.13"
     },
     "config": {
         "sort-packages": true

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