[BUGFIX] Avoid notices and use null coalesce

Resolves: #4392
sabbelasichon · Oct 25, 2024 · 1b07af9 · 1b07af9
1 parent 8bb7cb4
commit 1b07af9
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 14 deletions.
diff --git a/rules/TYPO312/v0/UseServerRequestInsteadOfGeneralUtilityPostRector.php b/rules/TYPO312/v0/UseServerRequestInsteadOfGeneralUtilityPostRector.php
@@ -5,6 +5,9 @@
 namespace Ssch\TYPO3Rector\TYPO312\v0;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\BinaryOp\Coalesce;
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use Rector\Rector\AbstractScopeAwareRector;
@@ -41,7 +44,7 @@ public function getRuleDefinition(): RuleDefinition
                 <<<'CODE_SAMPLE'
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-$value = $GLOBALS['TYPO3_REQUEST']->getParsedBody()['tx_scheduler'];
+$value = $GLOBALS['TYPO3_REQUEST']->getParsedBody()['tx_scheduler'] ?? null;
 CODE_SAMPLE
             ),
             new CodeSample(
@@ -66,7 +69,7 @@ class MyActionController extends ActionController
 {
     public function myMethod()
     {
-        $value = $this->request->getParsedBody()['tx_scheduler'];
+        $value = $this->request->getParsedBody()['tx_scheduler'] ?? null;
     }
 }
 CODE_SAMPLE
@@ -76,19 +79,48 @@ public function myMethod()
 
     public function getNodeTypes(): array
     {
-        return [StaticCall::class];
+        return [Coalesce::class, StaticCall::class];
     }
 
     /**
-     * @param StaticCall $node
+     * @param Coalesce|StaticCall $node
      */
     public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
-        return $this->globalsToPsr7ServerRequestFactory->refactorToPsr7MethodCall(
+        if ($node instanceof Coalesce) {
+            $staticCall = $node->left;
+
+            if (! $staticCall instanceof StaticCall) {
+                return null;
+            }
+
+            /** @var ArrayDimFetch $arrayDimFetch */
+            $arrayDimFetch = $this->globalsToPsr7ServerRequestFactory->refactorToPsr7MethodCall(
+                $scope->getClassReflection(),
+                $staticCall,
+                'getParsedBody',
+                '_POST'
+            );
+
+            $node->left = $arrayDimFetch;
+            return $node;
+        }
+
+        $methodCall = $this->globalsToPsr7ServerRequestFactory->refactorToPsr7MethodCall(
             $scope->getClassReflection(),
             $node,
             'getParsedBody',
             '_POST'
         );
+
+        if ($methodCall instanceof MethodCall) {
+            return $methodCall;
+        }
+
+        if (! $methodCall instanceof ArrayDimFetch) {
+            return null;
+        }
+
+        return new Coalesce($methodCall, $this->nodeFactory->createNull());
     }
 }
