Merge pull request #482 from kamil-tekiela/Drop-$options

Drop $options param from Component::build
phpmyadmin · Jun 17, 2023 · da08ab2 · da08ab2
2 parents 875ce2b + 1ae45d6
commit da08ab2
Show file tree

Hide file tree

Showing 27 changed files with 50 additions and 78 deletions.
diff --git a/src/Component.php b/src/Component.php
@@ -32,8 +32,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
      *
      * In other words, this function represents the inverse function of {@see Component::parse()}.
      *
-     * @param mixed                $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param mixed $component the component to be built
      */
-    public static function build($component, array $options = []): string;
+    public static function build($component): string;
 }
diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
@@ -520,10 +520,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param AlterOperation       $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param AlterOperation $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         // Specific case of RENAME COLUMN that insert the field between 2 options.
         $afterFieldsOptions = new OptionsArray();

diff --git a/src/Components/Array2d.php b/src/Components/Array2d.php
@@ -112,10 +112,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param ArrayObj[]           $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param ArrayObj[] $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         return ArrayObj::build($component);
     }

diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php
@@ -159,10 +159,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param ArrayObj|ArrayObj[]  $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param ArrayObj|ArrayObj[] $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php
@@ -253,10 +253,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param CaseExpression       $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param CaseExpression $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         $ret = 'CASE ';
         if (isset($component->value)) {

diff --git a/src/Components/Condition.php b/src/Components/Condition.php
@@ -221,10 +221,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param Condition[]          $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param Condition[] $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(' ', $component);

diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
@@ -319,9 +319,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param CreateDefinition|CreateDefinition[] $component the component to be built
-     * @param array<string, mixed>                $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return "(\n  " . implode(",\n  ", $component) . "\n)";
@@ -338,10 +337,8 @@ public static function build($component, array $options = []): string
         }
 
         if (! empty($component->type)) {
-            $tmp .= DataType::build(
-                $component->type,
-                ['lowercase' => true]
-            ) . ' ';
+            $component->type->lowercase = true;
+            $tmp .= DataType::build($component->type) . ' ';
         }
 
         if (! empty($component->key)) {

diff --git a/src/Components/DataType.php b/src/Components/DataType.php
@@ -72,6 +72,8 @@ final class DataType implements Component
      */
     public $options;
 
+    public bool $lowercase = false;
+
     /**
      * @param string         $name       the name of this data type
      * @param int[]|string[] $parameters the parameters (size or possible values)
@@ -153,13 +155,11 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param DataType             $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param DataType $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
-        $name = empty($options['lowercase']) ?
-            $component->name : strtolower($component->name);
+        $name = $component->lowercase ? strtolower($component->name) : $component->name;
 
         $parameters = '';
         if ($component->parameters !== []) {

diff --git a/src/Components/Expression.php b/src/Components/Expression.php
@@ -448,9 +448,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param Expression|Expression[] $component the component to be built
-     * @param array<string, mixed>    $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php
@@ -117,10 +117,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param Expression[]         $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param Expression[] $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         $ret = [];
         foreach ($component as $frag) {

diff --git a/src/Components/FunctionCall.php b/src/Components/FunctionCall.php
@@ -103,10 +103,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param FunctionCall         $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param FunctionCall $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         return $component->name . $component->parameters;
     }

diff --git a/src/Components/GroupKeyword.php b/src/Components/GroupKeyword.php
@@ -113,9 +113,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param GroupKeyword|GroupKeyword[] $component the component to be built
-     * @param array<string, mixed>        $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/IndexHint.php b/src/Components/IndexHint.php
@@ -179,9 +179,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param IndexHint|IndexHint[] $component the component to be built
-     * @param array<string, mixed>  $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(' ', $component);

diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php
@@ -259,10 +259,9 @@ public function parseFileOptions(Parser $parser, TokensList $list, $keyword = 'F
     }
 
     /**
-     * @param IntoKeyword          $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param IntoKeyword $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if ($component->dest instanceof Expression) {
             $columns = ! empty($component->columns) ? '(`' . implode('`, `', $component->columns) . '`)' : '';
@@ -282,7 +281,7 @@ public static function build($component, array $options = []): string
             $ret .= ' ' . $fieldsOptionsString;
         }
 
-        $linesOptionsString = OptionsArray::build($component->linesOptions, ['expr' => true]);
+        $linesOptionsString = OptionsArray::build($component->linesOptions);
         if (trim($linesOptionsString) !== '') {
             $ret .= ' LINES ' . $linesOptionsString;
         }

diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php
@@ -198,10 +198,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param JoinKeyword[]        $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param JoinKeyword[] $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         $ret = [];
         foreach ($component as $c) {

diff --git a/src/Components/Key.php b/src/Components/Key.php
@@ -264,10 +264,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param Key                  $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param Key $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         $ret = $component->type . ' ';
         if (! empty($component->name)) {

diff --git a/src/Components/Limit.php b/src/Components/Limit.php
@@ -109,10 +109,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param Limit                $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param Limit $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         return $component->offset . ', ' . $component->rowCount;
     }

diff --git a/src/Components/LockExpression.php b/src/Components/LockExpression.php
@@ -96,9 +96,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param LockExpression|LockExpression[] $component the component to be built
-     * @param array<string, mixed>            $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php
@@ -275,10 +275,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param OptionsArray         $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param OptionsArray $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (empty($component->options)) {
             return '';

diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php
@@ -118,9 +118,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param OrderKeyword|OrderKeyword[] $component the component to be built
-     * @param array<string, mixed>        $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php
@@ -142,9 +142,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param ParameterDefinition[] $component the component to be built
-     * @param array<string, mixed>  $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return '(' . implode(', ', $component) . ')';

diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php
@@ -225,9 +225,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param PartitionDefinition|PartitionDefinition[] $component the component to be built
-     * @param array<string, mixed>                      $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return "(\n" . implode(",\n", $component) . "\n)";

diff --git a/src/Components/Reference.php b/src/Components/Reference.php
@@ -140,10 +140,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param Reference            $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param Reference $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         return trim(
             $component->table

diff --git a/src/Components/RenameOperation.php b/src/Components/RenameOperation.php
@@ -149,10 +149,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param RenameOperation      $component the component to be built
-     * @param array<string, mixed> $options   parameters for building
+     * @param RenameOperation $component the component to be built
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php
@@ -141,9 +141,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param SetOperation|SetOperation[] $component the component to be built
-     * @param array<string, mixed>        $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (is_array($component)) {
             return implode(', ', $component);

diff --git a/src/Components/UnionKeyword.php b/src/Components/UnionKeyword.php
@@ -35,9 +35,8 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
     /**
      * @param array<UnionKeyword[]> $component the component to be built
-     * @param array<string, mixed>  $options   parameters for building
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         $tmp = [];
         foreach ($component as $componentPart) {

diff --git a/src/Components/WithKeyword.php b/src/Components/WithKeyword.php
@@ -46,10 +46,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
     }
 
     /**
-     * @param WithKeyword          $component
-     * @param array<string, mixed> $options
+     * @param WithKeyword $component
      */
-    public static function build($component, array $options = []): string
+    public static function build($component): string
     {
         if (! $component instanceof WithKeyword) {
             throw new RuntimeException('Can not build a component that is not a WithKeyword');