diff --git a/composer.json b/composer.json index 32dca2b..ff58aaa 100644 --- a/composer.json +++ b/composer.json @@ -17,14 +17,13 @@ ], "require": { "php": "^8.1", + "illuminate/support": "^10.0", "geo-io/wkb-parser": "^1.0", "jmikola/geojson": "^1.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.16", - "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.3", - "vimeo/psalm": "^3.11" + "orchestra/testbench": "^6.23|^7.0|^8.0", + "phpunit/phpunit": "^10.0" }, "autoload": { "psr-4": { @@ -37,10 +36,8 @@ } }, "scripts": { - "psalm": "vendor/bin/psalm", "test": "vendor/bin/phpunit", - "test-coverage": "vendor/bin/phpunit --coverage-html coverage", - "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes" + "test-coverage": "vendor/bin/phpunit --coverage-html coverage" }, "config": { "sort-packages": true diff --git a/src/Geo/Eloquent/GeoExpression.php b/src/Geo/Eloquent/GeoExpression.php index 4294cb5..2c54082 100644 --- a/src/Geo/Eloquent/GeoExpression.php +++ b/src/Geo/Eloquent/GeoExpression.php @@ -2,13 +2,14 @@ namespace Masterix21\Addressable\Geo\Eloquent; +use Illuminate\Database\Grammar; use Illuminate\Database\Query\Expression; use Masterix21\Addressable\Geo\Types\Geometry; /** @property-read Geometry $value */ class GeoExpression extends Expression { - public function getValue() + public function getValue(Grammar $grammar) { if ($this->hasSrid()) { return "ST_GeomFromText(?, ?)";