DoctrineEntitySniff: support multi-line attributes and self reference

Author: javer

Swivl/Sniffs/Commenting/DoctrineEntitySniff.php

@@ -520,13 +520,14 @@ protected function parseNativeAttributeParams(string $text): array
             $colonPos = strpos($text, ':');
             $name = substr($text, 0, $colonPos);
 
-            if (strpos($name, ' ') !== false) {
+            if (strpos($name, ' ') !== false && strpos($name, "\n") === false) {
                 $name = trim($name);
                 $error = 'Found extra space before attribute "%s" name';
                 $data = [$name];
                 $this->reportError($error, $this->tagStart, 'ExtraSpace', $data);
             }
 
+            $name = trim($name, " \r\n");
             $valuePos = $colonPos + 1;
 
             if (substr($text, $valuePos, 1) !== ' ') {
@@ -777,7 +778,7 @@ protected function validateAnnotationAttributeType(string $name, string $attrNam
                     break;
 
                 case 'class':
-                    $valid = (ucfirst($value) === $value) && (
+                    $valid = (ucfirst($value) === $value || $value === 'self::class') && (
                             (strpos($value, "\\") !== false)
                             || strpos($value, self::CLASS_SUFFIX, -self::CLASS_SUFFIX_LENGTH)
                         );
@@ -821,8 +822,8 @@ protected function validateAnnotationColumn(string $name, array $attributes): vo
             }
         }
 
-        $columnType = null;
-        $expectedType = null;
+        $expectedType = $this->memberType;
+
         if (isset($attributes['type'])) {
             $columnType = $attributes['type'];
 
@@ -1215,6 +1216,10 @@ protected function getShortClassName(string $className): string
             $className = substr($className, 0, -self::CLASS_SUFFIX_LENGTH);
         }
 
+        if ($className === 'self') {
+            $className = $this->getMethodClassName($this->memberPtr);
+        }
+
         return $className;
     }
 

composer.json

@@ -17,6 +17,9 @@
         "php": ">=7.1",
         "squizlabs/php_codesniffer": "^3.6"
     },
+    "conflict": {
+        "doctrine/orm": "<2.9"
+    },
     "autoload": {
         "psr-4": {
             "Swivl\\Sniffs\\": "Swivl/Sniffs/",
@@ -25,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3.x-dev"
+            "dev-master": "1.4.x-dev"
         }
     }
 }