Skip to content

Commit bab8828

Browse files
authored
Merge pull request #9015 from samsonasik/refactor-enable-phpunit-attribute
refactor: Enable phpunit 10 attribute Rector rules
2 parents 01f52ef + 8ab9e40 commit bab8828

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

rector.php

-12
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@
4242
use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
4343
use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
4444
use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
45-
use Rector\Php80\Rector\Class_\AnnotationToAttributeRector;
4645
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
4746
use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
4847
use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
49-
use Rector\PHPUnit\AnnotationsToAttributes\Rector\Class_\AnnotationWithValueToAttributeRector;
50-
use Rector\PHPUnit\AnnotationsToAttributes\Rector\Class_\CoversAnnotationWithValueToAttributeRector;
51-
use Rector\PHPUnit\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector;
52-
use Rector\PHPUnit\AnnotationsToAttributes\Rector\ClassMethod\DependsAnnotationWithValueToAttributeRector;
5348
use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
5449
use Rector\PHPUnit\Set\PHPUnitSetList;
5550
use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
@@ -176,13 +171,6 @@
176171

177172
// Unnecessary (string) is inserted
178173
NullToStrictStringFuncCallArgRector::class,
179-
180-
// PHPUnit 10 (requires PHP 8.1) features
181-
DataProviderAnnotationToAttributeRector::class,
182-
DependsAnnotationWithValueToAttributeRector::class,
183-
AnnotationWithValueToAttributeRector::class,
184-
AnnotationToAttributeRector::class,
185-
CoversAnnotationWithValueToAttributeRector::class,
186174
])
187175
// auto import fully qualified class names
188176
->withImportNames(removeUnusedImports: true)

system/Test/DatabaseTestTrait.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Config\Database;
2020
use Config\Migrations;
2121
use Config\Services;
22+
use PHPUnit\Framework\Attributes\AfterClass;
2223

2324
/**
2425
* DatabaseTestTrait
@@ -228,14 +229,12 @@ public function seed(string $name)
228229
// --------------------------------------------------------------------
229230
// Utility
230231
// --------------------------------------------------------------------
231-
232232
/**
233233
* Reset $doneMigration and $doneSeed
234234
*
235-
* @afterClass
236-
*
237235
* @return void
238236
*/
237+
#[AfterClass]
239238
public static function resetMigrationSeedCount()
240239
{
241240
self::$doneMigration = false;

0 commit comments

Comments
 (0)