From 9cbec075ebe8087aaf644115f3f553f3120b7892 Mon Sep 17 00:00:00 2001
From: Daniel Goerz <daniel.goerz@posteo.de>
Date: Tue, 27 Apr 2021 19:46:20 +0200
Subject: [PATCH] [BUGFIX] Prevent calling isFileValid with null
Resolves: #93997
Releases: master
Change-Id: Idf0591125371cc25f53b8c9cc178a5c595c7be2d
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/68887
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
phpstan.neon | 4 ----
typo3/sysext/core/Classes/Controller/FileDumpController.php | 3 +--
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/phpstan.neon b/phpstan.neon
index 1b30a45210d0..601521d20152 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -246,10 +246,6 @@ parameters:
message: "#^Parameter \\#1 \\$manifest of method TYPO3\\\\CMS\\\\Core\\\\Core\\\\ClassLoadingInformationGenerator\\:\\:getAutoloadSectionFromManifest\\(\\) expects stdClass, object given\\.$#"
count: 2
path: typo3/sysext/core/Classes/Core/ClassLoadingInformationGenerator.php
- -
- message: "#^Parameter \\#1 \\$file of method TYPO3\\\\CMS\\\\Core\\\\Controller\\\\FileDumpController\\:\\:isFileValid\\(\\) expects TYPO3\\\\CMS\\\\Core\\\\Resource\\\\FileInterface, TYPO3\\\\CMS\\\\Core\\\\Resource\\\\File\\|null given\\.$#"
- count: 1
- path: typo3/sysext/core/Classes/Controller/FileDumpController.php
-
message: "#^Parameter \\#2 \\$callback of function array_walk expects callable\\(\\)\\: mixed, array\\(\\$this\\(TYPO3\\\\CMS\\\\Core\\\\Cache\\\\Backend\\\\AbstractBackend\\), 'flushByTag'\\) given\\.$#"
count: 1
diff --git a/typo3/sysext/core/Classes/Controller/FileDumpController.php b/typo3/sysext/core/Classes/Controller/FileDumpController.php
index 4b5026ad4b6a..fedfd0091aec 100644
--- a/typo3/sysext/core/Classes/Controller/FileDumpController.php
+++ b/typo3/sysext/core/Classes/Controller/FileDumpController.php
@@ -182,8 +182,7 @@ class FileDumpController
$file = $this->resourceFactory->getFileObject($parameters['f']);
if ($file->isDeleted() || $file->isMissing()) {
$file = null;
- }
- if (!$this->isFileValid($file)) {
+ } elseif (!$this->isFileValid($file)) {
$file = null;
}
} catch (\Exception $e) {
--
GitLab