From 4730fbcdf402acecc2f570e0020e86c5f2179d18 Mon Sep 17 00:00:00 2001
From: gggeek <ggiunta@kaliop.com>
Date: Tue, 22 Nov 2022 15:34:14 +0000
Subject: [PATCH] Fix php warning in class `PHPExecutor` due to trait being
 used twice

---
 Core/Executor/PHPExecutor.php | 2 --
 WHATSNEW.md                   | 6 ++++++
 composer.json                 | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Core/Executor/PHPExecutor.php b/Core/Executor/PHPExecutor.php
index a9df30c4..cb4c8fe7 100644
--- a/Core/Executor/PHPExecutor.php
+++ b/Core/Executor/PHPExecutor.php
@@ -10,8 +10,6 @@
 
 class PHPExecutor extends BasePHPExecutor
 {
-    use IgnorableStepExecutorTrait;
-
     protected $supportedStepTypes = array('php');
     protected $supportedActions = array('call_function', 'call_static_method');
 
diff --git a/WHATSNEW.md b/WHATSNEW.md
index d24f9f6a..d4602682 100644
--- a/WHATSNEW.md
+++ b/WHATSNEW.md
@@ -1,3 +1,9 @@
+Version: 6.3.2
+==============
+
+* Fixed php warning in class `PHPExecutor` due to trait being used twice
+
+
 Version 6.3.1
 =============
 
diff --git a/composer.json b/composer.json
index 48dfb802..d3315d18 100644
--- a/composer.json
+++ b/composer.json
@@ -41,9 +41,11 @@
         "php-http/httplug-bundle": "Required for usage of HTTP/CALL migration steps"
     },
     "conflict": {
-        "netgen/tagsbundle": "1.*",
         "ezsystems/ezpublish-kernel": "6.7.3",
-        "symfony/symfony": "3.4.12"
+        "netgen/tagsbundle": "1.*",
+        "symfony/symfony": "3.4.12",
+        "tanoconsulting/ibexa-migration-bundle": "*",
+        "tanoconsulting/ezmigrationbundle2": "*"
     },
     "autoload": {
         "psr-4": { "Kaliop\\eZMigrationBundle\\": "" }