N°3216 - Refactor form files to be part of the autoloader

application/cmdbabstract.class.inc.php

@@ -36,7 +36,6 @@ require_once(APPROOT.'application/ui.passwordwidget.class.inc.php');
 require_once(APPROOT.'application/ui.extkeywidget.class.inc.php');
 require_once(APPROOT.'application/ui.htmleditorwidget.class.inc.php');
 require_once(APPROOT.'application/datatable.class.inc.php');
-require_once(APPROOT.'sources/renderer/console/consoleformrenderer.class.inc.php');
 require_once(APPROOT.'sources/application/search/searchform.class.inc.php');
 require_once(APPROOT.'sources/application/search/criterionparser.class.inc.php');
 require_once(APPROOT.'sources/application/search/criterionconversionabstract.class.inc.php');

composer.json

@@ -52,6 +52,7 @@
       "application",
       "sources/application",
       "sources/Composer",
+      "sources/Form",
       "sources/Renderer"
     ],
     "exclude-from-classmap": [

core/attributedef.class.inc.php

@@ -30,13 +30,9 @@ require_once('ormlinkset.class.inc.php');
 require_once('ormset.class.inc.php');
 require_once('ormtagset.class.inc.php');
 require_once('htmlsanitizer.class.inc.php');
-require_once(APPROOT.'sources/autoload.php');
 require_once('customfieldshandler.class.inc.php');
 require_once('ormcustomfieldsvalue.class.inc.php');
 require_once('datetimeformat.class.inc.php');
-// This should be changed to a use when we go full-namespace
-require_once(APPROOT.'sources/form/validator/validator.class.inc.php');
-require_once(APPROOT.'sources/form/validator/notemptyextkeyvalidator.class.inc.php');
 
 /**
  * MissingColumnException - sent if an attribute is being created but the column is missing in the row

lib/composer/autoload_classmap.php

@@ -153,6 +153,39 @@ return array(
     'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php',
     'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php',
     'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php',
+    'Combodo\\iTop\\Form\\Field\\BlobField' => $baseDir . '/sources/Form/Field/BlobField.php',
+    'Combodo\\iTop\\Form\\Field\\CaseLogField' => $baseDir . '/sources/Form/Field/CaseLogField.php',
+    'Combodo\\iTop\\Form\\Field\\CheckboxField' => $baseDir . '/sources/Form/Field/CheckboxField.php',
+    'Combodo\\iTop\\Form\\Field\\DateField' => $baseDir . '/sources/Form/Field/DateField.php',
+    'Combodo\\iTop\\Form\\Field\\DateTimeField' => $baseDir . '/sources/Form/Field/DateTimeField.php',
+    'Combodo\\iTop\\Form\\Field\\DurationField' => $baseDir . '/sources/Form/Field/DurationField.php',
+    'Combodo\\iTop\\Form\\Field\\EmailField' => $baseDir . '/sources/Form/Field/EmailField.php',
+    'Combodo\\iTop\\Form\\Field\\Field' => $baseDir . '/sources/Form/Field/Field.php',
+    'Combodo\\iTop\\Form\\Field\\FileUploadField' => $baseDir . '/sources/Form/Field/FileUploadField.php',
+    'Combodo\\iTop\\Form\\Field\\HiddenField' => $baseDir . '/sources/Form/Field/HiddenField.php',
+    'Combodo\\iTop\\Form\\Field\\ImageField' => $baseDir . '/sources/Form/Field/ImageField.php',
+    'Combodo\\iTop\\Form\\Field\\LabelField' => $baseDir . '/sources/Form/Field/LabelField.php',
+    'Combodo\\iTop\\Form\\Field\\LinkedSetField' => $baseDir . '/sources/Form/Field/LinkedSetField.php',
+    'Combodo\\iTop\\Form\\Field\\MultipleChoicesField' => $baseDir . '/sources/Form/Field/MultipleChoicesField.php',
+    'Combodo\\iTop\\Form\\Field\\MultipleSelectField' => $baseDir . '/sources/Form/Field/MultipleSelectField.php',
+    'Combodo\\iTop\\Form\\Field\\PasswordField' => $baseDir . '/sources/Form/Field/PasswordField.php',
+    'Combodo\\iTop\\Form\\Field\\PhoneField' => $baseDir . '/sources/Form/Field/PhoneField.php',
+    'Combodo\\iTop\\Form\\Field\\RadioField' => $baseDir . '/sources/Form/Field/RadioField.php',
+    'Combodo\\iTop\\Form\\Field\\SelectField' => $baseDir . '/sources/Form/Field/SelectField.php',
+    'Combodo\\iTop\\Form\\Field\\SelectObjectField' => $baseDir . '/sources/Form/Field/SelectObjectField.php',
+    'Combodo\\iTop\\Form\\Field\\SetField' => $baseDir . '/sources/Form/Field/SetField.php',
+    'Combodo\\iTop\\Form\\Field\\StringField' => $baseDir . '/sources/Form/Field/StringField.php',
+    'Combodo\\iTop\\Form\\Field\\SubFormField' => $baseDir . '/sources/Form/Field/SubFormField.php',
+    'Combodo\\iTop\\Form\\Field\\TagSetField' => $baseDir . '/sources/Form/Field/TagSetField.php',
+    'Combodo\\iTop\\Form\\Field\\TextAreaField' => $baseDir . '/sources/Form/Field/TextAreaField.php',
+    'Combodo\\iTop\\Form\\Field\\TextField' => $baseDir . '/sources/Form/Field/TextField.php',
+    'Combodo\\iTop\\Form\\Field\\UrlField' => $baseDir . '/sources/Form/Field/UrlField.php',
+    'Combodo\\iTop\\Form\\Form' => $baseDir . '/sources/Form/Form.php',
+    'Combodo\\iTop\\Form\\FormManager' => $baseDir . '/sources/Form/FormManager.php',
+    'Combodo\\iTop\\Form\\Validator\\IntegerValidator' => $baseDir . '/sources/Form/Validator/IntegerValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\MandatoryValidator' => $baseDir . '/sources/Form/Validator/MandatoryValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => $baseDir . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
+    'Combodo\\iTop\\Form\\Validator\\Validator' => $baseDir . '/sources/Form/Validator/Validator.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => $baseDir . '/sources/Renderer/Bootstrap/BsFormRenderer.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsFieldRenderer.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFileUploadFieldRenderer' => $baseDir . '/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php',

lib/composer/autoload_static.php

@@ -383,6 +383,39 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php',
         'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
         'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
+        'Combodo\\iTop\\Form\\Field\\BlobField' => __DIR__ . '/../..' . '/sources/Form/Field/BlobField.php',
+        'Combodo\\iTop\\Form\\Field\\CaseLogField' => __DIR__ . '/../..' . '/sources/Form/Field/CaseLogField.php',
+        'Combodo\\iTop\\Form\\Field\\CheckboxField' => __DIR__ . '/../..' . '/sources/Form/Field/CheckboxField.php',
+        'Combodo\\iTop\\Form\\Field\\DateField' => __DIR__ . '/../..' . '/sources/Form/Field/DateField.php',
+        'Combodo\\iTop\\Form\\Field\\DateTimeField' => __DIR__ . '/../..' . '/sources/Form/Field/DateTimeField.php',
+        'Combodo\\iTop\\Form\\Field\\DurationField' => __DIR__ . '/../..' . '/sources/Form/Field/DurationField.php',
+        'Combodo\\iTop\\Form\\Field\\EmailField' => __DIR__ . '/../..' . '/sources/Form/Field/EmailField.php',
+        'Combodo\\iTop\\Form\\Field\\Field' => __DIR__ . '/../..' . '/sources/Form/Field/Field.php',
+        'Combodo\\iTop\\Form\\Field\\FileUploadField' => __DIR__ . '/../..' . '/sources/Form/Field/FileUploadField.php',
+        'Combodo\\iTop\\Form\\Field\\HiddenField' => __DIR__ . '/../..' . '/sources/Form/Field/HiddenField.php',
+        'Combodo\\iTop\\Form\\Field\\ImageField' => __DIR__ . '/../..' . '/sources/Form/Field/ImageField.php',
+        'Combodo\\iTop\\Form\\Field\\LabelField' => __DIR__ . '/../..' . '/sources/Form/Field/LabelField.php',
+        'Combodo\\iTop\\Form\\Field\\LinkedSetField' => __DIR__ . '/../..' . '/sources/Form/Field/LinkedSetField.php',
+        'Combodo\\iTop\\Form\\Field\\MultipleChoicesField' => __DIR__ . '/../..' . '/sources/Form/Field/MultipleChoicesField.php',
+        'Combodo\\iTop\\Form\\Field\\MultipleSelectField' => __DIR__ . '/../..' . '/sources/Form/Field/MultipleSelectField.php',
+        'Combodo\\iTop\\Form\\Field\\PasswordField' => __DIR__ . '/../..' . '/sources/Form/Field/PasswordField.php',
+        'Combodo\\iTop\\Form\\Field\\PhoneField' => __DIR__ . '/../..' . '/sources/Form/Field/PhoneField.php',
+        'Combodo\\iTop\\Form\\Field\\RadioField' => __DIR__ . '/../..' . '/sources/Form/Field/RadioField.php',
+        'Combodo\\iTop\\Form\\Field\\SelectField' => __DIR__ . '/../..' . '/sources/Form/Field/SelectField.php',
+        'Combodo\\iTop\\Form\\Field\\SelectObjectField' => __DIR__ . '/../..' . '/sources/Form/Field/SelectObjectField.php',
+        'Combodo\\iTop\\Form\\Field\\SetField' => __DIR__ . '/../..' . '/sources/Form/Field/SetField.php',
+        'Combodo\\iTop\\Form\\Field\\StringField' => __DIR__ . '/../..' . '/sources/Form/Field/StringField.php',
+        'Combodo\\iTop\\Form\\Field\\SubFormField' => __DIR__ . '/../..' . '/sources/Form/Field/SubFormField.php',
+        'Combodo\\iTop\\Form\\Field\\TagSetField' => __DIR__ . '/../..' . '/sources/Form/Field/TagSetField.php',
+        'Combodo\\iTop\\Form\\Field\\TextAreaField' => __DIR__ . '/../..' . '/sources/Form/Field/TextAreaField.php',
+        'Combodo\\iTop\\Form\\Field\\TextField' => __DIR__ . '/../..' . '/sources/Form/Field/TextField.php',
+        'Combodo\\iTop\\Form\\Field\\UrlField' => __DIR__ . '/../..' . '/sources/Form/Field/UrlField.php',
+        'Combodo\\iTop\\Form\\Form' => __DIR__ . '/../..' . '/sources/Form/Form.php',
+        'Combodo\\iTop\\Form\\FormManager' => __DIR__ . '/../..' . '/sources/Form/FormManager.php',
+        'Combodo\\iTop\\Form\\Validator\\IntegerValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/IntegerValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\MandatoryValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/MandatoryValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
+        'Combodo\\iTop\\Form\\Validator\\Validator' => __DIR__ . '/../..' . '/sources/Form/Validator/Validator.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFormRenderer.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsFieldRenderer.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\BsFileUploadFieldRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/FieldRenderer/BsFileUploadFieldRenderer.php',

sources/autoload.php

@@ -1,55 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2019 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 is a "manual autoloader" for now that is meant to evolve into a real autoloader.
- */
-require_once APPROOT . 'sources/form/form.class.inc.php';
-require_once APPROOT . 'sources/form/formmanager.class.inc.php';
-require_once APPROOT . 'sources/form/field/field.class.inc.php';
-require_once APPROOT . 'sources/form/field/fileuploadfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/blobfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/imagefield.class.inc.php';
-require_once APPROOT . 'sources/form/field/subformfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/textfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/hiddenfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/labelfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/stringfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/urlfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/emailfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/phonefield.class.inc.php';
-require_once APPROOT . 'sources/form/field/passwordfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/datetimefield.class.inc.php';
-require_once APPROOT . 'sources/form/field/durationfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/textareafield.class.inc.php';
-require_once APPROOT . 'sources/form/field/caselogfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/multiplechoicesfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/selectfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/multipleselectfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/selectobjectfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/checkboxfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/radiofield.class.inc.php';
-require_once APPROOT . 'sources/form/field/setfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/tagsetfield.class.inc.php';
-require_once APPROOT . 'sources/form/field/linkedsetfield.class.inc.php';
-require_once APPROOT . 'sources/form/validator/validator.class.inc.php';
-require_once APPROOT . 'sources/form/validator/mandatoryvalidator.class.inc.php';
-require_once APPROOT . 'sources/form/validator/integervalidator.class.inc.php';
-require_once APPROOT . 'sources/form/validator/notemptyextkeyvalidator.class.inc.php';