Merge branch 'master' into replace_rest_with_graphql_for_theme_level_support

Author: enmaboya

.github/workflows/ci.yml

@@ -14,6 +14,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         analysis: [ false ]
         coverage: [ 'none' ]
         normalize: [ false ]
@@ -23,6 +24,7 @@ jobs:
           - '9.0'
           - '10.0'
           - '11.0.3'
+          - '12.0'
         exclude:
           - php: '8.0'
             laravel: '9.0'
@@ -40,6 +42,8 @@ jobs:
             laravel: '8.22'
           - php: '8.3'
             laravel: '9.0'
+          - php: '8.4'
+            laravel: '12.0'
         include:
           - php: '8.0'
             laravel: '9.39.0'
@@ -80,7 +84,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }}"

.github/workflows/lint.yml

@@ -31,4 +31,4 @@ jobs:
           composer install --no-interaction --prefer-dist
 
       - name: Check for code style violation with PHP-CS-Fixer
-        run: vendor/bin/php-cs-fixer fix --diff
+        run: vendor/bin/php-cs-fixer check

.idea/laravel-shopify.iml

@@ -24,22 +24,22 @@
         }
     ],
     "require": {
-        "php": "^8.0 || 8.1",
+        "php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
         "ext-json": "*",
         "funeralzone/valueobjects": "^0.5",
         "jenssegers/agent": "^2.6",
-        "laravel/framework": "^8.0 || ^9.0 || ^10.0 || ^11.0",
+        "laravel/framework": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
         "gnikyt/basic-shopify-api": "^9.0 || ^10.0 || ^11.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 || ~8.0",
+        "orchestra/database": "~3.8 || ~4.0 || ~5.0 || ~6.0 || ~7.0 || ~8.0 || ~9.0",
+        "orchestra/testbench": "~3.8 || ~4.0 || ~5.0 || ~6.0 || ~7.0 || ~8.0 || ~9.0",
         "phpstan/phpstan": "^0.12",
-        "phpunit/phpunit": "~8.0 || ^9.0 || ^10.0"
+        "phpunit/phpunit": "~8.0 || ^9.0 || ^10.0 || ^11.0"
     },
     "config": {
         "sort-packages": true,

composer.json

@@ -18,116 +18,45 @@
 use Osiset\ShopifyApp\Objects\Values\ShopId;
 use Osiset\ShopifyApp\Services\ChargeHelper;
 
-/**
- * Activates a plan for a shop.
- */
 class ActivatePlan
 {
     /**
-     * The charge helper.
-     *
-     * @var ChargeHelper
-     */
-    protected $chargeHelper;
-
-    /**
-     * Action which cancels the current plan.
-     *
-     * @var callable
-     */
-    protected $cancelCurrentPlan;
-
-    /**
-     * Querier for shops.
-     *
-     * @var IShopQuery
-     */
-    protected $shopQuery;
-
-    /**
-     * Command for charges.
-     *
-     * @var IChargeCommand
-     */
-    protected $chargeCommand;
-
-    /**
-     * Command for shops.
-     *
-     * @var IShopCommand
-     */
-    protected $shopCommand;
-
-    /**
-     * Querier for plans.
-     *
-     * @var IPlanQuery
-     */
-    protected $planQuery;
-
-    /**
-     * Setup.
-     *
-     * @param callable       $cancelCurrentPlanAction Action which cancels the current plan.
-     * @param ChargeHelper   $chargeHelper            The charge helper.
-     * @param IShopQuery     $shopQuery               The querier for shops.
-     * @param IPlanQuery     $planQuery               The querier for plans.
-     * @param IChargeCommand $chargeCommand           The commands for charges.
-     * @param IShopCommand   $shopCommand             The commands for shops.
-     *
-     * @return void
+     * @param callable $cancelCurrentPlan
      */
     public function __construct(
-        callable $cancelCurrentPlanAction,
-        ChargeHelper $chargeHelper,
-        IShopQuery $shopQuery,
-        IPlanQuery $planQuery,
-        IChargeCommand $chargeCommand,
-        IShopCommand $shopCommand
+        protected $cancelCurrentPlan,
+        protected ChargeHelper $chargeHelper,
+        protected IShopQuery $shopQuery,
+        protected IPlanQuery $planQuery,
+        protected IChargeCommand $chargeCommand,
+        protected IShopCommand $shopCommand
     ) {
-        $this->cancelCurrentPlan = $cancelCurrentPlanAction;
-        $this->chargeHelper = $chargeHelper;
-        $this->shopQuery = $shopQuery;
-        $this->planQuery = $planQuery;
-        $this->chargeCommand = $chargeCommand;
-        $this->shopCommand = $shopCommand;
     }
 
     /**
-     * Execution.
      * TODO: Rethrow an API exception.
-     *
-     * @param ShopId          $shopId    The shop ID.
-     * @param PlanId          $planId    The plan to use.
-     * @param ChargeReference $chargeRef The charge ID from Shopify.
-     *
-     * @return ChargeId
      */
     public function __invoke(ShopId $shopId, PlanId $planId, ChargeReference $chargeRef, string $host): ChargeId
     {
-        // Get the shop
         $shop = $this->shopQuery->getById($shopId);
-
-        // Get the plan
         $plan = $this->planQuery->getById($planId);
         $chargeType = ChargeType::fromNative($plan->getType()->toNative());
 
         // Activate the plan on Shopify
         $response = $shop->apiHelper()->activateCharge($chargeType, $chargeRef);
-
         // Cancel the shop's current plan
         call_user_func($this->cancelCurrentPlan, $shopId);
-
         // Cancel the existing charge if it exists (happens if someone refreshes during)
         $this->chargeCommand->delete($chargeRef, $shopId);
 
-        // Create the charge transfer
         $transfer = new ChargeTransfer();
         $transfer->shopId = $shopId;
         $transfer->planId = $planId;
         $transfer->chargeReference = $chargeRef;
         $transfer->chargeType = $chargeType;
         $transfer->chargeStatus = ChargeStatus::fromNative(strtoupper($response['status']));
+        $transfer->planDetails = $this->chargeHelper->details($plan, $shop, $host);
+
         if ($plan->isType(PlanType::RECURRING())) {
             $transfer->activatedOn = new Carbon($response['activated_on']);
             $transfer->billingOn = new Carbon($response['billing_on']);
@@ -137,9 +66,7 @@ public function __invoke(ShopId $shopId, PlanId $planId, ChargeReference $charge
             $transfer->billingOn = null;
             $transfer->trialEndsOn = null;
         }
-        $transfer->planDetails = $this->chargeHelper->details($plan, $shop, $host);
 
-        // Create the charge
         $charge = $this->chargeCommand->make($transfer);
         $this->shopCommand->setToPlan($shopId, $planId);
 

src/Actions/ActivatePlan.php

@@ -13,89 +13,45 @@
 use Osiset\ShopifyApp\Objects\Values\ShopId;
 use Osiset\ShopifyApp\Services\ChargeHelper;
 
-/**
- * Activates a usage charge for a shop.
- */
 class ActivateUsageCharge
 {
-    /**
-     * The helper for charges.
-     *
-     * @var ChargeHelper
-     */
-    protected $chargeHelper;
-
-    /**
-     * Command for charges.
-     *
-     * @var IChargeCommand
-     */
-    protected $chargeCommand;
-
-    /**
-     * Querier for shops.
-     *
-     * @var IShopQuery
-     */
-    protected $shopQuery;
-
-    /**
-     * Setup.
-     *
-     * @param ChargeHelper   $chargeHelper  The helper for charges.
-     * @param IChargeCommand $chargeCommand The commands for charges.
-     * @param IShopQuery     $shopQuery     The querier for shops.
-     *
-     * @return void
-     */
     public function __construct(
-        ChargeHelper $chargeHelper,
-        IChargeCommand $chargeCommand,
-        IShopQuery $shopQuery
+        protected ChargeHelper $chargeHelper,
+        protected IChargeCommand $chargeCommand,
+        protected IShopQuery $shopQuery
     ) {
-        $this->chargeHelper = $chargeHelper;
-        $this->chargeCommand = $chargeCommand;
-        $this->shopQuery = $shopQuery;
     }
 
     /**
-     * Execute.
      * TODO: Rethrow an API exception.
      *
-     * @param ShopId                    $shopId The shop ID.
-     * @param UsageChargeDetailsTransfer $ucd    The usage charge details (without charge ID).
-     *
      * @throws ChargeNotRecurringException
-     *
-     * @return ChargeId|bool
      */
-    public function __invoke(ShopId $shopId, UsageChargeDetailsTransfer $ucd)
+    public function __invoke(ShopId $shopId, UsageChargeDetailsTransfer $ucd): ChargeId|bool
     {
-        // Get the shop
         $shop = $this->shopQuery->getById($shopId);
-
         // Ensure we have a recurring charge
         $currentCharge = $this->chargeHelper->chargeForPlan($shop->plan->getId(), $shop);
+
         if (! $currentCharge->isType(ChargeType::RECURRING())) {
             throw new ChargeNotRecurringException('Can only create usage charges for recurring charge.');
         }
 
         // Create the usage charge
         $ucd->chargeReference = $currentCharge->getReference();
         $response = $shop->apiHelper()->createUsageCharge($ucd);
+
         if (! $response) {
             // Could not make usage charge, limit possibly reached
             return false;
         }
 
-        // Create the transfer
-        $uct = new UsageChargeTransfer();
-        $uct->shopId = $shopId;
-        $uct->planId = $shop->plan->getId();
-        $uct->chargeReference = ChargeReference::fromNative((int) $response['id']);
-        $uct->details = $ucd;
+        $transfer = new UsageChargeTransfer();
+        $transfer->shopId = $shopId;
+        $transfer->planId = $shop->plan->getId();
+        $transfer->chargeReference = ChargeReference::fromNative((int) $response['id']);
+        $transfer->details = $ucd;
 
-        // Save the usage charge
-        return $this->chargeCommand->makeUsage($uct);
+        return $this->chargeCommand->makeUsage($transfer);
     }
 }