Merge pull request #5 from esign/support-laravel-13

Support Laravel 13

Author: jordyvanderhaegen

.github/workflows/run-tests.yml

@@ -15,14 +15,19 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.4, 8.3, 8.2]
-                laravel: [12.*, 11.*]
+                php: [8.5, 8.4, 8.3]
+                laravel: [13.*, 12.*, 11.*]
                 stability: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 13.*
+                      testbench: 11.*
                     - laravel: 12.*
                       testbench: 10.*
                     - laravel: 11.*
                       testbench: ^9.9
+                exclude:
+                    - laravel: 13.*
+                      php: 8.2
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -24,16 +24,16 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^11.0|^12.0",
-        "illuminate/database": "^11.0|^12.0",
-        "illuminate/http": "^11.0|^12.0",
-        "illuminate/contracts": "^11.0|^12.0",
+        "illuminate/support": "^11.40|^12.0|^13.0",
+        "illuminate/database": "^11.40|^12.0|^13.0",
+        "illuminate/http": "^11.40|^12.0|^13.0",
+        "illuminate/contracts": "^11.40|^12.0|^13.0",
         "shopify/shopify-app-php": "^0.1",
         "spatie/laravel-data": "^4.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^10.0",
-        "phpunit/phpunit": "^11.0",
+        "orchestra/testbench": "^10.0|^11.0",
+        "phpunit/phpunit": "^11.5.3",
         "laravel/pint": "^1.13",
         "mockery/mockery": "^1.6"
     },

tests/Unit/Auth/TokenRefreshServiceTest.php

@@ -108,7 +108,6 @@ public function it_successfully_refreshes_token_and_updates_shop()
         // Inject mock using reflection
         $reflection = new \ReflectionClass($this->service);
         $property = $reflection->getProperty('shopifyApp');
-        $property->setAccessible(true);
         $property->setValue($this->service, $mockShopifyApp);
 
         $result = $this->service->refreshAccessToken($shop);
@@ -150,7 +149,6 @@ public function it_returns_true_when_token_is_still_valid()
 
         $reflection = new \ReflectionClass($this->service);
         $property = $reflection->getProperty('shopifyApp');
-        $property->setAccessible(true);
         $property->setValue($this->service, $mockShopifyApp);
 
         $result = $this->service->refreshAccessToken($shop);
@@ -191,7 +189,6 @@ public function it_clears_tokens_on_invalid_grant_error()
 
         $reflection = new \ReflectionClass($this->service);
         $property = $reflection->getProperty('shopifyApp');
-        $property->setAccessible(true);
         $property->setValue($this->service, $mockShopifyApp);
 
         $result = $this->service->refreshAccessToken($shop);
@@ -224,7 +221,6 @@ public function it_handles_token_refresh_exception()
 
         $reflection = new \ReflectionClass($this->service);
         $property = $reflection->getProperty('shopifyApp');
-        $property->setAccessible(true);
         $property->setValue($this->service, $mockShopifyApp);
 
         $result = $this->service->refreshAccessToken($shop);