Merge remote-tracking branch 'karyna/fix-arguments-reader-issue-on-php8.1' into ph-fixes

xmav · xmav · commit e6910bd77b8f · 2021-12-10T17:22:37.000-06:00
diff --git a/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
@@ -110,7 +110,8 @@ private function processType(\ReflectionClass $class, \Laminas\Code\Reflection\P
 
         $type = $parameter->detectType();
 
-        if ($type === 'null') {
+        if ($type === null || $type === 'null') {
+            // check on null for PHP 8.1 compatibility, emulates the behavior from PHP 7.4
             return null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ private function processType(\ReflectionClass $class, \Laminas\Code\Reflection\P`
`110`	`110`
`111`	`111`	`$type = $parameter->detectType();`
`112`	`112`
`113`		`- if ($type === 'null') {`
	`113`	`+ if ($type === null \|\| $type === 'null') {`
	`114`	`+ // check on null for PHP 8.1 compatibility, emulates the behavior from PHP 7.4`
`114`	`115`	`return null;`
`115`	`116`	`}`
`116`	`117`