Merge pull request #227 from Icinga/add-php-83

workflows: Add PHP 8.3
Icinga · Nov 20, 2023 · 100c39d · 100c39d
2 parents 4db2dd0 + 8918137
commit 100c39d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
         os: ['ubuntu-latest']
 
     steps:
@@ -60,7 +60,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
         os: ['ubuntu-latest']
 
     steps:

diff --git a/application/controllers/UsageController.php b/application/controllers/UsageController.php
@@ -95,6 +95,7 @@ public function indexAction()
         $this->addControl($searchBar);
 
         $this->handleFormatRequest($targets, function (Query $targets) {
+            /** @var X509Certificate $usage */
             foreach ($targets as $usage) {
                 $usage->valid_from = $usage->valid_from->format('l F jS, Y H:i:s e');
                 $usage->valid_to = $usage->valid_to->format('l F jS, Y H:i:s e');

diff --git a/phpstan-baseline-common.neon b/phpstan-baseline-common.neon
@@ -241,23 +241,8 @@ parameters:
 			path: application/controllers/SniController.php
 
 		-
-			message: "#^Cannot access property \\$chain on mixed\\.$#"
-			count: 4
-			path: application/controllers/UsageController.php
-
-		-
-			message: "#^Cannot access property \\$hostname on mixed\\.$#"
-			count: 1
-			path: application/controllers/UsageController.php
-
-		-
-			message: "#^Cannot access property \\$ip on mixed\\.$#"
-			count: 1
-			path: application/controllers/UsageController.php
-
-		-
-			message: "#^Cannot access property \\$port on mixed\\.$#"
-			count: 1
+			message: "#^Cannot access property \\$target on mixed\\.$#"
+			count: 3
 			path: application/controllers/UsageController.php
 
 		-
@@ -266,20 +251,10 @@ parameters:
 			path: application/controllers/UsageController.php
 
 		-
-			message: "#^Cannot access property \\$valid_from on mixed\\.$#"
-			count: 2
-			path: application/controllers/UsageController.php
-
-		-
-			message: "#^Cannot access property \\$valid_to on mixed\\.$#"
+			message: "#^Cannot call method format\\(\\) on mixed\\.$#"
 			count: 2
 			path: application/controllers/UsageController.php
 
-		-
-			message: "#^Cannot call method getExportableColumns\\(\\) on mixed\\.$#"
-			count: 1
-			path: application/controllers/UsageController.php
-
 		-
 			message: "#^Method Icinga\\\\Module\\\\X509\\\\Controllers\\\\UsageController\\:\\:completeAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -295,11 +270,6 @@ parameters:
 			count: 1
 			path: application/controllers/UsageController.php
 
-		-
-			message: "#^Parameter \\#1 \\$iterator of function iterator_to_array expects Traversable, mixed given\\.$#"
-			count: 1
-			path: application/controllers/UsageController.php
-
 		-
 			message: "#^Parameter \\#1 \\$peekAhead of method ipl\\\\Orm\\\\Query\\:\\:peekAhead\\(\\) expects bool, null given\\.$#"
 			count: 1