feat: paypal sdk v6

composer.json

@@ -53,9 +53,12 @@
         "lint:admin": "npm run lint-fix --prefix src/Resources/app/administration",
         "lint:admin:ci": "npm run lint --prefix src/Resources/app/administration",
         "init:storefront": "npm ci --no-audit --prefer-offline --prefix src/Resources/app/storefront",
-        "lint:storefront": "@lint:storefront:ci --fix",
+        "lint:storefront": [
+            "npm run lint-fix --prefix src/Resources/app/storefront",
+            "cd src/Resources/app/storefront && ../../../../../../../src/Storefront/Resources/app/storefront/node_modules/.bin/stylelint --config ../../../../../../../src/Storefront/Resources/app/storefront/stylelint.config.js ./src/scss"
+        ],
         "lint:storefront:ci": [
-            "cd src/Resources/app/storefront && ../../../../../../../src/Storefront/Resources/app/storefront/node_modules/.bin/eslint --config ../../../../../../../src/Storefront/Resources/app/storefront/.eslintrc.js ./src",
+            "npm run lint --prefix src/Resources/app/storefront",
             "cd src/Resources/app/storefront && ../../../../../../../src/Storefront/Resources/app/storefront/node_modules/.bin/stylelint --config ../../../../../../../src/Storefront/Resources/app/storefront/stylelint.config.js ./src/scss"
         ],
         "phpunit": "../../../vendor/bin/phpunit",

phpstan.neon.dist

@@ -24,6 +24,9 @@ parameters:
         constantHassers: false
 
     ignoreErrors:
+        - # ignore own deprecations
+          message: '#.*tag:v11.0.0 -.*#'
+
         # We won't type all arrays/iterables for now
         - '#no value type specified in iterable type#'
 

src/Checkout/ExpressCheckout/ExpressCheckoutButtonData.php

@@ -43,6 +43,9 @@ class ExpressCheckoutButtonData extends AbstractScriptData
 
     protected string $cancelRedirectUrl;
 
+    /**
+     * @deprecated tag:v11.0.0 - Will be removed and is replaced by {@see self::fundingSources}
+     */
     protected bool $showPayLater;
 
     /**
@@ -200,11 +203,17 @@ public function setCancelRedirectUrl(string $cancelRedirectUrl): void
         $this->cancelRedirectUrl = $cancelRedirectUrl;
     }
 
+    /**
+     * @deprecated tag:v11.0.0 - Will be removed and is replaced by {@see self::fundingSources}
+     */
     public function isShowPayLater(): bool
     {
         return $this->showPayLater;
     }
 
+    /**
+     * @deprecated tag:v11.0.0 - Will be removed and is replaced by {@see self::fundingSources}
+     */
     public function setShowPayLater(bool $showPayLater): void
     {
         $this->showPayLater = $showPayLater;

src/Checkout/ExpressCheckout/ExpressCheckoutSubscriber.php

@@ -44,6 +44,7 @@
 use Swag\PayPal\Setting\Exception\PayPalSettingsInvalidException;
 use Swag\PayPal\Setting\Service\SettingsValidationServiceInterface;
 use Swag\PayPal\Setting\Settings;
+use Swag\PayPal\Storefront\Data\Struct\AbstractScriptData;
 use Swag\PayPal\Util\PaymentMethodUtil;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
@@ -313,11 +314,15 @@ private function getExpressCheckoutButtonData(
             return null;
         }
 
-        return $this->expressCheckoutDataService->buildExpressCheckoutButtonData(
+        $data = $this->expressCheckoutDataService->buildExpressCheckoutButtonData(
             $event->getSalesChannelContext(),
             $addProductToCart,
             $event
         );
+
+        $data?->setPageType($this->getPageType($event));
+
+        return $data;
     }
 
     private function checkSettings(SalesChannelContext $context, string $eventName): bool
@@ -362,4 +367,22 @@ private function expressOptionForEventEnabled(string $salesChannelId, string $ev
                 return false;
         }
     }
