From 3f61228fe86800cb28440b82d04e221f6def24f4 Mon Sep 17 00:00:00 2001 From: Benjamin Morel Date: Sat, 6 Nov 2021 18:25:57 +0100 Subject: [PATCH] Fix getIterator() deprecation on PHP 8.1 --- src/CircularString.php | 2 +- src/CompoundCurve.php | 2 +- src/CurvePolygon.php | 2 +- src/GeometryCollection.php | 2 +- src/LineString.php | 2 +- src/Point.php | 2 +- src/Polygon.php | 2 +- src/PolyhedralSurface.php | 2 +- src/Proxy/CircularStringProxy.php | 2 +- src/Proxy/CompoundCurveProxy.php | 2 +- src/Proxy/CurvePolygonProxy.php | 2 +- src/Proxy/GeometryCollectionProxy.php | 2 +- src/Proxy/LineStringProxy.php | 2 +- src/Proxy/MultiCurveProxy.php | 2 +- src/Proxy/MultiLineStringProxy.php | 2 +- src/Proxy/MultiPointProxy.php | 2 +- src/Proxy/MultiPolygonProxy.php | 2 +- src/Proxy/MultiSurfaceProxy.php | 2 +- src/Proxy/PointProxy.php | 2 +- src/Proxy/PolygonProxy.php | 2 +- src/Proxy/PolyhedralSurfaceProxy.php | 2 +- src/Proxy/TINProxy.php | 2 +- src/Proxy/TriangleProxy.php | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/CircularString.php b/src/CircularString.php index 32a1648..954eef3 100644 --- a/src/CircularString.php +++ b/src/CircularString.php @@ -229,7 +229,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->points); } diff --git a/src/CompoundCurve.php b/src/CompoundCurve.php index 5419561..d0b4fcf 100644 --- a/src/CompoundCurve.php +++ b/src/CompoundCurve.php @@ -241,7 +241,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->curves); } diff --git a/src/CurvePolygon.php b/src/CurvePolygon.php index 7c191a0..b60e22b 100644 --- a/src/CurvePolygon.php +++ b/src/CurvePolygon.php @@ -226,7 +226,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->rings); } diff --git a/src/GeometryCollection.php b/src/GeometryCollection.php index 863c930..17cc9a7 100644 --- a/src/GeometryCollection.php +++ b/src/GeometryCollection.php @@ -253,7 +253,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->geometries); } diff --git a/src/LineString.php b/src/LineString.php index 114731e..d1279ec 100644 --- a/src/LineString.php +++ b/src/LineString.php @@ -271,7 +271,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->points); } diff --git a/src/Point.php b/src/Point.php index 8b6b92e..eedd3f3 100644 --- a/src/Point.php +++ b/src/Point.php @@ -328,7 +328,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->toArray()); } diff --git a/src/Polygon.php b/src/Polygon.php index d02d916..60c5ddd 100644 --- a/src/Polygon.php +++ b/src/Polygon.php @@ -246,7 +246,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->rings); } diff --git a/src/PolyhedralSurface.php b/src/PolyhedralSurface.php index 92c9810..69245e4 100644 --- a/src/PolyhedralSurface.php +++ b/src/PolyhedralSurface.php @@ -242,7 +242,7 @@ public function count() : int * * @psalm-return ArrayIterator */ - public function getIterator() + public function getIterator() : ArrayIterator { return new ArrayIterator($this->patches); } diff --git a/src/Proxy/CircularStringProxy.php b/src/Proxy/CircularStringProxy.php index 9fdb18c..9cea02b 100644 --- a/src/Proxy/CircularStringProxy.php +++ b/src/Proxy/CircularStringProxy.php @@ -231,7 +231,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/CompoundCurveProxy.php b/src/Proxy/CompoundCurveProxy.php index 1415828..695babc 100644 --- a/src/Proxy/CompoundCurveProxy.php +++ b/src/Proxy/CompoundCurveProxy.php @@ -231,7 +231,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/CurvePolygonProxy.php b/src/Proxy/CurvePolygonProxy.php index 67242a1..ac0e448 100644 --- a/src/Proxy/CurvePolygonProxy.php +++ b/src/Proxy/CurvePolygonProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/GeometryCollectionProxy.php b/src/Proxy/GeometryCollectionProxy.php index 2a1ca3e..7f1eca9 100644 --- a/src/Proxy/GeometryCollectionProxy.php +++ b/src/Proxy/GeometryCollectionProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/LineStringProxy.php b/src/Proxy/LineStringProxy.php index fc10d09..3d22326 100644 --- a/src/Proxy/LineStringProxy.php +++ b/src/Proxy/LineStringProxy.php @@ -231,7 +231,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/MultiCurveProxy.php b/src/Proxy/MultiCurveProxy.php index 01c8520..e2f8728 100644 --- a/src/Proxy/MultiCurveProxy.php +++ b/src/Proxy/MultiCurveProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/MultiLineStringProxy.php b/src/Proxy/MultiLineStringProxy.php index b44715a..175a0d9 100644 --- a/src/Proxy/MultiLineStringProxy.php +++ b/src/Proxy/MultiLineStringProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/MultiPointProxy.php b/src/Proxy/MultiPointProxy.php index aa5fef7..5ad8edf 100644 --- a/src/Proxy/MultiPointProxy.php +++ b/src/Proxy/MultiPointProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/MultiPolygonProxy.php b/src/Proxy/MultiPolygonProxy.php index 0eb087b..3149a9c 100644 --- a/src/Proxy/MultiPolygonProxy.php +++ b/src/Proxy/MultiPolygonProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/MultiSurfaceProxy.php b/src/Proxy/MultiSurfaceProxy.php index ef10351..c2da2a4 100644 --- a/src/Proxy/MultiSurfaceProxy.php +++ b/src/Proxy/MultiSurfaceProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/PointProxy.php b/src/Proxy/PointProxy.php index 3073dca..de20a28 100644 --- a/src/Proxy/PointProxy.php +++ b/src/Proxy/PointProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/PolygonProxy.php b/src/Proxy/PolygonProxy.php index 3569008..78922ae 100644 --- a/src/Proxy/PolygonProxy.php +++ b/src/Proxy/PolygonProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/PolyhedralSurfaceProxy.php b/src/Proxy/PolyhedralSurfaceProxy.php index fb9a6b7..a70cf01 100644 --- a/src/Proxy/PolyhedralSurfaceProxy.php +++ b/src/Proxy/PolyhedralSurfaceProxy.php @@ -213,7 +213,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/TINProxy.php b/src/Proxy/TINProxy.php index a5480a1..0f35a22 100644 --- a/src/Proxy/TINProxy.php +++ b/src/Proxy/TINProxy.php @@ -213,7 +213,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load(); diff --git a/src/Proxy/TriangleProxy.php b/src/Proxy/TriangleProxy.php index faa0795..b35eefb 100644 --- a/src/Proxy/TriangleProxy.php +++ b/src/Proxy/TriangleProxy.php @@ -222,7 +222,7 @@ public function count() : int return $this->proxyGeometry->count(); } - public function getIterator() + public function getIterator() : \ArrayIterator { if ($this->proxyGeometry === null) { $this->load();