From 9cf258f7b8356fdc20862d7e62b141f3db913a2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Mar 2021 04:02:17 +0000
Subject: [PATCH] Bump prestashop/php-dev-tools from 3.14 to 3.15

Bumps [prestashop/php-dev-tools](https://github.com/PrestaShop/php-dev-tools) from 3.14 to 3.15.
- [Release notes](https://github.com/PrestaShop/php-dev-tools/releases)
- [Commits](https://github.com/PrestaShop/php-dev-tools/compare/v3.14...v3.15)

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8abaf62..8bfbe92 100644
--- a/composer.lock
+++ b/composer.lock
@@ -271,16 +271,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": {
@@ -366,7 +366,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-01-18T03:31:06+00:00"
+            "time": "2021-01-26T00:22:21+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -567,16 +567,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": {
@@ -587,6 +587,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"
             ],
@@ -601,7 +604,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",