Migrate from slevomat/coding-standard to shipmonk/coding-standard

- Replace slevomat/coding-standard with shipmonk/coding-standard ^0.2.0
- Simplify phpcs.xml.dist to use ShipMonkCodingStandard ruleset
- Remove conflicting DisallowTrailingCommaInDeclaration rule
- Apply code style fixes (multi-line signatures, short nullable format)

Author: JanTvrdik

composer.json

@@ -17,9 +17,9 @@
         "phpstan/phpstan-phpunit": "2.0.0",
         "phpstan/phpstan-strict-rules": "2.0.0",
         "phpunit/phpunit": "10.5.36",
+        "shipmonk/coding-standard": "^0.2.0",
         "shipmonk/composer-dependency-analyser": "1.7.0",
         "shipmonk/phpstan-rules": "4.0.0",
-        "slevomat/coding-standard": "8.15.0",
         "symfony/cache": "^6.4.13",
         "symfony/cache-contracts": "^3.5.0"
     },

phpcs.xml.dist

@@ -119,7 +119,10 @@ public function walkEntityIdentificationVariable(string $identVariable): string
         return $this->callWalkers(SqlNode::EntityIdentificationVariable, parent::walkEntityIdentificationVariable($identVariable));
     }
 
-    public function walkIdentificationVariable(string $identificationVariable, string|null $fieldName = null): string
+    public function walkIdentificationVariable(
+        string $identificationVariable,
+        ?string $fieldName = null,
+    ): string
     {
         return $this->callWalkers(SqlNode::IdentificationVariable, parent::walkIdentificationVariable($identificationVariable, $fieldName));
     }
@@ -233,7 +236,10 @@ public function walkParenthesisExpression(ParenthesisExpression $parenthesisExpr
         return $this->callWalkers(SqlNode::ParenthesisExpression, parent::walkParenthesisExpression($parenthesisExpression));
     }
 
-    public function walkNewObject(NewObjectExpression $newObjectExpression, string|null $newObjectResultAlias = null): string
+    public function walkNewObject(
+        NewObjectExpression $newObjectExpression,
+        ?string $newObjectResultAlias = null,
+    ): string
     {
         return $this->callWalkers(SqlNode::NewObject, parent::walkNewObject($newObjectExpression, $newObjectResultAlias));
     }
@@ -273,7 +279,7 @@ public function walkUpdateItem(UpdateItem $updateItem): string
         return $this->callWalkers(SqlNode::UpdateItem, parent::walkUpdateItem($updateItem));
     }
 
-    public function walkWhereClause(WhereClause|null $whereClause): string
+    public function walkWhereClause(?WhereClause $whereClause): string
     {
         return $this->callWalkers(SqlNode::WhereClause, parent::walkWhereClause($whereClause));
     }
@@ -403,7 +409,10 @@ public function walkResultVariable(string $resultVariable): string
         return $this->callWalkers(SqlNode::ResultVariable, parent::walkResultVariable($resultVariable));
     }
 
-    private function callWalkers(SqlNode $sqlNode, string $sql): string
+    private function callWalkers(
+        SqlNode $sqlNode,
+        string $sql,
+    ): string
     {
         foreach ($this->stringSqlWalkers[$sqlNode->value] ?? [] as $stringSqlWalker) {
             $sql = $stringSqlWalker->processNode($sqlNode, $sql);

src/HintDrivenSqlWalker.php

@@ -29,6 +29,9 @@ protected function getHintValue(): mixed
      */
     abstract public function getNodes(): array;
 
-    abstract public function processNode(SqlNode $sqlNode, string $sql): string;
+    abstract public function processNode(
+        SqlNode $sqlNode,
+        string $sql,
+    ): string;
 
 }

src/HintHandler.php

@@ -16,7 +16,10 @@ public function getNodes(): array
         return [SqlNode::SelectStatement, SqlNode::UpdateStatement, SqlNode::DeleteStatement];
     }
 
-    public function processNode(SqlNode $sqlNode, string $sql): string
+    public function processNode(
+        SqlNode $sqlNode,
+        string $sql,
+    ): string
     {
         $hintValue = $this->getHintValue();
 

tests/Handlers/CommentWholeSqlHintHandler.php

@@ -15,7 +15,10 @@ public function getNodes(): array
         return [SqlNode::SelectClause];
     }
 
-    public function processNode(SqlNode $sqlNode, string $sql): string
+    public function processNode(
+        SqlNode $sqlNode,
+        string $sql,
+    ): string
     {
         $result = preg_replace('~^SELECT~', 'select', $sql);
 

tests/Handlers/LowercaseSelectHintHandler.php

@@ -21,6 +21,7 @@ class HintDrivenSqlWalkerTest extends TestCase
 
     /**
      * @param callable(EntityManager):Query $queryCallback
+     *
      * @dataProvider walksProvider
      */
     public function testWalker(