Skip to content

Commit b189ffb

Browse files
eespieeespie
committed
N°8781 - Improve twig base controller render error report
1 parent 5199d56 commit b189ffb

File tree

11 files changed

+213
-131
lines changed

11 files changed

+213
-131
lines changed

‎dictionaries/en.dictionary.itop.ui.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@
506506
'UI:Error:MaintenanceMode' => 'Application is currently in maintenance',
507507
'UI:Error:MaintenanceTitle' => 'Maintenance',
508508
'UI:Error:InvalidToken' => 'Error: the requested operation has already been performed (CSRF token not found)',
509-
'UI:Error:FormController' => 'Internal error in form controller',
509+
'UI:Error:TwigController' => 'Internal error in form controller',
510510

511511
'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP provider %1$s does not exist (email_transport_smtp.oauth.provider)',
512512

‎dictionaries/fr.dictionary.itop.ui.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@
500500
'UI:Error:MaintenanceMode' => 'L\'application est en maintenance',
501501
'UI:Error:MaintenanceTitle' => 'Maintenance',
502502
'UI:Error:InvalidToken' => 'Erreur: l\'opération a déjà été effectuée (CSRF token not found)',
503-
'UI:Error:FormController' => 'Erreur interne',
503+
'UI:Error:TwigController' => 'Erreur interne dans le contrôleur de formulaire',
504504
'UI:Error:SMTP:UnknownVendor' => 'Le provider SMTP OAuth 2.0 %1$s n\'existe pas',
505505
'UI:GroupBy:Count' => 'Nombre',
506506
'UI:GroupBy:Count+' => 'Nombre d\'éléments',

‎lib/composer/autoload_classmap.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@
144144
'Combodo\\iTop\\Application\\Search\\CriterionParser' => $baseDir . '/sources/Application/Search/criterionparser.class.inc.php',
145145
'Combodo\\iTop\\Application\\Search\\SearchForm' => $baseDir . '/sources/Application/Search/searchform.class.inc.php',
146146
'Combodo\\iTop\\Application\\Status\\Status' => $baseDir . '/sources/Application/Status/Status.php',
147-
'Combodo\\iTop\\Application\\Symfony\\Poc\\BaseForm\\BaseFormController' => $baseDir . '/sources/Application/Symfony/Poc/BaseForm/BaseFormController.php',
148-
'Combodo\\iTop\\Application\\Symfony\\Poc\\BaseForm\\BaseFormType' => $baseDir . '/sources/Application/Symfony/Poc/BaseForm/BaseFormType.php',
147+
'Combodo\\iTop\\Application\\TwigBase\\Controller\\AbstractProfilerInterface' => $baseDir . '/sources/Application/TwigBase/Controller/AbstractProfilerInterface.php',
149148
'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => $baseDir . '/sources/Application/TwigBase/Controller/Controller.php',
150149
'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => $baseDir . '/application/exceptions/PageNotFoundException.php',
150+
'Combodo\\iTop\\Application\\TwigBase\\Controller\\iProfilerExtension' => $baseDir . '/sources/Application/TwigBase/Controller/iProfilerExtension.php',
151151
'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => $baseDir . '/sources/Application/TwigBase/Twig/Extension.php',
152152
'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => $baseDir . '/sources/Application/TwigBase/Twig/TwigHelper.php',
153153
'Combodo\\iTop\\Application\\TwigBase\\UI\\UIBlockExtension' => $baseDir . '/sources/Application/TwigBase/UI/UIBlockExtension.php',
@@ -2414,13 +2414,6 @@
24142414
'Symfony\\Component\\Form\\SubmitButton' => $vendorDir . '/symfony/form/SubmitButton.php',
24152415
'Symfony\\Component\\Form\\SubmitButtonBuilder' => $vendorDir . '/symfony/form/SubmitButtonBuilder.php',
24162416
'Symfony\\Component\\Form\\SubmitButtonTypeInterface' => $vendorDir . '/symfony/form/SubmitButtonTypeInterface.php',
2417-
'Symfony\\Component\\Form\\Test\\FormBuilderInterface' => $vendorDir . '/symfony/form/Test/FormBuilderInterface.php',
2418-
'Symfony\\Component\\Form\\Test\\FormIntegrationTestCase' => $vendorDir . '/symfony/form/Test/FormIntegrationTestCase.php',
2419-
'Symfony\\Component\\Form\\Test\\FormInterface' => $vendorDir . '/symfony/form/Test/FormInterface.php',
2420-
'Symfony\\Component\\Form\\Test\\FormPerformanceTestCase' => $vendorDir . '/symfony/form/Test/FormPerformanceTestCase.php',
2421-
'Symfony\\Component\\Form\\Test\\Traits\\RunTestTrait' => $vendorDir . '/symfony/form/Test/Traits/RunTestTrait.php',
2422-
'Symfony\\Component\\Form\\Test\\Traits\\ValidatorExtensionTrait' => $vendorDir . '/symfony/form/Test/Traits/ValidatorExtensionTrait.php',
2423-
'Symfony\\Component\\Form\\Test\\TypeTestCase' => $vendorDir . '/symfony/form/Test/TypeTestCase.php',
24242417
'Symfony\\Component\\Form\\Util\\FormUtil' => $vendorDir . '/symfony/form/Util/FormUtil.php',
24252418
'Symfony\\Component\\Form\\Util\\InheritDataAwareIterator' => $vendorDir . '/symfony/form/Util/InheritDataAwareIterator.php',
24262419
'Symfony\\Component\\Form\\Util\\OptionsResolverWrapper' => $vendorDir . '/symfony/form/Util/OptionsResolverWrapper.php',
@@ -3616,5 +3609,5 @@
36163609
'privUITransactionFile' => $baseDir . '/application/transaction.class.inc.php',
36173610
'privUITransactionSession' => $baseDir . '/application/transaction.class.inc.php',
36183611
'utils' => $baseDir . '/application/utils.inc.php',
3619-
'©' => $vendorDir . '/symfony/cache/Traits/ValueWrapper.php',
3612+
'�' => $vendorDir . '/symfony/cache/Traits/ValueWrapper.php',
36203613
);

