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

Laravel 9.x
renoki-co · Feb 10, 2022 · 15e8b16 · 15e8b16
2 parents 0696ea5 + 0d372a5
commit 15e8b16
Show file tree

Hide file tree

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

diff --git a/composer.json b/composer.json
@@ -29,15 +29,17 @@
         }
     ],
     "require": {
-        "doctrine/dbal": "^2.10",
-        "illuminate/database": "^7.30|^8.23",
-        "illuminate/support": "^7.30|^8.23"
+        "doctrine/dbal": "^2.10|^3.3",
+        "illuminate/database": "^8.83|^9.0.1",
+        "illuminate/support": "^8.83|^9.0.1"
     },
     "require-dev": {
         "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": {

diff --git a/tests/BlockingTest.php b/tests/BlockingTest.php
@@ -18,7 +18,7 @@ class BlockingTest extends TestCase
 
     protected $simplePage;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/CanFilterBlockingTest.php b/tests/CanFilterBlockingTest.php
@@ -11,7 +11,7 @@ class CanFilterBlockingTest extends TestCase
 
     protected $alice;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/CanFilterFollowingTest.php b/tests/CanFilterFollowingTest.php
@@ -11,7 +11,7 @@ class CanFilterFollowingTest extends TestCase
 
     protected $alice;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/CanFilterLikingTest.php b/tests/CanFilterLikingTest.php
@@ -11,7 +11,7 @@ class CanFilterLikingTest extends TestCase
 
     protected $alice;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/FollowRequestTest.php b/tests/FollowRequestTest.php
@@ -18,7 +18,7 @@ class FollowRequestTest extends TestCase
 
     protected $simplePage;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/FollowTest.php b/tests/FollowTest.php
@@ -18,7 +18,7 @@ class FollowTest extends TestCase
 
     protected $simplePage;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

diff --git a/tests/LikingTest.php b/tests/LikingTest.php
@@ -18,7 +18,7 @@ class LikingTest extends TestCase
 
     protected $simplePage;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

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