Merge remote-tracking branch 'origin/develop' into feature/PIWOO-289

# Conflicts: # src/Activation/ActivationModule.php # src/PaymentMethods/Trustly.php
mollie · Oct 29, 2024 · 940b0f3 · 940b0f3
2 parents 6c34de0 + c392752
commit 940b0f3
Show file tree

Hide file tree

Showing 14 changed files with 140 additions and 227 deletions.
diff --git a/.distignore b/.distignore
@@ -6,7 +6,7 @@ resources/
 !vendor/mollie/mollie-api-php/Resources
 vendor/**/test*
 vendor/mollie/mollie-api-php/examples/
-languages/*.po
+languages/
 bin/
 *.lock
 composer.json

diff --git a/.idea/WooCommerce.iml b/.idea/WooCommerce.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.psalm/stubs.php b/.psalm/stubs.php
@@ -4,7 +4,6 @@ function as_unschedule_action($string) {}
 function mollieWooCommerceIsCheckoutContext() {}
 function wcs_get_subscriptions($subs) {}
 function mollieWooCommerceFormatCurrencyValue($value, $currency){}
-function mollieDeleteWPTranslationFiles(){}
 function mollieWooCommerceIsPayPalButtonEnabled($page){}
 function mollieWooCommerceIsApplePayDirectEnabled($page){}
 function mollieWooCommerceCheckIfNeedShipping($product){}

diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
     "ext-intl": "*",
     "ext-json": "*",
     "mollie/mollie-api-php": "^v2.40",
-    "inpsyde/modularity": "^1.3.0",
-    "psr/container": "1.0.0",
+    "inpsyde/modularity": "^1.7.4",
+    "psr/container": "1.1.0",
     "psr/log":"^1.1.4",
     "sniccowp/php-scoper-wordpress-excludes": "^6.6"
   },