dev #75882 fix trait conflicts

library/Class/ArticleCategorie.php

@@ -84,7 +84,10 @@ class ArticleCategorieLoader extends Storm_Model_Loader {
 
 
 class Class_ArticleCategorie extends Storm_Model_Abstract {
-  use Trait_TreeViewableCategorie, Trait_TreeNode,Trait_PermissionTargetable, Trait_CustomFields;
+  use Trait_TreeViewableCategorie, Trait_TreeNode,Trait_PermissionTargetable, Trait_CustomFields {
+    Trait_TreeViewableCategorie::getParent insteadof Trait_TreeNode;
+    Trait_TreeViewableCategorie::getChildren insteadof Trait_TreeNode;
+  }
 
 
   protected

library/Class/SitothequeCategorie.php

@@ -19,8 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 class Class_SitothequeCategorie extends Storm_Model_Abstract {
-  use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode;
-  use Trait_CustomFields;
+  use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode, Trait_CustomFields {
+    Trait_TreeViewableCategorie::getParent insteadof Trait_TreeNode;
+    Trait_TreeViewableCategorie::getChildren insteadof Trait_TreeNode;
+  }
+
   protected $_table_name = 'sito_categorie';
   protected $_table_primary = 'ID_CAT';
   protected $_belongs_to = ['parent_categorie' => ['model' => 'Class_SitothequeCategorie',

library/Class/UserGroupCategorie.php

@@ -50,7 +50,10 @@ class UserGroupCategorieLoader extends Storm_Model_Loader{
 
 
 class Class_UserGroupCategorie extends Storm_Model_Abstract {
-  use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode;
+  use Trait_TreeViewableCategorie, Trait_Translator, Trait_TreeNode {
+    Trait_TreeViewableCategorie::getParent insteadof Trait_TreeNode;
+    Trait_TreeViewableCategorie::getChildren insteadof Trait_TreeNode;
+  }
 
   protected
     $_table_name = 'user_group_categorie',