Laravel Pint (#112)

* migration

* automated fixes

Author: MatanYadaev

.editorconfig

@@ -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

.github/workflows/php-cs-fixer.yml renamed to .github/workflows/pint.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   php-cs-fixer:
-    name: PHP CS Fixer
+    name: Pint
 
     runs-on: ubuntu-latest
 
@@ -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

.php-cs-fixer.php

@@ -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"
@@ -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",

composer.json

@@ -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', '>=');
+    }
 }

src/AxisOrder.php

@@ -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';
+    }
 }

src/Doctrine/GeographyType.php

@@ -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';
+    }
 }

src/Doctrine/GeometryCollectionType.php

@@ -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';
+    }
 }

src/Doctrine/GeometryType.php

@@ -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';
+    }
 }

src/Doctrine/LineStringType.php

@@ -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';
+    }
 }

src/Doctrine/MultiLineStringType.php

@@ -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';
+    }
 }

src/Doctrine/MultiPointType.php

@@ -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';
+    }
 }

src/Doctrine/MultiPolygonType.php

@@ -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';
+    }
 }

src/Doctrine/PointType.php

@@ -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';
+    }
 }

src/Doctrine/PolygonType.php

@@ -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);
+        }
     }
-  }
 }

src/EloquentSpatialServiceProvider.php

@@ -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
 }