[TASK] Improve other Rectors by reusing removeArrayItemFromArrayByKey

sabbelasichon · Nov 16, 2023 · c7ade09 · c7ade09
1 parent be293f6
commit c7ade09
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 80 deletions.
diff --git a/src/Helper/TcaHelperTrait.php b/src/Helper/TcaHelperTrait.php
@@ -132,6 +132,11 @@ protected function isConfigType(Array_ $columnItemConfigurationArray, string $ty
         return $this->hasKeyValuePair($columnItemConfigurationArray, 'type', $type);
     }
 
+    protected function configIsOfRenderType(Array_ $configValueArray, string $expectedRenderType): bool
+    {
+        return $this->hasKeyValuePair($configValueArray, 'renderType', $expectedRenderType);
+    }
+
     private function isInlineType(Array_ $columnItemConfigurationArray): bool
     {
         return $this->isConfigType($columnItemConfigurationArray, 'inline');
@@ -192,11 +197,6 @@ private function configIsOfInternalType(Array_ $configValueArray, string $expect
         return $this->hasKeyValuePair($configValueArray, 'internal_type', $expectedType);
     }
 
-    private function configIsOfRenderType(Array_ $configValueArray, string $expectedRenderType): bool
-    {
-        return $this->hasKeyValuePair($configValueArray, 'renderType', $expectedRenderType);
-    }
-
     /**
      * @return Generator<string, Node>
      */

diff --git a/src/Rector/v10/v0/RemoveSeliconFieldPathRector.php b/src/Rector/v10/v0/RemoveSeliconFieldPathRector.php
@@ -5,7 +5,6 @@
 namespace Ssch\TYPO3Rector\Rector\v10\v0;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Stmt\Return_;
@@ -52,19 +51,8 @@ public function refactor(Node $node): ?Node
         }
 
         $hasAstBeenChanged = false;
-        foreach ($items->items as $fieldValue) {
-            if (! $fieldValue instanceof ArrayItem) {
-                continue;
-            }
-
-            if (! $fieldValue->key instanceof Expr) {
-                continue;
-            }
-
-            if ($this->valueResolver->isValue($fieldValue->key, 'selicon_field_path')) {
-                $this->removeNode($fieldValue);
-                $hasAstBeenChanged = true;
-            }
+        if ($this->removeArrayItemFromArrayByKey($items, 'selicon_field_path')) {
+            $hasAstBeenChanged = true;
         }
 
         return $hasAstBeenChanged ? $node : null;

diff --git a/src/Rector/v10/v0/RemoveTcaOptionSetToDefaultOnCopyRector.php b/src/Rector/v10/v0/RemoveTcaOptionSetToDefaultOnCopyRector.php
@@ -5,7 +5,6 @@
 namespace Ssch\TYPO3Rector\Rector\v10\v0;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Stmt\Return_;
@@ -52,19 +51,8 @@ public function refactor(Node $node): ?Node
         }
 
         $hasAstBeenChanged = false;
