isSuperTypeOf() returns IsSuperTypeOfResult

staabm · Nov 14, 2024 · 7c2e0e4 · 7c2e0e4
1 parent 91239bd
commit 7c2e0e4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/src/DoctrineReflection/DoctrineResultObjectType.php b/src/DoctrineReflection/DoctrineResultObjectType.php
@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Result;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
@@ -51,10 +52,10 @@ public function equals(Type $type): bool
         return parent::equals($type);
     }
 
-    public function isSuperTypeOf(Type $type): TrinaryLogic
+    public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
     {
         if ($type instanceof self) {
-            return TrinaryLogic::createFromBoolean(
+            return IsSuperTypeOfResult::createFromBoolean(
                 $type->rowType !== null
                 && $this->rowType !== null
                 && $type->rowType->equals($this->rowType)

diff --git a/src/DoctrineReflection/DoctrineStatementObjectType.php b/src/DoctrineReflection/DoctrineStatementObjectType.php
@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Statement;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
@@ -51,10 +52,10 @@ public function equals(Type $type): bool
         return parent::equals($type);
     }
 
-    public function isSuperTypeOf(Type $type): TrinaryLogic
+    public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
     {
         if ($type instanceof self) {
-            return TrinaryLogic::createFromBoolean(
+            return IsSuperTypeOfResult::createFromBoolean(
                 $type->rowType !== null
                 && $this->rowType !== null
                 && $type->rowType->equals($this->rowType)

diff --git a/src/MysqliReflection/MysqliResultObjectType.php b/src/MysqliReflection/MysqliResultObjectType.php
@@ -5,6 +5,7 @@
 namespace staabm\PHPStanDba\MysqliReflection;
 
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
@@ -40,10 +41,10 @@ public function equals(Type $type): bool
         return parent::equals($type);
     }
 
-    public function isSuperTypeOf(Type $type): TrinaryLogic
+    public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
     {
         if ($type instanceof self) {
-            return TrinaryLogic::createFromBoolean(
+            return IsSuperTypeOfResult::createFromBoolean(
                 $type->rowType !== null
                 && $this->rowType !== null
                 && $type->rowType->equals($this->rowType)

diff --git a/src/PdoReflection/PdoStatementObjectType.php b/src/PdoReflection/PdoStatementObjectType.php
@@ -14,6 +14,7 @@
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
+use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
@@ -165,10 +166,10 @@ public function equals(Type $type): bool
         return parent::equals($type);
     }
 
-    public function isSuperTypeOf(Type $type): TrinaryLogic
+    public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
     {
         if ($type instanceof self) {
-            return TrinaryLogic::createFromBoolean(
+            return IsSuperTypeOfResult::createFromBoolean(
                 $type->fetchType !== null
                 && $type->bothType !== null
                 && $this->bothType !== null

diff --git a/src/QueryReflection/QueryReflection.php b/src/QueryReflection/QueryReflection.php
@@ -206,7 +206,7 @@ public function isResolvable(Expr $queryExpr, Scope $scope): TrinaryLogic
         }
         $isStringOrMixed = $type->isSuperTypeOf(new StringType());
 
-        return $isStringOrMixed->negate();
+        return $isStringOrMixed->negate()->result;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             $isStringOrMixed = $type->isSuperTypeOf(new StringType());
-            return $isStringOrMixed->negate();
+            return $isStringOrMixed->negate()->result;
         }
         /**
@@ Expand Down @@