Merge pull request #31 from dimitriBouteille/17-saveorfail-doesnt-thr…

…ow-queryexception #17 saveOrFail doesnt throw QueryException
dimitriBouteille · Mar 10, 2024 · 76bee93 · 76bee93
2 parents 602650c + f3dd1bb
commit 76bee93
Show file tree

Hide file tree

Showing 10 changed files with 390 additions and 155 deletions.
diff --git a/composer.json b/composer.json
@@ -47,7 +47,8 @@
     "phpstan/phpstan-phpunit": "^1.3",
     "phpstan/extension-installer": "^1.3",
     "roots/wordpress": "6.4.3",
-    "rector/rector": "1.0.2"
+    "rector/rector": "1.0.2",
+    "szepeviktor/phpstan-wordpress": "^1.3"
   },
   "config": {
     "allow-plugins": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -3,5 +3,3 @@ parameters:
     paths:
         - src
         - tests
-    excludePaths:
-        - src/Orm/Database.php
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit cacheResult="false" stopOnError="true">
+<phpunit cacheResult="false" stopOnError="true" bootstrap="./tests/Bootstrap.php" processIsolation="true">
     <testsuites>
         <testsuite name="Tests">
             <directory>tests/</directory>

diff --git a/src/Orm/Builder.php b/src/Orm/Builder.php
@@ -8,6 +8,7 @@
 
 namespace Dbout\WpOrm\Orm;
 
+use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\Query\Builder as EloquentBuilder;
 
 class Builder extends EloquentBuilder
@@ -31,9 +32,9 @@ public function addWhereExistsQuery(EloquentBuilder $query, $boolean = 'and', $n
     }
 
     /**
-     * @return Database|\Illuminate\Database\ConnectionInterface
+     * @inheritDoc
      */
-    public function getConnection()
+    public function getConnection(): ConnectionInterface
     {
         return Database::getInstance();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,3 @@ parameters: @@
         paths:
             - src
             - tests
-        excludePaths:
-            - src/Orm/Database.php