Merge branch 'epic/ECTO-2267-66x' into 6.6.x

.php-cs-fixer.dist.php

@@ -40,7 +40,15 @@
         'php_unit_dedicate_assert' => ['target' => 'newest'],
         'php_unit_dedicate_assert_internal_type' => true,
         'php_unit_mock' => true,
-        'php_unit_test_case_static_method_calls' => ['call_type' => 'static'],
+        'php_unit_test_case_static_method_calls' => ['methods' => [
+            'any' => 'this',
+            'never' => 'this',
+            'atLeast' => 'this',
+            'atLeastOnce' => 'this',
+            'once' => 'this',
+            'exactly' => 'this',
+            'atMost' => 'this',
+        ]],
         'self_accessor' => false,
         'single_line_throw' => false,
         'single_quote' => ['strings_containing_single_quote_chars' => true],

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "swag/swag-extension-store",
-    "version": "3.4.2",
+    "version": "6.0.0",
     "description": "SWAG Extension Store",
     "type": "shopware-platform-plugin",
     "license": "MIT",

phpstan.neon.dist

@@ -19,10 +19,6 @@ parameters:
             message: '#Service ".*" is private#'
             path: tests
 
-        - # Ignore namespace for test plugins
-            message: '#Class like namespace .* does not follow PSR-4 configuration in composer.json#'
-            path: tests/_fixtures
-
         - # Ignore native type change
             message: '#Call to deprecated method scope\(\) of class Shopware\\Core\\Framework\\Context.*#'
             path: src/Controller/InAppPurchasesController.php

src/Controller/InAppPurchasesController.php

@@ -79,7 +79,7 @@ public function orderCart(RequestDataBag $data, Context $context): Response
         \assert($positions instanceof RequestDataBag);
         $extensionName = $data->get('name');
 
-        $positionCollection = InAppPurchaseCartPositionCollection::fromArray($positions->all());
+        $positionCollection = InAppPurchaseCartPositionCollection::fromArray(array_values($positions->all()));
 
         $app = $this->getAppByName($extensionName, $context);
         if (!$app) {

src/Controller/LicenseController.php

@@ -35,15 +35,15 @@ public function createCart(Request $request, Context $context): JsonResponse
         $extensionId = $request->request->get('extensionId');
         $variantId = $request->request->get('variantId');
 
-        if (!is_numeric($extensionId)) {
+        if (!\is_int($extensionId) && !\is_string($extensionId)) {
             throw ExtensionStoreException::invalidExtensionId();
         }
 
-        if (!is_numeric($variantId)) {
+        if (!\is_int($variantId) && !\is_string($variantId)) {
             throw ExtensionStoreException::invalidVariantId();
         }
 
-        $cart = $this->licenseService->createCart((int) $extensionId, (int) $variantId, $context);
+        $cart = $this->licenseService->createCart($extensionId, $variantId, $context);
 
         return new JsonResponse($cart);
     }

src/Exception/ExtensionStoreApiException.php

@@ -11,24 +11,48 @@ class ExtensionStoreApiException extends StoreApiException
 {
     protected string $apiCode;
 
+    protected string $description;
+
     public function __construct(ClientException $exception)
     {
-        $data = json_decode($exception->getResponse()->getBody()->getContents(), true);
-
         parent::__construct($exception);
 
+        $data = $this->getData($exception);
         $this->apiCode = $data['code'] ?? '';
+        $this->description = $data['description'] ?? '';
     }
 
     public function getErrors(bool $withTrace = false): \Generator
     {
-        $errors = parent::getErrors($withTrace);
-
-        foreach ($errors as $error) {
+        foreach (parent::getErrors($withTrace) as $error) {
             yield [
                 ...$error,
                 'apiCode' => $this->apiCode,
+                'description' => $this->description,
             ];
         }
     }
+
+    /**
+     * @return array<array-key, mixed>
+     */
+    private function getData(ClientException $exception): array
+    {
+        $body = $exception->getResponse()->getBody();
+
+        // The parent constructor already read the body to its end and left the stream at EOF,
+        // so reading it again without rewinding yields an empty string.
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        try {
+            $data = json_decode($body->getContents(), true, 512, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException) {
+            return [];
+        }
+
+        // A body may be valid JSON without being an object, e.g. a bare string or number.
+        return \is_array($data) ? $data : [];
+    }
 }

src/Migration/Migration1779864357StoreIFrameUrlConfig.php

@@ -0,0 +1,41 @@
+<?php declare(strict_types=1);
+
+namespace SwagExtensionStore\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Defaults;
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\Framework\Migration\MigrationStep;
+use Shopware\Core\Framework\Uuid\Uuid;
+
+/**
+ * @internal
+ */
+#[Package('checkout')]
+class Migration1779864357StoreIFrameUrlConfig extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1779864357;
+    }
+
+    public function update(Connection $connection): void
+    {
+        $configurationKey = 'SwagExtensionStore.config.iframeUrl';
+        $configurationExists = $connection->fetchOne(
+            'SELECT 1 FROM system_config WHERE configuration_key = :configurationKey',
+            ['configurationKey' => $configurationKey],
+        );
+
+        if ($configurationExists !== false) {
+            return;
+        }
+
+        $connection->insert('system_config', [
+            'id' => Uuid::randomBytes(),
+            'configuration_key' => $configurationKey,
+            'configuration_value' => '{"_value": "https://sky-bridge-store.production.shopware.in"}',
+            'created_at' => (new \DateTimeImmutable())->format(Defaults::STORAGE_DATE_TIME_FORMAT),
+        ]);
+    }
+}

src/Resources/app/administration/.eslintrc.js

@@ -67,7 +67,7 @@ module.exports = {
             '@shopware-ag/eslint-config-base',
             'plugin:@typescript-eslint/eslint-recommended',
             'plugin:@typescript-eslint/recommended',
-            'plugin:@typescript-eslint/recommended-requiring-type-checking',
+            'plugin:@typescript-eslint/recommended-requiring-type-checking'
         ],
         parser: '@typescript-eslint/parser',
         parserOptions: {
@@ -81,6 +81,15 @@ module.exports = {
             'no-void': 'off',
             'no-unused-vars': 'off',
             'no-shadow': 'off',
+            'no-useless-constructor': 'off',
+            'no-empty-function': 'off',
+            'default-case': 'off',
+            'consistent-return': 'off',
+            'max-len': 'off',
+            'no-return-await': 'off',
+            'no-restricted-syntax': 'off',
+
+            'import/prefer-default-export': 'off',
 
             '@typescript-eslint/indent': ['error', 4, { SwitchCase: 1 }],
             '@typescript-eslint/ban-ts-comment': 0,

src/Resources/app/administration/jest.config.js

@@ -10,7 +10,7 @@ module.exports = {
     preset: '@shopware-ag/jest-preset-sw6-admin',
     globals: {
         // required, e.g. /www/sw6/platform/src/Administration/Resources/app/administration
-        adminPath
+        adminPath,
     },
 
     setupFilesAfterEnv: [
@@ -39,7 +39,8 @@ module.exports = {
         '^\@shopware-ag\/meteor-admin-sdk\/es\/(.*)':
             `${process.env.ADMIN_PATH}/node_modules/@shopware-ag/meteor-admin-sdk/umd/$1`,
         vue$: '<rootDir>/node_modules/@vue/compat/dist/vue.cjs.js',
-        '@vue/test-utils': '<rootDir>/node_modules/@vue/test-utils'
+        '@vue/test-utils': '<rootDir>/node_modules/@vue/test-utils',
+        '^lodash-es/(.*)$': 'lodash/$1'
     },
 
     transformIgnorePatterns: [