Refactor

Author: SOHELAHMED7

src/lib/migrations/MigrationRecordBuilder.php

@@ -69,15 +69,15 @@ public function __construct(Schema $dbSchema)
 
     /**
      * @param string                     $tableAlias
-     * @param array|\yii\db\ColumnSchema $columns
+     * @param array|ColumnSchema $columns
      * @return string
      * @throws \yii\base\InvalidConfigException
      */
     public function createTable(string $tableAlias, array $columns):string
     {
         $codeColumns = [];
         foreach ($columns as $columnName => $cebeDbColumnSchema) {
-            if (!empty($cebeDbColumnSchema->xDbType) && is_string($cebeDbColumnSchema->xDbType)) {
+            if (static::isXDbType($cebeDbColumnSchema)) {
                 $name = static::quote($columnName);
                 $codeColumns[] = $name.' '.$this->columnToCode($tableAlias, $cebeDbColumnSchema, false)->getCode();
             } else {
@@ -393,4 +393,9 @@ public function renameColumn(string $table, string $fromColumn, string $toColumn
     {
         return sprintf(self::RENAME_COLUMN, $table, $fromColumn, $toColumn);
     }
+
+    public static function isXDbType(ColumnSchema $columnSchema): bool
+    {
+        return (!empty($columnSchema->xDbType) && is_string($columnSchema->xDbType));
+    }
 }

src/lib/migrations/PostgresMigrationBuilder.php

@@ -288,7 +288,7 @@ public function handleCommentsMigration()
         foreach ($this->newColumns as $column) {
             /** @var ColumnSchema $column */
             if ($column->comment) {
-                if (!empty($column->xDbType) && is_string($column->xDbType)) { # see \cebe\yii2openapi\lib\migrations\MigrationRecordBuilder::createTable()
+                if (MigrationRecordBuilder::isXDbType($column)) {
                     $this->migration
                         ->addUpCode($this->recordBuilder->addCommentOnColumn($tableAlias, $column->name, $column->comment));
                 }