diff --git a/build/phpstan/phpstan-baseline.neon b/build/phpstan/phpstan-baseline.neon
index 0cc40cf71d2..014b1ef249e 100644
--- a/build/phpstan/phpstan-baseline.neon
+++ b/build/phpstan/phpstan-baseline.neon
@@ -28332,12 +28332,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/public/bookcal/index.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 9
-			path: ../../htdocs/public/clicktodial/cidlookup.php
-
 		-
 			message: '#^Variable \$langs might not be defined\.$#'
 			identifier: variable.undefined
@@ -28350,12 +28344,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/public/cron/cron_run_jobs_by_url.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 5
-			path: ../../htdocs/public/cron/cron_run_jobs_by_url.php
-
 		-
 			message: '#^Comparison operation "\>\=" between ''0''\|''1'' and 0 is always true\.$#'
 			identifier: greaterOrEqual.alwaysTrue
@@ -28380,30 +28368,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/public/demo/index.php
 
-		-
-			message: '#^Variable \$conf might not be defined\.$#'
-			identifier: variable.undefined
-			count: 21
-			path: ../../htdocs/public/demo/index.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 2
-			path: ../../htdocs/public/demo/index.php
-
-		-
-			message: '#^Variable \$hookmanager might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: ../../htdocs/public/demo/index.php
-
-		-
-			message: '#^Variable \$langs might not be defined\.$#'
-			identifier: variable.undefined
-			count: 8
-			path: ../../htdocs/public/demo/index.php
-
 		-
 			message: '#^Variable \$conf might not be defined\.$#'
 			identifier: variable.undefined
@@ -28428,18 +28392,6 @@ parameters:
 			count: 7
 			path: ../../htdocs/public/donations/donateurs_code.php
 
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 9
-			path: ../../htdocs/public/emailing/mailing-read.php
-
-		-
-			message: '#^Variable \$db might not be defined\.$#'
-			identifier: variable.undefined
-			count: 12
-			path: ../../htdocs/public/emailing/mailing-unsubscribe.php
-
 		-
 			message: '#^Call to function is_numeric\(\) with int will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
@@ -28530,12 +28482,6 @@ parameters:
 			count: 2
 			path: ../../htdocs/public/fichinter/agendaexport.php
 
-		-
-			message: '#^Call to function is_numeric\(\) with int will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../htdocs/public/members/new.php
-
 		-
 			message: '#^Call to preg_quote\(\) is missing delimiter / to be effective\.$#'
 			identifier: argument.invalidPregQuote
@@ -28554,12 +28500,6 @@ parameters:
 			count: 1
 			path: ../../htdocs/public/members/new.php
 
-		-
-			message: '#^Call to function is_numeric\(\) with int will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../htdocs/public/members/public_card.php
-
 		-
 			message: '#^Property Adherent\:\:\$photo \(string\) in isset\(\) is not nullable\.$#'
 			identifier: isset.property
@@ -28578,12 +28518,6 @@ parameters:
 			count: 17
 			path: ../../htdocs/public/members/public_card.php
 
-		-
-			message: '#^Call to function is_numeric\(\) with int will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../../htdocs/public/members/public_list.php
-
 		-
 			message: '#^Call to function is_numeric\(\) with int will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType