From 49438c8579b94eaf9056bebe774f157ed610872c Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 15 Aug 2016 19:41:58 -0500 Subject: [PATCH] Add removal of directories deprecated in 1.11.x - refs CT#8361 --- src/Chamilo/CoreBundle/Composer/ScriptHandler.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Chamilo/CoreBundle/Composer/ScriptHandler.php b/src/Chamilo/CoreBundle/Composer/ScriptHandler.php index c8eb996c83..c6cf2f202e 100644 --- a/src/Chamilo/CoreBundle/Composer/ScriptHandler.php +++ b/src/Chamilo/CoreBundle/Composer/ScriptHandler.php @@ -23,6 +23,7 @@ class ScriptHandler /** * Delete old symfony folder before update (generates conflicts with composer) + * This method also applies to 1.10 folders removed for 1.11. */ public static function deleteOldFilesFrom19x() { @@ -60,11 +61,15 @@ class ScriptHandler __DIR__.'/../../../../main/inc/lib/pclzip/', __DIR__.'/../../../../main/inc/lib/htmlpurifier', __DIR__.'/../../../../main/announcements/resources', - __DIR__.'/../../../../main/plugin/ticket', + //Remove from 1.10 __DIR__.'/../../../../src/Chamilo/CoreBundle/Entity/GroupRelGroup.php', __DIR__.'/../../../../src/Chamilo/CoreBundle/Entity/GroupRelTag.php', __DIR__.'/../../../../src/Chamilo/CoreBundle/Entity/GroupRelUser.php', - __DIR__.'/../../../../src/Chamilo/CoreBundle/Entity/Groups.php' + __DIR__.'/../../../../src/Chamilo/CoreBundle/Entity/Groups.php', + __DIR__.'/../../../../plugin/ticket', + __DIR__.'/../../../../plugin/skype', + __DIR__.'/../../../../main/newscorm', + __DIR__.'/../../../../main/exercice', ]; $files = [