Merge branch 'refs/heads/develop'

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: mollie-payments-for-woocommerce
 type: wordpress
 docroot: .ddev/wordpress
-php_version: "7.2"
+php_version: "7.4"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"

.distignore

@@ -3,6 +3,7 @@
 .git*
 tests/
 resources/
+!vendor/mollie/mollie-api-php/Resources
 vendor/**/test*
 vendor/mollie/mollie-api-php/examples/
 languages/*.po

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
 
     name: PHP ${{ matrix.php-versions }}
     steps:

.github/workflows/release.yml

@@ -7,11 +7,10 @@ on:
         required: true
 jobs:
   create_archive:
-    uses: inpsyde/reusable-workflows/.github/workflows/build-plugin-archive.yml@task/build-plugin-archive-without-dep-dependencies
+    uses: inpsyde/reusable-workflows/.github/workflows/build-plugin-archive.yml@main
     with:
       PLUGIN_VERSION: ${{ inputs.PACKAGE_VERSION }}
-      PHP_VERSION: 7.2
+      PHP_VERSION: 7.4
       PLUGIN_MAIN_FILE: mollie-payments-for-woocommerce.php
       ARCHIVE_NAME: mollie-payments-for-woocommerce
-      POST_SCRIPT: |
-        mv dist/WooCommerce dist/mollie-payments-for-woocommerce
+      PLUGIN_FOLDER_NAME: mollie-payments-for-woocommerce

composer.json

@@ -16,15 +16,16 @@
     }
   ],
   "require": {
-    "php": ">=7.2",
+    "php": ">=7.4",
     "ext-intl": "*",
     "ext-json": "*",
     "mollie/mollie-api-php": "^v2.40",
-    "psr/log":"^1.1.4"
-  },
-  "require-dev": {
     "inpsyde/modularity": "^1.3.0",
     "psr/container": "1.0.0",
+    "psr/log":"^1.1.4",
+    "sniccowp/php-scoper-wordpress-excludes": "^6.6"
+  },
+  "require-dev": {
     "phpunit/phpunit": "^8",
     "brain/monkey": "^2.3",
     "ptrofimov/xpmock": "^1",
@@ -39,8 +40,7 @@
   "autoload": {
     "psr-4": {
       "Mollie\\WooCommerce\\": "src/",
-      "Inpsyde\\EnvironmentChecker\\": "pluginEnvironmentChecker",
-      "Mollie\\WooCommerce\\Vendor\\": "lib/packages/"
+      "Inpsyde\\EnvironmentChecker\\": "pluginEnvironmentChecker"
     }
   },
   "autoload-dev": {
@@ -78,17 +78,6 @@
       "pre-commit": [
         "vendor/bin/phpcbf"
       ]
-    },
-    "mozart": {
-      "dep_namespace": "Mollie\\WooCommerce\\Vendor\\",
-      "dep_directory": "/lib/packages/",
-      "classmap_directory": "/lib/classes/",
-      "classmap_prefix": "MOL_",
-      "packages": [
-        "psr/container", 
-        "inpsyde/modularity"
-      ],
-      "delete_vendor_directories": true
     }
   },
   "config": {