Merge branch 'master' into feature/fail-at-lower-level

Author: taka-oyama

CHANGELOG.md

@@ -11,6 +11,14 @@ Changed
 - Exception previously thrown in `Query/Builder` for `sharedLock`, `lockForUpdate`, `insertGetId` was moved to `Query/Grammar`.
 - Query/Builder::lock will now throw `BadMethodCallException` if called. Was ignored in previous versions.
 
+# v4.7.0 (Not released yet)
+
+Chore
+- Removed `ramsey/uuid` from composer.json since laravel already includes it.
+
+Fixed
+- Expressions given as $value in `Schema\Grammar::formatDefaultValue` will now go through `getValue` to match upstream (No behavioral change).
+
 # v4.6.0
 
 Fixed

composer.json

@@ -14,7 +14,6 @@
     "laravel/framework": "~9.42",
     "google/cloud-spanner": "^1.47",
     "grpc/grpc": "^1.42",
-    "ramsey/uuid": "~4",
     "symfony/cache": "~6",
     "symfony/lock": "~6"
   },
@@ -40,6 +39,10 @@
       ]
     }
   },
+  "scripts": {
+    "analyze": "phpstan analyse --configuration phpstan.neon --memory-limit=-1",
+    "test": "phpunit"
+  },
   "suggest": {
     "ext-sysvmsg": "Can use SemaphoreLock for session handling. Will use FileLock if not present.",
     "ext-sysvsem": "Can use SemaphoreLock for session handling. Will use FileLock if not present.",

phpstan-baseline.neon

@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Cannot cast mixed to string\\.$#"
+			count: 1
+			path: src/Schema/Grammar.php

phpstan.neon

@@ -1,3 +1,5 @@
+includes:
+  - phpstan-baseline.neon
 parameters:
     level: max
     checkMissingIterableValueType: false

src/Schema/Grammar.php

@@ -508,7 +508,7 @@ protected function modifyDefault(Blueprint $blueprint, Fluent $column)
     protected function formatDefaultValue(Fluent $column, string $type, mixed $value): string
     {
         if ($value instanceof Expression) {
-            return (string)$value;
+            return (string) $this->getValue($value);
         }
 
         // Match type without length or subtype.