diff --git a/.github/workflows/security-checker.yml b/.github/workflows/security-checker.yml index e1db40a6f..3396ba3bb 100644 --- a/.github/workflows/security-checker.yml +++ b/.github/workflows/security-checker.yml @@ -10,5 +10,5 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: symfonycorp/security-checker-action@v1 + - uses: symfonycorp/security-checker-action@v3 diff --git a/composer.json b/composer.json index b33b320a2..06a22356a 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "payum/paypal-pro-checkout-nvp": "^1.5", "payum/payum-bundle": "^2.3", "payum/stripe": "^1.5", - "php-http/guzzle6-adapter": "^2.0", + "php-http/guzzle7-adapter": "^1.0", "ramsey/uuid": "^3.9", "ramsey/uuid-doctrine": "^1.5", "sensio/framework-extra-bundle": "^5.5", @@ -143,7 +143,11 @@ "platform": { "php": "7.3.5" }, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "phpstan/extension-installer": true, + "symfony/flex": true + } }, "extra": { "branch-alias": { diff --git a/composer.lock b/composer.lock index 41dcc0a37..35f0a2830 100644 --- a/composer.lock +++ b/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": "7348e4d2dba8039f34790e25e90a9b9a", + "content-hash": "c610708710ed54c56747c2583a6a33e4", "packages": [ { "name": "api-platform/core", @@ -2513,37 +2513,49 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.7", + "version": "7.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "724562fa861e21a4071c652c8a159934e4f05592" + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592", - "reference": "724562fa861e21a4071c652c8a159934e4f05592", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "guzzlehttp/promises": "^1.5", + "guzzlehttp/psr7": "^1.9 || ^2.4", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.1" + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -2596,19 +2608,20 @@ } ], "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5.7" + "source": "https://github.com/guzzle/guzzle/tree/7.5.0" }, "funding": [ { @@ -2624,20 +2637,20 @@ "type": "tidelift" } ], - "time": "2022-06-09T21:36:50+00:00" + "time": "2022-08-28T15:39:27+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -2692,7 +2705,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -2708,47 +2721,51 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.5", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" + "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379", + "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "ralouphie/getallheaders": "^3.0" }, "provide": { + "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + "bamarni/composer-bin-plugin": "^1.8.1", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "2.4-dev" } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Psr7\\": "src/" } @@ -2787,6 +2804,11 @@ "name": "Tobias Schultze", "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", @@ -2802,7 +2824,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.5" + "source": "https://github.com/guzzle/psr7/tree/2.4.1" }, "funding": [ { @@ -2818,7 +2840,7 @@ "type": "tidelift" } ], - "time": "2022-03-20T21:51:18+00:00" + "time": "2022-08-28T14:45:39+00:00" }, { "name": "jms/metadata", @@ -5462,22 +5484,22 @@ "time": "2018-11-06T16:28:25+00:00" }, { - "name": "php-http/guzzle6-adapter", - "version": "v2.0.1", + "name": "php-http/guzzle7-adapter", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-http/guzzle6-adapter.git", - "reference": "6074a4b1f4d5c21061b70bab3b8ad484282fe31f" + "url": "https://github.com/php-http/guzzle7-adapter.git", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/6074a4b1f4d5c21061b70bab3b8ad484282fe31f", - "reference": "6074a4b1f4d5c21061b70bab3b8ad484282fe31f", + "url": "https://api.github.com/repos/php-http/guzzle7-adapter/zipball/fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", + "reference": "fb075a71dbfa4847cf0c2938c4e5a9c478ef8b01", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.0", - "php": "^7.1", + "guzzlehttp/guzzle": "^7.0", + "php": "^7.2 | ^8.0", "php-http/httplug": "^2.0", "psr/http-client": "^1.0" }, @@ -5487,19 +5509,18 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "ext-curl": "*", - "php-http/client-integration-tests": "^2.0", - "phpunit/phpunit": "^7.4" + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.0|^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "0.2.x-dev" } }, "autoload": { "psr-4": { - "Http\\Adapter\\Guzzle6\\": "src/" + "Http\\Adapter\\Guzzle7\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -5508,38 +5529,34 @@ ], "authors": [ { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, - { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" } ], - "description": "Guzzle 6 HTTP Adapter", + "description": "Guzzle 7 HTTP Adapter", "homepage": "http://httplug.io", "keywords": [ "Guzzle", "http" ], "support": { - "issues": "https://github.com/php-http/guzzle6-adapter/issues", - "source": "https://github.com/php-http/guzzle6-adapter/tree/master" + "issues": "https://github.com/php-http/guzzle7-adapter/issues", + "source": "https://github.com/php-http/guzzle7-adapter/tree/1.0.0" }, - "time": "2018-12-16T14:44:03+00:00" + "time": "2021-03-09T07:35:15+00:00" }, { "name": "php-http/httplug", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9" + "reference": "f640739f80dfa1152533976e3c112477f69274eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/191a0a1b41ed026b717421931f8d3bd2514ffbf9", - "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9", + "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", + "reference": "f640739f80dfa1152533976e3c112477f69274eb", "shasum": "" }, "require": { @@ -5586,9 +5603,9 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/master" + "source": "https://github.com/php-http/httplug/tree/2.3.0" }, - "time": "2020-07-13T15:43:23+00:00" + "time": "2022-02-21T09:52:22+00:00" }, { "name": "php-http/message", @@ -6157,6 +6174,61 @@ }, "time": "2020-06-29T06:28:15+00:00" }, + { + "name": "psr/http-factory", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/master" + }, + "time": "2019-04-30T12:38:16+00:00" + }, { "name": "psr/http-message", "version": "1.0.1", @@ -8327,16 +8399,16 @@ }, { "name": "symfony/flex", - "version": "v1.10.0", + "version": "v1.19.3", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "e38520236bdc911c2f219634b485bc328746e980" + "reference": "ab0453b16029e131c112df1a76e59eb2a47e1f67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/e38520236bdc911c2f219634b485bc328746e980", - "reference": "e38520236bdc911c2f219634b485bc328746e980", + "url": "https://api.github.com/repos/symfony/flex/zipball/ab0453b16029e131c112df1a76e59eb2a47e1f67", + "reference": "ab0453b16029e131c112df1a76e59eb2a47e1f67", "shasum": "" }, "require": { @@ -8345,15 +8417,13 @@ }, "require-dev": { "composer/composer": "^1.0.2|^2.0", - "symfony/dotenv": "^4.4|^5.0", - "symfony/phpunit-bridge": "^4.4|^5.0", - "symfony/process": "^3.4|^4.4|^5.0" + "symfony/dotenv": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/phpunit-bridge": "^4.4.12|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0" }, "type": "composer-plugin", "extra": { - "branch-alias": { - "dev-main": "1.9-dev" - }, "class": "Symfony\\Flex\\Flex" }, "autoload": { @@ -8374,7 +8444,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.10.0" + "source": "https://github.com/symfony/flex/tree/v1.19.3" }, "funding": [ { @@ -8390,7 +8460,7 @@ "type": "tidelift" } ], - "time": "2020-11-05T10:56:45+00:00" + "time": "2022-08-07T09:39:08+00:00" }, { "name": "symfony/form", diff --git a/src/NotificationBundle/Notification/NotificationManager.php b/src/NotificationBundle/Notification/NotificationManager.php index ead46e8e3..650e9ad97 100644 --- a/src/NotificationBundle/Notification/NotificationManager.php +++ b/src/NotificationBundle/Notification/NotificationManager.php @@ -67,7 +67,7 @@ public function sendNotification(string $event, NotificationMessageInterface $me $notification = new ChainedNotification(); - //@TODO: Settings should automatically be decoded + // @TODO: Settings should automatically be decoded $settings = json_decode($this->settings->get(sprintf('notification/%s', $event)), true, 512, JSON_THROW_ON_ERROR); if ((bool) $settings['email']) { diff --git a/src/PaymentBundle/Form/Methods/PaypalExpressCheckout.php b/src/PaymentBundle/Form/Methods/PaypalExpressCheckout.php index f0fade49c..a4d0d2afa 100644 --- a/src/PaymentBundle/Form/Methods/PaypalExpressCheckout.php +++ b/src/PaymentBundle/Form/Methods/PaypalExpressCheckout.php @@ -39,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'password', PasswordType::class, [ - //'help' => 'payment.settings.password.hint', + // 'help' => 'payment.settings.password.hint', 'constraints' => new NotBlank(), // @TODO: This constraint should only be added when saving for the first time ] ); diff --git a/src/PaymentBundle/Form/Methods/PaypalProCheckout.php b/src/PaymentBundle/Form/Methods/PaypalProCheckout.php index 01eeae151..5d0987d47 100644 --- a/src/PaymentBundle/Form/Methods/PaypalProCheckout.php +++ b/src/PaymentBundle/Form/Methods/PaypalProCheckout.php @@ -39,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'password', PasswordType::class, [ - //'help' => 'payment.settings.password.hint', + // 'help' => 'payment.settings.password.hint', 'constraints' => new NotBlank(), // @TODO: This constraint should only be added when saving for the first time ] ); diff --git a/symfony.lock b/symfony.lock index 1dd7798c0..8ac4d044c 100644 --- a/symfony.lock +++ b/symfony.lock @@ -185,15 +185,6 @@ "goetas-webservices/xsd2php-runtime": { "version": "v0.2.12" }, - "guzzlehttp/guzzle": { - "version": "6.5.5" - }, - "guzzlehttp/promises": { - "version": "v1.3.1" - }, - "guzzlehttp/psr7": { - "version": "1.6.1" - }, "hamcrest/hamcrest-php": { "version": "v2.0.1" }, @@ -344,21 +335,12 @@ "php-coveralls/php-coveralls": { "version": "v2.2.0" }, - "php-http/guzzle6-adapter": { - "version": "v2.0.1" - }, - "php-http/httplug": { - "version": "2.2.0" - }, "php-http/message": { "version": "1.8.0" }, "php-http/message-factory": { "version": "v1.0.2" }, - "php-http/promise": { - "version": "1.1.0" - }, "php-webdriver/webdriver": { "version": "1.8.2" }, @@ -398,9 +380,6 @@ "psr/container": { "version": "1.0.0" }, - "psr/http-client": { - "version": "1.0.1" - }, "psr/http-message": { "version": "1.0.1" }, @@ -413,9 +392,6 @@ "psr/simple-cache": { "version": "1.0.1" }, - "ralouphie/getallheaders": { - "version": "3.0.3" - }, "ramsey/uuid": { "version": "3.9.3" },