Skip to content

Commit d01a640

Browse files
committed
Laravel 11
1 parent 6ef13ca commit d01a640

10 files changed

+28
-31
lines changed

.github/workflows/phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup PHP
3232
uses: shivammathur/setup-php@v2
3333
with:
34-
php-version: "8.1"
34+
php-version: "8.2"
3535
coverage: none
3636

3737
- name: Install composer dependencies

.github/workflows/run-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
os: [ubuntu-latest]
16-
php: [8.2, 8.1]
17-
laravel: [10.*]
16+
php: [8.2, 8.3]
17+
laravel: [11.*]
1818
stability: [prefer-lowest, prefer-stable]
1919
include:
20-
- laravel: 10.*
21-
testbench: 8.*
20+
- laravel: 11.*
21+
testbench: 9.*
2222
carbon: ^2.63
2323

2424
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

composer.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,26 @@
2727
"php": "^8.1",
2828
"ext-json": "*",
2929
"ext-pdo": "*",
30-
"doctrine/dbal": "^3.5",
3130
"geo-io/wkb-parser": "^1.0",
32-
"illuminate/contracts": "^10.0",
33-
"illuminate/database": "^10.0",
31+
"illuminate/contracts": "^11.0",
32+
"illuminate/database": "^11.0",
3433
"jmikola/geojson": "^1.0"
3534
},
3635
"conflict": {},
3736
"require-dev": {
38-
"driftingly/rector-laravel": "^0.21.0",
39-
"laravel/browser-kit-testing": "^7.0",
40-
"laravel/laravel": "^10.2.4",
41-
"laravel/pint": "^1.10.3",
42-
"mockery/mockery": "^1.6.2",
43-
"nunomaduro/collision": "^7.7.0",
44-
"nunomaduro/larastan": "^2.6.3",
45-
"orchestra/testbench": "^8.5.9",
37+
"driftingly/rector-laravel": "^1.2",
38+
"laravel/browser-kit-testing": "^7.2",
39+
"laravel/laravel": "^11.0.7",
40+
"laravel/pint": "^1.15.3",
41+
"mockery/mockery": "^1.6.11",
42+
"nunomaduro/collision": "^8.1.1",
43+
"nunomaduro/larastan": "^2.9.6",
44+
"orchestra/testbench": "^9.0.4",
4645
"phpstan/extension-installer": "^1.3.1",
47-
"phpstan/phpstan-deprecation-rules": "^1.1.3",
48-
"phpstan/phpstan-phpunit": "^1.3.13",
49-
"phpunit/phpunit": "^10.2.3",
50-
"rector/rector": "^0.17.2"
46+
"phpstan/phpstan-deprecation-rules": "^1.1.4",
47+
"phpstan/phpstan-phpunit": "^1.3.16",
48+
"phpunit/phpunit": "^11.1.3",
49+
"rector/rector": "^1.0.5"
5150
},
5251
"autoload": {
5352
"psr-4": {

src/Schema/Builder.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ class Builder extends MySqlBuilder
1111
* Create a new command set with a Closure.
1212
*
1313
* @param string $table
14-
* @param Closure $callback
1514
* @return Blueprint
1615
*/
17-
protected function createBlueprint($table, Closure $callback = null)
16+
protected function createBlueprint($table, ?Closure $callback = null)
1817
{
1918
return new Blueprint($table, $callback);
2019
}

src/Types/Geometry.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Limenet\LaravelMysqlSpatial\Exceptions\UnknownWKBException;
1010
use Limenet\LaravelMysqlSpatial\Exceptions\UnknownWKTTypeException;
1111

12-
abstract class Geometry implements GeometryInterface, Jsonable, \JsonSerializable
12+
abstract class Geometry implements \JsonSerializable, GeometryInterface, Jsonable
1313
{
14-
protected static array$wkb_types = [
14+
protected static array $wkb_types = [
1515
1 => Point::class,
1616
2 => LineString::class,
1717
3 => Polygon::class,

src/Types/GeometryCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* @implements GeometryInterface<FeatureCollection>
1919
*/
20-
class GeometryCollection extends Geometry implements IteratorAggregate, ArrayAccess, Arrayable, Countable, GeometryInterface, \Stringable
20+
class GeometryCollection extends Geometry implements \Stringable, Arrayable, ArrayAccess, Countable, GeometryInterface, IteratorAggregate
2121
{
2222
/**
2323
* The minimum number of items required to create this collection.

src/Types/MultiLineString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @extends GeometryCollection<GeometryInterface>
1414
*/
15-
class MultiLineString extends GeometryCollection implements GeometryInterface, \Stringable
15+
class MultiLineString extends GeometryCollection implements \Stringable, GeometryInterface
1616
{
1717
/**
1818
* The minimum number of items required to create this collection.

src/Types/MultiPoint.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* @implements GeometryInterface<Point>
1111
*/
12-
class MultiPoint extends PointCollection implements GeometryInterface, \Stringable
12+
class MultiPoint extends PointCollection implements \Stringable, GeometryInterface
1313
{
1414
/**
1515
* The minimum number of items required to create this collection.

src/Types/MultiPolygon.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @extends GeometryCollection<Polygon>
1414
*/
15-
class MultiPolygon extends GeometryCollection implements GeometryInterface, \Stringable
15+
class MultiPolygon extends GeometryCollection implements \Stringable, GeometryInterface
1616
{
1717
/**
1818
* The minimum number of items required to create this collection.

src/Types/Point.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* @implements GeometryInterface<GeoJsonPoint>
1111
*/
12-
class Point extends Geometry implements GeometryInterface, \Stringable
12+
class Point extends Geometry implements \Stringable, GeometryInterface
1313
{
1414
public function __construct(protected float $lat, protected float $lng, ?int $srid = 0)
1515
{
@@ -64,8 +64,7 @@ public function __toString(): string
6464
}
6565

6666
/**
67-
* @param $geoJson \GeoJson\Feature\Feature|string
68-
* @return \Limenet\LaravelMysqlSpatial\Types\Point
67+
* @param $geoJson \GeoJson\Feature\Feature|string
6968
*/
7069
public static function fromJson(string|GeoJson $geoJson): self
7170
{

0 commit comments

Comments
 (0)