Merge pull request #36 from harrygulliford/laravel-10.x

Add support for Laravel 10

.github/workflows/tests.yml

@@ -9,18 +9,26 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.0, 7.4]
-        laravel: [8.*, 9.*]
+        php: [8.2, 8.1, 8.0, 7.4]
+        laravel: [10.*, 9.*, 8.*]
         stability: [prefer-lowest, prefer-stable]
         firebird: [v4.0, v3.0, v2.5.9-sc]
         include:
           - laravel: 8.*
             testbench: ^6.19
           - laravel: 9.*
             testbench: ^7.0
+          - laravel: 10.*
+            testbench: ^8.0
         exclude:
+          - laravel: 8.*
+            php: 8.2
           - laravel: 9.*
             php: 7.4
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 10.*
+            php: 7.4
 
     name: PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, Firebird ${{ matrix.firebird }}, ${{ matrix.stability }}
 

composer.json

@@ -1,40 +1,40 @@
 {
-    "name": "harrygulliford/laravel-firebird",
-    "description": "Firebird database driver for the Laravel Framework",
-    "license": "MIT",
-    "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/support": "^8.65|^9.0",
-        "illuminate/container": "^8.65|^9.0",
-        "illuminate/database": "^8.65|^9.0",
-        "illuminate/events": "^8.65|^9.0"
-    },
-    "require-dev": {
-        "mockery/mockery": "^1.4",
-        "phpunit/phpunit": "^9.5.10",
-        "orchestra/testbench": "^6.19|^7.0",
-        "fakerphp/faker": "^1.15"
-    },
-    "archive": {
-        "exclude": [
-            "/tests"
-        ]
-    },
-    "autoload": {
-        "psr-4": {
-            "HarryGulliford\\Firebird\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "HarryGulliford\\Firebird\\Tests\\": "tests/"
-        }
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "HarryGulliford\\Firebird\\FirebirdServiceProvider"
-            ]
-        }
+  "name": "harrygulliford/laravel-firebird",
+  "description": "Firebird database driver for the Laravel Framework",
+  "license": "MIT",
+  "require": {
+    "php": "^7.4|^8.0",
+    "illuminate/support": "^8.65|^9.33|^10.0",
+    "illuminate/container": "^8.65|^9.33|^10.0",
+    "illuminate/database": "^8.65|^9.33|^10.0",
+    "illuminate/events": "^8.65|^9.33|^10.0"
+  },
+  "require-dev": {
+    "mockery/mockery": "^1.4",
+    "phpunit/phpunit": "^9.5.10",
+    "orchestra/testbench": "^6.19|^7.0|^8.0",
+    "fakerphp/faker": "^1.15"
+  },
+  "archive": {
+    "exclude": [
+      "/tests"
+    ]
+  },
+  "autoload": {
+    "psr-4": {
+      "HarryGulliford\\Firebird\\": "src/"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "HarryGulliford\\Firebird\\Tests\\": "tests/"
+    }
+  },
+  "extra": {
+    "laravel": {
+      "providers": [
+        "HarryGulliford\\Firebird\\FirebirdServiceProvider"
+      ]
+    }
+  }
 }

tests/QueryTest.php

@@ -980,7 +980,7 @@ public function it_can_execute_raw_select_containing_arithmetic()
             ->get();
 
         foreach ($results as $result) {
-            $this->assertEquals($result->price * 1.1, $result->price_with_tax);
+            $this->assertEquals(round($result->price * 1.1), $result->price_with_tax);
         }
     }