Merge pull request #5 from moufmouf/doctrine-coding-standard-7

Upgrading to Doctrine Coding Standard 7

Author: moufmouf

.travis.yml

@@ -15,20 +15,20 @@ matrix:
   include:
       # Test the latest stable release
     - php: 7.2
-    - php: 7.3
+    - php: 7.4
       env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
 
       # Test LTS versions.
-    - php: 7.3
+    - php: 7.4
       env: DEPENDENCIES="symfony/lts:^4"
 
       # Latest commit to master
-    - php: 7.3
+    - php: 7.4
       env: STABILITY="dev"
 
   allow_failures:
     # Minimum supported dependencies with the latest and oldest PHP version
-    - php: 7.3
+    - php: 7.4
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
     - php: 7.2
       env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
@@ -48,6 +48,7 @@ install:
 script:
   - composer validate --strict --no-check-lock
   - composer phpstan
+  - composer cs-check
   - ./vendor/bin/phpunit
 
 after_script:

composer.json

@@ -28,7 +28,7 @@
     "phpstan/phpstan": "^0.11.16",
     "php-coveralls/php-coveralls": "^2.1.0",
     "symfony/translation": "^4",
-    "doctrine/coding-standard": "^6.0"
+    "doctrine/coding-standard": "^7.0"
   },
   "scripts": {
     "phpstan": "phpstan analyse src/ -c phpstan.neon --level=7 --no-progress",

phpcs.xml.dist

@@ -42,4 +42,11 @@
             <property name="spacesCountBeforeColon" value="0"/>
         </properties>
     </rule>
+
+    <!-- Disable PHP 7.4 type hints since we need to support PHP 7.2+ -->
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+        <properties>
+            <property name="enableNativeTypeHint" value="false"/>
+        </properties>
+    </rule>
 </ruleset>

src/Annotations/Assertion.php

@@ -35,9 +35,11 @@ public function __construct(array $values)
         if (! isset($values['for'])) {
             throw new BadMethodCallException('The @Assert annotation must be passed a target. For instance: "@Assert(for="$email", constraint=@Email)"');
         }
+
         if (! isset($values['constraint'])) {
             throw new BadMethodCallException('The @Assert annotation must be passed one or many constraints. For instance: "@Assert(for="$email", constraint=@Email)"');
         }
+
         $this->for = ltrim($values['for'], '$');
         $this->constraint = is_array($values['constraint']) ? $values['constraint'] : [ $values['constraint'] ];
     }

src/ConstraintViolationException.php

@@ -49,6 +49,7 @@ public function getExtensions(): array
         if ($code !== null) {
             $extensions['code'] = $code;
         }
+
         $propertyPath = $this->violation->getPropertyPath();
         if ($propertyPath !== null) {
             $extensions['field'] = $propertyPath;