‎lib/composer/autoload_static.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,10 +525,10 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
525525
'Combodo\\iTop\\Application\\Search\\CriterionParser' => __DIR__ . '/../..' . '/sources/Application/Search/criterionparser.class.inc.php',
526526
'Combodo\\iTop\\Application\\Search\\SearchForm' => __DIR__ . '/../..' . '/sources/Application/Search/searchform.class.inc.php',
527527
'Combodo\\iTop\\Application\\Status\\Status' => __DIR__ . '/../..' . '/sources/Application/Status/Status.php',
528-
'Combodo\\iTop\\Application\\Symfony\\Poc\\BaseForm\\BaseFormController' => __DIR__ . '/../..' . '/sources/Application/Symfony/Poc/BaseForm/BaseFormController.php',
529-
'Combodo\\iTop\\Application\\Symfony\\Poc\\BaseForm\\BaseFormType' => __DIR__ . '/../..' . '/sources/Application/Symfony/Poc/BaseForm/BaseFormType.php',
528+
'Combodo\\iTop\\Application\\TwigBase\\Controller\\AbstractProfilerExtension' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Controller/AbstractProfilerExtension.php',
530529
'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Controller/Controller.php',
531530
'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => __DIR__ . '/../..' . '/application/exceptions/PageNotFoundException.php',
531+
'Combodo\\iTop\\Application\\TwigBase\\Controller\\iProfilerExtension' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Controller/iProfilerExtension.php',
532532
'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Twig/Extension.php',
533533
'Combodo\\iTop\\Application\\TwigBase\\Twig\\TwigHelper' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Twig/TwigHelper.php',
534534
'Combodo\\iTop\\Application\\TwigBase\\UI\\UIBlockExtension' => __DIR__ . '/../..' . '/sources/Application/TwigBase/UI/UIBlockExtension.php',
@@ -3990,7 +3990,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
39903990
'privUITransactionFile' => __DIR__ . '/../..' . '/application/transaction.class.inc.php',
39913991
'privUITransactionSession' => __DIR__ . '/../..' . '/application/transaction.class.inc.php',
39923992
'utils' => __DIR__ . '/../..' . '/application/utils.inc.php',
3993-
'©' => __DIR__ . '/..' . '/symfony/cache/Traits/ValueWrapper.php',
3993+
'�' => __DIR__ . '/..' . '/symfony/cache/Traits/ValueWrapper.php',
39943994
);
39953995

39963996
public static function getInitializer(ClassLoader $loader)

‎sources/Application/TwigBase/Controller/AbstractProfilerExtension.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
/*
3+
* @copyright Copyright (C) 2010-2025 Combodo SARL
4+
* @license http://opensource.org/licenses/AGPL-3.0
5+
*/
6+
7+
namespace Combodo\iTop\Application\TwigBase\Controller;
8+
9+
10+
abstract class AbstractProfilerExtension implements iProfilerExtension
11+
{
12+
public function Init()
13+
{
14+
}
15+
16+
public abstract function GetTemplatesPath(): null|string|array;
17+
18+
public abstract function IsEnabled(): bool;
19+
20+
public abstract function GetDebugTemplate(): string;
21+
22+
public abstract function GetDebugParams(array $aParams): array;
23+
24+
public function GetLinkedScripts(): ?array
25+
{
26+
return null;
27+
}
28+
29+
public function GetLinkedStylesheets(): ?array
30+
{
31+
return null;
32+
}
33+
34+
public function GetSaas(): null|array
35+
{
36+
return null;
37+
}
38+
}

0 commit comments

Comments
 (0)