Use shipmonk/coding-standard (#19)

Author: JanTvrdik

composer.json

@@ -20,10 +20,10 @@
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^10.5",
         "psr/log": "^3",
+        "shipmonk/coding-standard": "^0.1.3",
         "shipmonk/composer-dependency-analyser": "^1.7",
         "shipmonk/name-collision-detector": "^2.1.1",
         "shipmonk/phpstan-rules": "^4.0",
-        "slevomat/coding-standard": "^8.15.0",
         "symfony/cache": "^6 || ^7"
     },
     "autoload": {

phpcs.xml.dist

@@ -35,6 +35,7 @@ public function __construct(
      * @param positive-int|null $batchSize
      * @param non-negative-int|null $maxFetchJoinSameFieldCount
      * @return list<E>
+     *
      * @template S of E
      */
     public function preload(
@@ -75,6 +76,7 @@ public function preload(
     /**
      * @param list<S> $entities
      * @return class-string<S>|null
+     *
      * @template S of E
      */
     private function getCommonAncestor(array $entities): ?string
@@ -108,6 +110,7 @@ private function getCommonAncestor(array $entities): ?string
      * @param positive-int $batchSize
      * @param non-negative-int $maxFetchJoinSameFieldCount
      * @return list<T>
+     *
      * @template T of E
      */
     private function loadProxies(
@@ -151,6 +154,7 @@ private function loadProxies(
      * @param positive-int|null $batchSize
      * @param non-negative-int $maxFetchJoinSameFieldCount
      * @return list<T>
+     *
      * @template S of E
      * @template T of E
      */
@@ -239,6 +243,7 @@ private function preloadToMany(
      * @param array<string, PersistentCollection<int, T>> $uninitializedCollections
      * @param non-negative-int $maxFetchJoinSameFieldCount
      * @return array<string, T>
+     *
      * @template S of E
      * @template T of E
      */
@@ -290,6 +295,7 @@ private function preloadOneToManyInner(
      * @param array<string, PersistentCollection<int, T>> $uninitializedCollections
      * @param non-negative-int $maxFetchJoinSameFieldCount
      * @return array<string, T>
+     *
      * @template S of E
      * @template T of E
      */
@@ -360,6 +366,7 @@ private function preloadManyToManyInner(
      * @param positive-int|null $batchSize
      * @param non-negative-int $maxFetchJoinSameFieldCount
      * @return list<T>
+     *
      * @template S of E
      * @template T of E
      */
@@ -400,6 +407,7 @@ private function preloadToOne(
      * @param non-negative-int $maxFetchJoinSameFieldCount
      * @param array<string, 'asc'|'desc'> $orderBy
      * @return list<T>
+     *
      * @template T of E
      */
     private function loadEntitiesBy(
@@ -434,6 +442,7 @@ private function loadEntitiesBy(
     /**
      * @param ClassMetadata<S> $sourceClassMetadata
      * @param array<string, array<string, int>> $alreadyPreloadedJoins
+     *
      * @template S of E
      */
     private function addFetchJoinsToPreventFetchDuringHydration(

src/EntityPreloader.php

@@ -51,7 +51,7 @@ public function testOneHasManyDeepWithWithManualPreloadUsingPartial(): void
             ->getQuery()
             ->getResult();
 
-        $subCategories = array_merge(...array_map(static fn(Category $category) => $category->getChildren()->toArray(), $rootCategories));
+        $subCategories = array_merge(...array_map(static fn (Category $category) => $category->getChildren()->toArray(), $rootCategories));
         $this->getEntityManager()->createQueryBuilder()
             ->select('PARTIAL subCategory.{id}', 'subSubCategory')
             ->from(Category::class, 'subCategory')
@@ -134,7 +134,11 @@ public function testOneHasManyDeepWithPreload(): void
         ]);
     }
 
-    private function createCategoryTree(int $depth, int $branchingFactor, ?Category $parent = null): void
+    private function createCategoryTree(
+        int $depth,
+        int $branchingFactor,
+        ?Category $parent = null,
+    ): void
     {
         for ($i = 0; $i < $branchingFactor; $i++) {
             $category = new Category("Category $depth-$i", $parent);

tests/EntityPreloadBlogOneHasManyDeepTest.php

@@ -902,7 +902,7 @@ private function givenEntityWithNoRelations(): EntityWithNoRelations
     }
 
     private function givenEntityWithManyToOneEntityWithNoRelations(
-        EntityWithNoRelations $entityWithNoRelations
+        EntityWithNoRelations $entityWithNoRelations,
     ): EntityWithManyToOneEntityWithNoRelations
     {
         $entityWithManyToOneEntityWithNoRelations = new EntityWithManyToOneEntityWithNoRelations($entityWithNoRelations);
@@ -920,7 +920,7 @@ private function givenChildEntityWithNoRelationsA(): ChildEntityWithNoRelationsA
     }
 
     private function givenEntityWithManyToOneAbstractEntityWithNoRelations(
-        AbstractEntityWithNoRelations $abstractEntityWithNoRelations
+        AbstractEntityWithNoRelations $abstractEntityWithNoRelations,
     ): EntityWithManyToOneAbstractEntityWithNoRelations
     {
         $entityWithManyToOneAbstractEntityWithNoRelations = new EntityWithManyToOneAbstractEntityWithNoRelations($abstractEntityWithNoRelations);
@@ -930,7 +930,7 @@ private function givenEntityWithManyToOneAbstractEntityWithNoRelations(
     }
 
     private function givenEntityWithManyToOneOfManyToOneAbstractEntities(
-        EntityWithManyToOneAbstractEntityWithNoRelations $entityWithManyToOneAbstractEntityWithNoRelations
+        EntityWithManyToOneAbstractEntityWithNoRelations $entityWithManyToOneAbstractEntityWithNoRelations,
     ): EntityWithManyToOneOfManyToOneAbstractEntities
     {
         $entityWithManyToOneOfManyToOneAbstractEntities = new EntityWithManyToOneOfManyToOneAbstractEntities($entityWithManyToOneAbstractEntityWithNoRelations);
@@ -969,7 +969,7 @@ private function thenExpectedQueriesArePerformed(array $expectedQueries): void
     }
 
     private function givenConcreteEntityWithOptionalManyToOneItselfRelation(
-        ?ConcreteStiEntityWithOptionalManyToOneOfItselfRelation $parent
+        ?ConcreteStiEntityWithOptionalManyToOneOfItselfRelation $parent,
     ): ConcreteStiEntityWithOptionalManyToOneOfItselfRelation
     {
         $entity = new ConcreteStiEntityWithOptionalManyToOneOfItselfRelation($parent);
@@ -980,7 +980,7 @@ private function givenConcreteEntityWithOptionalManyToOneItselfRelation(
     }
 
     private function givenWithManyToOneOfManyToOneItselfRelation(
-        ConcreteStiEntityWithOptionalManyToOneOfItselfRelation $currentEntityWithRelationToItself
+        ConcreteStiEntityWithOptionalManyToOneOfItselfRelation $currentEntityWithRelationToItself,
     ): EntityWithManyToOneOfManyToOneItselfStiRelation
     {
         $entityWithManyToOneOfManyToOneItselfRelation = new EntityWithManyToOneOfManyToOneItselfStiRelation($currentEntityWithRelationToItself);
@@ -991,7 +991,7 @@ private function givenWithManyToOneOfManyToOneItselfRelation(
     }
 
     private function givenWithManyToOneOfManyToOneOfManyToOneItselfRelation(
-        EntityWithManyToOneOfManyToOneItselfStiRelation $entityWithManyToOneOfManyToOneItselfRelation
+        EntityWithManyToOneOfManyToOneItselfStiRelation $entityWithManyToOneOfManyToOneItselfRelation,
     ): EntityWithManyToOneOfManyToOneOfManyToOneItselfRelation
     {
         $entityWithManyToOneOfManyToOneOfManyToOneItselfRelation = new EntityWithManyToOneOfManyToOneOfManyToOneItselfRelation($entityWithManyToOneOfManyToOneItselfRelation);

tests/EntityPreloadSyntheticTest.php

@@ -45,7 +45,11 @@ class Article
     #[OrderBy(['id' => 'DESC'])]
     private Collection $comments;
 
-    public function __construct(string $title, string $content, ?Category $category = null)
+    public function __construct(
+        string $title,
+        string $content,
+        ?Category $category = null,
+    )
     {
         $this->title = $title;
         $this->content = $content;

tests/Fixtures/Blog/Article.php

@@ -18,7 +18,11 @@ class Bot extends Contributor
     #[Column]
     private string $apiKeyHash;
 
-    public function __construct(string $name, string $apiKey, string $prompt)
+    public function __construct(
+        string $name,
+        string $apiKey,
+        string $prompt,
+    )
     {
         parent::__construct($name);
         $this->activePrompt = new BotPromptVersion($prompt);

tests/Fixtures/Blog/Bot.php

@@ -29,7 +29,10 @@ class BotPromptVersion
     #[OneToOne(mappedBy: 'prevVersion')]
     private ?BotPromptVersion $nextVersion;
 
-    public function __construct(string $prompt, ?self $prevScript = null)
+    public function __construct(
+        string $prompt,
+        ?self $prevScript = null,
+    )
     {
         $this->version = ($prevScript->version ?? 0) + 1;
         $this->prompt = $prompt;
@@ -56,12 +59,12 @@ public function getPrompt(): string
         return $this->prompt;
     }
 
-    public function getPrevVersion(): ?BotPromptVersion
+    public function getPrevVersion(): ?self
     {
         return $this->prevVersion;
     }
 
-    public function getNextVersion(): ?BotPromptVersion
+    public function getNextVersion(): ?self
     {
         return $this->nextVersion;
     }

tests/Fixtures/Blog/BotPromptVersion.php

@@ -39,7 +39,10 @@ class Category
     #[OneToMany(targetEntity: Article::class, mappedBy: 'category')]
     private Collection $articles;
 
-    public function __construct(string $name, ?self $parent = null)
+    public function __construct(
+        string $name,
+        ?self $parent = null,
+    )
     {
         $this->name = $name;
         $this->parent = $parent;
@@ -83,7 +86,7 @@ public function getArticles(): ReadableCollection
     /**
      * @internal
      */
-    public function addChild(Category $category): void
+    public function addChild(self $category): void
     {
         if (!$this->children->contains($category)) {
             $this->children->add($category);

tests/Fixtures/Blog/Category.php

@@ -26,7 +26,11 @@ class Comment
     #[Column]
     private string $content;
 
-    public function __construct(Article $article, Contributor $author, string $content)
+    public function __construct(
+        Article $article,
+        Contributor $author,
+        string $content,
+    )
     {
         $this->article = $article;
         $this->author = $author;