Drop php-cs-fixer and setup phpcs

.gitattributes

@@ -5,7 +5,7 @@
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs export-ignore
 /.travis.yml export-ignore
 /Makefile export-ignore
+/phpcs.xml.dist export-ignore
 /phpunit.xml.dist export-ignore

.github/workflows/coding-standards.yml

@@ -0,0 +1,27 @@
+name: "Coding Standards"
+
+on:
+  pull_request:
+    branches:
+      - "master"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - src/**
+      - phpcs.xml.dist
+      - tests/**
+  push:
+    branches:
+      - "master"
+    paths:
+      - .github/workflows/coding-standards.yml
+      - bin/**
+      - composer.*
+      - src/**
+      - phpcs.xml.dist
+      - tests/**
+
+jobs:
+  coding-standards:
+    uses: "doctrine/.github/.github/workflows/[email protected]"

.github/workflows/tests.yml

@@ -39,6 +39,3 @@ jobs:
         run: composer install --prefer-dist --no-progress --no-suggest
 
       - run: composer run test
-
-      - run: composer run lint -- --dry-run
-        if: ${{ matrix.php <= '8.0' }}

.gitignore

@@ -1,3 +1,4 @@
+.phpcs-cache
 .phpunit.result.cache
 /composer.lock
 /tests/phpunit.xml

composer.json

@@ -14,9 +14,10 @@
     },
     "require-dev": {
         "doctrine/cache": "^1.11",
-        "friendsofphp/php-cs-fixer": "^2.14",
+        "doctrine/coding-standard": "^9.0.2 || ^12.0",
         "nesbot/carbon": "*",
         "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+        "squizlabs/php_codesniffer": "^3.8",
         "symfony/yaml": "^4.4 || ^5.3 || ^6.0",
         "zf1/zend-date": "^1.12",
         "zf1/zend-registry": "^1.12"
@@ -28,10 +29,12 @@
         "psr-4": {"DoctrineExtensions\\Tests\\": "tests/"}
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "scripts": {
-        "lint": "php-cs-fixer fix --ansi --diff --diff-format udiff --show-progress=none --verbose",
         "test": "phpunit --colors=always"
     }
 }

phpcs.xml.dist

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<ruleset>
+    <arg name="basepath" value="."/>
+    <arg name="extensions" value="php"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value=".phpcs-cache"/>
+    <arg name="colors"/>
+
+    <!-- Ignore warnings, show progress of the run and show sniff names -->
+    <arg value="nps"/>
+
+    <config name="php_version" value="70100"/>
+
+    <file>src</file>
+    <file>tests</file>
+
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint" />
+        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint" />
+        <exclude name="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly.ReferencedGeneralException"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint" />
+        <exclude name="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden" />
+        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing" />
+    </rule>
+</ruleset>

src/Query/Mysql/Acos.php

@@ -4,19 +4,21 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
 
 class Acos extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return 'ACOS(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         ) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

src/Query/Mysql/AddTime.php

@@ -4,22 +4,22 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
 
-/**
- * @author Pascal Wacker <[email protected]>
- */
+/** @author Pascal Wacker <[email protected]> */
 class AddTime extends FunctionNode
 {
     public $date;
 
     public $time;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return 'ADDTIME(' . $sqlWalker->walkArithmeticPrimary($this->date) . ', ' . $sqlWalker->walkArithmeticPrimary($this->time) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

src/Query/Mysql/AesDecrypt.php

@@ -4,14 +4,18 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
 
 class AesDecrypt extends FunctionNode
 {
     public $field = '';
 
     public $key = '';
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +25,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return sprintf(
             'AES_DECRYPT(%s, %s)',

src/Query/Mysql/AesEncrypt.php

@@ -4,14 +4,18 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
 
 class AesEncrypt extends FunctionNode
 {
     public $field = '';
 
     public $key = '';
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +25,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return sprintf(
             'AES_ENCRYPT(%s, %s)',

src/Query/Mysql/AnyValue.php

@@ -4,20 +4,24 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
 
 class AnyValue extends FunctionNode
 {
     public $value;
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
         $this->value = $parser->StringPrimary();
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return sprintf(
             'ANY_VALUE(%s)',

src/Query/Mysql/Ascii.php

@@ -4,17 +4,19 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
 
 class Ascii extends FunctionNode
 {
     private $string;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
-        return 'ASCII('.$sqlWalker->walkArithmeticPrimary($this->string).')';
+        return 'ASCII(' . $sqlWalker->walkArithmeticPrimary($this->string) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

src/Query/Mysql/Asin.php

@@ -4,19 +4,21 @@
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
 
 class Asin extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return 'ASIN(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         ) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser): void
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);