Merge pull request #9017 from orklah/isnotaclass

Add getAtomicType to IsNotAClass for proper negation Reconciliation
vimeo · Dec 28, 2022 · 1bd0644 · 1bd0644
2 parents 7b8b44c + 58853c0
commit 1bd0644
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/Psalm/Storage/Assertion/IsAClass.php b/src/Psalm/Storage/Assertion/IsAClass.php
@@ -26,7 +26,7 @@ public function getNegation(): Assertion
         return new IsNotAClass($this->type, $this->allow_string);
     }
 
-    public function getAtomicType(): ?Atomic
+    public function getAtomicType(): Atomic
     {
         return $this->type;
     }

diff --git a/src/Psalm/Storage/Assertion/IsNotAClass.php b/src/Psalm/Storage/Assertion/IsNotAClass.php
@@ -31,6 +31,11 @@ public function getNegation(): Assertion
         return new IsAClass($this->type, $this->allow_string);
     }
 
+    public function getAtomicType(): Atomic
+    {
+        return $this->type;
+    }
+
     public function __toString(): string
     {
         return 'isa-' . ($this->allow_string ? 'string-' : '') . $this->type;

diff --git a/tests/TypeReconciliation/ReconcilerTest.php b/tests/TypeReconciliation/ReconcilerTest.php
@@ -175,6 +175,7 @@ public function providerTestReconcilation(): array
             'SimpleXMLIteratorNotAlwaysTruthy' => ['SimpleXMLIterator', new Truthy(), 'SimpleXMLIterator'],
             'SimpleXMLIteratorNotAlwaysTruthy2' => ['SimpleXMLIterator', new Falsy(), 'SimpleXMLIterator'],
             'stringWithAny' => ['string', new Any(), 'string'],
+            'IsNotAClassReconciliation' => ['int', new Assertion\IsNotAClass(new TNamedObject('IDObject'), true), 'int|IDObject'],
         ];
     }