mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-27 04:28:44 +02:00
N°8834 - Add compatibility with PHP 8.4 (#819)
* N°8834 - Add compatibility with PHP 8.4 * Rollback of scssphp/scssphp version upgrade due to compilation error
This commit is contained in:
@@ -41,7 +41,7 @@ class ProfilerController
|
||||
private ?ContentSecurityPolicyHandler $cspHandler;
|
||||
private ?string $baseDir;
|
||||
|
||||
public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ContentSecurityPolicyHandler $cspHandler = null, string $baseDir = null)
|
||||
public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ?ContentSecurityPolicyHandler $cspHandler = null, ?string $baseDir = null)
|
||||
{
|
||||
$this->generator = $generator;
|
||||
$this->profiler = $profiler;
|
||||
@@ -105,7 +105,7 @@ class ProfilerController
|
||||
}
|
||||
|
||||
if (!$profile->hasCollector($panel)) {
|
||||
throw new NotFoundHttpException(sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
|
||||
throw new NotFoundHttpException(\sprintf('Panel "%s" is not available for token "%s".', $panel, $token));
|
||||
}
|
||||
|
||||
return $this->renderWithCspNonces($request, $this->getTemplateManager()->getName($profile, $panel), [
|
||||
@@ -127,7 +127,7 @@ class ProfilerController
|
||||
*
|
||||
* @throws NotFoundHttpException
|
||||
*/
|
||||
public function toolbarAction(Request $request, string $token = null): Response
|
||||
public function toolbarAction(Request $request, ?string $token = null): Response
|
||||
{
|
||||
if (null === $this->profiler) {
|
||||
throw new NotFoundHttpException('The profiler must be enabled.');
|
||||
@@ -180,7 +180,7 @@ class ProfilerController
|
||||
$this->cspHandler?->disableCsp();
|
||||
|
||||
$session = null;
|
||||
if ($request->attributes->getBoolean('_stateless') && $request->hasSession()) {
|
||||
if (!$request->attributes->getBoolean('_stateless') && $request->hasSession()) {
|
||||
$session = $request->getSession();
|
||||
}
|
||||
|
||||
@@ -343,12 +343,12 @@ class ProfilerController
|
||||
{
|
||||
$this->denyAccessIfProfilerDisabled();
|
||||
if ('JetBrainsMono' !== $fontName) {
|
||||
throw new NotFoundHttpException(sprintf('Font file "%s.woff2" not found.', $fontName));
|
||||
throw new NotFoundHttpException(\sprintf('Font file "%s.woff2" not found.', $fontName));
|
||||
}
|
||||
|
||||
$fontFile = \dirname(__DIR__).'/Resources/fonts/'.$fontName.'.woff2';
|
||||
if (!is_file($fontFile) || !is_readable($fontFile)) {
|
||||
throw new NotFoundHttpException(sprintf('Cannot read font file "%s".', $fontFile));
|
||||
throw new NotFoundHttpException(\sprintf('Cannot read font file "%s".', $fontFile));
|
||||
}
|
||||
|
||||
$this->profiler?->disable();
|
||||
@@ -375,7 +375,7 @@ class ProfilerController
|
||||
$filename = $this->baseDir.\DIRECTORY_SEPARATOR.$file;
|
||||
|
||||
if (preg_match("'(^|[/\\\\])\.'", $file) || !is_readable($filename)) {
|
||||
throw new NotFoundHttpException(sprintf('The file "%s" cannot be opened.', $file));
|
||||
throw new NotFoundHttpException(\sprintf('The file "%s" cannot be opened.', $file));
|
||||
}
|
||||
|
||||
return $this->renderWithCspNonces($request, '@WebProfiler/Profiler/open.html.twig', [
|
||||
|
||||
Reference in New Issue
Block a user