From 15881f46b90269b8ece71c5a069dbdbe675a7f8c Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Wed, 12 Apr 2023 14:19:17 +0100
Subject: [PATCH] Issue #3352367 by andypost: Fix Variable $graph might not be
 defined

---
 core/lib/Drupal/Core/Extension/ModuleHandler.php | 2 +-
 core/phpstan-baseline.neon                       | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 262865403e6..512a6da04af 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -230,7 +230,7 @@ class ModuleHandler implements ModuleHandlerInterface {
         }
       }
     }
-    $graph_object = new Graph($graph);
+    $graph_object = new Graph($graph ?? []);
     $graph = $graph_object->searchAndSort();
     foreach ($graph as $module_name => $data) {
       $modules[$module_name]->required_by = $data['reverse_paths'] ?? [];
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index f3b78107aba..14770f9b94e 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -480,11 +480,6 @@ parameters:
 			count: 1
 			path: lib/Drupal/Core/Extension/ExtensionVersion.php
 
-		-
-			message: "#^Variable \\$graph might not be defined\\.$#"
-			count: 1
-			path: lib/Drupal/Core/Extension/ModuleHandler.php
-
 		-
 			message: "#^Variable \\$callback in isset\\(\\) always exists and is not nullable\\.$#"
 			count: 1