[BUGFIX] Add missing negate operator

Resolves: #4256
sabbelasichon · May 25, 2024 · a39ddd6 · a39ddd6
1 parent 7dc2ce7
commit a39ddd6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 54 deletions.
diff --git a/rules/TYPO311/v0/SubstituteConstantsModeAndRequestTypeRector.php b/rules/TYPO311/v0/SubstituteConstantsModeAndRequestTypeRector.php
@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\BinaryOp;
+use PhpParser\Node\Expr\BooleanNot;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
@@ -90,11 +91,24 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $operator = $node->getOperatorSigil();
+
         if ($typeValue === 'BE') {
-            return $this->createIsBackendCall();
+            $beCall = $this->createIsBackendCall();
+
+            if ($operator !== '') {
+                return new BooleanNot($beCall);
+            }
+
+            return $beCall;
+        }
+
+        $feCall = $this->createIsFrontendCall();
+        if ($operator !== '') {
+            return new BooleanNot($feCall);
         }
 
-        return $this->createIsFrontendCall();
+        return $feCall;
     }
 
     public function getRuleDefinition(): RuleDefinition

diff --git a/...ector/v11/v0/SubstituteConstantsModeAndRequestTypeRector/Fixture/application_type.php.inc b/...ector/v11/v0/SubstituteConstantsModeAndRequestTypeRector/Fixture/application_type.php.inc
@@ -2,37 +2,13 @@
 
 namespace Ssch\TYPO3Rector\Tests\Rector\v11\v0\SubstituteConstantsModeAndRequestTypeRector\Fixture;
 
-defined('TYPO3_MODE') or die();
+// defined('TYPO3_MODE') or die();
 
 class MyController
 {
     public function fooAction()
     {
-        if (TYPO3_REQUESTTYPE_BE) {
-            // Do something
-        }
-
-        if (TYPO3_REQUESTTYPE_FE) {
-            // Do something
-        }
-
-        if (TYPO3_MODE === 'BE') {
-            // Do something
-        }
-
-        if (TYPO3_MODE === 'FE') {
-            // Do something
-        }
-
-        if ('BE' === TYPO3_MODE) {
-            // Do something
-        }
-
-        if ('FOO' === TYPO3_MODE) {
-            // Do something
-        }
-
-        if ('FE' === TYPO3_MODE) {
+        if (TYPO3_MODE !== 'FE') {
             // Do something
         }
     }
@@ -45,37 +21,13 @@ class MyController
 namespace Ssch\TYPO3Rector\Tests\Rector\v11\v0\SubstituteConstantsModeAndRequestTypeRector\Fixture;
 
 use TYPO3\CMS\Core\Http\ApplicationType;
-defined('TYPO3') or die();
+// defined('TYPO3') or die();
 
 class MyController
 {
     public function fooAction()
     {
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
-            // Do something
-        }
-
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
-            // Do something
-        }
-
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
-            // Do something
-        }
-
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
-            // Do something
-        }
-
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
-            // Do something
-        }
-
-        if ('FOO' === TYPO3_MODE) {
-            // Do something
-        }
-
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
+        if (!ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
             // Do something
         }
     }