Skip to content

Commit 49efcd4

Browse files
committed
Updated layout.
1 parent 905846c commit 49efcd4

File tree

7 files changed

+23
-26
lines changed

7 files changed

+23
-26
lines changed

src/AuditTable.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class AuditTable
7171
private $tableName;
7272

7373
//--------------------------------------------------------------------------------------------------------------------
74-
7574
/**
7675
* Object constructor.
7776
*

src/Command/AlterAuditTableCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
7272
}
7373

7474
//--------------------------------------------------------------------------------------------------------------------
75-
7675
}
7776

7877
//----------------------------------------------------------------------------------------------------------------------

src/Command/BaseCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class BaseCommand extends Command
5252
protected $rewriteConfigFile = true;
5353

5454
//--------------------------------------------------------------------------------------------------------------------
55+
5556
/**
5657
* Reads configuration parameters from the configuration file.
5758
*/

src/Command/DiffCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
4545
}
4646

4747
//--------------------------------------------------------------------------------------------------------------------
48-
4948
}
5049

5150
//----------------------------------------------------------------------------------------------------------------------

src/DiffTable.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class DiffTable
3737
private $rows = [];
3838

3939
//--------------------------------------------------------------------------------------------------------------------
40-
4140
/**
4241
* Object constructor.
4342
*

src/Metadata/TableColumnsMetadata.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@ class TableColumnsMetadata
2121
*/
2222
private $columns = [];
2323

24+
//--------------------------------------------------------------------------------------------------------------------
25+
/**
26+
* Object constructor.
27+
*
28+
* @param array[] $columns The metadata of the columns as returned by AuditDataLayer::getTableColumns().
29+
* @param string $type The class for columns metadata.
30+
*/
31+
public function __construct(array $columns = [], string $type = 'ColumnMetadata')
32+
{
33+
foreach ($columns as $columnName => $column)
34+
{
35+
$this->columns[$column['column_name']] = static::columnFactory($type, $column);
36+
}
37+
}
38+
2439
//--------------------------------------------------------------------------------------------------------------------
2540
/**
2641
* Combines the metadata of two lists of table columns.
@@ -122,21 +137,6 @@ private static function columnFactory(string $type, array $column): ColumnMetada
122137
}
123138
}
124139

125-
//--------------------------------------------------------------------------------------------------------------------
126-
/**
127-
* Object constructor.
128-
*
129-
* @param array[] $columns The metadata of the columns as returned by AuditDataLayer::getTableColumns().
130-
* @param string $type The class for columns metadata.
131-
*/
132-
public function __construct(array $columns = [], string $type = 'ColumnMetadata')
133-
{
134-
foreach ($columns as $columnName => $column)
135-
{
136-
$this->columns[$column['column_name']] = static::columnFactory($type, $column);
137-
}
138-
}
139-
140140
//--------------------------------------------------------------------------------------------------------------------
141141
/**
142142
* Appends a table column to this list of table columns.

src/MySql/Metadata/ColumnMetadata.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ColumnMetadata extends BaseColumnMetadata
2626
/**
2727
* @inheritdoc
2828
*/
29-
public function getColumnDefinition(): string
29+
public function getColumnAuditDefinition(): string
3030
{
3131
$parts = [];
3232

@@ -51,6 +51,11 @@ public function getColumnDefinition(): string
5151
{
5252
$parts[] = 'default '.$this->getProperty('column_default');
5353
}
54+
elseif ($this->getProperty('column_type')=='timestamp')
55+
{
56+
// Prevent automatic updates of timestamp columns.
57+
$parts[] = 'default now()';
58+
}
5459

5560
return implode(' ', $parts);
5661
}
@@ -59,7 +64,7 @@ public function getColumnDefinition(): string
5964
/**
6065
* @inheritdoc
6166
*/
62-
public function getColumnAuditDefinition(): string
67+
public function getColumnDefinition(): string
6368
{
6469
$parts = [];
6570

@@ -84,11 +89,6 @@ public function getColumnAuditDefinition(): string
8489
{
8590
$parts[] = 'default '.$this->getProperty('column_default');
8691
}
87-
elseif ($this->getProperty('column_type')=='timestamp')
88-
{
89-
// Prevent automatic updates of timestamp columns.
90-
$parts[] = 'default now()';
91-
}
9292

9393
return implode(' ', $parts);
9494
}

0 commit comments

Comments
 (0)