Merge branch 'master' into master

benjaminkott · Jun 25, 2024 · 1570898 · 1570898
2 parents 1a0d41e + 9ea91d3
commit 1570898
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Build/phpstan.neon b/Build/phpstan.neon
@@ -7,10 +7,10 @@ includes:
 
 parameters:
 	level: 8
-	checkMissingIterableValueType: false
 	reportUnmatchedIgnoredErrors: false
 
 	ignoreErrors:
+		- identifier: missingType.iterableValue
 		- "#Casting to string something that's already string.#"
 		- "#^Call to an undefined method TYPO3Fluid\\\\Fluid\\\\Core\\\\Rendering\\\\RenderingContextInterface\\:\\:getRequest\\(\\)\\.$#"
 

diff --git a/Classes/Backend/ToolbarItem/VersionToolbarItem.php b/Classes/Backend/ToolbarItem/VersionToolbarItem.php
@@ -41,12 +41,12 @@ public function addVersionInformation(SystemInformationToolbarItem $systemInform
             if ((int)$returnCode === 0) {
                 $currentDir = (string) getcwd();
                 chdir($extensionDirectory);
-                $tag = trim(CommandUtility::exec('git tag -l --points-at HEAD'));
+                $tag = trim((string) CommandUtility::exec('git tag -l --points-at HEAD'));
                 if ($tag !== '') {
                     $value = $tag;
                 } else {
-                    $branch = trim(CommandUtility::exec('git rev-parse --abbrev-ref HEAD'));
-                    $revision = trim(CommandUtility::exec('git rev-parse --short HEAD'));
+                    $branch = trim((string) CommandUtility::exec('git rev-parse --abbrev-ref HEAD'));
+                    $revision = trim((string) CommandUtility::exec('git rev-parse --short HEAD'));
                     $value = $branch . ', ' . $revision;
                 }
                 chdir($currentDir);