[2.x] Develop 2.x

joelbutcher · Jan 13, 2022 · b3f7df8 · b3f7df8
2 parents 09fad4e + 5655fa2
commit b3f7df8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,8 +13,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, 8.0]
-        laravel: [^8.0]
+        php: [7.3, 7.4, '8.0', 8.1]
+        laravel: [8, 9]
+        exclude:
+          - php: 7.3
+            laravel: 9
+          - php: 7.4
+            laravel: 9
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -32,7 +37,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update
+           composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests

diff --git a/composer.json b/composer.json
@@ -16,15 +16,15 @@
     "require": {
         "php": "^7.3|^8.0",
         "doctrine/dbal": "^2.9|^3.0",
-        "illuminate/support": "^8.0",
+        "illuminate/support": "^8.0|^9.0",
         "laravel/jetstream": "^2.0.0",
         "laravel/socialite": "^5.0"
     },
     "require-dev": {
-        "inertiajs/inertia-laravel": "^0.3",
-        "laravel/sanctum": "^2.6",
+        "inertiajs/inertia-laravel": "^0.5.2",
+        "laravel/sanctum": "^2.7",
         "mockery/mockery": "^1.0",
-        "orchestra/testbench": "^6.0",
+        "orchestra/testbench": "^6.0|^7.0",
         "phpunit/phpunit": "^9.3"
     },
     "autoload": {

diff --git a/src/Actions/GenerateRedirectForProvider.php b/src/Actions/GenerateRedirectForProvider.php
@@ -11,7 +11,6 @@ class GenerateRedirectForProvider implements GeneratesProviderRedirect
      * Generates the redirect for a given provider.
      *
      * @param  string  $provider
-     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function generate(string $provider)

diff --git a/src/Contracts/GeneratesProviderRedirect.php b/src/Contracts/GeneratesProviderRedirect.php
@@ -8,7 +8,6 @@ interface GeneratesProviderRedirect
      * Generates the redirect for a given provider.
      *
      * @param  string  $provider
-     *
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function generate(string $provider);

diff --git a/src/Http/Controllers/Inertia/PasswordController.php b/src/Http/Controllers/Inertia/PasswordController.php
@@ -13,7 +13,6 @@ class PasswordController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Laravel\Jetstream\Contracts\SetsUserPasswords  $setter
-     *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request, SetsUserPasswords $setter)

diff --git a/src/Http/Controllers/OAuthController.php b/src/Http/Controllers/OAuthController.php
@@ -30,21 +30,21 @@ class OAuthController extends Controller
     /**
      * The creates user implementation.
      *
-     * @var  \JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
+     * @var \JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
      */
     protected $createsUser;
 
     /**
      * The creates connected accounts implementation.
      *
-     * @var  \JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
+     * @var \JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
      */
     protected $createsConnectedAccounts;
 
     /**
      * The handler for Socialite's InvalidStateException.
      *
-     * @var  \JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
+     * @var \JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
      */
     protected $invalidStateHandler;