-        foreach ($items->items as $fieldValue) {
-            if (! $fieldValue instanceof ArrayItem) {
-                continue;
-            }
-
-            if (! $fieldValue->key instanceof Expr) {
-                continue;
-            }
-
-            if ($this->valueResolver->isValue($fieldValue->key, 'setToDefaultOnCopy')) {
-                $this->removeNode($fieldValue);
-                $hasAstBeenChanged = true;
-            }
+        if ($this->removeArrayItemFromArrayByKey($items, 'setToDefaultOnCopy')) {
+            $hasAstBeenChanged = true;
         }
 
         return $hasAstBeenChanged ? $node : null;

diff --git a/src/Rector/v10/v1/RemoveEnableMultiSelectFilterTextfieldRector.php b/src/Rector/v10/v1/RemoveEnableMultiSelectFilterTextfieldRector.php
@@ -6,8 +6,6 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
-use PhpParser\Node\Expr\ArrayItem;
-use Ssch\TYPO3Rector\Helper\TcaHelperTrait;
 use Ssch\TYPO3Rector\Rector\Tca\AbstractTcaRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -18,8 +16,6 @@
  */
 final class RemoveEnableMultiSelectFilterTextfieldRector extends AbstractTcaRector
 {
-    use TcaHelperTrait;
-
     /**
      * @codeCoverageIgnore
      */
@@ -60,15 +56,7 @@ protected function refactorColumn(Expr $columnName, Expr $columnTca): void
             return;
         }
 
-        $toRemoveArrayItem = $this->extractArrayItemByKey($configArray, 'enableMultiSelectFilterTextfield');
-        if (! $toRemoveArrayItem instanceof ArrayItem || ! $toRemoveArrayItem->value instanceof Expr) {
-            return;
-        }
-
-        $nodeValue = $this->valueResolver->getValue($toRemoveArrayItem->value);
-
-        if ($nodeValue === true) {
-            $this->removeNode($toRemoveArrayItem);
+        if ($this->removeArrayItemFromArrayByKey($configArray, 'enableMultiSelectFilterTextfield')) {
             $this->hasAstBeenChanged = true;
         }
     }

diff --git a/src/Rector/v10/v3/RemoveExcludeOnTransOrigPointerFieldRector.php b/src/Rector/v10/v3/RemoveExcludeOnTransOrigPointerFieldRector.php
@@ -100,21 +100,8 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            foreach ($columnItem->value->items as $configValue) {
-                if (! $configValue instanceof ArrayItem) {
-                    continue;
-                }
-
-                if (! $configValue->key instanceof Expr) {
-                    continue;
-                }
-
-                $configFieldName = $this->valueResolver->getValue($configValue->key);
-
-                if ($configFieldName === 'exclude') {
-                    $this->removeNode($configValue);
-                    $hasAstBeenChanged = true;
-                }
+            if ($this->removeArrayItemFromArrayByKey($columnItem->value, 'exclude')) {
+                $hasAstBeenChanged = true;
             }
         }
 

diff --git a/src/Rector/v10/v3/RemoveShowRecordFieldListInsideInterfaceSectionRector.php b/src/Rector/v10/v3/RemoveShowRecordFieldListInsideInterfaceSectionRector.php
@@ -5,7 +5,6 @@
 namespace Ssch\TYPO3Rector\Rector\v10\v3;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Stmt\Return_;
@@ -54,20 +53,8 @@ public function refactor(Node $node): ?Node
 
         $remainingInterfaceItems = count($interfaceItems->items);
 
-        foreach ($interfaceItems->items as $interfaceItem) {
-            if (! $interfaceItem instanceof ArrayItem) {
-                continue;
-            }
-
-            if (! $interfaceItem->key instanceof Expr) {
-                continue;
-            }
-
-            if ($this->valueResolver->isValue($interfaceItem->key, 'showRecordFieldList')) {
-                $this->removeNode($interfaceItem);
-                --$remainingInterfaceItems;
-                break;
-            }
+        if ($this->removeArrayItemFromArrayByKey($interfaceItems, 'showRecordFieldList')) {
+            --$remainingInterfaceItems;
         }
 
         if ($remainingInterfaceItems === 0) {

diff --git a/src/Rector/v12/v0/tca/MigrateColsToSizeForTcaTypeNoneRector.php b/src/Rector/v12/v0/tca/MigrateColsToSizeForTcaTypeNoneRector.php
@@ -67,10 +67,7 @@ protected function refactorColumn(Expr $columnName, Expr $columnTca): void
             return;
         }
 
-        $arrayItemToRemove = $this->extractArrayItemByKey($configArray, 'size');
-        if ($arrayItemToRemove instanceof ArrayItem) {
-            $this->removeNode($arrayItemToRemove);
-        }
+        $this->removeArrayItemFromArrayByKey($configArray, 'size');
 
         $arrayItemToChange->key = new String_('size');