TASK: Fix

sabbelasichon · May 28, 2024 · 92139d8 · 92139d8
1 parent bc656ec
commit 92139d8
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 21 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
     bootstrap="tests/bootstrap.php"
     colors="true"
     verbose="true"

diff --git a/rules/TYPO312/v0/MoveAllowTableOnStandardPagesToTCAConfigurationRector.php b/rules/TYPO312/v0/MoveAllowTableOnStandardPagesToTCAConfigurationRector.php
@@ -90,13 +90,15 @@ public function refactor(Node $node)
         $tableNames = $this->valueResolver->getValue($tableArgument);
 
         foreach (explode(',', $tableNames) as $tableName) {
-            if (!$tableName) {
+            if ($tableName === '') {
                 continue;
             }
+
             $directoryName = dirname($this->file->getFilePath());
             $newConfigurationFile = $directoryName . '/Configuration/TCA/Overrides/' . $tableName . '.php';
             $this->writeConfigurationToFile($newConfigurationFile, $tableName);
         }
+
         return NodeTraverser::REMOVE_NODE;
     }
 

diff --git a/rules/TYPO313/v0/MigrateExpressionBuilderTrimMethodSecondParameterRector.php b/rules/TYPO313/v0/MigrateExpressionBuilderTrimMethodSecondParameterRector.php
@@ -77,15 +77,9 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $node->args[1]->value = $this->nodeFactory->createClassConstFetch(
-            'Doctrine\\DBAL\\Platforms\\TrimMode',
-            'UNSPECIFIED'
-        );
-        return $node;
-
         if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType(
             $node,
-            new ObjectType('TYPO3\\CMS\\Core\Database\\Query\\Expression\\ExpressionBuilder')
+            new ObjectType('TYPO3\\CMS\\Core\\Database\\Query\\Expression\\ExpressionBuilder')
         )) {
             return null;
         }
@@ -98,15 +92,15 @@ public function refactor(Node $node): ?Node
 
         $trimMode = $this->valueResolver->getValue($secondArgument->value);
 
-        if (! is_int($trimMode)) {
+        if (! is_numeric($trimMode)) {
             return null;
         }
 
-        if (! isset(self::$integerToTrimMode[$trimMode])) {
+        if (! isset(self::$integerToTrimMode[((int) $trimMode)])) {
             return null;
         }
 
-        $trimModeConstant = self::$integerToTrimMode[$trimMode];
+        $trimModeConstant = self::$integerToTrimMode[((int) $trimMode)];
 
         $node->args[1]->value = $this->nodeFactory->createClassConstFetch(
             'Doctrine\\DBAL\\Platforms\\TrimMode',

diff --git a/tests/Rector/General/Renaming/RenameAttributeRector/RenameAttributeRectorTest.php b/tests/Rector/General/Renaming/RenameAttributeRector/RenameAttributeRectorTest.php
@@ -5,7 +5,6 @@
 namespace Ssch\TYPO3Rector\Tests\Rector\General\Renaming\RenameAttributeRector;
 
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
-use Rector\ValueObject\PhpVersionFeature;
 
 final class RenameAttributeRectorTest extends AbstractRectorTestCase
 {
@@ -14,10 +13,6 @@ final class RenameAttributeRectorTest extends AbstractRectorTestCase
      */
     public function test(string $filePath): void
     {
-        if (PHP_VERSION_ID < PhpVersionFeature::ATTRIBUTES) {
-            $this->markTestSkipped('Do not execute');
-        }
-
         $this->doTestFile($filePath);
     }
 

diff --git a/tests/Rector/General/Renaming/RenameAttributeRector/config/configured_rule.php b/tests/Rector/General/Renaming/RenameAttributeRector/config/configured_rule.php
@@ -3,13 +3,13 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\ValueObject\PhpVersion;
+use Rector\ValueObject\PhpVersionFeature;
 use Ssch\TYPO3Rector\General\Renaming\RenameAttributeRector;
 use Ssch\TYPO3Rector\General\Renaming\ValueObject\RenameAttribute;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->import(__DIR__ . '/../../../../../../config/config_test.php');
-    $rectorConfig->phpVersion(PhpVersion::PHP_80);
+    $rectorConfig->phpVersion(PhpVersionFeature::ATTRIBUTES);
     $rectorConfig->ruleWithConfiguration(RenameAttributeRector::class, [
         new RenameAttribute('TYPO3\CMS\Backend\Attribute\Controller', 'TYPO3\CMS\Backend\Attribute\AsController'),
     ]);

diff --git a/...Rector/v13/v0/MigrateExpressionBuilderTrimMethodSecondParameterRector/Fixture/fixture.php b/...Rector/v13/v0/MigrateExpressionBuilderTrimMethodSecondParameterRector/Fixture/fixture.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v13\v0\MigrateExpressionBuilderTrimMethodSecondParameterRector\Fixture;
+
+use Doctrine\DBAL\Platforms\TrimMode;
+use TYPO3\CMS\Core\Database\Connection;
+use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+$queryBuilder = GeneralUtility::makeInstance(Connection::class)->createQueryBuilder();
+$queryBuilder->expr()
+    ->comparison(
+        $queryBuilder->expr()
+            ->trim('string', 0),
+        ExpressionBuilder::EQ,
+        $queryBuilder->createNamedParameter('', Connection::PARAM_STR)
+    );
+
+$queryBuilder->expr()
+    ->comparison(
+        $queryBuilder->expr()
+            ->trim('string', 1),
+        ExpressionBuilder::EQ,
+        $queryBuilder->createNamedParameter('', Connection::PARAM_STR)
+    );
+
+$queryBuilder->expr()
+    ->comparison(
+        $queryBuilder->expr()
+            ->trim('string', 2),
+        ExpressionBuilder::EQ,
+        $queryBuilder->createNamedParameter('', Connection::PARAM_STR)
+    );
+
+$queryBuilder->expr()
+    ->comparison(
+        $queryBuilder->expr()
+            ->trim('string', 3),
+        ExpressionBuilder::EQ,
+        $queryBuilder->createNamedParameter('', Connection::PARAM_STR)
+    );
+
+$queryBuilder->expr()
+    ->comparison(
+        $queryBuilder->expr()
+            ->trim('string', 5),
+        ExpressionBuilder::EQ,
+        $queryBuilder->createNamedParameter('', Connection::PARAM_STR)
+    );
+
+$queryBuilder->expr()
+    ->comparison(
+        $queryBuilder->expr()
+            ->trim('string', TrimMode::LEADING),
+        ExpressionBuilder::EQ,
+        $queryBuilder->createNamedParameter('', Connection::PARAM_STR)
+    );
diff --git a/...v13/v0/MigrateExpressionBuilderTrimMethodSecondParameterRector/config/configured_rule.php b/...v13/v0/MigrateExpressionBuilderTrimMethodSecondParameterRector/config/configured_rule.php
@@ -3,9 +3,11 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\ValueObject\PhpVersionFeature;
 use Ssch\TYPO3Rector\TYPO313\v0\MigrateExpressionBuilderTrimMethodSecondParameterRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->import(__DIR__ . '/../../../../../../config/config.php');
+    $rectorConfig->import(__DIR__ . '/../../../../../../config/config_test.php');
+    $rectorConfig->phpVersion(PhpVersionFeature::ENUM);
     $rectorConfig->rule(MigrateExpressionBuilderTrimMethodSecondParameterRector::class);
 };