N°6270 Remove empty model.*.php files

Not necessary anymore in 3.1.0 since :
* N°4875 - Compiler : do not force the model.*.php file to be present in the module.*.php file ('datamodel' key)
* N°4280 - Module loading : do not crash if 'datamodel' file doesn't exists (model.*.php)
This commit is contained in:
Pierre Goiffon
2023-05-04 11:15:37 +02:00
parent 03e22ce42d
commit 881aa87ad2
53 changed files with 3 additions and 305 deletions

View File

@@ -1,17 +0,0 @@
<?php
// PHP Data Model definition file
// WARNING - WARNING - WARNING
// DO NOT EDIT THIS FILE (unless you know what you are doing)
//
// If you use supply a datamodel.xxxx.xml file with your module
// the this file WILL BE overwritten by the compilation of the
// module (during the setup) if the datamodel.xxxx.xml file
// contains the definition of new classes or menus.
//
// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
// This file remains in the module's template only for the cases where there is:
// - either no new class or menu defined in the XML file
// - or no XML file at all supplied by the module

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.authent-cas.php',
'vendor/autoload.php',
'src/CASLoginExtension.php',
),

View File

@@ -1,16 +0,0 @@
<?php
// PHP Data Model definition file
// WARNING - WARNING - WARNING
// DO NOT EDIT THIS FILE (unless you know what you are doing)
//
// If you provide a datamodel.xxxx.xml file with your module,
// this file WILL BE overwritten by the compilation of the
// module (during the setup) if the datamodel.xxxx.xml file
// contains the definition of new classes or menus.
//
// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
// This file remains in the module's template only for the cases where there is:
// - either no new class or menu defined in the XML file
// - or no XML file at all supplied by the module

View File

@@ -27,7 +27,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.authent-ldap.php',
),
'data.struct' => array(
//'data.struct.authent-ldap.xml',

View File

@@ -1,17 +0,0 @@
<?php
// PHP Data Model definition file
// WARNING - WARNING - WARNING
// DO NOT EDIT THIS FILE (unless you know what you are doing)
//
// If you use supply a datamodel.xxxx.xml file with your module
// the this file WILL BE overwritten by the compilation of the
// module (during the setup) if the datamodel.xxxx.xml file
// contains the definition of new classes or menus.
//
// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
// This file remains in the module's template only for the cases where there is:
// - either no new class or menu defined in the XML file
// - or no XML file at all supplied by the module

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.combodo-backoffice-darkmoon-theme.php'
),
'webservice' => array(

View File

@@ -42,7 +42,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.combodo-db-tools.php',
'src/Service/DBToolsUtils.php',
'src/Service/DBAnalyzerUtils.php',
),

View File

