formatting

laravel · Nov 22, 2017 · 9a3d71d · 9a3d71d
1 parent bba3eae
commit 9a3d71d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/src/Illuminate/Database/Grammar.php b/src/Illuminate/Database/Grammar.php
@@ -138,29 +138,29 @@ public function parameterize(array $values)
     }
 
     /**
-     * Quote string literals.
+     * Get the appropriate query parameter place-holder for a value.
      *
-     * @param  string|array  $value
+     * @param  mixed   $value
      * @return string
      */
-    public function quote($value)
+    public function parameter($value)
     {
-        if (is_array($value)) {
-            return implode(', ', array_map([$this, 'quote'], $value));
-        }
-
-        return "'$value'";
+        return $this->isExpression($value) ? $this->getValue($value) : '?';
     }
 
     /**
-     * Get the appropriate query parameter place-holder for a value.
+     * Quote the given string literal.
      *
-     * @param  mixed   $value
+     * @param  string|array  $value
      * @return string
      */
-    public function parameter($value)
+    public function quoteString($value)
     {
-        return $this->isExpression($value) ? $this->getValue($value) : '?';
+        if (is_array($value)) {
+            return implode(', ', array_map([$this, __FUNCTION__], $value));
+        }
+
+        return "'$value'";
     }
 
     /**

diff --git a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
@@ -549,7 +549,7 @@ protected function typeBoolean(Fluent $column)
      */
     protected function typeEnum(Fluent $column)
     {
-        return sprintf('enum(%s)', $this->quote($column->allowed));
+        return sprintf('enum(%s)', $this->quoteString($column->allowed));
     }
 
     /**

diff --git a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -522,7 +522,7 @@ protected function typeEnum(Fluent $column)
         return sprintf(
             'varchar(255) check ("%s" in (%s))',
             $column->name,
-            $this->quote($column->allowed)
+            $this->quoteString($column->allowed)
         );
     }
 

diff --git a/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php b/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php
@@ -512,7 +512,7 @@ protected function typeEnum(Fluent $column)
         return sprintf(
             'varchar check ("%s" in (%s))',
             $column->name,
-            $this->quote($column->allowed)
+            $this->quoteString($column->allowed)
         );
     }
 

diff --git a/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -455,7 +455,7 @@ protected function typeEnum(Fluent $column)
         return sprintf(
             'nvarchar(255) check ("%s" in (%s))',
             $column->name,
-            $this->quote($column->allowed)
+            $this->quoteString($column->allowed)
         );
     }