moved away from spatialbuilder to scopes to allow projects to define their own builders (#102)

Co-authored-by: Philippe Damen <philippe@nextapps.be>

Author: yinx

README.md

@@ -68,15 +68,13 @@ composer require matanyadaev/laravel-eloquent-spatial
     namespace App\Models;
 
     use Illuminate\Database\Eloquent\Model;
-    use MatanYadaev\EloquentSpatial\SpatialBuilder;
     use MatanYadaev\EloquentSpatial\Objects\Point;
     use MatanYadaev\EloquentSpatial\Objects\Polygon;
     use MatanYadaev\EloquentSpatial\Traits\HasSpatial;
 
     /**
      * @property Point $location
      * @property Polygon $area
-     * @method static SpatialBuilder query()
      */
     class Place extends Model
     {
@@ -150,39 +148,6 @@ echo $vacationCity->area->toJson(); // {"type":"Polygon","coordinates":[[[41.907
 
 For more comprehensive documentation on the API, please refer to the [API](API.md) page.
 
-## Tips for Improving IDE Support
-
-In order to get better IDE support, you can add a `query` method phpDoc annotation to your model:
-
-```php
-/**
- * @method static SpatialBuilder query()
- */
-class Place extends Model
-{
-    // ...
-}
-```
-
-Or you could override the method:
-
-```php
-class Place extends Model
-{
-    public static function query(): SpatialBuilder
-    {
-        return parent::query();
-    }
-}
-```
-
-Create queries only with the `query()` static method:
-
-```php
-Place::query()->whereDistance(...); // This is IDE-friendly
-Place::whereDistance(...); // This is not
-```
-
 ## Extension
 
 You can add new methods to the `Geometry` class through macros.
@@ -219,6 +184,8 @@ Here are some useful commands for development:
 * Perform type checking: `composer phpstan`
 * Format your code: `composer php-cs-fixer`
 
+Before running tests, make sure to run `docker-compose up` to start the database container.
+
 ## Updates and Changes
 
 For details on updates and changes, please refer to our [CHANGELOG](CHANGELOG.md).

composer.json

@@ -20,7 +20,7 @@
     "doctrine/dbal": "^3.5.3",
     "friendsofphp/php-cs-fixer": "^3.14.3",
     "jubeki/laravel-code-style": "^1.2",
-    "nunomaduro/larastan": "^1.0|^2.4",
+    "larastan/larastan": "^1.0|^2.4",
     "orchestra/testbench": "^8.0",
     "pestphp/pest": "^2.0",
     "pestphp/pest-plugin-laravel": "^2.0"

phpstan.neon

@@ -1,5 +1,5 @@
 includes:
-  - ./vendor/nunomaduro/larastan/extension.neon
+  - ./vendor/larastan/larastan/extension.neon
 parameters:
   paths:
     - src