Fix php warning in class PHPExecutor due to trait being used twice

kaliop-uk · Nov 22, 2022 · 4730fbc · 4730fbc
1 parent c2927f1
commit 4730fbc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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\\": "" }