fix tests

change creds

doctrine/dbal

mysql creds

bump

mysql

mysql ext

change mysql

sleep

run against PRs

sleep

mysql

call parent

use mysql 8

use delta comparison

use delta

disable fail-fast

cleanup

dbal conflict

fail fast

Author: limenet

.github/workflows/fix-php-code-style-issues.yml

@@ -3,7 +3,9 @@ name: Fix PHP code style issues
 on:
   push:
     paths:
-      - '**.php'
+      - "**.php"
+  pull_request:
+    branches: [master]
 
 jobs:
   php-code-styling:

.github/workflows/phpstan.yml

@@ -3,8 +3,10 @@ name: PHPStan
 on:
   push:
     paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
+      - "**.php"
+      - "phpstan.neon.dist"
+  pull_request:
+    branches: [master]
 
 jobs:
   phpstan:
@@ -16,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: "8.1"
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -24,11 +24,10 @@ jobs:
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
-      - uses: mirromutth/mysql-action@v1.1
-        with:
-          mysql version: "8.0"
-          mysql user: "user"
-          mysql password: "password"
+      - name: Set up MySQL
+        run: |
+          sudo /etc/init.d/mysql start
+          mysql -e 'CREATE DATABASE laravel' -uroot -proot
 
       - name: Checkout code
         uses: actions/checkout@v3
@@ -37,7 +36,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, mysql
           coverage: none
 
       - name: Setup problem matchers

Makefile

@@ -19,25 +19,29 @@
     ],
     "require": {
         "php": "^8.1",
-        "ext-pdo": "*",
         "ext-json": "*",
+        "ext-pdo": "*",
+        "doctrine/dbal": "^2.5",
+        "geo-io/wkb-parser": "^1.0",
         "illuminate/contracts": "^9.0",
         "illuminate/database": "^9.0",
-        "geo-io/wkb-parser": "^1.0",
         "jmikola/geojson": "^1.0"
     },
+    "conflict": {
+        "doctrine/dbal": "2.13.*"
+    },
     "require-dev": {
-        "laravel/pint": "^1.0",
-        "laravel/laravel": "^9.0",
-        "laravel/browser-kit-testing": "^6.0",
-        "mockery/mockery": "^1.3",
-        "nunomaduro/collision": "^6.0",
-        "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "laravel/pint": "^1.5",
+        "laravel/laravel": "^9.5.2",
+        "laravel/browser-kit-testing": "^6.4",
+        "mockery/mockery": "^1.5.1",
+        "nunomaduro/collision": "^6.4",
+        "nunomaduro/larastan": "^2.4.1",
+        "orchestra/testbench": "^7.22",
+        "phpstan/extension-installer": "^1.2",
+        "phpstan/phpstan-deprecation-rules": "^1.1.1",
+        "phpstan/phpstan-phpunit": "^1.3.4",
+        "phpunit/phpunit": "^9.6.3"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -1,10 +1,10 @@
 version: '3.3'
 services:
   db:
-      image: mysql:5.7
-      ports:
-        - "3306:3306"
-      environment:
-        MYSQL_DATABASE: 'spatial_test'
-        MYSQL_ROOT_PASSWORD: ''
-        MYSQL_ALLOW_EMPTY_PASSWORD: 1
+    image: mysql:8.0
+    ports:
+      - "33306:3306"
+    environment:
+      MYSQL_DATABASE: 'laravel'
+      MYSQL_ROOT_PASSWORD: 'root'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1

docker-compose.yml

@@ -46,10 +46,10 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_DATABASE" value="test"/>
+        <env name="DB_DATABASE" value="laravel"/>
         <env name="DB_HOST" value="127.0.0.1"/>
         <env name="DB_PORT" value="3306"/>
         <env name="DB_USERNAME" value="root"/>
-        <env name="DB_PASSWORD" value=""/>
+        <env name="DB_PASSWORD" value="root"/>
     </php>
 </phpunit>

phpunit.xml.dist

@@ -27,6 +27,8 @@ class SpatialServiceProvider extends DatabaseServiceProvider
      */
     public function register()
     {
+        parent::register();
+
         // The connection factory is used to create the actual connection instances on
         // the database. We will inject the factory into the manager so that it may
         // make the connections while they are actually needed and not of before.

src/SpatialServiceProvider.php

@@ -212,7 +212,7 @@ public function testDistanceValue()
         $a = GeometryModel::distanceValue('location', $loc1->location)->get();
         $this->assertCount(2, $a);
         $this->assertEquals(0, $a[0]->distance);
-        $this->assertEquals(1.4142135623, $a[1]->distance); // PHP floats' 11th+ digits don't matter
+        $this->assertEqualsWithDelta(1.4142135623, $a[1]->distance, 0.00000001); // PHP floats' 11th+ digits don't matter
     }
 
     public function testDistanceSphereValue()
@@ -230,9 +230,9 @@ public function testDistanceSphereValue()
         $this->assertEquals(0, $a[0]->distance);
 
         if ($this->after_fix) {
-            $this->assertEquals(44.7414064842, $a[1]->distance); // PHP floats' 11th+ digits don't matter
+            $this->assertEqualsWithDelta(44.7414064842, $a[1]->distance, 0.00000001); // PHP floats' 11th+ digits don't matter
         } else {
-            $this->assertEquals(44.7414064845, $a[1]->distance); // PHP floats' 11th+ digits don't matter
+            $this->assertEqualsWithDelta(44.7414064845, $a[1]->distance, 0.00000001); // PHP floats' 11th+ digits don't matter
         }
     }