diff --git a/composer.lock b/composer.lock index f17f08f5..15180460 100644 --- a/composer.lock +++ b/composer.lock @@ -715,16 +715,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.18.0", + "version": "v2.18.2", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "cbc5b50bfa2688a1afca20e5a8c71f058e9ccbef" + "reference": "18f8c9d184ba777380794a389fabc179896ba913" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbc5b50bfa2688a1afca20e5a8c71f058e9ccbef", - "reference": "cbc5b50bfa2688a1afca20e5a8c71f058e9ccbef", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/18f8c9d184ba777380794a389fabc179896ba913", + "reference": "18f8c9d184ba777380794a389fabc179896ba913", "shasum": "" }, "require": { @@ -810,7 +810,7 @@ "type": "github" } ], - "time": "2021-01-18T03:31:06+00:00" + "time": "2021-01-26T00:22:21+00:00" }, { "name": "nikic/php-parser", @@ -1011,16 +1011,16 @@ }, { "name": "prestashop/php-dev-tools", - "version": "v3.14", + "version": "v3.15", "source": { "type": "git", "url": "https://github.com/PrestaShop/php-dev-tools.git", - "reference": "ef4217ee7212e6b65d983371b3255ca38395de44" + "reference": "1570fd43b0f5a8cfa105e6f2211c818c902951f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PrestaShop/php-dev-tools/zipball/ef4217ee7212e6b65d983371b3255ca38395de44", - "reference": "ef4217ee7212e6b65d983371b3255ca38395de44", + "url": "https://api.github.com/repos/PrestaShop/php-dev-tools/zipball/1570fd43b0f5a8cfa105e6f2211c818c902951f0", + "reference": "1570fd43b0f5a8cfa105e6f2211c818c902951f0", "shasum": "" }, "require": { @@ -1031,6 +1031,9 @@ "symfony/console": "~3.2 || ~4.0 || ~5.0", "symfony/filesystem": "~3.2 || ~4.0 || ~5.0" }, + "conflict": { + "friendsofphp/php-cs-fixer": "2.18.3" + }, "bin": [ "bin/prestashop-coding-standards" ], @@ -1045,7 +1048,7 @@ "MIT" ], "description": "PrestaShop coding standards", - "time": "2021-01-18T15:07:05+00:00" + "time": "2021-03-11T15:36:18+00:00" }, { "name": "psr/log",