Merge pull request #2965 from Majkl578/ci/cs-stable

Update Doctrine CS requirement

.travis.yml

@@ -31,6 +31,7 @@ script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
 jobs:
   allow_failures:
     - php: nightly
+    - stage: Coding standard
 
   include:
     - stage: Test
@@ -304,7 +305,7 @@ jobs:
 
     - stage: Pull request coding standard
       if: type = pull_request
-      php: 7.2
+      php: 7.1
       script:
         - |
           if [ $TRAVIS_BRANCH != "master" ]; then
@@ -317,6 +318,6 @@ jobs:
 
     - stage: Coding standard
       if: NOT type = pull_request
-      php: nightly
+      php: 7.1
       script:
         - ./vendor/bin/phpcs

composer.json

@@ -17,10 +17,9 @@
         "doctrine/common": "^2.7.1"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^1.0",
+        "doctrine/coding-standard": "~2.0.0",
         "phpunit/phpunit": "^6.3",
         "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
-        "squizlabs/php_codesniffer": "^3.0",
         "symfony/console": "^2.0.5||^3.0",
         "symfony/phpunit-bridge": "^3.3"
     },

phpcs.xml.dist

@@ -12,12 +12,20 @@
     <file>lib</file>
     <file>tests</file>
 
-    <rule ref="Doctrine"/>
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/>
+    </rule>
 
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
 
+    <rule ref="Squiz.Classes.ClassFileName.NoMatch">
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+
     <rule ref="Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase">
         <exclude-pattern>lib/Doctrine/DBAL/Events.php</exclude-pattern>
     </rule>