Skip to content

Commit 0b081f8

Browse files
committed
Using last stable version of geo-parser and wkt-parser
1 parent 087af2d commit 0b081f8

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

composer.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
"php": "^8.1",
2727
"ext-json": "*",
2828
"ext-mbstring": "*",
29-
"creof/geo-parser": "~2.2",
30-
"longitude-one/wkt-parser": "~1.0",
29+
"longitude-one/geo-parser": "2.1.*",
30+
"longitude-one/wkt-parser": "2.1.*",
3131
"creof/wkb-parser": "~2.3",
32-
"doctrine/orm": "^2.8.4"
32+
"doctrine/orm": "^2.19"
3333
},
3434
"require-dev": {
3535
"friendsofphp/php-cs-fixer": "^3.0",
@@ -41,6 +41,8 @@
4141
"cache/array-adapter": "^1.1",
4242
"dg/bypass-finals": "^1.3"
4343
},
44+
"prefer-stable": true,
45+
"minimum-stability": "dev",
4446
"scripts": {
4547
"check-quality-code": [
4648
"php-cs-fixer fix --dry-run --config=.php-cs-fixer.dist.php --allow-risky=yes -vvv",

lib/LongitudeOne/Spatial/PHP/Types/AbstractPoint.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
namespace LongitudeOne\Spatial\PHP\Types;
1717

18-
use CrEOF\Geo\String\Exception\RangeException;
19-
use CrEOF\Geo\String\Exception\UnexpectedValueException;
20-
use CrEOF\Geo\String\Parser;
18+
use LongitudeOne\Geo\String\Exception\RangeException;
19+
use LongitudeOne\Geo\String\Exception\UnexpectedValueException;
20+
use LongitudeOne\Geo\String\Parser;
2121
use LongitudeOne\Spatial\Exception\InvalidValueException;
2222

2323
/**

lib/LongitudeOne/Spatial/PHP/Types/Geography/Point.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
namespace LongitudeOne\Spatial\PHP\Types\Geography;
1717

18-
use CrEOF\Geo\String\Exception\RangeException;
19-
use CrEOF\Geo\String\Exception\UnexpectedValueException;
20-
use CrEOF\Geo\String\Parser;
18+
use LongitudeOne\Geo\String\Exception\RangeException;
19+
use LongitudeOne\Geo\String\Exception\UnexpectedValueException;
20+
use LongitudeOne\Geo\String\Parser;
2121
use LongitudeOne\Spatial\Exception\InvalidValueException;
2222
use LongitudeOne\Spatial\PHP\Types\AbstractPoint;
2323
use LongitudeOne\Spatial\PHP\Types\PointInterface;

tests/LongitudeOne/Spatial/Tests/PHP/Types/Geography/PointTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function testBadLatitudeDirection()
5757
{
5858
$this->expectException(InvalidValueException::class);
5959
// phpcs:disable Generic.Files.LineLength.MaxExceeded
60-
$this->expectExceptionMessage('[Syntax Error] line 0, col 8: Error: Expected CrEOF\\Geo\\String\\Lexer::T_INTEGER or CrEOF\\Geo\\String\\Lexer::T_FLOAT, got "Q" in value "84:26:46Q"');
60+
$this->expectExceptionMessage('[Syntax Error] line 0, col 8: Error: Expected LongitudeOne\\Geo\\String\\Lexer::T_INTEGER or LongitudeOne\\Geo\\String\\Lexer::T_FLOAT, got "Q" in value "84:26:46Q"');
6161
// phpcs:enable
6262

6363
new Point('100:56:55W', '84:26:46Q');
@@ -103,7 +103,7 @@ public function testBadLongitudeDirection()
103103
{
104104
$this->expectException(InvalidValueException::class);
105105
// phpcs:disable Generic.Files.LineLength.MaxExceeded
106-
$this->expectExceptionMessage('[Syntax Error] line 0, col 9: Error: Expected CrEOF\\Geo\\String\\Lexer::T_INTEGER or CrEOF\\Geo\\String\\Lexer::T_FLOAT, got "P" in value "100:56:55P"');
106+
$this->expectExceptionMessage('[Syntax Error] line 0, col 9: Error: Expected LongitudeOne\\Geo\\String\\Lexer::T_INTEGER or LongitudeOne\\Geo\\String\\Lexer::T_FLOAT, got "P" in value "100:56:55P"');
107107
// phpcs:enable
108108

109109
new Point('100:56:55P', '84:26:46N');

tests/LongitudeOne/Spatial/Tests/PHP/Types/Geometry/PointTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testBadLatitudeDirection()
6060
{
6161
$this->expectException(InvalidValueException::class);
6262
// phpcs:disable Generic.Files.LineLength.MaxExceeded
63-
$this->expectExceptionMessage('[Syntax Error] line 0, col 8: Error: Expected CrEOF\\Geo\\String\\Lexer::T_INTEGER or CrEOF\\Geo\\String\\Lexer::T_FLOAT, got "Q" in value "84:26:46Q"');
63+
$this->expectExceptionMessage('[Syntax Error] line 0, col 8: Error: Expected LongitudeOne\\Geo\\String\\Lexer::T_INTEGER or LongitudeOne\\Geo\\String\\Lexer::T_FLOAT, got "Q" in value "84:26:46Q"');
6464
// phpcs:enable
6565

6666
new Point('100:56:55W', '84:26:46Q');
@@ -106,7 +106,7 @@ public function testBadLongitudeDirection()
106106
{
107107
$this->expectException(InvalidValueException::class);
108108
// phpcs:disable Generic.Files.LineLength.MaxExceeded
109-
$this->expectExceptionMessage('[Syntax Error] line 0, col 9: Error: Expected CrEOF\\Geo\\String\\Lexer::T_INTEGER or CrEOF\\Geo\\String\\Lexer::T_FLOAT, got "P" in value "100:56:55P"');
109+
$this->expectExceptionMessage('[Syntax Error] line 0, col 9: Error: Expected LongitudeOne\\Geo\\String\\Lexer::T_INTEGER or LongitudeOne\\Geo\\String\\Lexer::T_FLOAT, got "P" in value "100:56:55P"');
110110
// phpcs:enable
111111

112112
new Point('100:56:55P', '84:26:46N');

0 commit comments

Comments
 (0)