Merge pull request #9220 from othercorey/dateperiod-end

closes #9147
vimeo · Feb 3, 2023 · 498cc45 · 498cc45
2 parents 234787b + cdbd71b
commit 498cc45
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/stubs/Php80.phpstub b/stubs/Php80.phpstub
@@ -220,12 +220,12 @@ class DatePeriod implements IteratorAggregate
     /**
      * @param Start $start
      * @param (Start is string ? 0|self::EXCLUDE_START_DATE : DateInterval) $interval
-     * @param (Start is string ? never : DateTimeInterface|positive-int) $end
+     * @param (Start is string ? never : (DateTimeInterface|positive-int)) $end
      * @param (Start is string ? never : 0|self::EXCLUDE_START_DATE) $options
      */
     public function __construct($start, $interval = 0, $end = 1, $options = 0) {}
 
-    /** @psalm-return (Start is string ? (Traversable<int, DateTime>&Iterator) : (Traversable<int, Start>&Iterator)) */
+    /** @psalm-return (Start is string ? Iterator<int, DateTime> : Iterator<int, Start>) */
     public function getIterator(): Iterator {}
 }
 

diff --git a/stubs/Php82.phpstub b/stubs/Php82.phpstub
@@ -10,4 +10,27 @@ namespace {
         /** @return non-empty-list<ReflectionNamedType|ReflectionIntersectionType> */
         public function getTypes(): array {}
     }
+
+    /**
+    * @psalm-immutable
+    *
+    * @template-covariant Start of string|DateTimeInterface
+    * @implements IteratorAggregate<int, DateTimeInterface>
+    */
+    class DatePeriod implements IteratorAggregate
+    {
+        const EXCLUDE_START_DATE = 1;
+        const INCLUDE_END_DATE = 2;
+
+        /**
+        * @param Start $start
+        * @param (Start is string ? int-mask<self::EXCLUDE_START_DATE, self::INCLUDE_END_DATE> : DateInterval) $interval
+        * @param (Start is string ? never : (DateTimeInterface|positive-int)) $end
+        * @param (Start is string ? never : int-mask<self::EXCLUDE_START_DATE, self::INCLUDE_END_DATE>) $options
+        */
+        public function __construct($start, $interval = 0, $end = 1, $options = 0) {}
+
+        /** @psalm-return (Start is string ? Iterator<int, DateTime> : Iterator<int, Start>) */
+        public function getIterator(): Iterator {}
+    }
 }