composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-28 04:58:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3567 - Migrate backoffice pages to new UIBlock system : App. upgrade (display twig errors)

Browse Source
This commit is contained in:
Eric
2021-01-19 18:09:58 +01:00
parent 6dd1807fca
commit 392cdf6058
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/application/TwigBase/Twig/TwigHelper.php
View File

@@ -7,6 +7,7 @@
namespace Combodo\iTop\Application\TwigBase\Twig;
use Combodo\iTop\Application\TwigBase\UI\UIBlockExtension;
use Exception;
use IssueLog;
use Twig\Environment;
use Twig_Environment;
@@ -110,21 +111,30 @@ class TwigHelper
* @param array $aParams
* @param string $sName
* @param string $sTemplateFileExtension
* @param bool $bLogMissingFile
*
* @return string
* @throws \Twig\Error\LoaderError
* @throws \Twig\Error\RuntimeError
* @throws \Twig\Error\SyntaxError
* @throws \Exception
*/
public static function RenderTemplate(Environment $oTwig, $aParams, $sName, $sTemplateFileExtension = self::DEFAULT_FILE_TYPE)
public static function RenderTemplate(Environment $oTwig, array $aParams, string $sName, string $sTemplateFileExtension = self::DEFAULT_FILE_TYPE, bool $bLogMissingFile = true): string
{
try {
return $oTwig->render($sName.'.'.$sTemplateFileExtension.'.twig', $aParams);
} catch (Twig_Error $e) {
$sPath = '';
if ($e->getSourceContext()) {
$sPath = utils::LocalPath($e->getSourceContext()->getPath()).' ('.$e->getLine().') - ';
}
$sMessage = $sPath.$e->getMessage();
if (!utils::StartsWith($e->getMessage(), 'Unable to find template')) {
IssueLog::Error($e->getMessage());
} else {
IssueLog::Debug($e->getMessage());
IssueLog::Error($sMessage);
// Todo 3.0 Less violent message
throw new Exception($sMessage);
} elseif ($bLogMissingFile) {
IssueLog::Debug($sMessage);
}
}