Move iterable methods from array to iterable traits

src/Type/BooleanType.php

@@ -7,6 +7,7 @@
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonCallableTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -21,6 +22,7 @@ class BooleanType implements Type
 {
 
 	use JustNullableTypeTrait;
+	use NonArrayTypeTrait;
 	use NonCallableTypeTrait;
 	use NonIterableTypeTrait;
 	use NonObjectTypeTrait;

src/Type/ClosureType.php

@@ -25,6 +25,7 @@
 use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
+use PHPStan\Type\Traits\NonIterableTypeTrait;
 use PHPStan\Type\Traits\NonOffsetAccessibleTypeTrait;
 use PHPStan\Type\Traits\NonRemoveableTypeTrait;
 use PHPStan\Type\Traits\UndecidedComparisonTypeTrait;
@@ -39,6 +40,7 @@ class ClosureType implements TypeWithClassName, ParametersAcceptor
 
 	use NonArrayTypeTrait;
 	use NonGenericTypeTrait;
+	use NonIterableTypeTrait;
 	use UndecidedComparisonTypeTrait;
 	use NonOffsetAccessibleTypeTrait;
 	use NonRemoveableTypeTrait;
@@ -238,16 +240,6 @@ public function isIterableAtLeastOnce(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function getIterableKeyType(): Type
-	{
-		return new ErrorType();
-	}
-
-	public function getIterableValueType(): Type
-	{
-		return new ErrorType();
-	}
-
 	public function isCallable(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();

src/Type/IntegerType.php

@@ -5,6 +5,7 @@
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonCallableTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -19,6 +20,7 @@ class IntegerType implements Type
 {
 
 	use JustNullableTypeTrait;
+	use NonArrayTypeTrait;
 	use NonCallableTypeTrait;
 	use NonIterableTypeTrait;
 	use NonObjectTypeTrait;

src/Type/IterableType.php

@@ -226,11 +226,31 @@ public function getIterableKeyType(): Type
 		return $this->keyType;
 	}
 
+	public function getFirstIterableKeyType(): Type
+	{
+		return $this->keyType;
+	}
+
+	public function getLastIterableKeyType(): Type
+	{
+		return $this->keyType;
+	}
+
 	public function getIterableValueType(): Type
 	{
 		return $this->getItemType();
 	}
 
+	public function getFirstIterableValueType(): Type
+	{
+		return $this->getItemType();
+	}
+
+	public function getLastIterableValueType(): Type
+	{
+		return $this->getItemType();
+	}
+
 	public function isString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

src/Type/JustNullableTypeTrait.php

@@ -3,14 +3,11 @@
 namespace PHPStan\Type;
 
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\Traits\NonArrayTypeTrait;
 use function get_class;
 
 trait JustNullableTypeTrait
 {
 
-	use NonArrayTypeTrait;
-
 	/**
 	 * @return string[]
 	 */

src/Type/NeverType.php

@@ -15,6 +15,7 @@
 use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
+use PHPStan\Type\Traits\NonIterableTypeTrait;
 use PHPStan\Type\Traits\NonRemoveableTypeTrait;
 use PHPStan\Type\Traits\UndecidedBooleanTypeTrait;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
@@ -26,6 +27,7 @@ class NeverType implements CompoundType
 	use UndecidedBooleanTypeTrait;
 	use NonArrayTypeTrait;
 	use NonGenericTypeTrait;
+	use NonIterableTypeTrait;
 	use UndecidedComparisonCompoundTypeTrait;
 	use NonRemoveableTypeTrait;
 	use NonGeneralizableTypeTrait;

src/Type/NonexistentParentClassType.php

@@ -10,6 +10,7 @@
 use PHPStan\Reflection\Type\UnresolvedPropertyPrototypeReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonCallableTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -23,6 +24,7 @@ class NonexistentParentClassType implements Type
 {
 
 	use JustNullableTypeTrait;
+	use NonArrayTypeTrait;
 	use NonCallableTypeTrait;
 	use NonIterableTypeTrait;
 	use NonOffsetAccessibleTypeTrait;

src/Type/ObjectType.php

@@ -33,6 +33,7 @@
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Traits\MaybeIterableTypeTrait;
 use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -53,6 +54,7 @@
 class ObjectType implements TypeWithClassName, SubtractableType
 {
 
+	use MaybeIterableTypeTrait;
 	use NonArrayTypeTrait;
 	use NonGenericTypeTrait;
 	use UndecidedComparisonTypeTrait;
@@ -753,6 +755,16 @@ public function getIterableKeyType(): Type
 		return new ErrorType();
 	}
 
+	public function getFirstIterableKeyType(): Type
+	{
+		return $this->getIterableKeyType();
+	}
+
+	public function getLastIterableKeyType(): Type
+	{
+		return $this->getIterableKeyType();
+	}
+
 	public function getIterableValueType(): Type
 	{
 		$isTraversable = false;
@@ -794,6 +806,16 @@ public function getIterableValueType(): Type
 		return new ErrorType();
 	}
 
+	public function getFirstIterableValueType(): Type
+	{
+		return $this->getIterableValueType();
+	}
+
+	public function getLastIterableValueType(): Type
+	{
+		return $this->getIterableValueType();
+	}
+
 	public function isString(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

src/Type/ResourceType.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonCallableTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
@@ -19,6 +20,7 @@ class ResourceType implements Type
 {
 
 	use JustNullableTypeTrait;
+	use NonArrayTypeTrait;
 	use NonCallableTypeTrait;
 	use NonIterableTypeTrait;
 	use NonObjectTypeTrait;

src/Type/StrictMixedType.php

@@ -15,6 +15,7 @@
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
+use PHPStan\Type\Traits\NonIterableTypeTrait;
 use PHPStan\Type\Traits\NonRemoveableTypeTrait;
 use PHPStan\Type\Traits\UndecidedComparisonCompoundTypeTrait;
 
@@ -23,6 +24,7 @@ class StrictMixedType implements CompoundType
 
 	use UndecidedComparisonCompoundTypeTrait;
 	use NonArrayTypeTrait;
+	use NonIterableTypeTrait;
 	use NonRemoveableTypeTrait;
 	use NonGeneralizableTypeTrait;
 

src/Type/StringType.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Traits\MaybeCallableTypeTrait;
+use PHPStan\Type\Traits\NonArrayTypeTrait;
 use PHPStan\Type\Traits\NonGeneralizableTypeTrait;
 use PHPStan\Type\Traits\NonGenericTypeTrait;
 use PHPStan\Type\Traits\NonIterableTypeTrait;
@@ -22,6 +23,7 @@ class StringType implements Type
 
 	use JustNullableTypeTrait;
 	use MaybeCallableTypeTrait;
+	use NonArrayTypeTrait;
 	use NonIterableTypeTrait;
 	use NonObjectTypeTrait;
 	use UndecidedBooleanTypeTrait;

src/Type/Traits/MaybeArrayTypeTrait.php

@@ -3,8 +3,6 @@
 namespace PHPStan\Type\Traits;
 
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\MixedType;
-use PHPStan\Type\Type;
 
 trait MaybeArrayTypeTrait
 {
@@ -19,26 +17,6 @@ public function getConstantArrays(): array
 		return [];
 	}
 
-	public function getFirstIterableKeyType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function getLastIterableKeyType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function getFirstIterableValueType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function getLastIterableValueType(): Type
-	{
-		return new MixedType();
-	}
-
 	public function isArray(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();

src/Type/Traits/MaybeIterableTypeTrait.php

@@ -24,9 +24,29 @@ public function getIterableKeyType(): Type
 		return new MixedType();
 	}
 
+	public function getFirstIterableKeyType(): Type
+	{
+		return new MixedType();
+	}
+
+	public function getLastIterableKeyType(): Type
+	{
+		return new MixedType();
+	}
+
 	public function getIterableValueType(): Type
 	{
 		return new MixedType();
 	}
 
+	public function getFirstIterableValueType(): Type
+	{
+		return new MixedType();
+	}
+
+	public function getLastIterableValueType(): Type
+	{
+		return new MixedType();
+	}
+
 }

src/Type/Traits/NonArrayTypeTrait.php

@@ -3,8 +3,6 @@
 namespace PHPStan\Type\Traits;
 
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\ErrorType;
-use PHPStan\Type\Type;
 
 trait NonArrayTypeTrait
 {
@@ -19,26 +17,6 @@ public function getConstantArrays(): array
 		return [];
 	}
 
-	public function getFirstIterableKeyType(): Type
-	{
-		return new ErrorType();
-	}
-
-	public function getLastIterableKeyType(): Type
-	{
-		return new ErrorType();
-	}
-
-	public function getFirstIterableValueType(): Type
-	{
-		return new ErrorType();
-	}
-
-	public function getLastIterableValueType(): Type
-	{
-		return new ErrorType();
-	}
-
 	public function isArray(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

src/Type/Traits/NonIterableTypeTrait.php

@@ -24,9 +24,29 @@ public function getIterableKeyType(): Type
 		return new ErrorType();
 	}
 
+	public function getFirstIterableKeyType(): Type
+	{
+		return new ErrorType();
+	}
+
+	public function getLastIterableKeyType(): Type
+	{
+		return new ErrorType();
+	}
+
 	public function getIterableValueType(): Type
 	{
 		return new ErrorType();
 	}
 
+	public function getFirstIterableValueType(): Type
+	{
+		return new ErrorType();
+	}
+
+	public function getLastIterableValueType(): Type
+	{
+		return new ErrorType();
+	}
+
 }