Merge pull request vimeo#7217 from weirdan/restore-constant-attributes-storage

weirdan · web-flow · commit aea1cba98208 · 2021-12-26T04:10:54.000+02:00
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php
@@ -1296,6 +1296,19 @@ private function visitClassConstDeclaration(
             }
 
             $constant_storage->description = $description;
+
+            foreach ($stmt->attrGroups as $attr_group) {
+                foreach ($attr_group->attrs as $attr) {
+                    $constant_storage->attributes[] = AttributeResolver::resolve(
+                        $this->codebase,
+                        $this->file_scanner,
+                        $this->file_storage,
+                        $this->aliases,
+                        $attr,
+                        $this->storage->name ?? null
+                    );
+                }
+            }
         }
     }
 
diff --git a/src/Psalm/Storage/ClassConstantStorage.php b/src/Psalm/Storage/ClassConstantStorage.php
@@ -39,6 +39,12 @@ class ClassConstantStorage
      */
     public $deprecated = false;
 
+    /**
+     * @var list<AttributeStorage>
+     * @psalm-suppress PossiblyUnusedProperty
+     */
+    public $attributes = [];
+
     /**
      * @var ?string
      */

Original file line number	Diff line number	Diff line change
`@@ -1296,6 +1296,19 @@ private function visitClassConstDeclaration(`
`1296`	`1296`	`}`
`1297`	`1297`
`1298`	`1298`	`$constant_storage->description = $description;`
	`1299`	`+`
	`1300`	`+ foreach ($stmt->attrGroups as $attr_group) {`
	`1301`	`+ foreach ($attr_group->attrs as $attr) {`
	`1302`	`+ $constant_storage->attributes[] = AttributeResolver::resolve(`
	`1303`	`+ $this->codebase,`
	`1304`	`+ $this->file_scanner,`
	`1305`	`+ $this->file_storage,`
	`1306`	`+ $this->aliases,`
	`1307`	`+ $attr,`
	`1308`	`+ $this->storage->name ?? null`
	`1309`	`+ );`
	`1310`	`+ }`
	`1311`	`+ }`
`1299`	`1312`	`}`
`1300`	`1313`	`}`
`1301`	`1314`