feat: improve performance

.platform.app.yaml

@@ -81,4 +81,8 @@ web:
       # The front-controller script to send non-static requests to.
       passthru: "/index.php"
 
-
+    '/build':
+      expires: 1h
+      passthru: false
+      scripts: false
+      allow: true

braintree_profiler.patch

@@ -0,0 +1,12 @@
+diff --git 1/lib/Braintree/Http.php 2/lib/Braintree/Http.php
+index 3d4bae3..6ba23fd 100644
+--- 1/lib/Braintree/Http.php
++++ 2/lib/Braintree/Http.php
+@@ -143,6 +143,6 @@ class Http
+     {
+         $curlRequest = new CurlRequest($url);
+         // phpcs:ignore Generic.Files.LineLength
+-        return Curl::makeRequest($httpVerb, $url, $this->_config, $curlRequest, $requestBody, $file, $customHeaders, $this->_useClientCredentials);
++        return \Swag\Braintree\Framework\Profiler::trace('braintree::' . \parse_url($url, \PHP_URL_PATH), fn () => Curl::makeRequest($httpVerb, $url, $this->_config, $curlRequest, $requestBody, $file, $customHeaders, $this->_useClientCredentials));
+     }
+ }

composer.json

@@ -10,6 +10,7 @@
         "ext-session": "*",
         "ext-simplexml": "*",
         "braintree/braintree_php": "^6.24",
+        "cweagans/composer-patches": "^1.7",
         "doctrine/doctrine-bundle": "^2.13",
         "doctrine/doctrine-migrations-bundle": "^3.4",
         "doctrine/orm": "^3.3",
@@ -19,9 +20,9 @@
         "shopware/app-bundle": "^4.1",
         "symfony/console": "^7.2",
         "symfony/dotenv": "^7.2",
-        "symfony/http-foundation": "^7.2",
         "symfony/flex": "^2",
         "symfony/framework-bundle": "^7.2",
+        "symfony/http-foundation": "^7.2",
         "symfony/monolog-bundle": "^3.10",
         "symfony/property-access": "^7.2",
         "symfony/psr-http-message-bridge": "^7.2",
@@ -32,11 +33,12 @@
     },
     "config": {
         "allow-plugins": {
+            "cweagans/composer-patches": true,
+            "infection/extension-installer": true,
             "php-http/discovery": true,
+            "phpstan/extension-installer": true,
             "symfony/flex": true,
-            "symfony/runtime": true,
-            "infection/extension-installer": true,
-            "phpstan/extension-installer": true
+            "symfony/runtime": true
         },
         "sort-packages": true
     },
