From c9b4a36c0260c2c02550517779b6ac2ab217fc5b Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Mon, 19 Aug 2024 21:00:25 -0300 Subject: [PATCH] Update Rector config --- rector.php | 4 +++- src/Sluggable/SluggableListener.php | 4 +--- .../Query/TreeWalker/SoftDeleteableWalker.php | 5 +---- src/Tool/Logging/DBAL/QueryAnalyzer.php | 4 ++-- .../Query/TreeWalker/TranslationWalker.php | 4 +--- src/Tree/Strategy/ORM/Closure.php | 2 +- src/Tree/Strategy/ORM/Nested.php | 2 +- src/Uploadable/UploadableListener.php | 4 ++-- tests/Gedmo/Blameable/Fixture/Entity/Company.php | 6 ++---- .../Gedmo/Sluggable/Fixture/Issue100/Article.php | 12 +++--------- tests/Gedmo/Sluggable/Issue/Issue100Test.php | 5 +---- .../TranslatableEntityDefaultTranslationTest.php | 3 ++- tests/Gedmo/Tree/Fixture/Issue2616/Category.php | 4 +--- tests/Gedmo/Tree/Fixture/Issue2616/Page.php | 4 +--- tests/Gedmo/Tree/Issue/Issue2616Test.php | 5 +---- tests/Gedmo/Uploadable/UploadableEntityTest.php | 15 +++++---------- 16 files changed, 28 insertions(+), 55 deletions(-) diff --git a/rector.php b/rector.php index c6e03d83e9..ebb3971a6a 100644 --- a/rector.php +++ b/rector.php @@ -21,10 +21,12 @@ ]) ->withPhpVersion(PhpVersion::PHP_74) ->withPhpSets() + ->withConfiguredRule(TypedPropertyFromAssignsRector::class, []) ->withSkip([ TypedPropertyFromAssignsRector::class => [ __DIR__.'/src/Mapping/MappedEventSubscriber.php', // Rector is trying to set a type on the $annotationReader property which requires a union type, not supported on PHP 7.4 - __DIR__.'/tests/Gedmo/Wrapper/Fixture/Entity/CompositeRelation.php', // @todo: remove this when https://github.com/doctrine/orm/issues/8255 is solved + __DIR__.'/tests/Gedmo/Blameable/Fixture/Entity/Company.php', // @todo: Remove this when fixing the configuration for the `Company::$created` property + __DIR__.'/tests/Gedmo/Wrapper/Fixture/Entity/CompositeRelation.php', // @todo: Remove this when https://github.com/doctrine/orm/issues/8255 is solved ], ]) ->withImportNames(true, true, false) diff --git a/src/Sluggable/SluggableListener.php b/src/Sluggable/SluggableListener.php index bc21cf7d1e..b0793546a9 100644 --- a/src/Sluggable/SluggableListener.php +++ b/src/Sluggable/SluggableListener.php @@ -74,10 +74,8 @@ class SluggableListener extends MappedEventSubscriber /** * The power exponent to jump * the slug unique number by tens. - * - * @var int */ - private $exponent = 0; + private int $exponent = 0; /** * Transliteration callback for slugs diff --git a/src/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php b/src/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php index 010330eab5..6f8de3ce72 100644 --- a/src/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php +++ b/src/SoftDeleteable/Query/TreeWalker/SoftDeleteableWalker.php @@ -81,10 +81,7 @@ class SoftDeleteableWalker extends SqlWalker */ protected $meta; - /** - * @var QuoteStrategy - */ - private $quoteStrategy; + private QuoteStrategy $quoteStrategy; public function __construct($query, $parserResult, array $queryComponents) { diff --git a/src/Tool/Logging/DBAL/QueryAnalyzer.php b/src/Tool/Logging/DBAL/QueryAnalyzer.php index d0e8e71a68..e323ce0138 100644 --- a/src/Tool/Logging/DBAL/QueryAnalyzer.php +++ b/src/Tool/Logging/DBAL/QueryAnalyzer.php @@ -46,7 +46,7 @@ class QueryAnalyzer implements SQLLogger * * @var string[] */ - private $queries = []; + private array $queries = []; /** * Query execution times indexed @@ -54,7 +54,7 @@ class QueryAnalyzer implements SQLLogger * * @var float[] */ - private $queryExecutionTimes = []; + private array $queryExecutionTimes = []; /** * Initialize log listener with database diff --git a/src/Translatable/Query/TreeWalker/TranslationWalker.php b/src/Translatable/Query/TreeWalker/TranslationWalker.php index d0253d5892..43f613fe25 100644 --- a/src/Translatable/Query/TreeWalker/TranslationWalker.php +++ b/src/Translatable/Query/TreeWalker/TranslationWalker.php @@ -97,10 +97,8 @@ class TranslationWalker extends SqlWalker /** * DBAL database connection - * - * @var Connection */ - private $conn; + private Connection $conn; /** * List of aliases to replace with translation diff --git a/src/Tree/Strategy/ORM/Closure.php b/src/Tree/Strategy/ORM/Closure.php index 43d35574a5..d455224df6 100644 --- a/src/Tree/Strategy/ORM/Closure.php +++ b/src/Tree/Strategy/ORM/Closure.php @@ -64,7 +64,7 @@ class Closure implements Strategy * * @phpstan-var array */ - private $pendingNodeUpdates = []; + private array $pendingNodeUpdates = []; /** * List of pending Nodes, which needs their "level" diff --git a/src/Tree/Strategy/ORM/Nested.php b/src/Tree/Strategy/ORM/Nested.php index 0d9228a385..f74e1e5cde 100644 --- a/src/Tree/Strategy/ORM/Nested.php +++ b/src/Tree/Strategy/ORM/Nested.php @@ -75,7 +75,7 @@ class Nested implements Strategy * * @var array */ - private $treeEdges = []; + private array $treeEdges = []; /** * Stores a list of node position strategies diff --git a/src/Uploadable/UploadableListener.php b/src/Uploadable/UploadableListener.php index 34e874713d..6794b73952 100644 --- a/src/Uploadable/UploadableListener.php +++ b/src/Uploadable/UploadableListener.php @@ -76,7 +76,7 @@ class UploadableListener extends MappedEventSubscriber * * @var array */ - private $pendingFileRemovals = []; + private array $pendingFileRemovals = []; /** * Array of FileInfoInterface objects. The index is the hash of the entity owner @@ -86,7 +86,7 @@ class UploadableListener extends MappedEventSubscriber * * @phpstan-var array */ - private $fileInfoObjects = []; + private array $fileInfoObjects = []; public function __construct(?MimeTypeGuesserInterface $mimeTypeGuesser = null) { diff --git a/tests/Gedmo/Blameable/Fixture/Entity/Company.php b/tests/Gedmo/Blameable/Fixture/Entity/Company.php index 35f14d0662..9c7d411f39 100644 --- a/tests/Gedmo/Blameable/Fixture/Entity/Company.php +++ b/tests/Gedmo/Blameable/Fixture/Entity/Company.php @@ -37,15 +37,13 @@ class Company implements Blameable private $id; /** - * @var string|null - * * @ORM\Column(name="name", type="string", length=128) */ #[ORM\Column(name: 'name', type: Types::STRING, length: 128)] - private $name; + private ?string $name = null; /** - * @var UuidV6|null + * @var UuidV6|string|null * * @Gedmo\Blameable(on="create") * diff --git a/tests/Gedmo/Sluggable/Fixture/Issue100/Article.php b/tests/Gedmo/Sluggable/Fixture/Issue100/Article.php index 0ce9ce50e5..f285322886 100644 --- a/tests/Gedmo/Sluggable/Fixture/Issue100/Article.php +++ b/tests/Gedmo/Sluggable/Fixture/Issue100/Article.php @@ -36,19 +36,15 @@ class Article implements Sluggable, Translatable private $id; /** - * @var string|null - * * @Gedmo\Translatable * * @ORM\Column(name="title", type="string", length=64) */ #[ORM\Column(name: 'title', type: Types::STRING, length: 64)] #[Gedmo\Translatable] - private $title; + private ?string $title = null; /** - * @var string|null - * * @Gedmo\Translatable * @Gedmo\Slug(separator="-", updatable=true, fields={"title"}, unique=true, uniqueOverTranslations=true) * @@ -57,17 +53,15 @@ class Article implements Sluggable, Translatable #[Gedmo\Translatable] #[Gedmo\Slug(fields: ['title'], updatable: true, unique: true, uniqueOverTranslations: true, separator: '-')] #[ORM\Column(name: 'slug', type: Types::STRING, length: 64, unique: true)] - private $slug; + private ?string $slug = null; /** - * @var string|null - * * @Gedmo\Locale * Used locale to override Translation listener`s locale * this is not a mapped field of entity metadata, just a simple property */ #[Gedmo\Locale] - private $locale; + private ?string $locale = null; public function getId(): ?int { diff --git a/tests/Gedmo/Sluggable/Issue/Issue100Test.php b/tests/Gedmo/Sluggable/Issue/Issue100Test.php index 4ef37918ba..c8e659c34b 100644 --- a/tests/Gedmo/Sluggable/Issue/Issue100Test.php +++ b/tests/Gedmo/Sluggable/Issue/Issue100Test.php @@ -28,10 +28,7 @@ final class Issue100Test extends BaseTestCaseORM public const ARTICLE = Article::class; public const TRANSLATION = Translation::class; - /** - * @var TranslatableListener - */ - private $translatableListener; + private TranslatableListener $translatableListener; protected function setUp(): void { diff --git a/tests/Gedmo/Translatable/TranslatableEntityDefaultTranslationTest.php b/tests/Gedmo/Translatable/TranslatableEntityDefaultTranslationTest.php index cfb3434750..1491039105 100644 --- a/tests/Gedmo/Translatable/TranslatableEntityDefaultTranslationTest.php +++ b/tests/Gedmo/Translatable/TranslatableEntityDefaultTranslationTest.php @@ -12,6 +12,7 @@ namespace Gedmo\Tests\Translatable; use Doctrine\Common\EventManager; +use Doctrine\ORM\EntityRepository; use Gedmo\Tests\Tool\BaseTestCaseORM; use Gedmo\Tests\Translatable\Fixture\Article; use Gedmo\Translatable\Entity\Repository\TranslationRepository; @@ -33,7 +34,7 @@ final class TranslatableEntityDefaultTranslationTest extends BaseTestCaseORM /** * @var TranslationRepository */ - private $repo; + private EntityRepository $repo; protected function setUp(): void { diff --git a/tests/Gedmo/Tree/Fixture/Issue2616/Category.php b/tests/Gedmo/Tree/Fixture/Issue2616/Category.php index eb31bfc668..ab90a9906c 100644 --- a/tests/Gedmo/Tree/Fixture/Issue2616/Category.php +++ b/tests/Gedmo/Tree/Fixture/Issue2616/Category.php @@ -68,12 +68,10 @@ class Category private $id; /** - * @var string|null - * * @ORM\Column(name="title", type="string", length=64) */ #[ORM\Column(name: 'title', type: Types::STRING, length: 64)] - private $title; + private ?string $title = null; /** * @Gedmo\TreeLevel diff --git a/tests/Gedmo/Tree/Fixture/Issue2616/Page.php b/tests/Gedmo/Tree/Fixture/Issue2616/Page.php index 7c99f7ad37..6f15d52d55 100644 --- a/tests/Gedmo/Tree/Fixture/Issue2616/Page.php +++ b/tests/Gedmo/Tree/Fixture/Issue2616/Page.php @@ -41,12 +41,10 @@ class Page private $id; /** - * @var string|null - * * @ORM\Column(name="title", type="string", length=64) */ #[ORM\Column(name: 'title', type: Types::STRING, length: 64)] - private $title; + private ?string $title = null; public function getId(): ?int { diff --git a/tests/Gedmo/Tree/Issue/Issue2616Test.php b/tests/Gedmo/Tree/Issue/Issue2616Test.php index a8a51bd246..788be2f705 100644 --- a/tests/Gedmo/Tree/Issue/Issue2616Test.php +++ b/tests/Gedmo/Tree/Issue/Issue2616Test.php @@ -17,10 +17,7 @@ class Issue2616Test extends BaseTestCaseORM { - /** - * @var TreeListener - */ - private $listener; + private TreeListener $listener; protected function setUp(): void { diff --git a/tests/Gedmo/Uploadable/UploadableEntityTest.php b/tests/Gedmo/Uploadable/UploadableEntityTest.php index 6706ca4436..8d70c3777e 100644 --- a/tests/Gedmo/Uploadable/UploadableEntityTest.php +++ b/tests/Gedmo/Uploadable/UploadableEntityTest.php @@ -70,20 +70,15 @@ final class UploadableEntityTest extends BaseTestCaseORM private UploadableListenerStub $listener; - /** @var string */ - private $testFile; + private string $testFile; - /** @var string */ - private $testFile2; + private string $testFile2; - /** @var string */ - private $testFile3; + private string $testFile3; - /** @var string */ - private $testFileWithoutExt; + private string $testFileWithoutExt; - /** @var string */ - private $testFileWithSpaces; + private string $testFileWithSpaces; private string $destinationTestDir;