Extend PseudoType from Type classes

Author: ahjdev

src/PseudoTypes/AbstractConditional.php

@@ -22,7 +22,7 @@
  *
  * @psalm-immutable
  */
-abstract class AbstractConditional implements PseudoType
+abstract class AbstractConditional extends Mixed_ implements PseudoType
 {
     /** @var Type */
     private $target;

src/PseudoTypes/AggregatedPseudoType.php

@@ -22,7 +22,7 @@
 use function implode;
 
 /** @psalm-immutable */
-class ArrayShape implements PseudoType
+class ArrayShape extends Array_ implements PseudoType
 {
     /** @var ArrayShapeItem[] */
     private $items;

src/PseudoTypes/ArrayShape.php

@@ -22,7 +22,7 @@
  *
  * @psalm-immutable
  */
-final class ClosedResource implements PseudoType
+final class ClosedResource extends Resource_ implements PseudoType
 {
     public function underlyingType(): Type
     {

src/PseudoTypes/ClosedResource.php

@@ -20,7 +20,7 @@
 use function sprintf;
 
 /** @psalm-immutable */
-final class ConstExpression implements PseudoType
+final class ConstExpression extends Mixed_ implements PseudoType
 {
     /** @var Type */
     private $owner;

src/PseudoTypes/ConstExpression.php

@@ -18,7 +18,7 @@
 use phpDocumentor\Reflection\Types\Float_;
 
 /** @psalm-immutable */
-class FloatValue implements PseudoType
+class FloatValue extends Float_ implements PseudoType
 {
     /** @var float */
     private $value;

src/PseudoTypes/FloatValue.php

@@ -14,11 +14,13 @@
 namespace phpDocumentor\Reflection\PseudoTypes;
 
 use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\PseudoType;
 use phpDocumentor\Reflection\Types\Integer;
-use phpDocumentor\Reflection\PseudoTypes\AggregatedPseudoType;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\AggregatedType;
 
 /** @psalm-immutable */
-final class IntMask  extends AggregatedPseudoType
+final class IntMask extends AggregatedType implements PseudoType
 {
     public function __construct(array $types)
     {
@@ -27,7 +29,7 @@ public function __construct(array $types)
 
     public function underlyingType(): Type
     {
-        return new Integer();
+        return new Compound([new Integer()]);
     }
 
     /**

src/PseudoTypes/IntMask.php

@@ -14,11 +14,13 @@
 namespace phpDocumentor\Reflection\PseudoTypes;
 
 use phpDocumentor\Reflection\Type;
+use phpDocumentor\Reflection\PseudoType;
 use phpDocumentor\Reflection\Types\Integer;
-use phpDocumentor\Reflection\PseudoTypes\AggregatedPseudoType;
+use phpDocumentor\Reflection\Types\Compound;
+use phpDocumentor\Reflection\Types\AggregatedType;
 
 /** @psalm-immutable */
-final class IntMaskOf extends AggregatedPseudoType
+final class IntMaskOf extends AggregatedType implements PseudoType
 {
     public function __construct(array $types)
     {
@@ -27,7 +29,7 @@ public function __construct(array $types)
 
     public function underlyingType(): Type
     {
-        return new Integer();
+        return new Compound([new Integer()]);
     }
 
     /**

src/PseudoTypes/IntMaskOf.php

@@ -18,7 +18,7 @@
 use phpDocumentor\Reflection\Types\Integer;
 
 /** @psalm-immutable */
-final class IntegerValue implements PseudoType
+final class IntegerValue extends Integer implements PseudoType
 {
     /** @var int */
     private $value;

src/PseudoTypes/IntegerValue.php

@@ -18,7 +18,7 @@
 use phpDocumentor\Reflection\PseudoType;
 
 /** @psalm-immutable */
-final class KeyOf implements PseudoType
+final class KeyOf extends Mixed_ implements PseudoType
 {
     /** @var Type */
     protected $keyType;