From 5be1d2c156ca21e6e3d1f167ecd0e73d5431d5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=20Alexandre=20J-S=20William=20ELIS=C3=89?= Date: Mon, 10 Feb 2025 13:07:17 -0400 Subject: [PATCH 1/3] Update NodeScopeResolver.php to prevent null exception --- src/Analyser/NodeScopeResolver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php index d5fde30813..f6b1daa28e 100644 --- a/src/Analyser/NodeScopeResolver.php +++ b/src/Analyser/NodeScopeResolver.php @@ -4966,7 +4966,7 @@ private function processArgs( $scope = $scope->pushInFunctionCall($calleeReflection, $parameter); } - $originalArg = $arg->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg; + $originalArg = $arg?->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg; $nodeCallback($originalArg, $scope); $originalScope = $scope; From 4d240165cb1bfa4297f6548d761c6efc41f151ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=20Alexandre=20J-S=20William=20ELIS=C3=89?= Date: Mon, 10 Feb 2025 13:14:53 -0400 Subject: [PATCH 2/3] Update NodeScopeResolver.php to prevent null expected --- src/Analyser/NodeScopeResolver.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php index f6b1daa28e..4b34490b2d 100644 --- a/src/Analyser/NodeScopeResolver.php +++ b/src/Analyser/NodeScopeResolver.php @@ -4966,7 +4966,12 @@ private function processArgs( $scope = $scope->pushInFunctionCall($calleeReflection, $parameter); } - $originalArg = $arg?->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg; + // Attempt to prevent null exception at line 4974 when calling getAttritbute + if(!isset($arg) && !is_object($arg)) { + continue; + } + + $originalArg = $arg->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg; $nodeCallback($originalArg, $scope); $originalScope = $scope; From 47ff9c2df7c71968f30b2af3a2d02e3a3f833711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=20Alexandre=20J-S=20William=20ELIS=C3=89?= Date: Mon, 10 Feb 2025 13:30:19 -0400 Subject: [PATCH 3/3] Update NodeScopeResolver.php to prevent null exception Attempt to prevent null exception on ` $arg->getAttribute ` call --- src/Analyser/NodeScopeResolver.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php index 4b34490b2d..bdb2f15ae6 100644 --- a/src/Analyser/NodeScopeResolver.php +++ b/src/Analyser/NodeScopeResolver.php @@ -212,6 +212,7 @@ use function in_array; use function is_array; use function is_int; +use function is_object; use function is_string; use function ksort; use function sprintf; @@ -4967,7 +4968,7 @@ private function processArgs( } // Attempt to prevent null exception at line 4974 when calling getAttritbute - if(!isset($arg) && !is_object($arg)) { + if (!isset($arg) && !is_object($arg)) { continue; }