diff --git a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php index 00558bc51..b00c2ef5c 100644 --- a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php +++ b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php @@ -1,26 +1,27 @@ -// +/** + * Copyright (C) 2013-2020 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 + */ // // iTop module definition file // +/** @noinspection PhpUnhandledExceptionInspection */ SetupWebPage::AddModule( __FILE__, // Path to the current file, all other file names are relative to the directory containing this file 'combodo-db-tools/2.7.0', diff --git a/datamodels/2.x/itop-core-update/README.md b/datamodels/2.x/itop-core-update/README.md deleted file mode 100644 index 59420f0cd..000000000 --- a/datamodels/2.x/itop-core-update/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# itop-core-update -Application upgrade - -This feature allows administrators to upgrade the application from a downloaded package. - -namespace Combodo\iTop\CoreUpdate; diff --git a/datamodels/2.x/itop-core-update/module.itop-core-update.php b/datamodels/2.x/itop-core-update/module.itop-core-update.php index 24e8bda89..571750885 100644 --- a/datamodels/2.x/itop-core-update/module.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/module.itop-core-update.php @@ -1,13 +1,27 @@ array( - 'itop-files-information/1.0.0', - 'combodo-db-tools/1.0.8', + 'itop-files-information/2.7.0', + 'combodo-db-tools/2.7.0', ), 'mandatory' => false, 'visible' => true, diff --git a/datamodels/2.x/itop-files-information/README.md b/datamodels/2.x/itop-files-information/README.md deleted file mode 100644 index 6abf9e9fc..000000000 --- a/datamodels/2.x/itop-files-information/README.md +++ /dev/null @@ -1 +0,0 @@ -# itop-files-information \ No newline at end of file diff --git a/datamodels/2.x/itop-files-information/module.itop-files-information.php b/datamodels/2.x/itop-files-information/module.itop-files-information.php new file mode 100644 index 000000000..72884f223 --- /dev/null +++ b/datamodels/2.x/itop-files-information/module.itop-files-information.php @@ -0,0 +1,63 @@ + 'iTop files information', + 'category' => 'business', + + // Setup + // + 'dependencies' => array( + ), + 'mandatory' => false, + 'visible' => false, + + // Components + // + 'datamodel' => array( + 'model.itop-files-information.php', + 'src/Service/FilesInformation.php', + 'src/Service/FilesInformationException.php', + 'src/Service/FilesInformationUtils.php', + 'src/Service/FilesIntegrity.php', + ), + 'webservice' => array(), + 'data.struct' => array(), + 'data.sample' => array(), + + // Documentation + // + 'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any + 'doc.more_information' => '', // hyperlink to more information, if any + + // Default settings + // + 'settings' => array(), + ) +); diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 2eec1e455..79227041e 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -139,6 +139,7 @@ return array( 'Combodo\\iTop\\Application\\Search\\CriterionParser' => $baseDir . '/sources/application/search/criterionparser.class.inc.php', 'Combodo\\iTop\\Application\\Search\\SearchForm' => $baseDir . '/sources/application/search/searchform.class.inc.php', 'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => $baseDir . '/sources/application/TwigBase/Controller/Controller.php', + 'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => $baseDir . '/sources/application/TwigBase/Controller/Controller.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => $baseDir . '/sources/application/TwigBase/Twig/Extension.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => $baseDir . '/sources/application/TwigBase/Twig/TwigHelper.php', 'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 2b23344b9..c473bbec4 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -369,6 +369,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b 'Combodo\\iTop\\Application\\Search\\CriterionParser' => __DIR__ . '/../..' . '/sources/application/search/criterionparser.class.inc.php', 'Combodo\\iTop\\Application\\Search\\SearchForm' => __DIR__ . '/../..' . '/sources/application/search/searchform.class.inc.php', 'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => __DIR__ . '/../..' . '/sources/application/TwigBase/Controller/Controller.php', + 'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => __DIR__ . '/../..' . '/sources/application/TwigBase/Controller/Controller.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => __DIR__ . '/../..' . '/sources/application/TwigBase/Twig/Extension.php', 'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => __DIR__ . '/../..' . '/sources/application/TwigBase/Twig/TwigHelper.php', 'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',