@@ -106,6 +108,11 @@
         "symfony": {
             "allow-contrib": false,
             "require": "7.2.*"
+        },
+        "patches": {
+            "braintree/braintree_php": {
+                "profile": "./braintree_profiler.patch"
+            }
         }
     },
     "require-dev": {

config/packages/property_info.yaml

@@ -0,0 +1,3 @@
+framework:
+    property_info:
+        with_constructor_extractor: true

src/Braintree/Gateway/BraintreeGatewayFactory.php

@@ -5,6 +5,7 @@
 use Braintree\Configuration;
 use Braintree\Gateway;
 use Swag\Braintree\Entity\ShopEntity;
+use Swag\Braintree\Framework\Profiler;
 use Swag\Braintree\Framework\Request\ShopResolver;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -13,6 +14,7 @@
     public function __construct(
         private readonly RequestStack $requestStack,
         private readonly ShopResolver $shopResolver,
+        private readonly Profiler $profiler, // make sure stopwatch got injected
     ) {
     }
 

src/Controller/GatewayController.php

@@ -2,6 +2,8 @@
 
 namespace Swag\Braintree\Controller;
 
+use Braintree\Exception\NotFound;
+use Braintree\Gateway;
 use Psr\Http\Message\ResponseInterface;
 use Shopware\App\SDK\Context\Cart\Error;
 use Shopware\App\SDK\Context\Gateway\Checkout\CheckoutGatewayAction;
@@ -11,7 +13,6 @@
 use Shopware\App\SDK\Gateway\Checkout\Command\RemovePaymentMethodCommand;
 use Shopware\App\SDK\Response\GatewayResponse;
 use Swag\Braintree\Braintree\Gateway\BraintreeConnectionService;
-use Swag\Braintree\Braintree\Gateway\Connection\BraintreeConnectionStatus;
 use Swag\Braintree\Braintree\Util\SalesChannelConfigService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpKernel\Attribute\AsController;
@@ -24,8 +25,9 @@
     public const CREDIT_CARD_TECHNICAL_NAME = 'payment_SwagBraintreeApp_credit_card';
 
     public function __construct(
         private readonly BraintreeConnectionService $connectionService,
         private readonly SalesChannelConfigService $salesChannelConfigService,
+        private readonly Gateway $gateway,
     ) {
     }
 
@@ -38,23 +40,23 @@
         if (!$action->paymentMethods->has(self::CREDIT_CARD_TECHNICAL_NAME)) {
             return GatewayResponse::createCheckoutGatewayResponse($commands);
         }
-
-        $status = $this->connectionService->testConnection();
-
-        if ($status->connectionStatus !== BraintreeConnectionStatus::STATUS_CONNECTED) {
-            $commands->add(new RemovePaymentMethodCommand(self::CREDIT_CARD_TECHNICAL_NAME));
-        }
-
-        if (!$this->salesChannelConfigService->getMerchantId(
+
+        $merchantId = $this->salesChannelConfigService->getMerchantId(
             $action->context->getSalesChannel()->getId(),
             $action->context->getCurrencyId(),
             $action->shop
-        )) {
+        );
+
+        try {
+            $this->gateway->merchantAccount()->find($merchantId);
+        } catch(NotFound) {
             $commands->add(new RemovePaymentMethodCommand(self::CREDIT_CARD_TECHNICAL_NAME));
 
             if ($action->context->getPaymentMethod()->getTechnicalName() === self::CREDIT_CARD_TECHNICAL_NAME) {
                 $commands->add(new AddCartErrorCommand('Checkout with Braintree is currently not available in your currency', true, Error::LEVEL_ERROR));
             }
+        } catch (\Throwable) {
+            $commands->add(new RemovePaymentMethodCommand(self::CREDIT_CARD_TECHNICAL_NAME));
         }
 
         return GatewayResponse::createCheckoutGatewayResponse($commands);

src/Framework/Profiler.php

@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace Swag\Braintree\Framework;
+
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Stopwatch\Stopwatch;
+
+class Profiler
+{
+    private static ?Stopwatch $stopwatch = null;
+
+    public function __construct(
+        #[Autowire(service: 'debug.stopwatch')]
+        ?Stopwatch $stopwatch = null,
+    ) {
+        self::$stopwatch = $stopwatch;
+    }
+
+    public static function trace(string $name, \Closure $closure): mixed
+    {
+        try {
+            self::$stopwatch?->start($name, 'app');
+
+            $result = $closure();
+        } finally {
+            self::$stopwatch?->stop($name, 'app');
+        }
+
+        return $result;
+    }
+}

symfony.lock

@@ -11,6 +11,15 @@
             "config/packages/dama_doctrine_test_bundle.yaml"
         ]
     },
+    "doctrine/deprecations": {
+        "version": "1.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "87424683adc81d7dc305eefec1fced883084aab9"
+        }
+    },
     "doctrine/doctrine-bundle": {
         "version": "2.10",
         "recipe": {
@@ -181,6 +190,18 @@
             "config/packages/monolog.yaml"
         ]
     },
+    "symfony/property-info": {
+        "version": "7.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "7.3",
+            "ref": "dae70df71978ae9226ae915ffd5fad817f5ca1f7"
+        },
+        "files": [
+            "config/packages/property_info.yaml"
+        ]
+    },
     "symfony/routing": {
         "version": "6.3",
         "recipe": {