@@ -37,7 +37,6 @@ SetupWebPage::AddModule(
//
'datamodel' => array(
'vendor/autoload.php',
'model.itop-attachments.php',
'main.itop-attachments.php',
'renderers.itop-attachments.php',
),

View File

@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
//
'datamodel' => array(
'main.itop-backup.php',
'model.itop-backup.php',
),
'webservice' => array(
//'webservices.itop-backup.php',

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -25,7 +25,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-bridge-cmdb-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
),
'webservice' => array(

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -25,7 +25,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-bridge-cmdb-ticket.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
),
'webservice' => array(

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -27,7 +27,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-bridge-endusers-devices-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
),
'webservice' => array(

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -26,7 +26,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-bridge-virtualization-mgmt-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
),
'webservice' => array(

View File

@@ -1,18 +0,0 @@
<?php
/**
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
// WARNING - WARNING - WARNING
// DO NOT EDIT THIS FILE (unless you know what you are doing)
//
// If you provide a datamodel.xxxx.xml file with your module,
// this file WILL BE overwritten by the compilation of the
// module (during the setup) if the datamodel.xxxx.xml file
// contains the definition of new classes or menus.
//
// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
// This file remains in the module's template only for the cases where there is:
// - either no new class or menu defined in the XML file
// - or no XML file at all supplied by the module

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-bridge-virtualization-storage.php',
),
'data.struct' => array(
//'data.struct.itop-change-mgmt.xml',

View File

@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-change-mgmt-itil.php',
),
'data.struct' => array(
//'data.struct.itop-change-mgmt.xml',

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-change-mgmt.php',
),
'data.struct' => array(
//'data.struct.itop-change-mgmt.xml',

View File

@@ -19,7 +19,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-config.php',
'src/Validator/ConfigNodesVisitor.php',
'src/Validator/iTopConfigAstValidator.php',
'src/Validator/iTopConfigSyntaxValidator.php',

View File

@@ -43,7 +43,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => [
'model.itop-core-update.php',
'src/Service/RunTimeEnvironmentCoreUpdater.php',
'src/Service/CoreUpdater.php',
'src/Controller/UpdateController.php',

View File

@@ -35,10 +35,7 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-datacenter-mgmt.php',
),
'datamodel' => array(),
'webservice' => array(
),

View File

@@ -44,7 +44,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-endusers-devices.php'
),
'webservice' => array(

View File

@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-faq-light.php',
),
'data.struct' => array(
//'data.struct.itop-knownerror-mgmt.xml',

View File

@@ -1,6 +0,0 @@
<?php
/**
* @copyright Copyright (C) 2010-2023 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/

View File

@@ -41,7 +41,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-files-information.php',
'src/Service/FilesInformation.php',
'src/Service/FilesInformationException.php',
'src/Service/FilesInformationUtils.php',

View File

@@ -23,8 +23,7 @@ SetupWebPage::AddModule(
'auto_select' => 'SetupInfo::ModuleIsSelected("itop-request-mgmt-itil") && SetupInfo::ModuleIsSelected("itop-incident-mgmt-itil")',
// Components
//
'datamodel' => array(//'model.itop-portal-full-itil.php'
),
'datamodel' => array(),
'webservice' => array(),
'data.struct' => array(// add your 'structure' definition XML files here,
),

View File

@@ -1,17 +0,0 @@
<?php
// PHP Data Model definition file
// WARNING - WARNING - WARNING
// DO NOT EDIT THIS FILE (unless you know what you are doing)
//
// If you use supply a datamodel.xxxx.xml file with your module
// the this file WILL BE overwritten by the compilation of the
// module (during the setup) if the datamodel.xxxx.xml file
// contains the definition of new classes or menus.
//
// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
// This file remains in the module's template only for the cases where there is:
// - either no new class or menu defined in the XML file
// - or no XML file at all supplied by the module

View File

@@ -25,7 +25,6 @@ SetupWebPage::AddModule(
'datamodel' => array(
'menus.php',
'hubnewsroomprovider.class.inc.php',
'model.itop-hub-connector.php'
),
'webservice' => array(

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-incident-mgmt-itil.php',
),
'data.struct' => array(

View File

@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-knownerror-mgmt.php',
),
'data.struct' => array(
//'data.struct.itop-knownerror-mgmt.xml',

View File

@@ -24,7 +24,6 @@ SetupWebPage::AddModule(
//
'datamodel' => array(
'vendor/autoload.php',
'model.itop-oauth-client.php', // Contains the PHP code generated by the "compilation" of datamodel.remote-authent-oauth.xml
'src/Service/PopupMenuExtension.php',
'src/Service/ApplicationUIExtension.php',
),

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -34,7 +34,6 @@ SetupWebPage::AddModule(
// Note: The autoloader is there instead of portal/config/bootstrap.php in order to be available for other modules with a dependency on this one.
// eg. If a module has a class extending \Combodo\iTop\Portal\Controller\AbstractController, it needs to find it even if the portal kernel is not loaded.
'portal/vendor/autoload.php',
'model.itop-portal-base.php',
),
'webservice' => array(
//'webservices.itop-portal-base.php',

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -33,7 +33,6 @@ SetupWebPage::AddModule(
// Components
'datamodel' => array(
'main.itop-portal.php',
'model.itop-portal.php',
),
'webservice' => array(
//'webservices.itop-portal.php',

View File

@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-problem-mgmt.php',
),
'data.struct' => array(
//'data.struct.itop-problem-mgmt.xml',

View File

@@ -36,7 +36,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-profiles-itil.php',
),
'webservice' => array(
//'webservices.itop-profiles-itil.php',

View File

@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-request-mgmt-itil.php',
'main.itop-request-mgmt-itil.php',
),
'data.struct' => array(

View File

@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-request-mgmt.php',
'main.itop-request-mgmt.php',
),
'data.struct' => array(

View File

@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-service-mgmt-provider.php',
),
'data.struct' => array(
//'data.struct.itop-service-mgmt.xml',

View File

@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-service-mgmt.php',
),
'data.struct' => array(
//'data.struct.itop-service-mgmt.xml',

View File

@@ -36,7 +36,7 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'main.itop-sla-computation.php'
'main.itop-sla-computation.php',
),
'webservice' => array(

View File

@@ -44,7 +44,6 @@
// Components
//
'datamodel' => array(
'model.itop-storage-mgmt.php'
),
'webservice' => array(

View File

@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
//
'datamodel' => array(
'main.itop-structure.php',
'model.itop-structure.php',
),
'data.struct' => array(
),

View File

@@ -1,17 +0,0 @@
<?php
// PHP Data Model definition file
// WARNING - WARNING - WARNING
// DO NOT EDIT THIS FILE (unless you know what you are doing)
//
// If you provide a datamodel.xxxx.xml file with your module,
// this file WILL BE overwritten by the compilation of the
// module (during the setup) if the datamodel.xxxx.xml file
// contains the definition of new classes or menus.
//
// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
// This file remains in the module's template only for the cases where there is:
// - either no new class or menu defined in the XML file
// - or no XML file at all supplied by the module

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-themes-compat.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-themes-compat.xml
),
'webservice' => array(

View File

@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
//
'datamodel' => array(
'main.itop-tickets.php',
'model.itop-tickets.php',
),
'data.struct' => array(
// 'data.struct.ta-actions.xml',

View File

@@ -34,7 +34,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-virtualization-mgmt.php'
),
'webservice' => array(

View File

@@ -1,22 +0,0 @@
<?php
/**
* Copyright (C) 2013-2023 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*/
// This file may be amended with XML snippets

View File

@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
// Components
//
'datamodel' => array(
'model.itop-welcome-itil.php',
),
'webservice' => array(
//'webservices.itop-welcome-itil.php',