Fix PossiblyNullArrayOffset issues

morozov · morozov · commit 8c6ea53361de · 2020-10-16T05:17:38.000-07:00
diff --git a/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php b/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
@@ -1602,8 +1602,10 @@ public function getCreateTableSQL(Table $table, $createFlags = self::CREATE_INDE
                 }
             }
 
+            $name = $column->getQuotedName($this);
+
             $columnData = array_merge($column->toArray(), [
-                'name' => $column->getQuotedName($this),
+                'name' => $name,
                 'version' => $column->hasPlatformOption('version') ? $column->getPlatformOption('version') : false,
                 'comment' => $this->getColumnComment($column),
             ]);
@@ -1616,7 +1618,7 @@ public function getCreateTableSQL(Table $table, $createFlags = self::CREATE_INDE
                 $columnData['primary'] = true;
             }
 
-            $columns[$columnData['name']] = $columnData;
+            $columns[$name] = $columnData;
         }
 
         if (($createFlags & self::CREATE_FOREIGNKEYS) > 0) {

Original file line number	Diff line number	Diff line change
`@@ -1602,8 +1602,10 @@ public function getCreateTableSQL(Table $table, $createFlags = self::CREATE_INDE`
`1602`	`1602`	`}`
`1603`	`1603`	`}`
`1604`	`1604`
	`1605`	`+ $name = $column->getQuotedName($this);`
	`1606`	`+`
`1605`	`1607`	`$columnData = array_merge($column->toArray(), [`
`1606`		`- 'name' => $column->getQuotedName($this),`
	`1608`	`+ 'name' => $name,`
`1607`	`1609`	`'version' => $column->hasPlatformOption('version') ? $column->getPlatformOption('version') : false,`
`1608`	`1610`	`'comment' => $this->getColumnComment($column),`
`1609`	`1611`	`]);`
`@@ -1616,7 +1618,7 @@ public function getCreateTableSQL(Table $table, $createFlags = self::CREATE_INDE`
`1616`	`1618`	`$columnData['primary'] = true;`
`1617`	`1619`	`}`
`1618`	`1620`
`1619`		`- $columns[$columnData['name']] = $columnData;`
	`1621`	`+ $columns[$name] = $columnData;`
`1620`	`1622`	`}`
`1621`	`1623`
`1622`	`1624`	`if (($createFlags & self::CREATE_FOREIGNKEYS) > 0) {`