+
+    private function getPageType(ShopwareSalesChannelEvent $event): ?string
+    {
+        return match (true) {
+            $event instanceof ProductPageLoadedEvent,
+            $event instanceof QuickviewPageletLoadedEvent => AbstractScriptData::PAGE_TYPE_PRODUCT_DETAILS,
+            $event instanceof OffcanvasCartPageLoadedEvent => AbstractScriptData::PAGE_TYPE_MINI_CART,
+            $event instanceof CheckoutRegisterPageLoadedEvent => AbstractScriptData::PAGE_TYPE_CHECKOUT,
+            $event instanceof CheckoutCartPageLoadedEvent => AbstractScriptData::PAGE_TYPE_CART,
+            $event instanceof NavigationPageLoadedEvent,
+            $event instanceof CmsPageLoadedEvent,
+            $event instanceof SearchPageLoadedEvent,
+            $event instanceof GuestWishlistPageletLoadedEvent,
+            $event instanceof SwitchBuyBoxVariantEvent,
+            $event instanceof SalesChannelEntitySearchResultLoadedEvent => AbstractScriptData::PAGE_TYPE_PRODUCT_LISTING,
+            default => null,
+        };
+    }
 }

src/Checkout/ExpressCheckout/Service/PayPalExpressCheckoutDataService.php

@@ -36,14 +36,14 @@ class PayPalExpressCheckoutDataService extends AbstractScriptDataService
     public function __construct(
         private readonly CartService $cartService,
         LocaleCodeProvider $localeCodeProvider,
-        private readonly RouterInterface $router,
+        RouterInterface $router,
         private readonly PaymentMethodUtil $paymentMethodUtil,
         SystemConfigService $systemConfigService,
         CredentialsUtilInterface $credentialsUtil,
         private readonly CartPriceService $cartPriceService,
         private readonly PayLaterMethodData $payLaterMethodData,
     ) {
-        parent::__construct($localeCodeProvider, $systemConfigService, $credentialsUtil);
+        parent::__construct($localeCodeProvider, $systemConfigService, $credentialsUtil, $router);
     }
 
     public function buildExpressCheckoutButtonData(

src/Checkout/SalesChannel/AbstractClientTokenRoute.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+/*
+ * (c) shopware AG <info@shopware.com>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Swag\PayPal\Checkout\SalesChannel;
+
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+#[Package('checkout')]
+abstract class AbstractClientTokenRoute
+{
+    abstract public function getDecorated(): AbstractClientTokenRoute;
+
+    abstract public function getClientToken(Request $request, SalesChannelContext $salesChannelContext): Response;
+}

src/Checkout/SalesChannel/ClientTokenRoute.php

@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+/*
+ * (c) shopware AG <info@shopware.com>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Swag\PayPal\Checkout\SalesChannel;
+
+use OpenApi\Attributes as OA;
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\Framework\Plugin\Exception\DecorationPatternException;
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Swag\PayPal\Checkout\TokenResponse;
+use Swag\PayPal\RestApi\V1\Resource\TokenResource;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+#[Package('checkout')]
+#[Route(defaults: ['_routeScope' => ['store-api']])]
+class ClientTokenRoute extends AbstractClientTokenRoute
+{
+    /**
+     * @internal
+     */
+    public function __construct(
+        private readonly TokenResource $tokenResource,
+    ) {
+    }
+
+    public function getDecorated(): AbstractClientTokenRoute
+    {
+        throw new DecorationPatternException(self::class);
+    }
+
+    #[OA\Post(
+        path: '/paypal/client-token',
+        operationId: 'paypalClientToken',
+        description: 'Retrieves a client ID token for the current sales channel',
+        tags: ['Store API', 'PayPal'],
+        responses: [new OA\Response(
+            response: Response::HTTP_OK,
+            description: 'Client ID token',
+            content: new OA\JsonContent(properties: [new OA\Property(
+                property: 'token',
+                type: 'string'
+            )])
+        )]
+    )]
+    #[Route(path: '/store-api/paypal/client-token', name: 'store-api.paypal.client-token', methods: ['POST'], defaults: ['_loginRequired' => true])]
+    public function getClientToken(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        $clientToken = $this->tokenResource->getClientToken($salesChannelContext)->getAccessToken();
+
+        return new TokenResponse($clientToken);
+    }
+}

src/Checkout/SalesChannel/CustomerVaultTokenRoute.php

@@ -27,6 +27,8 @@ class CustomerVaultTokenRoute
 {
     /**
      * @internal
+     *
+     * @deprecated tag:v11.0.0 - reason:remove-interface - Interface TokenResourceInterface will be replaced by TokenResource
      */
     public function __construct(
         private EntityRepository $vaultRepository,