Refactoring (#216)

yiisoft · Oct 17, 2023 · 176070a · 176070a
1 parent 940d988
commit 176070a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 30 deletions.
diff --git a/src/Migrator.php b/src/Migrator.php
@@ -78,6 +78,7 @@ public function getMigrationNameLimit(): ?int
         return $this->migrationNameLimit = $limit;
     }
 
+    /** @psalm-return array<string, int|string> */
     public function getHistory(?int $limit = null): array
     {
         $this->checkMigrationHistoryTable();
@@ -92,6 +93,7 @@ public function getHistory(?int $limit = null): array
             $query->limit($limit);
         }
 
+        /** @psalm-var array<string, int|string> */
         return $query->column();
     }
 

diff --git a/src/Service/Generate/FieldsParser.php b/src/Service/Generate/FieldsParser.php
@@ -4,7 +4,14 @@
 
 namespace Yiisoft\Db\Migration\Service\Generate;
 
+use function array_shift;
+use function array_unshift;
+use function explode;
 use function in_array;
+use function preg_match;
+use function preg_split;
+use function str_replace;
+use function str_starts_with;
 
 /**
  * @internal
@@ -33,30 +40,30 @@ public function parse(
             /** @psalm-var string[] $fields */
             foreach ($fields as $field) {
                 $chunks = $this->splitFieldIntoChunks($field);
-                $property = (string) array_shift($chunks);
+                $column = (string) array_shift($chunks);
 
                 /** @psalm-var string[] $chunks */
                 foreach ($chunks as $i => $chunk) {
                     if (str_starts_with($chunk, 'foreignKey')) {
                         preg_match('/foreignKey\((\w*)\s?(\w*)\)/', $chunk, $matches);
                         $foreignKeys[] = $this->foreignKeyFactory->create(
                             $table,
-                            $property,
-                            $matches[1] ?? preg_replace('/_id$/', '', $property),
+                            $column,
+                            $matches[1] ?? preg_replace('/_id$/', '', $column),
                             empty($matches[2]) ? null : $matches[2]
                         );
 
                         unset($chunks[$i]);
                         continue;
                     }
 
-                    if (!preg_match('/^(.+?)\(([^(]+)\)$/', $chunk)) {
+                    if (!preg_match('/\(([^(]+)\)$/', $chunk)) {
                         $chunks[$i] .= '()';
                     }
                 }
 
                 /** @psalm-var string[] $chunks */
-                $columns[] = new Column($property, $chunks);
+                $columns[] = new Column($column, $chunks);
             }
         }
 
@@ -71,21 +78,17 @@ private function splitFieldIntoChunks(string $field): array
     {
         $defaultValue = '';
         $originalDefaultValue = '';
-        $hasDoubleQuotes = false;
 
-        preg_match_all('/defaultValue\(.*?:.*?\)/', $field, $matches);
-
-        if (isset($matches[0][0])) {
-            $hasDoubleQuotes = true;
-            $originalDefaultValue = $matches[0][0];
+        if (preg_match('/defaultValue\(.*?:.*?\)/', $field, $matches) === 1) {
+            $originalDefaultValue = $matches[0];
             $defaultValue = str_replace(':', '{{colon}}', $originalDefaultValue);
             $field = str_replace($originalDefaultValue, $defaultValue, $field);
         }
 
         /** @var string[] $chunks */
-        $chunks = preg_split('/\s?:\s?/', $field);
+        $chunks = preg_split('/\s?:\s?/', $field, -1, PREG_SPLIT_NO_EMPTY);
 
-        if ($hasDoubleQuotes) {
+        if ($defaultValue !== '') {
             foreach ($chunks as $key => $chunk) {
                 $chunks[$key] = str_replace($defaultValue, $originalDefaultValue, $chunk);
             }
@@ -107,9 +110,6 @@ private function addDefaultPrimaryKey(array &$columns): void
             }
         }
 
-        array_unshift(
-            $columns,
-            new Column('id', ['primaryKey()']),
-        );
+        array_unshift($columns, new Column('id', ['primaryKey()']));
     }
 }
diff --git a/src/Service/Generate/ForeignKeyFactory.php b/src/Service/Generate/ForeignKeyFactory.php
@@ -37,8 +37,7 @@ public function create(
             $tablePrimaryKeys = $this->db->getSchema()->getTablePrimaryKey($relatedTable);
 
             if ($tablePrimaryKeys !== null) {
-                $columNames = $tablePrimaryKeys->getColumnNames() ?? [];
-                $primaryKeys = is_string($columNames) ? [$columNames] : $columNames;
+                $primaryKeys = (array) $tablePrimaryKeys->getColumnNames();
 
                 match (count($primaryKeys)) {
                     1 => $relatedColumn = (string) $primaryKeys[0],

diff --git a/src/Service/Generate/PhpRenderer.php b/src/Service/Generate/PhpRenderer.php
@@ -6,27 +6,27 @@
 
 use Throwable;
 
+use function extract;
+use function ob_clean;
+use function ob_end_clean;
+use function ob_get_clean;
+use function ob_get_level;
+use function ob_implicit_flush;
+use function ob_start;
+
 /**
  * @internal
  */
 final class PhpRenderer
 {
     public function render(string $file, array $params = []): string
     {
-        /** @psalm-suppress MissingClosureReturnType */
-        $renderer = function () {
-            /** @psalm-suppress MixedArgument */
-            extract(func_get_arg(1), EXTR_OVERWRITE);
-            /** @psalm-suppress UnresolvableInclude */
-            require func_get_arg(0);
-        };
-
         $obInitialLevel = ob_get_level();
         ob_start();
         ob_implicit_flush(false);
+
         try {
-            /** @psalm-suppress PossiblyInvalidFunctionCall,PossiblyNullFunctionCall */
-            $renderer->bindTo($this)($file, $params);
+            $this->renderer($file, $params);
             return ob_get_clean();
         } catch (Throwable $e) {
             while (ob_get_level() > $obInitialLevel) {
@@ -37,4 +37,12 @@ public function render(string $file, array $params = []): string
             throw $e;
         }
     }
+
+    private function renderer(): void
+    {
+        /** @psalm-suppress MixedArgument */
+        extract(func_get_arg(1));
+        /** @psalm-suppress UnresolvableInclude */
+        require func_get_arg(0);
+    }
 }
diff --git a/src/Service/MigrationService.php b/src/Service/MigrationService.php
@@ -112,7 +112,7 @@ public function getNewMigrations(): array
         $applied = [];
 
         foreach ($this->migrator->getHistory() as $class => $time) {
-            $applied[trim((string) $class, '\\')] = true;
+            $applied[trim($class, '\\')] = true;
         }
 
         $migrationPaths = [];