fix: Expression should go through Grammar::getValue (#78)

colopl · Feb 24, 2023 · 12ab08f · 12ab08f
1 parent 78c5caa
commit 12ab08f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
-# v4.6.1 (Not released yet)
+# 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

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -0,0 +1,6 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Cannot cast mixed to string\\.$#"
+			count: 1
+			path: src/Schema/Grammar.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,3 +1,5 @@
+includes:
+  - phpstan-baseline.neon
 parameters:
     level: max
     checkMissingIterableValueType: false

diff --git a/src/Schema/Grammar.php b/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.