Merge branch 'main' of https://github.com/clickbar/laravel-magellan i…

…nto build/laravel-11x # Conflicts: # CHANGELOG.md # composer.json # composer.lock
clickbar · Mar 15, 2024 · 26daf64 · 26daf64
2 parents 5959a9e + 841292b
commit 26daf64
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 59 deletions.
diff --git a/.github/workflows/check-styling.yml b/.github/workflows/check-styling.yml
@@ -2,6 +2,7 @@ name: Check styling
 
 on:
   push:
+    branches: [main]
   pull_request:
     branches: [main]
 

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -2,9 +2,9 @@ name: PHPStan
 
 on:
   push:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 permissions:
   contents: read

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Laravel 11.x support
 
+### Improved
+- Updated `spatie/invade` to v2, works without reflection now 🥳
+
 ## [1.5.0](https://github.com/clickbar/laravel-magellan/tree/1.5.0) - 2024-01-19
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -27,14 +27,14 @@
         "illuminate/contracts": "^9.28|^10.0|^11.0",
         "illuminate/database": "^9.0|^10.0|^11.0",
         "illuminate/support": "^9.0|^10.0|^11.0",
-        "spatie/invade": "^1.1",
+        "spatie/invade": "^2.0",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.5",
+        "larastan/larastan": "^2.6",
         "laravel/pint": "^1.2.1",
         "nunomaduro/collision": "^6.0|^v8.1",
-        "larastan/larastan": "^2.0.1",
         "orchestra/testbench": "^7.15|^8.0|^9.0",
         "pestphp/pest": "^1.22|^2.34",
         "pestphp/pest-plugin-laravel": "^1.1|^2.3",

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,6 +1,3 @@
-includes:
-    - phpstan-baseline.neon
-
 parameters:
     level: 4
     paths:

diff --git a/src/Database/Builder/BuilderMacros.php b/src/Database/Builder/BuilderMacros.php
@@ -154,7 +154,6 @@ public function stFrom()
             // NOTE: the `as` field has to be included in the DB expression instead of using the `from` method with the
             // `as` parameter, because the latter will try to use the expression in a string concatenation with `as`.
             /** @var Builder $this */
-            // @phpstan-ignore-next-line Laravel did not type the property correctly
             $this->from = $magellanExpression->invoke($this, 'from', $as);
 
             return $this;