diff --git a/README.md b/README.md
index a88bd15..2e83c50 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Please ensure that you meet the following requirements before installing this pl
### Tested successfully
- Prestashop v8.0, v8.0.1, v8.0.4, v8.1.0, v8.1.3 and v8.1.4
- BTCPay server v1.7.0, v1.7.3.0, v1.12.5, v1.13.0 and v1.13.5
- - BTCPay server v2 should be supported as of module version v6.2.0.
+ - BTCPay server v2 should be supported as of module version v6.3.0.
### Multistore
diff --git a/modules/btcpay/btcpay.php b/modules/btcpay/btcpay.php
index 042cbad..598e823 100644
--- a/modules/btcpay/btcpay.php
+++ b/modules/btcpay/btcpay.php
@@ -52,7 +52,7 @@ public function __construct()
{
$this->name = 'btcpay';
$this->tab = 'payments_gateways';
- $this->version = '6.2.1';
+ $this->version = '6.3.0';
$this->author = 'BTCPay Server';
$this->ps_versions_compliancy = ['min' => Constants::MINIMUM_PS_VERSION, 'max' => _PS_VERSION_];
$this->controllers = ['payment', 'validation', 'webhook'];
@@ -411,12 +411,6 @@ public function hookPaymentOptions(): array
return [];
}
- // Prepare smarty
- $this->context->smarty->assign([
- 'onChain' => $client->onChain()->getPaymentMethods($storeID),
- 'offChain' => $client->offChain()->getPaymentMethods($storeID),
- ]);
-
return [
(new PaymentOption())
->setModuleName($this->name)
diff --git a/modules/btcpay/composer.json b/modules/btcpay/composer.json
index 0508e5c..eb1e123 100644
--- a/modules/btcpay/composer.json
+++ b/modules/btcpay/composer.json
@@ -25,7 +25,7 @@
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
- "btcpayserver/btcpayserver-greenfield-php": "^2.6.0",
+ "btcpayserver/btcpayserver-greenfield-php": "^2.8.1",
"composer/semver": "^3.4.2",
"stechstudio/backoff": "^1.4"
},
diff --git a/modules/btcpay/composer.lock b/modules/btcpay/composer.lock
index 49fcb5d..17ab017 100644
--- a/modules/btcpay/composer.lock
+++ b/modules/btcpay/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "8e2085700bec86c18b7619578f4e4d4f",
+ "content-hash": "a5120ea33e9d727761753c4d1e1baa00",
"packages": [
{
"name": "btcpayserver/btcpayserver-greenfield-php",
@@ -265,16 +265,16 @@
},
{
"name": "ergebnis/json",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/ergebnis/json.git",
- "reference": "84051b4e243d6a8e2f8271604b11ffa52d29bc7a"
+ "reference": "7656ac2aa6c2ca4408f96f599e9a17a22c464f69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json/zipball/84051b4e243d6a8e2f8271604b11ffa52d29bc7a",
- "reference": "84051b4e243d6a8e2f8271604b11ffa52d29bc7a",
+ "url": "https://api.github.com/repos/ergebnis/json/zipball/7656ac2aa6c2ca4408f96f599e9a17a22c464f69",
+ "reference": "7656ac2aa6c2ca4408f96f599e9a17a22c464f69",
"shasum": ""
},
"require": {
@@ -282,16 +282,19 @@
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.36.0",
- "ergebnis/phpunit-slow-test-detector": "^2.15.1",
- "fakerphp/faker": "^1.23.1",
+ "ergebnis/data-provider": "^3.3.0",
+ "ergebnis/license": "^2.5.0",
+ "ergebnis/php-cs-fixer-config": "^6.37.0",
+ "ergebnis/phpunit-slow-test-detector": "^2.16.1",
+ "fakerphp/faker": "^1.24.0",
"infection/infection": "~0.26.6",
+ "phpstan/extension-installer": "^1.4.3",
+ "phpstan/phpstan": "^1.12.10",
+ "phpstan/phpstan-deprecation-rules": "^1.2.1",
+ "phpstan/phpstan-phpunit": "^1.4.0",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
"phpunit/phpunit": "^9.6.18",
- "psalm/plugin-phpunit": "~0.19.0",
- "rector/rector": "^1.2.5",
- "vimeo/psalm": "^5.26.1"
+ "rector/rector": "^1.2.10"
},
"type": "library",
"extra": {
@@ -326,20 +329,20 @@
"security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md",
"source": "https://github.com/ergebnis/json"
},
- "time": "2024-09-27T15:01:05+00:00"
+ "time": "2024-11-17T11:51:22+00:00"
},
{
"name": "ergebnis/json-normalizer",
- "version": "4.6.0",
+ "version": "4.7.0",
"source": {
"type": "git",
"url": "https://github.com/ergebnis/json-normalizer.git",
- "reference": "859fd3cee417f0b10a8e6ffb8dbeb03587106b8b"
+ "reference": "36d86389095736944a5954ec440552bbe92e425f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/859fd3cee417f0b10a8e6ffb8dbeb03587106b8b",
- "reference": "859fd3cee417f0b10a8e6ffb8dbeb03587106b8b",
+ "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/36d86389095736944a5954ec440552bbe92e425f",
+ "reference": "36d86389095736944a5954ec440552bbe92e425f",
"shasum": ""
},
"require": {
@@ -353,21 +356,34 @@
},
"require-dev": {
"composer/semver": "^3.4.3",
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.36.0",
- "ergebnis/phpunit-slow-test-detector": "^2.15.1",
- "fakerphp/faker": "^1.23.1",
+ "ergebnis/composer-normalize": "^2.44.0",
+ "ergebnis/data-provider": "^3.3.0",
+ "ergebnis/license": "^2.5.0",
+ "ergebnis/php-cs-fixer-config": "^6.37.0",
+ "ergebnis/phpunit-slow-test-detector": "^2.16.1",
+ "fakerphp/faker": "^1.24.0",
"infection/infection": "~0.26.6",
+ "phpstan/extension-installer": "^1.4.3",
+ "phpstan/phpstan": "^1.12.10",
+ "phpstan/phpstan-deprecation-rules": "^1.2.1",
+ "phpstan/phpstan-phpunit": "^1.4.0",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
"phpunit/phpunit": "^9.6.19",
- "psalm/plugin-phpunit": "~0.19.0",
- "rector/rector": "^1.2.5",
- "vimeo/psalm": "^5.26.1"
+ "rector/rector": "^1.2.10"
},
"suggest": {
"composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "4.7-dev"
+ },
+ "composer-normalize": {
+ "indent-size": 2,
+ "indent-style": "space"
+ }
+ },
"autoload": {
"psr-4": {
"Ergebnis\\Json\\Normalizer\\": "src/"
@@ -395,20 +411,20 @@
"security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md",
"source": "https://github.com/ergebnis/json-normalizer"
},
- "time": "2024-09-27T15:11:59+00:00"
+ "time": "2024-11-17T20:34:42+00:00"
},
{
"name": "ergebnis/json-pointer",
- "version": "3.5.0",
+ "version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/ergebnis/json-pointer.git",
- "reference": "f6ff71e69305b8ab5e4457e374b35dcd0812609b"
+ "reference": "4fc85d8edb74466d282119d8d9541ec7cffc0798"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/f6ff71e69305b8ab5e4457e374b35dcd0812609b",
- "reference": "f6ff71e69305b8ab5e4457e374b35dcd0812609b",
+ "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/4fc85d8edb74466d282119d8d9541ec7cffc0798",
+ "reference": "4fc85d8edb74466d282119d8d9541ec7cffc0798",
"shasum": ""
},
"require": {
@@ -422,15 +438,18 @@
"ergebnis/phpunit-slow-test-detector": "^2.15.0",
"fakerphp/faker": "^1.23.1",
"infection/infection": "~0.26.6",
+ "phpstan/extension-installer": "^1.4.3",
+ "phpstan/phpstan": "^1.12.10",
+ "phpstan/phpstan-deprecation-rules": "^1.2.1",
+ "phpstan/phpstan-phpunit": "^1.4.0",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
"phpunit/phpunit": "^9.6.19",
- "psalm/plugin-phpunit": "~0.19.0",
- "rector/rector": "^1.2.1",
- "vimeo/psalm": "^5.25.0"
+ "rector/rector": "^1.2.10"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.4-dev"
+ "dev-main": "3.6-dev"
},
"composer-normalize": {
"indent-size": 2,
@@ -465,20 +484,20 @@
"security": "https://github.com/ergebnis/json-pointer/blob/main/.github/SECURITY.md",
"source": "https://github.com/ergebnis/json-pointer"
},
- "time": "2024-09-27T15:47:15+00:00"
+ "time": "2024-11-17T12:37:06+00:00"
},
{
"name": "ergebnis/json-printer",
- "version": "3.6.0",
+ "version": "3.7.0",
"source": {
"type": "git",
"url": "https://github.com/ergebnis/json-printer.git",
- "reference": "d2e51379dc62d73017a779a78fcfba568de39e0a"
+ "reference": "ced41fce7854152f0e8f38793c2ffe59513cdd82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/d2e51379dc62d73017a779a78fcfba568de39e0a",
- "reference": "d2e51379dc62d73017a779a78fcfba568de39e0a",
+ "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/ced41fce7854152f0e8f38793c2ffe59513cdd82",
+ "reference": "ced41fce7854152f0e8f38793c2ffe59513cdd82",
"shasum": ""
},
"require": {
@@ -487,16 +506,19 @@
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.36.0",
- "ergebnis/phpunit-slow-test-detector": "^2.15.1",
- "fakerphp/faker": "^1.23.1",
+ "ergebnis/data-provider": "^3.3.0",
+ "ergebnis/license": "^2.5.0",
+ "ergebnis/php-cs-fixer-config": "^6.37.0",
+ "ergebnis/phpunit-slow-test-detector": "^2.16.1",
+ "fakerphp/faker": "^1.24.0",
"infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.19",
- "psalm/plugin-phpunit": "~0.19.0",
- "rector/rector": "~1.2.5",
- "vimeo/psalm": "^5.26.1"
+ "phpstan/extension-installer": "^1.4.3",
+ "phpstan/phpstan": "^1.12.10",
+ "phpstan/phpstan-deprecation-rules": "^1.2.1",
+ "phpstan/phpstan-phpunit": "^1.4.1",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
+ "phpunit/phpunit": "^9.6.21",
+ "rector/rector": "^1.2.10"
},
"type": "library",
"autoload": {
@@ -527,43 +549,50 @@
"security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md",
"source": "https://github.com/ergebnis/json-printer"
},
- "time": "2024-09-27T15:19:56+00:00"
+ "time": "2024-11-17T11:20:51+00:00"
},
{
"name": "ergebnis/json-schema-validator",
- "version": "4.3.0",
+ "version": "4.4.0",
"source": {
"type": "git",
"url": "https://github.com/ergebnis/json-schema-validator.git",
- "reference": "73f938f8995c6ad1e37d2c1dfeaa8336861f9db8"
+ "reference": "85f90c81f718aebba1d738800af83eeb447dc7ec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/73f938f8995c6ad1e37d2c1dfeaa8336861f9db8",
- "reference": "73f938f8995c6ad1e37d2c1dfeaa8336861f9db8",
+ "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/85f90c81f718aebba1d738800af83eeb447dc7ec",
+ "reference": "85f90c81f718aebba1d738800af83eeb447dc7ec",
"shasum": ""
},
"require": {
"ergebnis/json": "^1.2.0",
"ergebnis/json-pointer": "^3.4.0",
"ext-json": "*",
- "justinrainbow/json-schema": "^5.2.12",
+ "justinrainbow/json-schema": "^5.2.12 || ^6.0.0",
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.36.0",
- "ergebnis/phpunit-slow-test-detector": "^2.15.1",
- "fakerphp/faker": "^1.23.1",
+ "ergebnis/composer-normalize": "^2.44.0",
+ "ergebnis/data-provider": "^3.3.0",
+ "ergebnis/license": "^2.5.0",
+ "ergebnis/php-cs-fixer-config": "^6.37.0",
+ "ergebnis/phpunit-slow-test-detector": "^2.16.1",
+ "fakerphp/faker": "^1.24.0",
"infection/infection": "~0.26.6",
+ "phpstan/extension-installer": "^1.4.3",
+ "phpstan/phpstan": "^1.12.10",
+ "phpstan/phpstan-deprecation-rules": "^1.2.1",
+ "phpstan/phpstan-phpunit": "^1.4.0",
+ "phpstan/phpstan-strict-rules": "^1.6.1",
"phpunit/phpunit": "^9.6.20",
- "psalm/plugin-phpunit": "~0.19.0",
- "rector/rector": "^1.2.5",
- "vimeo/psalm": "^5.26.1"
+ "rector/rector": "^1.2.10"
},
"type": "library",
"extra": {
+ "branch-alias": {
+ "dev-main": "4.4-dev"
+ },
"composer-normalize": {
"indent-size": 2,
"indent-style": "space"
@@ -597,7 +626,7 @@
"security": "https://github.com/ergebnis/json-schema-validator/blob/main/.github/SECURITY.md",
"source": "https://github.com/ergebnis/json-schema-validator"
},
- "time": "2024-09-27T15:16:33+00:00"
+ "time": "2024-11-18T06:32:28+00:00"
},
{
"name": "justinrainbow/json-schema",
@@ -830,23 +859,23 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
- "reference": "ed0688c3e18bf76d2a17fb243b99acb52c2e29ef"
+ "reference": "b33a18b5d222c63472a4b41f6fa3e15e591c9595"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ed0688c3e18bf76d2a17fb243b99acb52c2e29ef",
- "reference": "ed0688c3e18bf76d2a17fb243b99acb52c2e29ef",
+ "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b33a18b5d222c63472a4b41f6fa3e15e591c9595",
+ "reference": "b33a18b5d222c63472a4b41f6fa3e15e591c9595",
"shasum": ""
},
"conflict": {
"3f/pygmentize": "<1.2",
- "admidio/admidio": "<4.3.10",
+ "admidio/admidio": "<4.3.12",
"adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
"aheinze/cockpit": "<2.2",
- "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6",
+ "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.07.2",
"aimeos/ai-admin-jsonadm": "<2020.10.13|>=2021.04.1,<2021.10.6|>=2022.04.1,<2022.10.3|>=2023.04.1,<2023.10.4|==2024.04.1",
"aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.22|>=2022.04.1,<2022.10.13|>=2023.04.1,<2023.10.15|>=2024.04.1,<2024.04.7",
- "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9",
+ "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9|==2024.04.1",
"aimeos/aimeos-core": ">=2022.04.1,<2022.10.17|>=2023.04.1,<2023.10.17|>=2024.04.1,<2024.04.7",
"aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5",
"airesvsg/acf-to-rest-api": "<=3.1",
@@ -855,6 +884,7 @@
"alextselegidis/easyappointments": "<1.5",
"alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1",
"amazing/media2click": ">=1,<1.3.3",
+ "ameos/ameos_tarteaucitron": "<1.2.23",
"amphp/artax": "<1.0.6|>=2,<2.0.6",
"amphp/http": "<=1.7.2|>=2,<=2.1",
"amphp/http-client": ">=4,<4.4",
@@ -880,6 +910,7 @@
"azuracast/azuracast": "<0.18.3",
"backdrop/backdrop": "<1.27.3|>=1.28,<1.28.2",
"backpack/crud": "<3.4.9",
+ "backpack/filemanager": "<2.0.2|>=3,<3.0.9",
"bacula-web/bacula-web": "<8.0.0.0-RC2-dev",
"badaso/core": "<2.7",
"bagisto/bagisto": "<2.1",
@@ -887,7 +918,7 @@
"barrelstrength/sprout-forms": "<3.9",
"barryvdh/laravel-translation-manager": "<0.6.2",
"barzahlen/barzahlen-php": "<2.0.1",
- "baserproject/basercms": "<5.0.9",
+ "baserproject/basercms": "<=5.1.1",
"bassjobsen/bootstrap-3-typeahead": ">4.0.2",
"bbpress/bbpress": "<2.6.5",
"bcosca/fatfree": "<3.7.2",
@@ -932,22 +963,23 @@
"codeigniter4/shield": "<1.0.0.0-beta8",
"codiad/codiad": "<=2.8.4",
"composer/composer": "<1.10.27|>=2,<2.2.24|>=2.3,<2.7.7",
- "concrete5/concrete5": "<9.3.3",
+ "concrete5/concrete5": "<9.3.4",
"concrete5/core": "<8.5.8|>=9,<9.1",
"contao-components/mediaelement": ">=2.14.2,<2.21.1",
"contao/comments-bundle": ">=2,<4.13.40|>=5.0.0.0-RC1-dev,<5.3.4",
- "contao/contao": ">=3,<3.5.37|>=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4",
+ "contao/contao": "<=5.4.1",
"contao/core": "<3.5.39",
- "contao/core-bundle": "<4.13.40|>=5,<5.3.4",
+ "contao/core-bundle": "<4.13.49|>=5,<5.3.15|>=5.4,<5.4.3",
"contao/listing-bundle": ">=3,<=3.5.30|>=4,<4.4.8",
"contao/managed-edition": "<=1.5",
"corveda/phpsandbox": "<1.3.5",
"cosenary/instagram": "<=2.3",
- "craftcms/cms": "<4.6.2|>=5,<=5.2.2",
+ "craftcms/cms": "<=4.12.6.1|>=5,<=5.4.7.1",
"croogo/croogo": "<4",
"cuyz/valinor": "<0.12",
+ "czim/file-handling": "<1.5|>=2,<2.3",
"czproject/git-php": "<4.0.3",
- "damienharper/auditor-bundle": "<6",
+ "damienharper/auditor-bundle": "<5.2.6",
"dapphp/securimage": "<3.6.6",
"darylldoyle/safe-svg": "<1.9.10",
"datadog/dd-trace": ">=0.30,<0.30.2",
@@ -958,6 +990,7 @@
"derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3",
"derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4",
"desperado/xml-bundle": "<=0.1.7",
+ "dev-lancer/minecraft-motd-parser": "<=1.0.5",
"devgroup/dotplant": "<2020.09.14-dev",
"directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2",
"doctrine/annotations": "<1.2.7",
@@ -972,9 +1005,9 @@
"dolibarr/dolibarr": "<19.0.2",
"dompdf/dompdf": "<2.0.4",
"doublethreedigital/guest-entries": "<3.1.2",
- "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2|==11.9999999.9999999.9999999-dev",
- "drupal/core-recommended": "==11.9999999.9999999.9999999-dev",
- "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4|==11.9999999.9999999.9999999-dev",
+ "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5",
+ "drupal/core-recommended": ">=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5",
+ "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<10.2.9|>=10.3,<10.3.6|>=11,<11.0.5",
"duncanmcclean/guest-entries": "<3.1.2",
"dweeves/magmi": "<=0.7.24",
"ec-cube/ec-cube": "<2.4.4|>=2.11,<=2.17.1|>=3,<=3.0.18.0-patch4|>=4,<=4.1.2",
@@ -1010,13 +1043,16 @@
"ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1",
"ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3",
"ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15",
- "ezyang/htmlpurifier": "<4.1.1",
+ "ezyang/htmlpurifier": "<=4.2",
"facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2",
"facturascripts/facturascripts": "<=2022.08",
"fastly/magento2": "<1.2.26",
"feehi/cms": "<=2.1.1",
"feehi/feehicms": "<=2.1.1",
"fenom/fenom": "<=2.12.1",
+ "filament/actions": ">=3.2,<3.2.123",
+ "filament/infolists": ">=3,<3.2.115",
+ "filament/tables": ">=3,<3.2.115",
"filegator/filegator": "<7.8",
"filp/whoops": "<2.1.13",
"fineuploader/php-traditional-server": "<=1.2.2",
@@ -1051,7 +1087,7 @@
"froxlor/froxlor": "<=2.2.0.0-RC3",
"frozennode/administrator": "<=5.0.12",
"fuel/core": "<1.8.1",
- "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3",
+ "funadmin/funadmin": "<=5.0.2",
"gaoming13/wechat-php-sdk": "<=1.10.2",
"genix/cms": "<=1.1.11",
"getformwork/formwork": "<1.13.1|==2.0.0.0-beta1",
@@ -1103,7 +1139,7 @@
"in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3",
"in2code/ipandlanguageredirect": "<5.1.2",
"in2code/lux": "<17.6.1|>=18,<24.0.2",
- "in2code/powermail": "<7.5|>=8,<8.5|>=9,<10.9|>=11,<12.4",
+ "in2code/powermail": "<7.5.1|>=8,<8.5.1|>=9,<10.9.1|>=11,<12.4.1",
"innologi/typo3-appointments": "<2.0.6",
"intelliants/subrion": "<4.2.2",
"inter-mediator/inter-mediator": "==5.5",
@@ -1133,21 +1169,24 @@
"kelvinmo/simplexrd": "<3.1.1",
"kevinpapst/kimai2": "<1.16.7",
"khodakhah/nodcms": "<=3",
- "kimai/kimai": "<2.16",
+ "kimai/kimai": "<=2.20.1",
"kitodo/presentation": "<3.2.3|>=3.3,<3.3.4",
"klaviyo/magento2-extension": ">=1,<3",
"knplabs/knp-snappy": "<=1.4.2",
"kohana/core": "<3.3.3",
- "krayin/laravel-crm": "<1.2.2",
+ "krayin/laravel-crm": "<=1.3",
"kreait/firebase-php": ">=3.2,<3.8.1",
"kumbiaphp/kumbiapp": "<=1.1.1",
"la-haute-societe/tcpdf": "<6.2.22",
"laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2",
"laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
"laminas/laminas-http": "<2.14.2",
+ "lara-zeus/artemis": ">=1,<=1.0.6",
+ "lara-zeus/dynamic-dashboard": ">=3,<=3.0.1",
"laravel/fortify": "<1.11.1",
- "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75",
+ "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31",
"laravel/laravel": ">=5.4,<5.4.22",
+ "laravel/reverb": "<1.4",
"laravel/socialite": ">=1,<2.0.10",
"latte/latte": "<2.10.8",
"lavalite/cms": "<=9|==10.1",
@@ -1160,13 +1199,14 @@
"librenms/librenms": "<2017.08.18",
"liftkit/database": "<2.13.2",
"lightsaml/lightsaml": "<1.3.5",
- "limesurvey/limesurvey": "<3.27.19",
+ "limesurvey/limesurvey": "<6.5.12",
"livehelperchat/livehelperchat": "<=3.91",
- "livewire/livewire": ">2.2.4,<2.2.6|>=3.3.5,<3.4.9",
+ "livewire/livewire": "<2.12.7|>=3.0.0.0-beta1,<3.5.2",
"lms/routes": "<2.1.1",
"localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
"luyadev/yii-helpers": "<1.2.1",
- "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch8|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch6|==2.4.7",
+ "maestroerror/php-heic-to-jpg": "<1.0.5",
+ "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch10|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch8|>=2.4.7.0-beta1,<2.4.7.0-patch3",
"magento/core": "<=1.9.4.5",
"magento/magento1ce": "<1.9.4.3-dev",
"magento/magento1ee": ">=1,<1.14.4.3-dev",
@@ -1174,12 +1214,15 @@
"magneto/core": "<1.9.4.4-dev",
"maikuolan/phpmussel": ">=1,<1.6",
"mainwp/mainwp": "<=4.4.3.3",
- "mantisbt/mantisbt": "<2.26.2",
+ "mantisbt/mantisbt": "<=2.26.3",
"marcwillmann/turn": "<0.3.3",
"matyhtf/framework": "<3.0.6",
- "mautic/core": "<4.4.12|>=5.0.0.0-alpha,<5.0.4",
+ "mautic/core": "<4.4.13|>=5,<5.1.1",
+ "mautic/core-lib": ">=1.0.0.0-beta,<4.4.13|>=5.0.0.0-alpha,<5.1.1",
+ "maximebf/debugbar": "<1.19",
"mdanter/ecc": "<2",
- "mediawiki/core": "<1.36.2",
+ "mediawiki/cargo": "<3.6.1",
+ "mediawiki/core": "<1.39.5|==1.40",
"mediawiki/matomo": "<2.4.3",
"mediawiki/semantic-media-wiki": "<4.0.2",
"melisplatform/melis-asset-manager": "<5.0.1",
@@ -1199,7 +1242,7 @@
"mojo42/jirafeau": "<4.4",
"mongodb/mongodb": ">=1,<1.9.2",
"monolog/monolog": ">=1.8,<1.12",
- "moodle/moodle": "<4.3.5|>=4.4.0.0-beta,<4.4.1",
+ "moodle/moodle": "<4.3.8|>=4.4,<4.4.4",
"mos/cimage": "<0.7.19",
"movim/moxl": ">=0.8,<=0.10",
"movingbytes/social-network": "<=1.2.1",
@@ -1235,7 +1278,7 @@
"nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
"october/backend": "<1.1.2",
"october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1",
- "october/october": "<=3.4.4",
+ "october/october": "<=3.6.4",
"october/rain": "<1.0.472|>=1.1,<1.1.2",
"october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.15",
"omeka/omeka-s": "<4.0.3",
@@ -1247,7 +1290,7 @@
"openmage/magento-lts": "<20.10.1",
"opensolutions/vimbadmin": "<=3.0.15",
"opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2",
- "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5",
+ "orchid/platform": ">=8,<14.43",
"oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1",
"oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1",
"oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
@@ -1278,7 +1321,7 @@
"phenx/php-svg-lib": "<0.5.2",
"php-censor/php-censor": "<2.0.13|>=2.1,<2.1.5",
"php-mod/curl": "<2.3.2",
- "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1",
+ "phpbb/phpbb": "<3.3.11",
"phpems/phpems": ">=6,<=6.1.3",
"phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7",
"phpmailer/phpmailer": "<6.5",
@@ -1286,8 +1329,8 @@
"phpmyadmin/phpmyadmin": "<5.2.1",
"phpmyfaq/phpmyfaq": "<3.2.5|==3.2.5",
"phpoffice/common": "<0.2.9",
- "phpoffice/phpexcel": "<1.8",
- "phpoffice/phpspreadsheet": "<1.29.1|>=2,<2.2.1",
+ "phpoffice/phpexcel": "<1.8.1",
+ "phpoffice/phpspreadsheet": "<1.29.4|>=2,<2.1.3|>=2.2,<2.3.2|>=3.3,<3.4",
"phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36",
"phpservermon/phpservermon": "<3.6",
"phpsysinfo/phpsysinfo": "<3.4.3",
@@ -1324,13 +1367,13 @@
"processwire/processwire": "<=3.0.229",
"propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7",
"propel/propel1": ">=1,<=1.7.1",
- "pterodactyl/panel": "<1.11.6",
+ "pterodactyl/panel": "<1.11.8",
"ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2",
"ptrofimov/beanstalk_console": "<1.7.14",
"pubnub/pubnub": "<6.1",
"pusher/pusher-php-server": "<2.2.1",
"pwweb/laravel-core": "<=0.3.6.0-beta",
- "pxlrbt/filament-excel": "<2.3.3",
+ "pxlrbt/filament-excel": "<1.1.14|>=2.0.0.0-alpha,<2.3.3",
"pyrocms/pyrocms": "<=3.9.1",
"qcubed/qcubed": "<=3.1.1",
"quickapps/cms": "<=2.0.0.0-beta2",
@@ -1341,7 +1384,7 @@
"rap2hpoutre/laravel-log-viewer": "<0.13",
"react/http": ">=0.7,<1.9",
"really-simple-plugins/complianz-gdpr": "<6.4.2",
- "redaxo/source": "<=5.15.1",
+ "redaxo/source": "<5.18",
"remdex/livehelperchat": "<4.29",
"reportico-web/reportico": "<=8.1",
"rhukster/dom-sanitizer": "<1.0.7",
@@ -1397,7 +1440,7 @@
"slim/slim": "<2.6",
"slub/slub-events": "<3.0.3",
"smarty/smarty": "<4.5.3|>=5,<5.1.1",
- "snipe/snipe-it": "<6.4.2",
+ "snipe/snipe-it": "<=7.0.13",
"socalnick/scn-social-auth": "<1.15.2",
"socialiteproviders/steam": "<1.1",
"spatie/browsershot": "<3.57.4",
@@ -1407,14 +1450,15 @@
"spoonity/tcpdf": "<6.2.22",
"squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
"ssddanbrown/bookstack": "<24.05.1",
- "statamic/cms": "<4.46|>=5.3,<5.6.2",
+ "starcitizentools/citizen-skin": ">=2.6.3,<2.31",
+ "statamic/cms": "<=5.16",
"stormpath/sdk": "<9.9.99",
"studio-42/elfinder": "<=2.1.64",
"studiomitte/friendlycaptcha": "<0.1.4",
"subhh/libconnect": "<7.0.8|>=8,<8.1",
"sukohi/surpass": "<1",
"sulu/form-bundle": ">=2,<2.5.3",
- "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13",
+ "sulu/sulu": "<1.6.44|>=2,<2.5.21|>=2.6,<2.6.5",
"sumocoders/framework-user-bundle": "<1.4",
"superbig/craft-audit": "<3.0.2",
"swag/paypal": "<5.4.4",
@@ -1436,7 +1480,8 @@
"symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4",
"symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1",
"symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<5.3.15|>=5.4.3,<5.4.4|>=6.0.3,<6.0.4",
- "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7",
+ "symfony/http-client": ">=4.3,<5.4.47|>=6,<6.4.15|>=7,<7.1.8",
+ "symfony/http-foundation": "<5.4.46|>=6,<6.4.14|>=7,<7.1.7",
"symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6",
"symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13",
"symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1",
@@ -1444,20 +1489,22 @@
"symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
"symfony/polyfill": ">=1,<1.10",
"symfony/polyfill-php55": ">=1,<1.10",
+ "symfony/process": "<5.4.46|>=6,<6.4.14|>=7,<7.1.7",
"symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
"symfony/routing": ">=2,<2.0.19",
+ "symfony/runtime": ">=5.3,<5.4.46|>=6,<6.4.14|>=7,<7.1.7",
"symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8",
- "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6",
+ "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.4.10|>=7,<7.0.10|>=7.1,<7.1.3",
"symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9",
"symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
"symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8",
- "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2|>=5.4,<5.4.31|>=6,<6.3.8",
+ "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.4.47|>=6,<6.4.15|>=7,<7.1.8",
"symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12",
- "symfony/symfony": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8",
+ "symfony/symfony": "<5.4.47|>=6,<6.4.15|>=7,<7.1.8",
"symfony/translation": ">=2,<2.0.17",
"symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8",
"symfony/ux-autocomplete": "<2.11.2",
- "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
+ "symfony/validator": "<5.4.43|>=6,<6.4.11|>=7,<7.1.4",
"symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8",
"symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
"symfony/webhook": ">=6.3,<6.3.8",
@@ -1483,16 +1530,16 @@
"tobiasbg/tablepress": "<=2.0.0.0-RC1",
"topthink/framework": "<6.0.17|>=6.1,<=8.0.4",
"topthink/think": "<=6.1.1",
- "topthink/thinkphp": "<=3.2.3",
+ "topthink/thinkphp": "<=3.2.3|>=6.1.3,<=8.0.4",
"torrentpier/torrentpier": "<=2.4.3",
"tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2",
- "tribalsystems/zenario": "<9.5.60602",
+ "tribalsystems/zenario": "<=9.7.61188",
"truckersmp/phpwhois": "<=4.3.1",
"ttskch/pagination-service-provider": "<1",
"twbs/bootstrap": "<=3.4.1|>=4,<=4.6.2",
- "twig/twig": "<1.44.8|>=2,<2.16.1|>=3,<3.11.1|>=3.12,<3.14",
+ "twig/twig": "<3.11.2|>=3.12,<3.14.1",
"typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2",
- "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
+ "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<10.4.46|>=11,<11.5.40|>=12,<12.4.21|>=13,<13.3.1",
"typo3/cms-core": "<=8.7.56|>=9,<=9.5.47|>=10,<=10.4.44|>=11,<=11.5.36|>=12,<=12.4.14|>=13,<=13.1",
"typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1",
"typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1",
@@ -1509,6 +1556,7 @@
"ua-parser/uap-php": "<3.8",
"uasoft-indonesia/badaso": "<=2.9.7",
"unisharp/laravel-filemanager": "<2.6.4",
+ "unopim/unopim": "<0.1.5",
"userfrosting/userfrosting": ">=0.3.1,<4.6.3",
"usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2",
"uvdesk/community-skeleton": "<=1.1.1",
@@ -1542,6 +1590,7 @@
"winter/wn-dusk-plugin": "<2.1",
"winter/wn-system-module": "<1.2.4",
"wintercms/winter": "<=1.2.3",
+ "wireui/wireui": "<1.19.3|>=2,<2.1.3",
"woocommerce/woocommerce": "<6.6|>=8.8,<8.8.5|>=8.9,<8.9.3",
"wp-cli/wp-cli": ">=0.12,<2.5",
"wp-graphql/wp-graphql": "<=1.14.5",
@@ -1553,7 +1602,7 @@
"xataface/xataface": "<3",
"xpressengine/xpressengine": "<3.0.15",
"yab/quarx": "<2.4.5",
- "yeswiki/yeswiki": "<4.1",
+ "yeswiki/yeswiki": "<=4.4.4",
"yetiforce/yetiforce-crm": "<=6.4",
"yidashi/yii2cmf": "<=2",
"yii2mod/yii2-cms": "<1.9.2",
@@ -1644,20 +1693,20 @@
"type": "tidelift"
}
],
- "time": "2024-09-10T18:06:22+00:00"
+ "time": "2024-11-19T21:04:39+00:00"
},
{
"name": "symfony/debug-bundle",
- "version": "v5.4.40",
+ "version": "v5.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug-bundle.git",
- "reference": "177f79296705823eee0d7dd79773f3a9df884fe0"
+ "reference": "653c7629d036ef24ac5de54a157aecdc400d2570"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/177f79296705823eee0d7dd79773f3a9df884fe0",
- "reference": "177f79296705823eee0d7dd79773f3a9df884fe0",
+ "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/653c7629d036ef24ac5de54a157aecdc400d2570",
+ "reference": "653c7629d036ef24ac5de54a157aecdc400d2570",
"shasum": ""
},
"require": {
@@ -1707,7 +1756,7 @@
"description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/debug-bundle/tree/v5.4.40"
+ "source": "https://github.com/symfony/debug-bundle/tree/v5.4.45"
},
"funding": [
{
@@ -1723,7 +1772,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:33:22+00:00"
+ "time": "2024-09-25T14:11:13+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1794,16 +1843,16 @@
},
{
"name": "symfony/error-handler",
- "version": "v5.4.42",
+ "version": "v5.4.46",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "db15ba0fd50890156ed40087ccedc7851a1f5b76"
+ "reference": "d19ede7a2cafb386be9486c580649d0f9e3d0363"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/db15ba0fd50890156ed40087ccedc7851a1f5b76",
- "reference": "db15ba0fd50890156ed40087ccedc7851a1f5b76",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/d19ede7a2cafb386be9486c580649d0f9e3d0363",
+ "reference": "d19ede7a2cafb386be9486c580649d0f9e3d0363",
"shasum": ""
},
"require": {
@@ -1845,7 +1894,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/error-handler/tree/v5.4.42"
+ "source": "https://github.com/symfony/error-handler/tree/v5.4.46"
},
"funding": [
{
@@ -1861,20 +1910,20 @@
"type": "tidelift"
}
],
- "time": "2024-07-23T12:34:05+00:00"
+ "time": "2024-11-05T14:17:06+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v5.4.40",
+ "version": "v5.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4"
+ "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4",
- "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9",
+ "reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9",
"shasum": ""
},
"require": {
@@ -1930,7 +1979,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45"
},
"funding": [
{
@@ -1946,7 +1995,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:33:22+00:00"
+ "time": "2024-09-25T14:11:13+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -2105,16 +2154,16 @@
},
{
"name": "symfony/http-kernel",
- "version": "v5.4.43",
+ "version": "v5.4.47",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "83f101ea1122972ffe52d1c1f6957a824c205370"
+ "reference": "0ac42d5e16317f15dc5f8ea83742c51d2ed2350f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/83f101ea1122972ffe52d1c1f6957a824c205370",
- "reference": "83f101ea1122972ffe52d1c1f6957a824c205370",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/0ac42d5e16317f15dc5f8ea83742c51d2ed2350f",
+ "reference": "0ac42d5e16317f15dc5f8ea83742c51d2ed2350f",
"shasum": ""
},
"require": {
@@ -2198,7 +2247,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v5.4.43"
+ "source": "https://github.com/symfony/http-kernel/tree/v5.4.47"
},
"funding": [
{
@@ -2214,7 +2263,7 @@
"type": "tidelift"
}
],
- "time": "2024-08-30T16:52:25+00:00"
+ "time": "2024-11-13T13:47:53+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -2531,16 +2580,16 @@
},
{
"name": "symfony/twig-bridge",
- "version": "v5.4.43",
+ "version": "v5.4.45",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
- "reference": "0057d058fdfcfa857a08b40fa203b8de3b35da65"
+ "reference": "b3d3738b4be14bf1a4544a6faeed89463fe8b60e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/0057d058fdfcfa857a08b40fa203b8de3b35da65",
- "reference": "0057d058fdfcfa857a08b40fa203b8de3b35da65",
+ "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/b3d3738b4be14bf1a4544a6faeed89463fe8b60e",
+ "reference": "b3d3738b4be14bf1a4544a6faeed89463fe8b60e",
"shasum": ""
},
"require": {
@@ -2632,7 +2681,7 @@
"description": "Provides integration for Twig with various Symfony components",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/twig-bridge/tree/v5.4.43"
+ "source": "https://github.com/symfony/twig-bridge/tree/v5.4.45"
},
"funding": [
{
@@ -2648,20 +2697,20 @@
"type": "tidelift"
}
],
- "time": "2024-08-28T14:41:19+00:00"
+ "time": "2024-10-24T15:46:29+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v5.4.43",
+ "version": "v5.4.47",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "6be6a6a8af4818564e3726fc65cf936f34743cef"
+ "reference": "e13e8dfa8eaab2b0536ef365beddc2af723a9ac0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6be6a6a8af4818564e3726fc65cf936f34743cef",
- "reference": "6be6a6a8af4818564e3726fc65cf936f34743cef",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e13e8dfa8eaab2b0536ef365beddc2af723a9ac0",
+ "reference": "e13e8dfa8eaab2b0536ef365beddc2af723a9ac0",
"shasum": ""
},
"require": {
@@ -2721,7 +2770,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v5.4.43"
+ "source": "https://github.com/symfony/var-dumper/tree/v5.4.47"
},
"funding": [
{
@@ -2737,20 +2786,20 @@
"type": "tidelift"
}
],
- "time": "2024-08-30T16:01:46+00:00"
+ "time": "2024-11-08T15:21:10+00:00"
},
{
"name": "twig/twig",
- "version": "v3.11.2",
+ "version": "v3.11.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "5b580ec1882b54c98cbd8c0f8a3ca5d1904db6b1"
+ "reference": "3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/5b580ec1882b54c98cbd8c0f8a3ca5d1904db6b1",
- "reference": "5b580ec1882b54c98cbd8c0f8a3ca5d1904db6b1",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e",
+ "reference": "3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e",
"shasum": ""
},
"require": {
@@ -2805,7 +2854,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.11.2"
+ "source": "https://github.com/twigphp/Twig/tree/v3.11.3"
},
"funding": [
{
@@ -2817,7 +2866,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T18:50:16+00:00"
+ "time": "2024-11-07T12:34:41+00:00"
}
],
"aliases": [],
@@ -2841,5 +2890,5 @@
"platform-overrides": {
"php": "8.0"
},
- "plugin-api-version": "2.6.0"
+ "plugin-api-version": "2.3.0"
}
diff --git a/modules/btcpay/src/Server/Client.php b/modules/btcpay/src/Server/Client.php
index 4bdc89b..51a553f 100644
--- a/modules/btcpay/src/Server/Client.php
+++ b/modules/btcpay/src/Server/Client.php
@@ -10,8 +10,6 @@
use BTCPayServer\Client\Server as ServerClient;
use BTCPayServer\Client\Store as StoreClient;
use BTCPayServer\Client\StorePaymentMethod;
-use BTCPayServer\Client\StorePaymentMethodLightningNetwork;
-use BTCPayServer\Client\StorePaymentMethodOnChain;
use PrestaShop\PrestaShop\Adapter\Configuration;
use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
@@ -46,16 +44,6 @@ class Client extends AbstractClient
*/
private $payment;
- /**
- * @var StorePaymentMethodOnChain
- */
- private $onChain;
-
- /**
- * @var StorePaymentMethodLightningNetwork
- */
- private $offChain;
-
/**
* @var Webhook
*/
@@ -77,8 +65,6 @@ public function __construct(string $baseUrl, string $apiKey)
$this->server = new ServerClient($baseUrl, $apiKey, $httpClient);
$this->store = new StoreClient($baseUrl, $apiKey, $httpClient);
$this->payment = new StorePaymentMethod($baseUrl, $apiKey, $httpClient);
- $this->onChain = new StorePaymentMethodOnChain($baseUrl, $apiKey, $httpClient);
- $this->offChain = new StorePaymentMethodLightningNetwork($baseUrl, $apiKey, $httpClient);
$this->webhook = new Webhook($baseUrl, $apiKey, $httpClient);
$this->configuration = new Configuration();
@@ -127,16 +113,6 @@ public function payment(): StorePaymentMethod
return $this->payment;
}
- public function onChain(): StorePaymentMethodOnChain
- {
- return $this->onChain;
- }
-
- public function offChain(): StorePaymentMethodLightningNetwork
- {
- return $this->offChain;
- }
-
public function webhook(): Webhook
{
return $this->webhook;
diff --git a/modules/btcpay/views/templates/admin/configure.html.twig b/modules/btcpay/views/templates/admin/configure.html.twig
index ac5cc19..d61feca 100644
--- a/modules/btcpay/views/templates/admin/configure.html.twig
+++ b/modules/btcpay/views/templates/admin/configure.html.twig
@@ -194,12 +194,9 @@
{{ 'Supported payment methods'|trans({}, 'Modules.Btcpay.Front') }}
-
- {% for paymentMethod in client.offChain().getPaymentMethods(storeId) %}
- - {{ paymentMethod.cryptoCode }} Lightning ⚡
- {% endfor %}
- {% for paymentMethod in client.onChain().getPaymentMethods(storeId) %}
- - {{ paymentMethod.cryptoCode }} On-Chain
+
+ {% for paymentMethod in client.payment().getPaymentMethods(storeId) %}
+ - {{ paymentMethod.cryptoCode }} {% if 'LNURL' in paymentMethod.paymentMethod %}LNURL ⚡{% elseif 'LN' in paymentMethod.paymentMethod or 'Lightning' in paymentMethod.paymentMethod %}Lightning ⚡{% else %}(On-Chain){% endif %}
{% endfor %}
diff --git a/modules/btcpay/views/templates/hooks/payment_option.tpl b/modules/btcpay/views/templates/hooks/payment_option.tpl
index 9296384..5538a72 100644
--- a/modules/btcpay/views/templates/hooks/payment_option.tpl
+++ b/modules/btcpay/views/templates/hooks/payment_option.tpl
@@ -1,13 +1,3 @@
{l s='Please pay the exact amount (including transaction fees when paying on-chain).' d='Modules.Btcpay.Front'}
-
- {l s='Supported payment methods' d='Modules.Btcpay.Front'}:
-
- {foreach $offChain as $paymentMethod}
- - {$paymentMethod.cryptoCode|escape:'htmlall':'UTF-8'} Lightning ⚡
- {/foreach}
- {foreach $onChain as $paymentMethod}
- - {$paymentMethod.cryptoCode|escape:'htmlall':'UTF-8'} (On-Chain)
- {/foreach}
-