Laravel 10 Support (#97)

Add support for Laravel 10

---------

Co-authored-by: Luke Walsh <kyon.rf@gmail.com>

Author: vincenzoraco

.github/workflows/ci.yml

@@ -10,24 +10,24 @@ jobs:
       max-parallel: 3
       matrix:
         php:
-          - '7.3'
-          - '7.4'
           - '8.0'
+          - '8.1'
         analysis: [ false ]
         coverage: [ 'none' ]
         normalize: [ false ]
         validate: [ false ]
         laravel:
           - '8.22'
           - '9.0'
+          - '10.0'
         exclude:
-          - php: '7.3'
-            laravel: '9.0'
-          - php: '7.4'
-            laravel: '9.0'
           - php: '8.0'
-            laravel: '7.0'
+            laravel: '9.0'
           - php: '8.0'
+            laravel: '10.0'
+          - php: '8.1'
+            laravel: '8.22'
+          - php: '8.1'
             laravel: '9.0'
         include:
           - php: '8.0'

.gitignore

@@ -14,6 +14,8 @@ composer.lock
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
+.idea/git_toolbox_prj.xml
+.idea/php-test-framework.xml
 
 # Generated files
 .idea/**/contentModel.xml

composer.json

@@ -24,22 +24,22 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0 || 8.1",
+        "php": "^8.0 || 8.1",
         "ext-json": "*",
         "funeralzone/valueobjects": "^0.5",
         "jenssegers/agent": "^2.6",
-        "laravel/framework": "^7.0 || ^8.0 || ^9.0",
-        "osiset/basic-shopify-api": "^9.0 || <=10.0.5"
+        "laravel/framework": "^8.0 || ^9.0 || ^10.0",
+        "gnikyt/basic-shopify-api": "^9.0 || ^10.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^v1.3.0",
         "ergebnis/composer-normalize": "^2.8",
         "friendsofphp/php-cs-fixer": "^3.0",
         "mockery/mockery": "^1.0",
         "orchestra/database": "~3.8 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
-        "orchestra/testbench": "~3.8 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
+        "orchestra/testbench": "~3.8 || ~4.0 || ~5.0 || ~6.0 || ~7.0 || ~8.0",
         "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit": "~8.0 || ^9.0"
+        "phpunit/phpunit": "~8.0 || ^9.0 || ^10.0"
     },
     "config": {
         "sort-packages": true,

tests/Services/ChargeHelperTest.php

@@ -172,7 +172,7 @@ public function testDetails2(): void
     protected function seedData($extraCharge = [], $extraPlan = [], $type = 'onetime'): array
     {
         // Create a plan
-        $plan = factory(Util::getShopifyConfig('models.plan', Plan::class))->states("type_${type}")->create(
+        $plan = factory(Util::getShopifyConfig('models.plan', Plan::class))->states("type_{$type}")->create(
             array_merge(
                 ['trial_days' => 7],
                 $extraPlan
@@ -185,7 +185,7 @@ protected function seedData($extraCharge = [], $extraPlan = [], $type = 'onetime
         ]);
 
         // Create a charge for the plan and shop
-        $charge = factory(Util::getShopifyConfig('models.charge', Charge::class))->states("type_${type}")->create(
+        $charge = factory(Util::getShopifyConfig('models.charge', Charge::class))->states("type_{$type}")->create(
             array_merge(
                 [
                     'charge_id' => 12345,