From be99a7c02da23c891649e761f496b8c88017c870 Mon Sep 17 00:00:00 2001 From: Benjamin Dalsass <95754414+bdalsass@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:31:36 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B07059=20-=20Symfony=206.4=20-=20Applicati?= =?UTF-8?q?on=20skeleton=20-=20sources=20registration=20(#588)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We configure global sources directory in symfony configuration file except the directory Application/WebPage (potential impacts) --- app.php | 2 +- application/cmdbabstract.class.inc.php | 2 +- core/csvbulkexport.class.inc.php | 2 +- core/pdfbulkexport.class.inc.php | 2 +- lib/composer/autoload_classmap.php | 18 +++++++++--------- lib/composer/autoload_static.php | 18 +++++++++--------- lib/composer/installed.php | 4 ++-- pages/ajax.csvimport.php | 2 +- pages/csvimport.php | 2 +- pages/preferences.php | 2 +- .../UI/Base/Component/DataTable/DataTable.php | 2 +- .../DataTableConfig/DataTableConfig.php | 2 ++ .../Component/GlobalSearch/GlobalSearch.php | 2 +- .../Input/Select/SelectUIBlockFactory.php | 2 +- .../Base/Component/QuickCreate/QuickCreate.php | 2 +- .../ActivityPanel/ActivityPanelFactory.php | 2 +- .../CaseLogEntryFormFactory.php | 2 +- .../Layout/NavigationMenu/NavigationMenu.php | 2 +- .../UI/Base/Layout/Object/ObjectDetails.php | 2 +- .../Application/UI/Hook/iKeyboardShortcut.php | 2 ++ ...y.php => BlockLinkSetDisplayAsProperty.php} | 0 ...ckFactory.php => LinkSetUIBlockFactory.php} | 0 .../Smtp/{SmtpOAuthLogin.php => Oauth.php} | 3 ++- sources/Core/Email/EmailFactory.php | 2 +- sources/Core/Email/EmailLaminas.php | 14 ++++++++++++-- sources/Kernel.php | 2 +- .../ConsoleSelectObjectFieldRenderer.php | 2 +- .../ConsoleSimpleFieldRenderer.php | 2 +- symfony/config/services.yaml | 9 ++++----- webservices/export-v2.php | 2 +- 30 files changed, 62 insertions(+), 48 deletions(-) rename sources/Application/UI/Links/Set/{BlockLinksSetDisplayAsProperty.php => BlockLinkSetDisplayAsProperty.php} (100%) rename sources/Application/UI/Links/Set/{LinksSetUIBlockFactory.php => LinkSetUIBlockFactory.php} (100%) rename sources/Core/Authentication/Client/Smtp/{SmtpOAuthLogin.php => Oauth.php} (97%) diff --git a/app.php b/app.php index 6127fbdcb..25be8e90d 100644 --- a/app.php +++ b/app.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -use App\Kernel; +use Combodo\iTop\Kernel; require_once __DIR__.'/lib/autoload_runtime.php'; diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 362b71d23..bb6f0356c 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -26,7 +26,7 @@ use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\Html\HtmlFactory; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenu; use Combodo\iTop\Application\UI\Base\Component\PopoverMenu\PopoverMenuItem\JsPopoverMenuItem; diff --git a/core/csvbulkexport.class.inc.php b/core/csvbulkexport.class.inc.php index 4eed34bd5..7d04173b1 100644 --- a/core/csvbulkexport.class.inc.php +++ b/core/csvbulkexport.class.inc.php @@ -8,7 +8,7 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; diff --git a/core/pdfbulkexport.class.inc.php b/core/pdfbulkexport.class.inc.php index bcba0c6b7..75ac4529a 100644 --- a/core/pdfbulkexport.class.inc.php +++ b/core/pdfbulkexport.class.inc.php @@ -8,7 +8,7 @@ use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory; use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory; diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 8e2464f25..9a8fd95cb 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -20,7 +20,6 @@ return array( 'ActionNotification' => $baseDir . '/core/action.class.inc.php', 'AjaxPage' => $baseDir . '/sources/Application/WebPage/AjaxPage.php', 'ApcService' => $baseDir . '/core/apc-service.class.inc.php', - 'App\\Kernel' => $baseDir . '/sources/Kernel.php', 'ApplicationContext' => $baseDir . '/application/applicationcontext.class.inc.php', 'ApplicationException' => $baseDir . '/application/exceptions/ApplicationException.php', 'ApplicationMenu' => $baseDir . '/application/menunode.class.inc.php', @@ -231,6 +230,7 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletHeaderStatic' => $baseDir . '/sources/Application/UI/Base/Component/Dashlet/DashletHeaderStatic.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletPlainText' => $baseDir . '/sources/Application/UI/Base/Component/Dashlet/DashletPlainText.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTable' => $baseDir . '/sources/Application/UI/Base/Component/DataTable/DataTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableConfig\\DataTableConfig' => $baseDir . '/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableSettings' => $baseDir . '/sources/Application/UI/Base/Component/DataTable/DataTableSettings.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\StaticTable\\FormTableRow\\FormTableRow' => $baseDir . '/sources/Application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php', @@ -257,10 +257,10 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/Input/InputUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputWithLabel' => $baseDir . '/sources/Application/UI/Base/Component/Input/InputWithLabel.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\RichText\\RichText' => $baseDir . '/sources/Application/UI/Base/Component/Input/RichText/RichText.php', - 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\SelectUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/Input/Select/SelectUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\Select' => $baseDir . '/sources/Application/UI/Base/Component/Input/Select/Select.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectOption' => $baseDir . '/sources/Application/UI/Base/Component/Input/Select/SelectOption.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectOptionUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/Input/Select/SelectOptionUIBlockFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectUIBlockFactory' => $baseDir . '/sources/Application/UI/Base/Component/Input/Select/SelectUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Set\\DataProvider\\AbstractDataProvider' => $baseDir . '/sources/Application/UI/Base/Component/Input/Set/DataProvider/AbstractDataProvider.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Set\\DataProvider\\AjaxDataProvider' => $baseDir . '/sources/Application/UI/Base/Component/Input/Set/DataProvider/AjaxDataProvider.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Set\\DataProvider\\AjaxDataProviderForOQL' => $baseDir . '/sources/Application/UI/Base/Component/Input/Set/DataProvider/AjaxDataProviderForOql.php', @@ -321,8 +321,8 @@ return array( 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelFactory' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelHelper' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelPrint' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelPrint.php', - 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryFormFactory\\CaseLogEntryFormFactory' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryForm' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryFormFactory' => $baseDir . '/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardColumn' => $baseDir . '/sources/Application/UI/Base/Layout/Dashboard/DashboardColumn.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardLayout' => $baseDir . '/sources/Application/UI/Base/Layout/Dashboard/DashboardLayout.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => $baseDir . '/sources/Application/UI/Base/Layout/Dashboard/DashboardRow.php', @@ -359,14 +359,15 @@ return array( 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockCsv\\BlockCsv' => $baseDir . '/sources/Application/UI/DisplayBlock/BlockCsv/BlockCsv.php', 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockList\\BlockList' => $baseDir . '/sources/Application/UI/DisplayBlock/BlockList/BlockList.php', 'Combodo\\iTop\\Application\\UI\\Helper\\UIHelper' => $baseDir . '/sources/Application/UI/Helper/UIHelper.php', + 'Combodo\\iTop\\Application\\UI\\Hook\\iKeyboardShortcut' => $baseDir . '/sources/Application/UI/Hook/iKeyboardShortcut.php', 'Combodo\\iTop\\Application\\UI\\Links\\AbstractBlockLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetEditTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetEditTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetEditTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockObjectPickerDialog.php', - 'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => $baseDir . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php', - 'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php', + 'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => $baseDir . '/sources/Application/UI/Links/Set/BlockLinkSetDisplayAsProperty.php', + 'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinkSetUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => $baseDir . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php', 'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => $baseDir . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php', 'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php', @@ -385,8 +386,10 @@ return array( 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAzure' => $baseDir . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAzure.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderFactory' => $baseDir . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderFactory.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderGoogle' => $baseDir . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderGoogle.php', + 'Combodo\\iTop\\Core\\Authentication\\Client\\Smtp\\Oauth' => $baseDir . '/sources/Core/Authentication/Client/Smtp/Oauth.php', 'Combodo\\iTop\\Core\\CMDBChange\\CMDBChangeOrigin' => $baseDir . '/sources/Core/CMDBChange/CMDBChangeOrigin.php', 'Combodo\\iTop\\Core\\DbConnectionWrapper' => $baseDir . '/core/DbConnectionWrapper.php', + 'Combodo\\iTop\\Core\\Email\\EMailLaminas' => $baseDir . '/sources/Core/Email/EmailLaminas.php', 'Combodo\\iTop\\Core\\Email\\EmailFactory' => $baseDir . '/sources/Core/Email/EmailFactory.php', 'Combodo\\iTop\\Core\\Email\\iEMail' => $baseDir . '/sources/Core/Email/iEMail.php', 'Combodo\\iTop\\Core\\EventListener\\AttributeBlobEventListener' => $baseDir . '/sources/Core/EventListener/AttributeBlobEventListener.php', @@ -436,6 +439,7 @@ return array( 'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => $baseDir . '/sources/Form/Validator/NotEmptyExtKeyValidator.php', 'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => $baseDir . '/sources/Form/Validator/SelectObjectValidator.php', 'Combodo\\iTop\\Form\\Validator\\Validator' => $baseDir . '/sources/Form/Validator/Validator.php', + 'Combodo\\iTop\\Kernel' => $baseDir . '/sources/Kernel.php', 'Combodo\\iTop\\Renderer\\BlockRenderer' => $baseDir . '/sources/Renderer/BlockRenderer.php', 'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => $baseDir . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php', 'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => $baseDir . '/sources/Renderer/Bootstrap/BsFormRenderer.php', @@ -531,7 +535,6 @@ return array( 'DashletProxy' => $baseDir . '/application/dashlet.class.inc.php', 'DashletUnknown' => $baseDir . '/application/dashlet.class.inc.php', 'DataTable' => $baseDir . '/application/datatable.class.inc.php', - 'DataTableConfig' => $baseDir . '/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Datamatrix' => $vendorDir . '/combodo/tcpdf/include/barcodes/datamatrix.php', 'DateError' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateError.php', 'DateException' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/DateException.php', @@ -579,7 +582,6 @@ return array( 'DisplayableRedundancyNode' => $baseDir . '/core/displayablegraph.class.inc.php', 'DownloadPage' => $baseDir . '/sources/Application/WebPage/DownloadPage.php', 'EMail' => $baseDir . '/core/email.class.inc.php', - 'EMailLaminas' => $baseDir . '/sources/Core/Email/EmailLaminas.php', 'ErrorPage' => $baseDir . '/sources/Application/WebPage/ErrorPage.php', 'Event' => $baseDir . '/core/event.class.inc.php', 'EventIssue' => $baseDir . '/core/event.class.inc.php', @@ -806,7 +808,6 @@ return array( 'Laminas\\Mail\\Protocol\\SmtpPluginManagerFactory' => $vendorDir . '/laminas/laminas-mail/src/Protocol/SmtpPluginManagerFactory.php', 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Crammd5' => $vendorDir . '/laminas/laminas-mail/src/Protocol/Smtp/Auth/Crammd5.php', 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Login' => $vendorDir . '/laminas/laminas-mail/src/Protocol/Smtp/Auth/Login.php', - 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Oauth' => $baseDir . '/sources/Core/Authentication/Client/Smtp/SmtpOAuthLogin.php', 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Plain' => $vendorDir . '/laminas/laminas-mail/src/Protocol/Smtp/Auth/Plain.php', 'Laminas\\Mail\\Storage' => $vendorDir . '/laminas/laminas-mail/src/Storage.php', 'Laminas\\Mail\\Storage\\AbstractStorage' => $vendorDir . '/laminas/laminas-mail/src/Storage/AbstractStorage.php', @@ -3101,7 +3102,6 @@ return array( 'iDisplay' => $baseDir . '/core/dbobject.class.php', 'iFieldRendererMappingsExtension' => $baseDir . '/application/applicationextension.inc.php', 'iKPILoggerExtension' => $baseDir . '/application/applicationextension.inc.php', - 'iKeyboardShortcut' => $baseDir . '/sources/Application/UI/Hook/iKeyboardShortcut.php', 'iLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php', 'iLoginExtension' => $baseDir . '/application/applicationextension.inc.php', 'iLoginFSMExtension' => $baseDir . '/application/applicationextension.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 79d76a21d..67687b9aa 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -393,7 +393,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'ActionNotification' => __DIR__ . '/../..' . '/core/action.class.inc.php', 'AjaxPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/AjaxPage.php', 'ApcService' => __DIR__ . '/../..' . '/core/apc-service.class.inc.php', - 'App\\Kernel' => __DIR__ . '/../..' . '/sources/Kernel.php', 'ApplicationContext' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php', 'ApplicationException' => __DIR__ . '/../..' . '/application/exceptions/ApplicationException.php', 'ApplicationMenu' => __DIR__ . '/../..' . '/application/menunode.class.inc.php', @@ -604,6 +603,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletHeaderStatic' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Dashlet/DashletHeaderStatic.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Dashlet\\DashletPlainText' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Dashlet/DashletPlainText.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTable' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/DataTable/DataTable.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableConfig\\DataTableConfig' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableSettings' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/DataTable/DataTableSettings.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\DataTableUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\DataTable\\StaticTable\\FormTableRow\\FormTableRow' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/DataTable/StaticTable/FormTableRow/FormTableRow.php', @@ -630,10 +630,10 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/InputUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\InputWithLabel' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/InputWithLabel.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\RichText\\RichText' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/RichText/RichText.php', - 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\SelectUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Select/SelectUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\Select' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Select/Select.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectOption' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Select/SelectOption.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectOptionUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Select/SelectOptionUIBlockFactory.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Select\\SelectUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Select/SelectUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Set\\DataProvider\\AbstractDataProvider' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Set/DataProvider/AbstractDataProvider.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Set\\DataProvider\\AjaxDataProvider' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Set/DataProvider/AjaxDataProvider.php', 'Combodo\\iTop\\Application\\UI\\Base\\Component\\Input\\Set\\DataProvider\\AjaxDataProviderForOQL' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/Input/Set/DataProvider/AjaxDataProviderForOql.php', @@ -694,8 +694,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelHelper' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelHelper.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\ActivityPanelPrint' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanelPrint.php', - 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryFormFactory\\CaseLogEntryFormFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryForm' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryForm.php', + 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\ActivityPanel\\CaseLogEntryForm\\CaseLogEntryFormFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/ActivityPanel/CaseLogEntryForm/CaseLogEntryFormFactory.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardColumn' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Dashboard/DashboardColumn.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardLayout' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Dashboard/DashboardLayout.php', 'Combodo\\iTop\\Application\\UI\\Base\\Layout\\Dashboard\\DashboardRow' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Layout/Dashboard/DashboardRow.php', @@ -732,14 +732,15 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockCsv\\BlockCsv' => __DIR__ . '/../..' . '/sources/Application/UI/DisplayBlock/BlockCsv/BlockCsv.php', 'Combodo\\iTop\\Application\\UI\\DisplayBlock\\BlockList\\BlockList' => __DIR__ . '/../..' . '/sources/Application/UI/DisplayBlock/BlockList/BlockList.php', 'Combodo\\iTop\\Application\\UI\\Helper\\UIHelper' => __DIR__ . '/../..' . '/sources/Application/UI/Helper/UIHelper.php', + 'Combodo\\iTop\\Application\\UI\\Hook\\iKeyboardShortcut' => __DIR__ . '/../..' . '/sources/Application/UI/Hook/iKeyboardShortcut.php', 'Combodo\\iTop\\Application\\UI\\Links\\AbstractBlockLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/AbstractBlockLinkSetViewTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetEditTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php', 'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockObjectPickerDialog.php', - 'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php', - 'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php', + 'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/BlockLinkSetDisplayAsProperty.php', + 'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinkSetUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => __DIR__ . '/../..' . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php', 'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => __DIR__ . '/../..' . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php', 'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php', @@ -758,8 +759,10 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAzure' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAzure.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderFactory' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderFactory.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderGoogle' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderGoogle.php', + 'Combodo\\iTop\\Core\\Authentication\\Client\\Smtp\\Oauth' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/Smtp/Oauth.php', 'Combodo\\iTop\\Core\\CMDBChange\\CMDBChangeOrigin' => __DIR__ . '/../..' . '/sources/Core/CMDBChange/CMDBChangeOrigin.php', 'Combodo\\iTop\\Core\\DbConnectionWrapper' => __DIR__ . '/../..' . '/core/DbConnectionWrapper.php', + 'Combodo\\iTop\\Core\\Email\\EMailLaminas' => __DIR__ . '/../..' . '/sources/Core/Email/EmailLaminas.php', 'Combodo\\iTop\\Core\\Email\\EmailFactory' => __DIR__ . '/../..' . '/sources/Core/Email/EmailFactory.php', 'Combodo\\iTop\\Core\\Email\\iEMail' => __DIR__ . '/../..' . '/sources/Core/Email/iEMail.php', 'Combodo\\iTop\\Core\\EventListener\\AttributeBlobEventListener' => __DIR__ . '/../..' . '/sources/Core/EventListener/AttributeBlobEventListener.php', @@ -809,6 +812,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/NotEmptyExtKeyValidator.php', 'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/SelectObjectValidator.php', 'Combodo\\iTop\\Form\\Validator\\Validator' => __DIR__ . '/../..' . '/sources/Form/Validator/Validator.php', + 'Combodo\\iTop\\Kernel' => __DIR__ . '/../..' . '/sources/Kernel.php', 'Combodo\\iTop\\Renderer\\BlockRenderer' => __DIR__ . '/../..' . '/sources/Renderer/BlockRenderer.php', 'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php', 'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFormRenderer.php', @@ -904,7 +908,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'DashletProxy' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DashletUnknown' => __DIR__ . '/../..' . '/application/dashlet.class.inc.php', 'DataTable' => __DIR__ . '/../..' . '/application/datatable.class.inc.php', - 'DataTableConfig' => __DIR__ . '/../..' . '/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php', 'Datamatrix' => __DIR__ . '/..' . '/combodo/tcpdf/include/barcodes/datamatrix.php', 'DateError' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateError.php', 'DateException' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/DateException.php', @@ -952,7 +955,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'DisplayableRedundancyNode' => __DIR__ . '/../..' . '/core/displayablegraph.class.inc.php', 'DownloadPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/DownloadPage.php', 'EMail' => __DIR__ . '/../..' . '/core/email.class.inc.php', - 'EMailLaminas' => __DIR__ . '/../..' . '/sources/Core/Email/EmailLaminas.php', 'ErrorPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/ErrorPage.php', 'Event' => __DIR__ . '/../..' . '/core/event.class.inc.php', 'EventIssue' => __DIR__ . '/../..' . '/core/event.class.inc.php', @@ -1179,7 +1181,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Laminas\\Mail\\Protocol\\SmtpPluginManagerFactory' => __DIR__ . '/..' . '/laminas/laminas-mail/src/Protocol/SmtpPluginManagerFactory.php', 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Crammd5' => __DIR__ . '/..' . '/laminas/laminas-mail/src/Protocol/Smtp/Auth/Crammd5.php', 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Login' => __DIR__ . '/..' . '/laminas/laminas-mail/src/Protocol/Smtp/Auth/Login.php', - 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Oauth' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/Smtp/SmtpOAuthLogin.php', 'Laminas\\Mail\\Protocol\\Smtp\\Auth\\Plain' => __DIR__ . '/..' . '/laminas/laminas-mail/src/Protocol/Smtp/Auth/Plain.php', 'Laminas\\Mail\\Storage' => __DIR__ . '/..' . '/laminas/laminas-mail/src/Storage.php', 'Laminas\\Mail\\Storage\\AbstractStorage' => __DIR__ . '/..' . '/laminas/laminas-mail/src/Storage/AbstractStorage.php', @@ -3474,7 +3475,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'iDisplay' => __DIR__ . '/../..' . '/core/dbobject.class.php', 'iFieldRendererMappingsExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', 'iKPILoggerExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', - 'iKeyboardShortcut' => __DIR__ . '/../..' . '/sources/Application/UI/Hook/iKeyboardShortcut.php', 'iLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php', 'iLoginExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', 'iLoginFSMExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', diff --git a/lib/composer/installed.php b/lib/composer/installed.php index 0f0acba03..e6d8b37cc 100644 --- a/lib/composer/installed.php +++ b/lib/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'combodo/itop', 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '62d7e10257f88b1de89da257859f8280cab77689', + 'reference' => 'e24ca08fc8e30020d60a75282ccc059fffaf9786', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -22,7 +22,7 @@ 'combodo/itop' => array( 'pretty_version' => 'dev-develop', 'version' => 'dev-develop', - 'reference' => '62d7e10257f88b1de89da257859f8280cab77689', + 'reference' => 'e24ca08fc8e30020d60a75282ccc059fffaf9786', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php index 1d287f43c..ba53a7a6c 100644 --- a/pages/ajax.csvimport.php +++ b/pages/ajax.csvimport.php @@ -8,7 +8,7 @@ use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\TextArea; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Renderer\BlockRenderer; diff --git a/pages/csvimport.php b/pages/csvimport.php index 6d847f8c4..8303549de 100644 --- a/pages/csvimport.php +++ b/pages/csvimport.php @@ -17,7 +17,7 @@ use Combodo\iTop\Application\UI\Base\Component\Input\FileSelect\FileSelectUIBloc use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\Select\Select; use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\TextArea; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; diff --git a/pages/preferences.php b/pages/preferences.php index d8417227b..0b88c4f89 100644 --- a/pages/preferences.php +++ b/pages/preferences.php @@ -10,7 +10,7 @@ use Combodo\iTop\Application\UI\Base\Component\Form\Form; use Combodo\iTop\Application\UI\Base\Component\Html\Html; use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockFactory; -use Combodo\iTop\Application\UI\Base\Component\Input\SelectUIBlockFactory; +use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Panel\Panel; use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory; use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory; diff --git a/sources/Application/UI/Base/Component/DataTable/DataTable.php b/sources/Application/UI/Base/Component/DataTable/DataTable.php index baf99544c..4ad032edd 100644 --- a/sources/Application/UI/Base/Component/DataTable/DataTable.php +++ b/sources/Application/UI/Base/Component/DataTable/DataTable.php @@ -10,7 +10,7 @@ namespace Combodo\iTop\Application\UI\Base\Component\DataTable; use ApplicationContext; use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock; use Combodo\iTop\Application\UI\Base\tJSRefreshCallback; -use DataTableConfig; +use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableConfig\DataTableConfig; /** * Class DataTable diff --git a/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php b/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php index 4dc69984b..849547a1e 100644 --- a/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php +++ b/sources/Application/UI/Base/Component/DataTable/DataTableConfig/DataTableConfig.php @@ -1,5 +1,7 @@