Support Laravel 10 (animalife#1)

Co-authored-by: Tsuguya Toma <toma@animalife.jp>

Author: Tsuguya

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
           ini-file: development
           tools: composer:v2
           extensions: mbstring, dom, fileinfo, pdo, pcntl
-          coverage: none
+          coverage: xdebug
       - run: composer install
       - name: run test
         run: vendor/bin/phpunit

composer.json

@@ -15,18 +15,18 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-pdo": "*",
         "ext-json": "*",
-        "illuminate/database": "^9.0",
+        "illuminate/database": "^10.0",
         "geo-io/wkb-parser": "^1.0",
         "jmikola/geojson": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
-        "laravel/laravel": "^9.0",
+        "phpunit/phpunit": "^10.0",
+        "laravel/laravel": "^10.0",
         "doctrine/dbal": "^3.3",
-        "laravel/browser-kit-testing": "^6.3",
+        "laravel/browser-kit-testing": "^7.0",
         "mockery/mockery": "^1.4.4"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        backupGlobals="false"
+        bootstrap="./vendor/autoload.php"
+        colors="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+        cacheDirectory=".phpunit.cache"
+        backupStaticProperties="false"
+        displayDetailsOnTestsThatTriggerDeprecations="true"
+>
+  <coverage>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
@@ -16,10 +27,6 @@
       <directory suffix="Test.php">./tests/Integration</directory>
     </testsuite>
   </testsuites>
-  <listeners>
-    <listener class="\Mockery\Adapter\Phpunit\TestListener" file="vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php">
-        </listener>
-  </listeners>
   <logging/>
   <php>
     <env name="APP_ENV" value="testing"/>

src/Eloquent/SpatialExpression.php

@@ -2,11 +2,12 @@
 
 namespace Grimzy\LaravelMysqlSpatial\Eloquent;
 
+use Illuminate\Database\Grammar;
 use Illuminate\Database\Query\Expression;
 
 class SpatialExpression extends Expression
 {
-    public function getValue()
+    public function getValue(Grammar $grammar)
     {
         return "ST_GeomFromText(?, ?, 'axis-order=long-lat')";
     }

tests/Integration/IntegrationBaseTestCase.php

@@ -71,7 +71,7 @@ public function tearDown(): void
     // MySQL 8.0.4 fixed bug #26941370 and bug #88031
     private function isMySQL8AfterFix()
     {
-        $results = DB::select(DB::raw('select version()'));
+        $results = DB::select('select version()');
         $mysql_version = $results[0]->{'version()'};
 
         return version_compare($mysql_version, '8.0.4', '>=');

tests/Integration/SridSpatialTest.php

@@ -113,8 +113,9 @@ public function testInsertPointWithWrongSrid()
             'does not match the SRID of the column \'location\'. The SRID '.
             'of the geometry is 0, but the SRID of the column is 3857. '.
             'Consider changing the SRID of the geometry or the SRID property '.
-            'of the column. (SQL: insert into `with_srid` (`location`) values '.
-            '(ST_GeomFromText(POINT(2 1), 0, \'axis-order=long-lat\')))'
+            'of the column. (Connection: mysql, SQL: insert into `with_srid` '.
+            '(`location`) values (ST_GeomFromText(POINT(2 1), 0, '.
+            '\'axis-order=long-lat\')))'
         );
         $geo->save();
     }

tests/Unit/Connectors/ConnectionFactoryTest.php

@@ -5,7 +5,7 @@
 use Illuminate\Container\Container;
 use Stubs\PDOStub;
 
-class ConnectionFactoryBaseTest extends BaseTestCase
+class ConnectionFactoryTest extends BaseTestCase
 {
     public function testMakeCallsCreateConnection()
     {

tests/Unit/Eloquent/SpatialTraitTest.php

@@ -4,6 +4,7 @@
 use Grimzy\LaravelMysqlSpatial\MysqlConnection;
 use Grimzy\LaravelMysqlSpatial\Types\Point;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Grammar;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use Mockery as m;
 
@@ -14,17 +15,23 @@ class SpatialTraitTest extends BaseTestCase
     /**
      * @var TestModel
      */
-    protected $model;
+    protected TestModel $model;
 
     /**
      * @var array
      */
-    protected $queries;
+    protected array $queries;
+
+    /**
+     * @var Grammar
+     */
+    protected Grammar $grammar;
 
     public function setUp(): void
     {
         $this->model = new TestModel();
         $this->queries = &$this->model->getConnection()->getPdo()->queries;
+        $this->grammar = $this->model->getConnection()->getQueryGrammar();
     }
 
     public function tearDown(): void
@@ -303,7 +310,7 @@ public function testScopeDistanceValue()
         $this->assertNotEmpty($bindings);
         $this->assertEquals('*', $q->columns[0]);
         $this->assertInstanceOf(\Illuminate\Database\Query\Expression::class, $q->columns[1]);
-        $this->assertEquals('st_distance(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue());
+        $this->assertEquals('st_distance(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue($this->grammar));
         $this->assertEquals('POINT(2 1)', $bindings[0]);
     }
 
@@ -319,7 +326,7 @@ public function testScopeDistanceValueWithSelect()
         $this->assertNotEmpty($bindings);
         $this->assertEquals('some_column', $q->columns[0]);
         $this->assertInstanceOf(\Illuminate\Database\Query\Expression::class, $q->columns[1]);
-        $this->assertEquals('st_distance(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue());
+        $this->assertEquals('st_distance(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue($this->grammar));
         $this->assertEquals('POINT(2 1)', $bindings[0]);
     }
 
@@ -335,7 +342,7 @@ public function testScopeDistanceSphereValue()
         $this->assertNotEmpty($bindings);
         $this->assertEquals('*', $q->columns[0]);
         $this->assertInstanceOf(\Illuminate\Database\Query\Expression::class, $q->columns[1]);
-        $this->assertEquals('st_distance_sphere(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue());
+        $this->assertEquals('st_distance_sphere(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue($this->grammar));
         $this->assertEquals('POINT(2 1)', $bindings[0]);
     }
 
@@ -351,7 +358,7 @@ public function testScopeDistanceSphereValueWithSelect()
         $this->assertNotEmpty($bindings);
         $this->assertEquals('some_column', $q->columns[0]);
         $this->assertInstanceOf(\Illuminate\Database\Query\Expression::class, $q->columns[1]);
-        $this->assertEquals('st_distance_sphere(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue());
+        $this->assertEquals('st_distance_sphere(`point`, ST_GeomFromText(?, ?, \'axis-order=long-lat\')) as distance', $q->columns[1]->getValue($this->grammar));
         $this->assertEquals('POINT(2 1)', $bindings[0]);
     }
 

tests/Unit/Schema/Grammars/MySqlGrammarTest.php

@@ -4,7 +4,7 @@
 use Grimzy\LaravelMysqlSpatial\Schema\Blueprint;
 use Grimzy\LaravelMysqlSpatial\Schema\Grammars\MySqlGrammar;
 
-class MySqlGrammarBaseTest extends BaseTestCase
+class MySqlGrammarTest extends BaseTestCase
 {
     public function testAddingGeometry()
     {