Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ root = true

[*]
charset = utf-8
indent_size = 2
indent_size = 4
indent_style = space
end_of_line = lf
insert_final_newline = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
php-cs-fixer:
name: PHP CS Fixer
name: Pint

runs-on: ubuntu-latest

Expand All @@ -26,4 +26,4 @@ jobs:
run: composer install --prefer-dist --no-interaction

- name: Run PHP CS Fixer
run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes --diff --dry-run
run: ./vendor/bin/pint --test
13 changes: 0 additions & 13 deletions .php-cs-fixer.php

This file was deleted.

5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
},
"require-dev": {
"doctrine/dbal": "^3.5.3",
"friendsofphp/php-cs-fixer": "^3.14.3",
"jubeki/laravel-code-style": "^1.2",
"larastan/larastan": "^1.0|^2.4",
"laravel/pint": "^1.14",
"orchestra/testbench": "^8.0",
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0"
Expand All @@ -36,7 +35,7 @@
}
},
"scripts": {
"php-cs-fixer": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes",
"pint": "./vendor/bin/pint",
"phpstan": "./vendor/bin/phpstan analyse --memory-limit=2G",
"pest:mysql": "DB_PORT=3307 ./vendor/bin/pest",
"pest:postgres": "DB_CONNECTION=pgsql DB_PORT=5433 ./vendor/bin/pest",
Expand Down
50 changes: 25 additions & 25 deletions src/AxisOrder.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,37 @@
/** @codeCoverageIgnore */
class AxisOrder
{
public static function supported(ConnectionInterface $connection): bool
{
if (self::isMariaDb($connection)) {
return false;
}

if (self::isMySql8OrAbove($connection)) {
return true;
}
public static function supported(ConnectionInterface $connection): bool
{
if (self::isMariaDb($connection)) {
return false;
}

return false;
}
if (self::isMySql8OrAbove($connection)) {
return true;
}

private static function isMariaDb(ConnectionInterface $connection): bool
{
if (! ($connection instanceof MySqlConnection)) {
return false;
return false;
}

return $connection->isMaria();
}
private static function isMariaDb(ConnectionInterface $connection): bool
{
if (! ($connection instanceof MySqlConnection)) {
return false;
}

private static function isMySql8OrAbove(ConnectionInterface $connection): bool
{
if (! ($connection instanceof MySqlConnection)) {
return false;
return $connection->isMaria();
}

/** @var string $version */
$version = $connection->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
private static function isMySql8OrAbove(ConnectionInterface $connection): bool
{
if (! ($connection instanceof MySqlConnection)) {
return false;
}

return version_compare($version, '8.0.0', '>=');
}
/** @var string $version */
$version = $connection->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);

return version_compare($version, '8.0.0', '>=');
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/GeographyType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class GeographyType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'geography';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'geography';
}

public function getName(): string
{
return 'geography';
}
public function getName(): string
{
return 'geography';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/GeometryCollectionType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class GeometryCollectionType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'geometrycollection';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'geometrycollection';
}

public function getName(): string
{
return 'geometrycollection';
}
public function getName(): string
{
return 'geometrycollection';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/GeometryType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class GeometryType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'geometry';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'geometry';
}

public function getName(): string
{
return 'geometry';
}
public function getName(): string
{
return 'geometry';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/LineStringType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class LineStringType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'linestring';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'linestring';
}

public function getName(): string
{
return 'linestring';
}
public function getName(): string
{
return 'linestring';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/MultiLineStringType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class MultiLineStringType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'multilinestring';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'multilinestring';
}

public function getName(): string
{
return 'multilinestring';
}
public function getName(): string
{
return 'multilinestring';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/MultiPointType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class MultiPointType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'multipoint';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'multipoint';
}

public function getName(): string
{
return 'multipoint';
}
public function getName(): string
{
return 'multipoint';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/MultiPolygonType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class MultiPolygonType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'multipolygon';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'multipolygon';
}

public function getName(): string
{
return 'multipolygon';
}
public function getName(): string
{
return 'multipolygon';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/PointType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class PointType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'point';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'point';
}

public function getName(): string
{
return 'point';
}
public function getName(): string
{
return 'point';
}
}
16 changes: 8 additions & 8 deletions src/Doctrine/PolygonType.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/** @codeCoverageIgnore */
class PolygonType extends Type
{
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'polygon';
}
public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
{
return 'polygon';
}

public function getName(): string
{
return 'polygon';
}
public function getName(): string
{
return 'polygon';
}
}
50 changes: 25 additions & 25 deletions src/EloquentSpatialServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,34 @@

class EloquentSpatialServiceProvider extends DatabaseServiceProvider
{
public function boot(): void
{
/** @var Connection $connection */
$connection = DB::connection();
public function boot(): void
{
/** @var Connection $connection */
$connection = DB::connection();

if ($connection->isDoctrineAvailable()) {
$this->registerDoctrineTypes($connection);
if ($connection->isDoctrineAvailable()) {
$this->registerDoctrineTypes($connection);
}
}
}

protected function registerDoctrineTypes(Connection $connection): void
{
$geometries = [
'point' => PointType::class,
'linestring' => LineStringType::class,
'multipoint' => MultiPointType::class,
'polygon' => PolygonType::class,
'multilinestring' => MultiLineStringType::class,
'multipolygon' => MultiPolygonType::class,
'geometrycollection' => GeometryCollectionType::class,
'geomcollection' => GeometryCollectionType::class,
'geography' => GeographyType::class,
'geometry' => GeometryType::class,
];
protected function registerDoctrineTypes(Connection $connection): void
{
$geometries = [
'point' => PointType::class,
'linestring' => LineStringType::class,
'multipoint' => MultiPointType::class,
'polygon' => PolygonType::class,
'multilinestring' => MultiLineStringType::class,
'multipolygon' => MultiPolygonType::class,
'geometrycollection' => GeometryCollectionType::class,
'geomcollection' => GeometryCollectionType::class,
'geography' => GeographyType::class,
'geometry' => GeometryType::class,
];

foreach ($geometries as $type => $class) {
DB::registerDoctrineType($class, $type, $type);
$connection->registerDoctrineType($class, $type, $type);
foreach ($geometries as $type => $class) {
DB::registerDoctrineType($class, $type, $type);
$connection->registerDoctrineType($class, $type, $type);
}
}
}
}
4 changes: 2 additions & 2 deletions src/Enums/Srid.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

enum Srid: int
{
case WGS84 = 4326; // https://epsg.org/crs_4326/WGS-84.html
case WEB_MERCATOR = 3857; //https://epsg.org/crs_3857/WGS-84-Pseudo-Mercator.html
case WGS84 = 4326; // https://epsg.org/crs_4326/WGS-84.html
case WEB_MERCATOR = 3857; //https://epsg.org/crs_3857/WGS-84-Pseudo-Mercator.html
}
Loading