diff --git a/rules/TYPO312/v4/UseServerRequestInsteadOfGeneralUtilityGetRector.php b/rules/TYPO312/v4/UseServerRequestInsteadOfGeneralUtilityGetRector.php
@@ -5,6 +5,9 @@
 namespace Ssch\TYPO3Rector\TYPO312\v4;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\BinaryOp\Coalesce;
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use Rector\Rector\AbstractScopeAwareRector;
@@ -41,7 +44,7 @@ public function getRuleDefinition(): RuleDefinition
                 <<<'CODE_SAMPLE'
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-$value = $GLOBALS['TYPO3_REQUEST']->getQueryParams()['tx_scheduler'];
+$value = $GLOBALS['TYPO3_REQUEST']->getQueryParams()['tx_scheduler'] ?? null;
 CODE_SAMPLE
             ),
             new CodeSample(
@@ -66,7 +69,7 @@ class MyActionController extends ActionController
 {
     public function myMethod()
     {
-        $value = $this->request->getQueryParams()['tx_scheduler'];
+        $value = $this->request->getQueryParams()['tx_scheduler'] ?? null;
     }
 }
 CODE_SAMPLE
@@ -76,19 +79,48 @@ public function myMethod()
 
     public function getNodeTypes(): array
     {
-        return [StaticCall::class];
+        return [Coalesce::class, StaticCall::class];
     }
 
     /**
-     * @param StaticCall $node
+     * @param Coalesce|StaticCall $node
      */
     public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
-        return $this->globalsToPsr7ServerRequestFactory->refactorToPsr7MethodCall(
+        if ($node instanceof Coalesce) {
+            $staticCall = $node->left;
+
+            if (! $staticCall instanceof StaticCall) {
+                return null;
+            }
+
+            /** @var ArrayDimFetch $arrayDimFetch */
+            $arrayDimFetch = $this->globalsToPsr7ServerRequestFactory->refactorToPsr7MethodCall(
+                $scope->getClassReflection(),
+                $staticCall,
+                'getQueryParams',
+                '_GET'
+            );
+
+            $node->left = $arrayDimFetch;
+            return $node;
+        }
+
+        $methodCall = $this->globalsToPsr7ServerRequestFactory->refactorToPsr7MethodCall(
             $scope->getClassReflection(),
             $node,
             'getQueryParams',
             '_GET'
         );
+
+        if ($methodCall instanceof MethodCall) {
+            return $methodCall;
+        }
+
+        if (! $methodCall instanceof ArrayDimFetch) {
+            return null;
+        }
+
+        return new Coalesce($methodCall, $this->nodeFactory->createNull());
     }
 }
diff --git a/...eServerRequestInsteadOfGeneralUtilityPostRector/Fixture/action_controller_context.php.inc b/...eServerRequestInsteadOfGeneralUtilityPostRector/Fixture/action_controller_context.php.inc
@@ -26,7 +26,7 @@ class MyController extends ActionController
 {
     public function myMethod(): void
     {
-        $value = $this->request->getParsedBody()['tx_scheduler'];
+        $value = $this->request->getParsedBody()['tx_scheduler'] ?? null;
     }
 }
 

diff --git a/...v12/v0/UseServerRequestInsteadOfGeneralUtilityPostRector/Fixture/standalone_class.php.inc b/...v12/v0/UseServerRequestInsteadOfGeneralUtilityPostRector/Fixture/standalone_class.php.inc
@@ -27,7 +27,7 @@ class MyClass
 {
     public function myMethod(): void
     {
-        $value = $GLOBALS['TYPO3_REQUEST']->getParsedBody()['tx_scheduler'];
+        $value = $GLOBALS['TYPO3_REQUEST']->getParsedBody()['tx_scheduler'] ?? null;
 
         $anotherValue = $GLOBALS['TYPO3_REQUEST']->getParsedBody();
         $anotherValue2 = $GLOBALS['TYPO3_REQUEST']->getParsedBody();

diff --git a/...seServerRequestInsteadOfGeneralUtilityGetRector/Fixture/action_controller_context.php.inc b/...seServerRequestInsteadOfGeneralUtilityGetRector/Fixture/action_controller_context.php.inc
@@ -28,7 +28,7 @@ class MyController extends ActionController
 {
     public function myAction(): ResponseInterface
     {
-        $value = $this->request->getQueryParams()['tx_scheduler'];
+        $value = $this->request->getQueryParams()['tx_scheduler'] ?? null;
     }
 }
 

diff --git a/.../v12/v4/UseServerRequestInsteadOfGeneralUtilityGetRector/Fixture/standalone_class.php.inc b/.../v12/v4/UseServerRequestInsteadOfGeneralUtilityGetRector/Fixture/standalone_class.php.inc
@@ -27,7 +27,7 @@ class MyClass
 {
     public function myMethod(): void
     {
-        $value = $GLOBALS['TYPO3_REQUEST']->getQueryParams()['tx_scheduler'];
+        $value = $GLOBALS['TYPO3_REQUEST']->getQueryParams()['tx_scheduler'] ?? null;
 
         $anotherValue = $GLOBALS['TYPO3_REQUEST']->getQueryParams();
         $anotherValue2 = $GLOBALS['TYPO3_REQUEST']->getQueryParams();