From 15bfd74c75a76b2c858c698fb3c855626e620305 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 4 May 2023 19:37:17 +0100 Subject: [PATCH] Move ScaleData to Ds namespace Signed-off-by: Kamil Tekiela --- libraries/classes/Gis/{ => Ds}/ScaleData.php | 2 +- libraries/classes/Gis/GisGeometry.php | 1 + libraries/classes/Gis/GisGeometryCollection.php | 1 + libraries/classes/Gis/GisLineString.php | 1 + libraries/classes/Gis/GisMultiLineString.php | 1 + libraries/classes/Gis/GisMultiPoint.php | 1 + libraries/classes/Gis/GisMultiPolygon.php | 1 + libraries/classes/Gis/GisPoint.php | 1 + libraries/classes/Gis/GisPolygon.php | 1 + libraries/classes/Gis/GisVisualization.php | 1 + test/classes/Gis/GisGeometryCollectionTest.php | 2 +- test/classes/Gis/GisGeometryTest.php | 2 +- test/classes/Gis/GisLineStringTest.php | 2 +- test/classes/Gis/GisMultiLineStringTest.php | 2 +- test/classes/Gis/GisMultiPointTest.php | 2 +- test/classes/Gis/GisMultiPolygonTest.php | 2 +- test/classes/Gis/GisPointTest.php | 2 +- test/classes/Gis/GisPolygonTest.php | 2 +- 18 files changed, 18 insertions(+), 9 deletions(-) rename libraries/classes/Gis/{ => Ds}/ScaleData.php (96%) diff --git a/libraries/classes/Gis/ScaleData.php b/libraries/classes/Gis/Ds/ScaleData.php similarity index 96% rename from libraries/classes/Gis/ScaleData.php rename to libraries/classes/Gis/Ds/ScaleData.php index 5fe9e33e44..9280475acf 100644 --- a/libraries/classes/Gis/ScaleData.php +++ b/libraries/classes/Gis/Ds/ScaleData.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace PhpMyAdmin\Gis; +namespace PhpMyAdmin\Gis\Ds; use function max; use function min; diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php index ccb4267802..ddc71a98b7 100644 --- a/libraries/classes/Gis/GisGeometry.php +++ b/libraries/classes/Gis/GisGeometry.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisGeometryCollection.php b/libraries/classes/Gis/GisGeometryCollection.php index 84f1870d7c..cfdde03a61 100644 --- a/libraries/classes/Gis/GisGeometryCollection.php +++ b/libraries/classes/Gis/GisGeometryCollection.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; use ErrorException; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php index 94ad073612..1269478cc1 100644 --- a/libraries/classes/Gis/GisLineString.php +++ b/libraries/classes/Gis/GisLineString.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php index b18a1cb1dc..3b06a5158f 100644 --- a/libraries/classes/Gis/GisMultiLineString.php +++ b/libraries/classes/Gis/GisMultiLineString.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php index f2c19f4ae6..3db9157d5e 100644 --- a/libraries/classes/Gis/GisMultiPoint.php +++ b/libraries/classes/Gis/GisMultiPoint.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php index cf77ea6443..0e06e6245c 100644 --- a/libraries/classes/Gis/GisMultiPolygon.php +++ b/libraries/classes/Gis/GisMultiPolygon.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; use PhpMyAdmin\Gis\Ds\Polygon; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php index 02ed49be4a..00145092cb 100644 --- a/libraries/classes/Gis/GisPoint.php +++ b/libraries/classes/Gis/GisPoint.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php index dc74aaf508..51dc9ad9d9 100644 --- a/libraries/classes/Gis/GisPolygon.php +++ b/libraries/classes/Gis/GisPolygon.php @@ -7,6 +7,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/libraries/classes/Gis/GisVisualization.php b/libraries/classes/Gis/GisVisualization.php index 30bdcef7ea..ace1bf3430 100644 --- a/libraries/classes/Gis/GisVisualization.php +++ b/libraries/classes/Gis/GisVisualization.php @@ -8,6 +8,7 @@ declare(strict_types=1); namespace PhpMyAdmin\Gis; use PhpMyAdmin\Core; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use PhpMyAdmin\Sanitize; use PhpMyAdmin\Util; diff --git a/test/classes/Gis/GisGeometryCollectionTest.php b/test/classes/Gis/GisGeometryCollectionTest.php index 1e5a46b63e..02271a8af4 100644 --- a/test/classes/Gis/GisGeometryCollectionTest.php +++ b/test/classes/Gis/GisGeometryCollectionTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisGeometryCollection; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/test/classes/Gis/GisGeometryTest.php b/test/classes/Gis/GisGeometryTest.php index 2cdecec544..ea2073a127 100644 --- a/test/classes/Gis/GisGeometryTest.php +++ b/test/classes/Gis/GisGeometryTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisGeometry; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Tests\AbstractTestCase; use PHPUnit\Framework\MockObject\MockObject; diff --git a/test/classes/Gis/GisLineStringTest.php b/test/classes/Gis/GisLineStringTest.php index f2b2b8bcdf..8cb1409823 100644 --- a/test/classes/Gis/GisLineStringTest.php +++ b/test/classes/Gis/GisLineStringTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisLineString; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/test/classes/Gis/GisMultiLineStringTest.php b/test/classes/Gis/GisMultiLineStringTest.php index 715756bc8f..2a763dfee9 100644 --- a/test/classes/Gis/GisMultiLineStringTest.php +++ b/test/classes/Gis/GisMultiLineStringTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisMultiLineString; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/test/classes/Gis/GisMultiPointTest.php b/test/classes/Gis/GisMultiPointTest.php index 6bf0a628e8..1033dce89c 100644 --- a/test/classes/Gis/GisMultiPointTest.php +++ b/test/classes/Gis/GisMultiPointTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisMultiPoint; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/test/classes/Gis/GisMultiPolygonTest.php b/test/classes/Gis/GisMultiPolygonTest.php index e56d420a13..832bea3e27 100644 --- a/test/classes/Gis/GisMultiPolygonTest.php +++ b/test/classes/Gis/GisMultiPolygonTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisMultiPolygon; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/test/classes/Gis/GisPointTest.php b/test/classes/Gis/GisPointTest.php index 91a165457a..589d82d137 100644 --- a/test/classes/Gis/GisPointTest.php +++ b/test/classes/Gis/GisPointTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisPoint; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF; diff --git a/test/classes/Gis/GisPolygonTest.php b/test/classes/Gis/GisPolygonTest.php index 2c2882d9c9..d4a43d76b5 100644 --- a/test/classes/Gis/GisPolygonTest.php +++ b/test/classes/Gis/GisPolygonTest.php @@ -4,8 +4,8 @@ declare(strict_types=1); namespace PhpMyAdmin\Tests\Gis; +use PhpMyAdmin\Gis\Ds\ScaleData; use PhpMyAdmin\Gis\GisPolygon; -use PhpMyAdmin\Gis\ScaleData; use PhpMyAdmin\Image\ImageWrapper; use TCPDF;