NTR: Merge branch 'master' into users/vm/MOL-1196-tracking

mollie · Nov 27, 2023 · cfd494e · cfd494e
2 parents d548cb8 + 214c933
commit cfd494e
Show file tree

Hide file tree

Showing 356 changed files with 19,146 additions and 6,703 deletions.
diff --git a/.github/actions/build-plugin/action.yml b/.github/actions/build-plugin/action.yml
@@ -8,7 +8,7 @@ runs:
     - name: Start Docker
       shell: bash
       run: |
-        docker run --rm --name shop --env NODE_VERSION=18 --env PHP_VERSION=8.1 -d dockware/dev:6.5.3.2
+        docker run --rm --name shop --env NODE_VERSION=18 --env PHP_VERSION=8.1 -d dockware/dev:6.5.7.2
         sleep 20
         docker logs shop
 

diff --git a/.github/workflows/build_zip.yml b/.github/workflows/build_zip.yml
@@ -1,7 +1,6 @@
 name: Build ZIP File
 
-on:
-  workflow_dispatch:
+on: [ pull_request, workflow_dispatch ]
 
 jobs:
 

diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
@@ -340,7 +340,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shopware: '6.5.3.2'
+          - shopware: '6.5.7.2'
+            php: '8.2'
+          - shopware: '6.5.6.1'
+            php: '8.2'
+          - shopware: '6.5.5.2'
             php: '8.2'
           - shopware: '6.4.20.2'
             php: '8.2'

diff --git a/.github/workflows/nightly_pipe.yml b/.github/workflows/nightly_pipe.yml
@@ -334,7 +334,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shopware: '6.5.3.2'
+          - shopware: '6.5.7.2'
+            php: '8.2'
+          - shopware: '6.5.6.1'
+            php: '8.2'
+          - shopware: '6.5.5.2'
+            php: '8.2'
+          - shopware: '6.5.4.1'
+            php: '8.2'
+          - shopware: '6.5.3.3'
             php: '8.2'
           - shopware: '6.5.3.0'
             php: '8.2'

diff --git a/.github/workflows/pr_pipe.yml b/.github/workflows/pr_pipe.yml
@@ -333,7 +333,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shopware: '6.5.3.2'
+          - shopware: '6.5.6.1'
+            php: '8.2'
+          - shopware: '6.5.5.2'
             php: '8.2'
           - shopware: '6.4.20.2'
             php: '8.2'

diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,7 @@ src/Resources/public/administration/js/
 /tests/Cypress/cypress/results
 /src/Resources/app/administration/.stryker-tmp
 /.phpunuhi/
-/src/Resources/public/static
+/src/Resources/public/static/css
+/src/Resources/public/static/js
 /src/Resources/public/js
+/src/Resources/public/mollie-payments.js
diff --git a/.php_cs.php b/.php_cs.php
@@ -1,8 +1,19 @@
 <?php
 
-return PhpCsFixer\Config::create()
-    ->setUsingCache(false)
-    ->setRules([
+$finder = \PhpCsFixer\Finder::create()->in([
+    __DIR__ . '/src',
+]);
+
+$finder->exclude(
+    [
+        'Resources'
+    ]
+);
+
+$config = new \PhpCsFixer\Config();
+
+$config->setRules(
+    [
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => true,
@@ -14,9 +25,12 @@
         'phpdoc_order' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
         'phpdoc_types_order' => true,
-        'yoda_style' => null,
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->exclude(['Resources'])
-            ->in(__DIR__ . '/src'));
+        'yoda_style' => false,
+    ]
+);
+
+$config->setFinder($finder);
+
+$config->setUsingCache(false);
+
+return $config;
diff --git a/.phpstan.neon b/.phpstan.neon
@@ -8,7 +8,22 @@ parameters:
         # legacy code that is not working with abstract/interface changes
         - ./src/Compatibility/Storefront/Route/PaymentMethodRoute/RemovePaymentMethodRoute63.php
         - ./src/Service/Mail/MailService63.php
+    disallowedFunctionCalls:
+        - function: 'var_dump()'
+          message: 'use some logger instead'
+        - function: 'var_export()'
+          message: 'use some logger instead'
+        - function: 'dd()'
+          message: 'use some logger instead'
+        - function: 'print_r()'
+          message: 'use some logger instead'
+        - function: 'putenv()'
+          message: 'might overwrite existing variables'
+
 services:
     - class: MolliePayments\PHPStan\Rules\NoManufacturerRule
       tags:
         - phpstan.rules.rule
+
+includes:
+    - vendor/spaze/phpstan-disallowed-calls/extension.neon
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "kiener/mollie-payments-plugin",
     "description": "Mollie Payments",
-    "version": "v4.0.0",
+    "version": "v4.3.0",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "authors": [
@@ -36,13 +36,15 @@
     "config": {
         "optimize-autoloader": true,
         "allow-plugins": {
-            "infection/extension-installer": true
+            "infection/extension-installer": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {
         "psr-4": {
             "Kiener\\MolliePayments\\": "src/",
-            "Mollie\\Api\\": "vendor/mollie/mollie-api-php/src/"
+            "Mollie\\Api\\": "vendor_manual/mollie/mollie-api-php/src/",
+            "Shopware\\Core\\": "polyfill/Shopware/Core/"
         }
     },
     "autoload-dev": {
@@ -62,17 +64,17 @@
     },
     "require": {
         "php": ">=7.4",
-        "ext-curl": "*",
-        "mollie/mollie-api-php": "2.40.1"
+        "ext-curl": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "1.8.2",
+        "phpstan/phpstan": "1.10.0",
         "friendsofphp/php-cs-fixer": "^2.18",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6",
         "infection/infection": "^0.25.4",
         "boxblinkracer/phpunuhi": "dev-main",
+        "spaze/phpstan-disallowed-calls": "^2.16",
         "shopware/core": "*",
         "shopware/administration": "*",
         "shopware/storefront": "*"