[BUGFIX] Keep max property for other input types

Resolves #3925
sabbelasichon · Nov 23, 2023 · 988df0f · 988df0f
1 parent 3e9263b
commit 988df0f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/src/Rector/v12/v0/flexform/MigrateEvalIntAndDouble2ToTypeNumberFlexFormRector.php b/src/Rector/v12/v0/flexform/MigrateEvalIntAndDouble2ToTypeNumberFlexFormRector.php
@@ -120,7 +120,9 @@ private function refactorColumn(DOMDocument $domDocument, ?DOMElement $configEle
             return;
         }
 
-        if (! StringUtility::inList($evalListValue, self::INT) && ! StringUtility::inList($evalListValue, self::DOUBLE2)) {
+        if (! StringUtility::inList($evalListValue, self::INT)
+            && ! StringUtility::inList($evalListValue, self::DOUBLE2)
+        ) {
             return;
         }
 

diff --git a/src/Rector/v12/v0/tca/MigrateEvalIntAndDouble2ToTypeNumberRector.php b/src/Rector/v12/v0/tca/MigrateEvalIntAndDouble2ToTypeNumberRector.php
@@ -103,7 +103,9 @@ protected function refactorColumn(Expr $columnName, Expr $columnTca): void
             return;
         }
 
-        if (! StringUtility::inList($evalListValue, self::INT) && ! StringUtility::inList($evalListValue, self::DOUBLE2)) {
+        if (! StringUtility::inList($evalListValue, self::INT)
+            && ! StringUtility::inList($evalListValue, self::DOUBLE2)
+        ) {
             return;
         }
 

diff --git a/src/Rector/v12/v0/tca/MigrateToEmailTypeRector.php b/src/Rector/v12/v0/tca/MigrateToEmailTypeRector.php
@@ -81,8 +81,6 @@ protected function refactorColumn(Expr $columnName, Expr $columnTca): void
             return;
         }
 
-        $this->removeArrayItemFromArrayByKey($configArray, 'max');
-
         if (! $this->hasKey($configArray, 'eval')) {
             return;
         }
@@ -103,6 +101,8 @@ protected function refactorColumn(Expr $columnName, Expr $columnTca): void
             return;
         }
 
+        $this->removeArrayItemFromArrayByKey($configArray, 'max');
+
         $evalList = ArrayUtility::trimExplode(',', $evalListValue, true);
 
         // Remove "email" and "trim" from $evalList

diff --git a/...ctor/v12/v0/tca/MigrateToEmailTypeRector/Fixture/fixture_keep_max_for_other_types.php.inc b/...ctor/v12/v0/tca/MigrateToEmailTypeRector/Fixture/fixture_keep_max_for_other_types.php.inc
@@ -0,0 +1,39 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\tca\MigrateToEmailTypeRector\Fixture;
+
+return [
+    'ctrl' => [],
+    'columns' => [
+        'email_field' => [
+            'label' => 'Text',
+            'config' => [
+                'type' => 'input',
+                'eval' => 'trim',
+                'max' => 255,
+            ],
+        ],
+    ],
+];
+
+?>
+-----
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v12\v0\tca\MigrateToEmailTypeRector\Fixture;
+
+return [
+    'ctrl' => [],
+    'columns' => [
+        'email_field' => [
+            'label' => 'Text',
+            'config' => [
+                'type' => 'input',
+                'eval' => 'trim',
+                'max' => 255,
+            ],
+        ],
+    ],
+];
+
+?>