Non-iterable interface deprecated and removed from all classes

paranoiq · Dec 6, 2019 · a1054d7 · a1054d7
1 parent aabb0b7
commit a1054d7
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 25 deletions.
diff --git a/src/Enum/EnumMixin.php b/src/Enum/EnumMixin.php
@@ -13,7 +13,6 @@
 use Dogma\InvalidTypeException;
 use Dogma\InvalidValueException;
 use Dogma\NonCloneableMixin;
-use Dogma\NonIterableMixin;
 use Dogma\NonSerializableMixin;
 use Dogma\StrictBehaviorMixin;
 use function count;
@@ -27,7 +26,6 @@
 trait EnumMixin
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
     use NonCloneableMixin;
     use NonSerializableMixin;
 

diff --git a/src/Enum/IntEnum.php b/src/Enum/IntEnum.php
@@ -11,9 +11,8 @@
 
 use Dogma\Arr;
 use Dogma\InvalidValueException;
-use Dogma\NonIterable;
 
-abstract class IntEnum implements NonIterable
+abstract class IntEnum
 {
     use EnumMixin;
 

diff --git a/src/Enum/SetMixin.php b/src/Enum/SetMixin.php
@@ -13,7 +13,6 @@
 use Dogma\InvalidTypeException;
 use Dogma\InvalidValueException;
 use Dogma\NonCloneableMixin;
-use Dogma\NonIterableMixin;
 use Dogma\NonSerializableMixin;
 use Dogma\StrictBehaviorMixin;
 use function count;
@@ -27,7 +26,6 @@
 trait SetMixin
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
     use NonCloneableMixin;
     use NonSerializableMixin;
 

diff --git a/src/Enum/StringEnum.php b/src/Enum/StringEnum.php
@@ -11,9 +11,8 @@
 
 use Dogma\Arr;
 use Dogma\InvalidValueException;
-use Dogma\NonIterable;
 
-abstract class StringEnum implements NonIterable
+abstract class StringEnum
 {
     use EnumMixin;
 

diff --git a/src/Geolocation/Position.php b/src/Geolocation/Position.php
@@ -15,19 +15,16 @@
 use Dogma\Mapping\Type\Exportable;
 use Dogma\Math\Constant;
 use Dogma\Math\Vector\Vector3;
-use Dogma\NonIterable;
-use Dogma\NonIterableMixin;
 use Dogma\StrictBehaviorMixin;
 use function deg2rad;
 use function rad2deg;
 
 /**
  * http://www.movable-type.co.uk/scripts/latlong.html
  */
-class Position implements NonIterable, Exportable
+class Position
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
 
     public const PLANET_EARTH_RADIUS = 6371000.0;
 

diff --git a/src/Reflection/MethodTypeParser.php b/src/Reflection/MethodTypeParser.php
@@ -9,8 +9,6 @@
 
 namespace Dogma\Reflection;
 
-use Dogma\NonIterable;
-use Dogma\NonIterableMixin;
 use Dogma\ShouldNotHappenException;
 use Dogma\StrictBehaviorMixin;
 use Dogma\Type;
@@ -34,10 +32,9 @@
 use function strtolower;
 use function trim;
 
-class MethodTypeParser implements NonIterable
+class MethodTypeParser
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
 
     /**
      * @param \ReflectionMethod $method

diff --git a/src/Time/Date.php b/src/Time/Date.php
@@ -13,7 +13,6 @@
 use Dogma\Check;
 use Dogma\Comparable;
 use Dogma\Equalable;
-use Dogma\NonIterableMixin;
 use Dogma\Order;
 use Dogma\Pokeable;
 use Dogma\StrictBehaviorMixin;
@@ -36,7 +35,6 @@
 class Date implements DateOrDateTime, Pokeable
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
 
     public const MIN = '0001-01-01';
     public const MAX = '9999-12-31';

diff --git a/src/Time/DateOrTime.php b/src/Time/DateOrTime.php
@@ -11,11 +11,10 @@
 
 use Dogma\Comparable;
 use Dogma\Equalable;
-use Dogma\NonIterable;
 use Dogma\Time\Format\DateTimeFormatter;
 use Dogma\Time\Format\DateTimeValues;
 
-interface DateOrTime extends NonIterable, Equalable, Comparable
+interface DateOrTime extends Equalable, Comparable
 {
 
     public function format(string $format = '', ?DateTimeFormatter $formatter = null): string;

diff --git a/src/Time/DateTime.php b/src/Time/DateTime.php
@@ -12,7 +12,6 @@
 use Dogma\Check;
 use Dogma\Comparable;
 use Dogma\Equalable;
-use Dogma\NonIterableMixin;
 use Dogma\Str;
 use Dogma\StrictBehaviorMixin;
 use Dogma\Time\Format\DateTimeFormatter;
@@ -40,7 +39,6 @@
 class DateTime extends \DateTimeImmutable implements DateOrDateTime, DateTimeOrTime, \DateTimeInterface
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
 
     public const MIN = '0001-01-01 00:00:00.000000';
     public const MAX = '9999-12-31 23:59:59.999999';

diff --git a/src/Time/Time.php b/src/Time/Time.php
@@ -13,7 +13,6 @@
 use Dogma\Check;
 use Dogma\Comparable;
 use Dogma\Equalable;
-use Dogma\NonIterableMixin;
 use Dogma\Order;
 use Dogma\Pokeable;
 use Dogma\Str;
@@ -39,7 +38,6 @@
 class Time implements DateTimeOrTime, Pokeable
 {
     use StrictBehaviorMixin;
-    use NonIterableMixin;
 
     public const MIN = '00:00:00.000000';
     public const MAX = '23:59:59.999999';

diff --git a/src/common/mixins/NonIterable.php b/src/common/mixins/NonIterable.php
@@ -9,6 +9,9 @@
 
 namespace Dogma;
 
+/**
+ * @deprecated PHPStan reports invalid usage of iteration. Use it instead
+ */
 interface NonIterable extends \IteratorAggregate
 {
 

diff --git a/src/common/mixins/NonIterableMixin.php b/src/common/mixins/NonIterableMixin.php
@@ -9,6 +9,9 @@
 
 namespace Dogma;
 
+/**
+ * @deprecated PHPStan reports invalid usage of iteration. Use it instead
+ */
 trait NonIterableMixin
 {
 

diff --git a/src/common/types/Check.php b/src/common/types/Check.php
@@ -1084,7 +1084,7 @@ public static function isIterable($value): bool
     {
         return is_array($value)
             || $value instanceof \stdClass
-            || ($value instanceof \Traversable && !$value instanceof NonIterable);
+            || ($value instanceof \Traversable);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,9 @@ @@
     namespace Dogma;
+    /**
+     * @deprecated PHPStan reports invalid usage of iteration. Use it instead
+     */
     interface NonIterable extends \IteratorAggregate
     {
@@ Expand Down @@