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

N°8834 - Add compatibility with PHP 8.4 (#819)

Browse Source 
* N°8834 - Add compatibility with PHP 8.4

* Rollback of scssphp/scssphp version upgrade due to compilation error
This commit is contained in:
Lenaick
2026-02-26 10:36:32 +01:00
committed by GitHub
parent d4821b7edc
commit fc967c06ce
961 changed files with 12298 additions and 7130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/symfony/web-profiler-bundle/Controller/ExceptionPanelController.php
View File

@@ -28,7 +28,7 @@ class ExceptionPanelController
private HtmlErrorRenderer $errorRenderer;
private ?Profiler $profiler;
public function __construct(HtmlErrorRenderer $errorRenderer, Profiler $profiler = null)
public function __construct(HtmlErrorRenderer $errorRenderer, ?Profiler $profiler = null)
{
$this->errorRenderer = $errorRenderer;
$this->profiler = $profiler;

14
lib/symfony/web-profiler-bundle/Controller/ProfilerController.php
View File

@@ -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', [

10
lib/symfony/web-profiler-bundle/Controller/RouterController.php
View File

@@ -40,7 +40,7 @@ class RouterController
*/
private iterable $expressionLanguageProviders;
public function __construct(?Profiler $profiler, Environment $twig, UrlMatcherInterface $matcher = null, RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
public function __construct(?Profiler $profiler, Environment $twig, ?UrlMatcherInterface $matcher = null, ?RouteCollection $routes = null, iterable $expressionLanguageProviders = [])
{
$this->profiler = $profiler;
$this->twig = $twig;
@@ -83,10 +83,10 @@ class RouterController
*/
private function getTraces(RequestDataCollector $request, string $method): array
{
$traceRequest = Request::create(
$request->getPathInfo(),
$request->getRequestServer(true)->get('REQUEST_METHOD'),
\in_array($request->getMethod(), ['DELETE', 'PATCH', 'POST', 'PUT'], true) ? $request->getRequestRequest()->all() : $request->getRequestQuery()->all(),
$traceRequest = new Request(
$request->getRequestQuery()->all(),
$request->getRequestRequest()->all(),
$request->getRequestAttributes()->all(),
$request->getRequestCookies(true)->all(),
[],
$request->getRequestServer(true)->all()