Merge branch 'master' into symfony-update

.github/workflows/php.yml

@@ -11,14 +11,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: "7.4"
-            symfony-version: "^4.4"
-          - php-version: "8.0"
-            symfony-version: "^4.4"
-          - php-version: "8.1"
-            symfony-version: "^4.4"
-          - php-version: "8.2"
-            symfony-version: "^4.4"
           - php-version: "7.4"
             symfony-version: "^5.4"
           - php-version: "8.0"

composer.json

@@ -18,20 +18,20 @@
 	"prefer-stable": true,
 	"require": {
 		"php": "^7.4 || ^8.0",
-		"symfony/console": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-		"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-		"symfony/config": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-		"symfony/yaml": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-		"symfony/finder": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-		"symfony/filesystem": "^4.4 || ^5.4 || ^6.4 || ^7.0",
-		"symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.4 || ^7.0",
+		"symfony/console": "^5.4 || ^6.4 || ^7.0",
+		"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
+		"symfony/config": "^5.4 || ^6.4 || ^7.0",
+		"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
+		"symfony/finder": "^5.4 || ^6.4 || ^7.0",
+		"symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+		"symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
 		"helmich/typo3-typoscript-parser": "^2.3",
 		"ext-json": "*"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^9.6.8",
 		"mikey179/vfsstream": "^1.6.11",
-		"vimeo/psalm": "^4.29.0",
+		"vimeo/psalm": "^5.22.2",
 		"phpspec/prophecy-phpunit": "^2.0.2"
 	},
 	"scripts": {

src/Linter/ReportPrinter/CheckstyleReportPrinter.php

@@ -55,7 +55,7 @@ public function writeReport(Report $report): void
 
             foreach ($file->getIssues() as $issue) {
                 $xmlWarning = $xml->createElement('error');
-                $xmlWarning->setAttribute('line', $issue->getLine() ? ((string)$issue->getLine()) : "");
+                $xmlWarning->setAttribute('line', $issue->getLine() !== null ? ((string)$issue->getLine()) : "");
                 $xmlWarning->setAttribute('severity', $issue->getSeverity());
                 $xmlWarning->setAttribute('message', $issue->getMessage());
                 $xmlWarning->setAttribute('source', $issue->getSource());

src/Linter/ReportPrinter/GccReportPrinter.php

@@ -45,8 +45,8 @@ public function writeReport(Report $report): void
                 $this->output->writeLn(sprintf(
                     "%s:%d:%d: %s: %s",
                     $file->getFilename(),
-                    $issue->getLine() ?: 0,
-                    $issue->getColumn() ?: 0,
+                    $issue->getLine() ?? 0,
+                    $issue->getColumn() ?? 0,
                     $issue->getSeverity(),
                     $issue->getMessage()
                 ));