chore: Clean up Rector skip config on SimplifyRegexPatternRector and …

…RemoveUnusedPromotedPropertyRector
codeigniter4 · Jun 9, 2024 · 260c379 · 260c379
1 parent 801b4f3
commit 260c379
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/rector.php b/rector.php
@@ -36,7 +36,6 @@
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
@@ -107,11 +106,6 @@
 
         YieldDataProviderRector::class,
 
-        RemoveUnusedPromotedPropertyRector::class => [
-            // Bug in rector 1.0.0. See https://github.com/rectorphp/rector-src/pull/5573
-            __DIR__ . '/tests/_support/Entity/CustomUser.php',
-        ],
-
         RemoveUnusedPrivateMethodRector::class => [
             // private method called via getPrivateMethodInvoker
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
@@ -155,8 +149,6 @@
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
 
-        SimplifyRegexPatternRector::class,
-
         // PHP 8.0 features but cause breaking changes
         ClassPropertyAssignToConstructorPromotionRector::class => [
             __DIR__ . '/system/Database/BaseResult.php',

diff --git a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php
@@ -58,7 +58,7 @@ public function testGetFieldDataDefault(): void
         $fields = $this->db->getFieldData($this->table);
 
         $idDefault = $this->getFieldMetaData('id', $this->table)->default;
-        $this->assertMatchesRegularExpression('/"ORACLE"."ISEQ\$\$_[0-9]+".nextval/', $idDefault);
+        $this->assertMatchesRegularExpression('/"ORACLE"."ISEQ\$\$_\d+".nextval/', $idDefault);
 
         $expected = [
             (object) [

diff --git a/tests/system/Database/RawSqlTest.php b/tests/system/Database/RawSqlTest.php
@@ -49,6 +49,6 @@ public function testGetBindingKey(): void
 
         $key = $rawSql->getBindingKey();
 
-        $this->assertMatchesRegularExpression('/\ARawSql[0-9]+\z/', $key);
+        $this->assertMatchesRegularExpression('/\ARawSql\d+\z/', $key);
     }
 }