Fix issues by copying code from Ondrej

phpstan · Dec 8, 2024 · ca3e5d2 · ca3e5d2
1 parent a261621
commit ca3e5d2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/stubs/dom.stub b/stubs/dom.stub
@@ -37,7 +37,6 @@ class DOMNode
 
 	/**
 	 * @phpstan-assert-if-true DOMNamedNodeMap<DOMAttr> $this->attributes
-	 * @phpstan-assert-if-false null $this->attributes
 	 */
 	public function hasAttributes(): bool {}
 }
@@ -48,6 +47,12 @@ class DOMElement extends DOMNode
 	/** @var DOMDocument */
 	public $ownerDocument;
 
+	/**
+	 * @readonly
+	 * @var DOMNamedNodeMap<DOMAttr>|null
+	 */
+	public $attributes;
+
 	/**
 	 * @param string $name
 	 * @return DOMNodeList<DOMElement>
@@ -64,11 +69,12 @@ class DOMElement extends DOMNode
 	/**
 	 * @template-covariant T of string
 	 * @param T $qualifiedName
-	 * @phpstan-assert-if-true DOMAttr|DOMNameSpaceNode $this->getAttributeNode($qualifiedName)
+	 * @phpstan-assert-if-true =DOMAttr $this->getAttributeNode($qualifiedName)
+	 * @phpstan-assert-if-true =DOMNamedNodeMap<DOMAttr> $this->attributes
 	 */
 	public function hasAttribute(string $qualifiedName): bool {}
 
-	public function getAttributeNode(string $qualifiedName): DOMAttr|DOMNameSpaceNode|false {}
+	public function getAttributeNode(string $qualifiedName): DOMAttr|false {}
 }
 
 /**

diff --git a/tests/PHPStan/Analyser/nsrt/DOMLegacyNamedNodeNap.php b/tests/PHPStan/Analyser/nsrt/DOMLegacyNamedNodeNap.php
@@ -22,6 +22,7 @@ public function basic_node(DOMNode $node): void {
 
 	public function element_node(DOMElement $element): void
 	{
+		assertType('DOMNamedNodeMap<DOMAttr>|null', $element->attributes);
 		if ($element->hasAttribute('class')) {
 			assertType('DOMNamedNodeMap<DOMAttr>', $element->attributes);
 			$attribute = $element->getAttributeNode('class');
@@ -34,6 +35,7 @@ public function element_node(DOMElement $element): void
 
 	public function element_node_attribute_fetch_via_attributes_property(DOMElement $element): void
 	{
+		assertType('DOMNamedNodeMap<DOMAttr>|null', $element->attributes);
 		if ($element->hasAttribute('class')) {
 			assertType('DOMNamedNodeMap<DOMAttr>', $element->attributes);
 			$attribute = $element->attributes->getNamedItem('class');

diff --git a/tests/PHPStan/Rules/Properties/data/dom-legacy-ext-template-nodes.php b/tests/PHPStan/Rules/Properties/data/dom-legacy-ext-template-nodes.php
@@ -1,38 +1,24 @@
 <?php
 
-use function PHPStan\Testing\assertType;
+namespace DOMNodeStubsAccessProperties;
 
 function basic_node(\DOMNode $node): void {
-	if ($node->hasAttributes()) {
-		assertType(DOMNamedNodeMap::class . '<' . DOMAttr::class . '>', $node->attributes);
-	} else {
-		assertType('null', $node->attributes);
-	}
+	var_dump($node->attributes);
 }
 
 function element_node(\DOMElement $element): void
 {
 	if ($element->hasAttribute('class')) {
-		assertType(DOMNamedNodeMap::class . '<' . DOMAttr::class . '>', $element->attributes);
 		$attribute = $element->getAttributeNode('class');
-		assertType(DOMAttr::class, $attribute);
-		assertType('string', $attribute->value);
-	} else {
-		assertType('DOMNamedNodeMap::class . '<' . DOMAttr::class . '>'|null', $element->attributes);
+		echo $attribute->value;
 	}
 }
 
 function element_node_attribute_fetch_via_attributes_property(\DOMElement $element): void
 {
-	if ($element->hasAttribute('class')) {
-		assertType(DOMNamedNodeMap::class . '<' . DOMAttr::class . '>', $element->attributes);
-		$attribute = $element->attributes->getNamedItem('class');
-		if ($attribute === null) {
-			return;
-		}
-		assertType(DOMAttr::class, $attribute);
-		assertType('string', $attribute->value);
-	} else {
-		assertType('DOMNamedNodeMap::class . '<' . DOMAttr::class . '>'|null', $element->attributes);
+	$attribute = $element->attributes->getNamedItem('class');
+	if ($attribute === null) {
+		return;
 	}
+	echo $attribute->value;
 }