SetBased / php-audit

src/Columns.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
    *
    * @param string $columnName The column name.
    *
-   * @return null|string
+   * @return integer|null
    */
   public function getPreviousColumn($columnName)
   {

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
       {
         $columns[] = ['column_name' => $column['column_name'],
                       'column_type' => $column['column_type']];
-      }
-      else
+      } else
       {
         $columns[] = ['column_name' => $column['column_name'],
                       'column_type' => $column['column_type'].' NULL'];

Indentation +118 added lines, -118 removed lines

@@ -8,179 +8,179 @@
  */
 class Columns
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The metadata of the columns.
-   *
-   * @var array[]
-   */
-  private $columns = [];
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param array[] $columns The metadata of the columns.
-   */
-  public function __construct($columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The metadata of the columns.
+     *
+     * @var array[]
+     */
+    private $columns = [];
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param array[] $columns The metadata of the columns.
+     */
+    public function __construct($columns)
+    {
     foreach ($columns as $column)
     {
-      $columnTypes                           = new ColumnTypes($column);
-      $this->columns[$column['column_name']] = $columnTypes->getTypes();
+        $columnTypes                           = new ColumnTypes($column);
+        $this->columns[$column['column_name']] = $columnTypes->getTypes();
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Generate array with audit columns and columns from data table.
-   *
-   * @param Columns $auditColumnsMetadata   AuditApplication columns for adding to exist columns
-   * @param Columns $currentColumnsMetadata Exist table columns
-   *
-   * @return Columns
-   */
-  public static function combine($auditColumnsMetadata, $currentColumnsMetadata)
-  {
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Generate array with audit columns and columns from data table.
+     *
+     * @param Columns $auditColumnsMetadata   AuditApplication columns for adding to exist columns
+     * @param Columns $currentColumnsMetadata Exist table columns
+     *
+     * @return Columns
+     */
+    public static function combine($auditColumnsMetadata, $currentColumnsMetadata)
+    {
     $columns = [];
 
     foreach ($auditColumnsMetadata->columns as $column)
     {
-      $columns[] = ['column_name' => $column['column_name'],
+        $columns[] = ['column_name' => $column['column_name'],
                     'column_type' => $column['column_type']];
     }
 
     foreach ($currentColumnsMetadata->columns as $column)
     {
-      if ($column['column_type']!='timestamp')
-      {
+        if ($column['column_type']!='timestamp')
+        {
         $columns[] = ['column_name' => $column['column_name'],
-                      'column_type' => $column['column_type']];
-      }
-      else
-      {
+                        'column_type' => $column['column_type']];
+        }
+        else
+        {
         $columns[] = ['column_name' => $column['column_name'],
-                      'column_type' => $column['column_type'].' NULL'];
-      }
+                        'column_type' => $column['column_type'].' NULL'];
+        }
     }
 
     return new Columns($columns);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Compares two Columns objects and returns an array with columns that are in the first columns object and in the
-   * second Columns object but have different types.
-   *
-   * @param Columns $columns1 The first Columns object.
-   * @param Columns $columns2 The second Columns object.
-   *
-   * @return Columns
-   */
-  public static function differentColumnTypes($columns1, $columns2)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Compares two Columns objects and returns an array with columns that are in the first columns object and in the
+     * second Columns object but have different types.
+     *
+     * @param Columns $columns1 The first Columns object.
+     * @param Columns $columns2 The second Columns object.
+     *
+     * @return Columns
+     */
+    public static function differentColumnTypes($columns1, $columns2)
+    {
     $diff = [];
     foreach ($columns2->columns as $column2)
     {
-      if (isset($columns1->columns[$column2['column_name']]))
-      {
+        if (isset($columns1->columns[$column2['column_name']]))
+        {
         $column1 = $columns1->columns[$column2['column_name']];
         if ($column2['column_type']!=$column1['column_type'])
         {
-          $diff[] = $column1;
+            $diff[] = $column1;
+        }
         }
-      }
     }
 
     return new Columns($diff);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Compares two Columns objects and returns an array with columns that are in the first columns object but not in the
-   * second Columns object.
-   *
-   * @param Columns $columns1 The first Columns object.
-   * @param Columns $columns2 The second Columns object.
-   *
-   * @return Columns
-   */
-  public static function notInOtherSet($columns1, $columns2)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Compares two Columns objects and returns an array with columns that are in the first columns object but not in the
+     * second Columns object.
+     *
+     * @param Columns $columns1 The first Columns object.
+     * @param Columns $columns2 The second Columns object.
+     *
+     * @return Columns
+     */
+    public static function notInOtherSet($columns1, $columns2)
+    {
     $diff = [];
     if (isset($columns1))
     {
-      foreach ($columns1->columns as $column1)
-      {
+        foreach ($columns1->columns as $column1)
+        {
         if (!isset($columns2->columns[$column1['column_name']]))
         {
-          $diff[] = ['column_name' => $column1['column_name'],
-                     'column_type' => $column1['column_type']];
+            $diff[] = ['column_name' => $column1['column_name'],
+                        'column_type' => $column1['column_type']];
+        }
         }
-      }
     }
 
     return new Columns($diff);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns the underlying array with metadata of the columns.
-   *
-   * @return array[]
-   */
-  public function getColumns()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns the underlying array with metadata of the columns.
+     *
+     * @return array[]
+     */
+    public function getColumns()
+    {
     return $this->columns;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Return column type with character set and collation.
-   *
-   * @param string $columnName The column name.
-   *
-   * @return null|string
-   */
-  public function getColumnTypeWithCharSetCollation($columnName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Return column type with character set and collation.
+     *
+     * @param string $columnName The column name.
+     *
+     * @return null|string
+     */
+    public function getColumnTypeWithCharSetCollation($columnName)
+    {
     $columns = array_keys($this->columns);
     $key     = array_search($columnName, $columns);
 
     if ($key!==false)
     {
-      $column                       = $this->columns[$columns[$key]];
-      $column['character_set_name'] = isset($column['character_set_name']) ? ' '.$column['character_set_name'] : '';
-      $column['collation_name']     = isset($column['collation_name']) ? ' '.$column['collation_name'] : '';
+        $column                       = $this->columns[$columns[$key]];
+        $column['character_set_name'] = isset($column['character_set_name']) ? ' '.$column['character_set_name'] : '';
+        $column['collation_name']     = isset($column['collation_name']) ? ' '.$column['collation_name'] : '';
 
-      return sprintf('%s%s%s', $column['column_type'], $column['character_set_name'], $column['collation_name']);
+        return sprintf('%s%s%s', $column['column_type'], $column['character_set_name'], $column['collation_name']);
     }
 
     return null;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns previous column of a columns. Returns null if the column name is not found in this Columns.
-   *
-   * @param string $columnName The column name.
-   *
-   * @return null|string
-   */
-  public function getPreviousColumn($columnName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns previous column of a columns. Returns null if the column name is not found in this Columns.
+     *
+     * @param string $columnName The column name.
+     *
+     * @return null|string
+     */
+    public function getPreviousColumn($columnName)
+    {
     $columns = array_keys($this->columns);
     $key     = array_search($columnName, $columns);
 
     if ($key>=1)
     {
-      return $columns[$key - 1];
+        return $columns[$key - 1];
     }
 
     return null;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
 
     foreach ($currentColumnsMetadata->columns as $column)
     {
-      if ($column['column_type']!='timestamp')
+      if ($column['column_type'] != 'timestamp')
       {
         $columns[] = ['column_name' => $column['column_name'],
                       'column_type' => $column['column_type']];
@@ -85,7 +85,7 @@ 
       if (isset($columns1->columns[$column2['column_name']]))
       {
         $column1 = $columns1->columns[$column2['column_name']];
-        if ($column2['column_type']!=$column1['column_type'])
+        if ($column2['column_type'] != $column1['column_type'])
         {
           $diff[] = $column1;
         }
@@ -147,7 +147,7 @@ 
     $columns = array_keys($this->columns);
     $key     = array_search($columnName, $columns);
 
-    if ($key!==false)
+    if ($key !== false)
     {
       $column                       = $this->columns[$columns[$key]];
       $column['character_set_name'] = isset($column['character_set_name']) ? ' '.$column['character_set_name'] : '';
@@ -172,7 +172,7 @@ 
     $columns = array_keys($this->columns);
     $key     = array_search($columnName, $columns);
 
-    if ($key>=1)
+    if ($key >= 1)
     {
       return $columns[$key - 1];
     }

src/Table.php

Doc Comments +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
   /**
    * Selects and returns the metadata of the columns of this table from information_schema.
    *
-   * @return array[]
+   * @return \array[]
    */
   private function getColumnsFromInformationSchema()
   {

Indentation +288 added lines, -288 removed lines

@@ -11,92 +11,92 @@ 
  */
 class Table
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The unique alias for this data table.
-   *
-   * @var string
-   */
-  private $alias;
-
-  /**
-   * The metadata (additional) audit columns (as stored in the config file).
-   *
-   * @var Columns
-   */
-  private $auditColumns;
-
-  /**
-   * The name of the schema with the audit tables.
-   *
-   * @var string
-   */
-  private $auditSchemaName;
-
-  /**
-   * The name of the schema with the data tables.
-   *
-   * @var string
-   */
-  private $dataSchemaName;
-
-  /**
-   * The metadata of the columns of the data table as stored in the config file.
-   *
-   * @var Columns
-   */
-  private $dataTableColumnsConfig;
-
-  /**
-   * The metadata of the columns of the data table retrieved from information_schema.
-   *
-   * @var Columns
-   */
-  private $dataTableColumnsDatabase;
-
-  /**
-   * The output decorator
-   *
-   * @var StratumStyle
-   */
-  private $io;
-
-  /**
-   * The skip variable for triggers.
-   *
-   * @var string
-   */
-  private $skipVariable;
-
-  /**
-   * The name of this data table.
-   *
-   * @var string
-   */
-  private $tableName;
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param StratumStyle $io                    The output for log messages.
-   * @param string       $tableName             The table name.
-   * @param string       $dataSchema            The name of the schema with data tables.
-   * @param string       $auditSchema           The name of the schema with audit tables.
-   * @param array[]      $configColumnsMetadata The columns of the data table as stored in the config file.
-   * @param array[]      $auditColumnsMetadata  The columns of the audit table as stored in the config file.
-   * @param string       $alias                 An unique alias for this table.
-   * @param string       $skipVariable          The skip variable
-   */
-  public function __construct($io,
-                              $tableName,
-                              $dataSchema,
-                              $auditSchema,
-                              $configColumnsMetadata,
-                              $auditColumnsMetadata,
-                              $alias,
-                              $skipVariable)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The unique alias for this data table.
+     *
+     * @var string
+     */
+    private $alias;
+
+    /**
+     * The metadata (additional) audit columns (as stored in the config file).
+     *
+     * @var Columns
+     */
+    private $auditColumns;
+
+    /**
+     * The name of the schema with the audit tables.
+     *
+     * @var string
+     */
+    private $auditSchemaName;
+
+    /**
+     * The name of the schema with the data tables.
+     *
+     * @var string
+     */
+    private $dataSchemaName;
+
+    /**
+     * The metadata of the columns of the data table as stored in the config file.
+     *
+     * @var Columns
+     */
+    private $dataTableColumnsConfig;
+
+    /**
+     * The metadata of the columns of the data table retrieved from information_schema.
+     *
+     * @var Columns
+     */
+    private $dataTableColumnsDatabase;
+
+    /**
+     * The output decorator
+     *
+     * @var StratumStyle
+     */
+    private $io;
+
+    /**
+     * The skip variable for triggers.
+     *
+     * @var string
+     */
+    private $skipVariable;
+
+    /**
+     * The name of this data table.
+     *
+     * @var string
+     */
+    private $tableName;
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param StratumStyle $io                    The output for log messages.
+     * @param string       $tableName             The table name.
+     * @param string       $dataSchema            The name of the schema with data tables.
+     * @param string       $auditSchema           The name of the schema with audit tables.
+     * @param array[]      $configColumnsMetadata The columns of the data table as stored in the config file.
+     * @param array[]      $auditColumnsMetadata  The columns of the audit table as stored in the config file.
+     * @param string       $alias                 An unique alias for this table.
+     * @param string       $skipVariable          The skip variable
+     */
+    public function __construct($io,
+                                $tableName,
+                                $dataSchema,
+                                $auditSchema,
+                                $configColumnsMetadata,
+                                $auditColumnsMetadata,
+                                $alias,
+                                $skipVariable)
+    {
     $this->io                       = $io;
     $this->tableName                = $tableName;
     $this->dataTableColumnsConfig   = new Columns($configColumnsMetadata);
@@ -106,39 +106,39 @@ 
     $this->auditColumns             = new Columns($auditColumnsMetadata);
     $this->alias                    = $alias;
     $this->skipVariable             = $skipVariable;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns a random alias for this table.
-   *
-   * @return string
-   */
-  public static function getRandomAlias()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns a random alias for this table.
+     *
+     * @return string
+     */
+    public static function getRandomAlias()
+    {
     return uniqid();
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Creates missing audit table for this table.
-   */
-  public function createMissingAuditTable()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Creates missing audit table for this table.
+     */
+    public function createMissingAuditTable()
+    {
     $this->io->logInfo('Creating audit table <dbo>%s.%s<dbo>', $this->auditSchemaName, $this->tableName);
 
     $columns = Columns::combine($this->auditColumns, $this->dataTableColumnsDatabase);
     DataLayer::createAuditTable($this->dataSchemaName, $this->auditSchemaName, $this->tableName, $columns);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Creates audit triggers on this table.
-   *
-   * @param string[] $additionalSql Additional SQL statements to be include in triggers.
-   */
-  public function createTriggers($additionalSql)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Creates audit triggers on this table.
+     *
+     * @param string[] $additionalSql Additional SQL statements to be include in triggers.
+     */
+    public function createTriggers($additionalSql)
+    {
     // Lock the table to prevent insert, updates, or deletes between dropping and creating triggers.
     $this->lockTable($this->tableName);
 
@@ -152,142 +152,142 @@ 
 
     // Insert, updates, and deletes are no audited again. So, release lock on the table.
     $this->unlockTables();
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns the name of this table.
-   *
-   * @return string
-   */
-  public function getTableName()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns the name of this table.
+     *
+     * @return string
+     */
+    public function getTableName()
+    {
     return $this->tableName;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Main function for work with table.
-   *
-   * @param string[] $additionalSql Additional SQL statements to be include in triggers.
-   *
-   * @return \array[] Columns for config file
-   */
-  public function main($additionalSql)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Main function for work with table.
+     *
+     * @param string[] $additionalSql Additional SQL statements to be include in triggers.
+     *
+     * @return \array[] Columns for config file
+     */
+    public function main($additionalSql)
+    {
     $comparedColumns = null;
     if (isset($this->dataTableColumnsConfig))
     {
-      $comparedColumns = $this->getTableColumnInfo();
+        $comparedColumns = $this->getTableColumnInfo();
     }
 
     $newColumns      = $comparedColumns['new_columns']->getColumns();
     $obsoleteColumns = $comparedColumns['obsolete_columns']->getColumns();
     if (empty($newColumns) && empty($obsoleteColumns))
     {
-      $alteredColumns = $comparedColumns['altered_columns']->getColumns();
-      if (empty($alteredColumns))
-      {
+        $alteredColumns = $comparedColumns['altered_columns']->getColumns();
+        if (empty($alteredColumns))
+        {
         $this->createTriggers($additionalSql);
-      }
+        }
     }
 
     return $comparedColumns;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Adds new columns to audit table.
-   *
-   * @param Columns $columns Columns array
-   */
-  private function addNewColumns($columns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Adds new columns to audit table.
+     *
+     * @param Columns $columns Columns array
+     */
+    private function addNewColumns($columns)
+    {
     DataLayer::addNewColumns($this->auditSchemaName, $this->tableName, $columns);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Creates a triggers for this table.
-   *
-   * @param string      $action      The trigger action (INSERT, DELETE, or UPDATE).
-   * @param string|null $skipVariable
-   * @param string[]    $additionSql The additional SQL statements to be included in triggers.
-   */
-  private function createTableTrigger($action, $skipVariable, $additionSql)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Creates a triggers for this table.
+     *
+     * @param string      $action      The trigger action (INSERT, DELETE, or UPDATE).
+     * @param string|null $skipVariable
+     * @param string[]    $additionSql The additional SQL statements to be included in triggers.
+     */
+    private function createTableTrigger($action, $skipVariable, $additionSql)
+    {
     $triggerName = $this->getTriggerName($action);
 
     $this->io->logVerbose('Creating trigger <dbo>%s.%s</dbo> on table <dbo>%s.%s</dbo>',
-                          $this->dataSchemaName,
-                          $triggerName,
-                          $this->dataSchemaName,
-                          $this->tableName);
+                            $this->dataSchemaName,
+                            $triggerName,
+                            $this->dataSchemaName,
+                            $this->tableName);
 
     DataLayer::createAuditTrigger($this->dataSchemaName,
-                                  $this->auditSchemaName,
-                                  $this->tableName,
-                                  $triggerName,
-                                  $action,
-                                  $this->auditColumns,
-                                  $this->dataTableColumnsDatabase,
-                                  $skipVariable,
-                                  $additionSql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Drops all triggers from this table.
-   */
-  private function dropTriggers()
-  {
+                                    $this->auditSchemaName,
+                                    $this->tableName,
+                                    $triggerName,
+                                    $action,
+                                    $this->auditColumns,
+                                    $this->dataTableColumnsDatabase,
+                                    $skipVariable,
+                                    $additionSql);
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Drops all triggers from this table.
+     */
+    private function dropTriggers()
+    {
     $triggers = DataLayer::getTableTriggers($this->dataSchemaName, $this->tableName);
     foreach ($triggers as $trigger)
     {
-      $this->io->logVerbose('Dropping trigger <dbo>%s</dbo> on <dbo>%s.%s</dbo>',
+        $this->io->logVerbose('Dropping trigger <dbo>%s</dbo> on <dbo>%s.%s</dbo>',
                             $trigger['trigger_name'],
                             $this->dataSchemaName,
                             $this->tableName);
 
-      DataLayer::dropTrigger($this->dataSchemaName, $trigger['trigger_name']);
+        DataLayer::dropTrigger($this->dataSchemaName, $trigger['trigger_name']);
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Compares columns types from table in data_schema with columns in config file.
-   *
-   * @return Columns
-   */
-  private function getAlteredColumns()
-  {
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Compares columns types from table in data_schema with columns in config file.
+     *
+     * @return Columns
+     */
+    private function getAlteredColumns()
+    {
     $alteredColumnsTypes = Columns::differentColumnTypes($this->dataTableColumnsDatabase,
-                                                         $this->dataTableColumnsConfig);
+                                                            $this->dataTableColumnsConfig);
 
     return $alteredColumnsTypes;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Selects and returns the metadata of the columns of this table from information_schema.
-   *
-   * @return array[]
-   */
-  private function getColumnsFromInformationSchema()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Selects and returns the metadata of the columns of this table from information_schema.
+     *
+     * @return array[]
+     */
+    private function getColumnsFromInformationSchema()
+    {
     $result = DataLayer::getTableColumns($this->dataSchemaName, $this->tableName);
 
     return $result;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Compare columns from table in data_schema with columns in config file.
-   *
-   * @return \array[]
-   */
-  private function getTableColumnInfo()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Compare columns from table in data_schema with columns in config file.
+     *
+     * @return \array[]
+     */
+    private function getTableColumnInfo()
+    {
     $columnActual  = new Columns(DataLayer::getTableColumns($this->auditSchemaName, $this->tableName));
     $columnsConfig = Columns::combine($this->auditColumns, $this->dataTableColumnsConfig);
     $columnsTarget = Columns::combine($this->auditColumns, $this->dataTableColumnsDatabase);
@@ -303,108 +303,108 @@ 
             'new_columns'      => $newColumns,
             'obsolete_columns' => $obsoleteColumns,
             'altered_columns'  => $alteredColumns];
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Check for know what columns array returns.
-   *
-   * @param Columns $newColumns
-   * @param Columns $obsoleteColumns
-   *
-   * @return Columns
-   */
-  private function getTableColumnsFromConfig($newColumns, $obsoleteColumns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Check for know what columns array returns.
+     *
+     * @param Columns $newColumns
+     * @param Columns $obsoleteColumns
+     *
+     * @return Columns
+     */
+    private function getTableColumnsFromConfig($newColumns, $obsoleteColumns)
+    {
     $new      = $newColumns->getColumns();
     $obsolete = $obsoleteColumns->getColumns();
     if (!empty($new) && !empty($obsolete))
     {
-      return $this->dataTableColumnsConfig;
+        return $this->dataTableColumnsConfig;
     }
 
     return $this->dataTableColumnsDatabase;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create and return trigger name.
-   *
-   * @param string $action Trigger on action (Insert, Update, Delete)
-   *
-   * @return string
-   */
-  private function getTriggerName($action)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create and return trigger name.
+     *
+     * @param string $action Trigger on action (Insert, Update, Delete)
+     *
+     * @return string
+     */
+    private function getTriggerName($action)
+    {
     return strtolower(sprintf('trg_%s_%s', $this->alias, $action));
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Lock the table to prevent insert, updates, or deletes between dropping and creating triggers.
-   *
-   * @param string $tableName Name of table
-   */
-  private function lockTable($tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Lock the table to prevent insert, updates, or deletes between dropping and creating triggers.
+     *
+     * @param string $tableName Name of table
+     */
+    private function lockTable($tableName)
+    {
     DataLayer::lockTable($tableName);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Logging new and obsolete columns.
-   *
-   * @param Columns $newColumns
-   * @param Columns $obsoleteColumns
-   * @param Columns $alteredColumns
-   */
-  private function loggingColumnInfo($newColumns, $obsoleteColumns, $alteredColumns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Logging new and obsolete columns.
+     *
+     * @param Columns $newColumns
+     * @param Columns $obsoleteColumns
+     * @param Columns $alteredColumns
+     */
+    private function loggingColumnInfo($newColumns, $obsoleteColumns, $alteredColumns)
+    {
     $new      = $newColumns->getColumns();
     $obsolete = $obsoleteColumns->getColumns();
     if (!empty($new) && !empty($obsolete))
     {
-      $this->io->logInfo('Found both new and obsolete columns for table %s', $this->tableName);
-      $this->io->logInfo('No action taken');
-      foreach ($newColumns->getColumns() as $column)
-      {
+        $this->io->logInfo('Found both new and obsolete columns for table %s', $this->tableName);
+        $this->io->logInfo('No action taken');
+        foreach ($newColumns->getColumns() as $column)
+        {
         $this->io->logInfo('New column %s', $column['column_name']);
-      }
-      foreach ($obsoleteColumns->getColumns() as $column)
-      {
+        }
+        foreach ($obsoleteColumns->getColumns() as $column)
+        {
         $this->io->logInfo('Obsolete column %s', $column['column_name']);
-      }
+        }
     }
 
     foreach ($obsoleteColumns->getColumns() as $column)
     {
-      $this->io->logInfo('Obsolete column %s.%s', $this->tableName, $column['column_name']);
+        $this->io->logInfo('Obsolete column %s.%s', $this->tableName, $column['column_name']);
     }
 
     foreach ($newColumns->getColumns() as $column)
     {
-      $this->io->logInfo('New column %s.%s', $this->tableName, $column['column_name']);
+        $this->io->logInfo('New column %s.%s', $this->tableName, $column['column_name']);
     }
 
     foreach ($alteredColumns->getColumns() as $column)
     {
-      $this->io->logInfo('Type of <dbo>%s.%s</dbo> has been altered to <dbo>%s</dbo>',
-                         $this->tableName,
-                         $column['column_name'],
-                         $column['column_type']);
+        $this->io->logInfo('Type of <dbo>%s.%s</dbo> has been altered to <dbo>%s</dbo>',
+                            $this->tableName,
+                            $column['column_name'],
+                            $column['column_type']);
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Releases all table locks.
-   */
-  private function unlockTables()
-  {
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Releases all table locks.
+     */
+    private function unlockTables()
+    {
     DataLayer::unlockTables();
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Helper/CompoundSyntaxStore.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     if ($trim) $line = trim($line);
 
     $words = explode(' ', $line);
-    if (count($words)>0)
+    if (count($words) > 0)
     {
       switch ($words[0])
       {

Indentation +106 added lines, -106 removed lines

@@ -10,150 +10,150 @@
  */
 class CompoundSyntaxStore
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The the number of spaces per indent level.
-   *
-   * @var int
-   */
-  public static $indentation = 2;
-
-  /**
-   * The current indent level of the code.
-   *
-   * @var int
-   */
-  private $indentLevel = 0;
-
-  /**
-   * The source code. Each element is a line.
-   *
-   * @var string[]
-   */
-  private $lines = [];
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   */
-  public function __construct()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The the number of spaces per indent level.
+     *
+     * @var int
+     */
+    public static $indentation = 2;
+
+    /**
+     * The current indent level of the code.
+     *
+     * @var int
+     */
+    private $indentLevel = 0;
+
+    /**
+     * The source code. Each element is a line.
+     *
+     * @var string[]
+     */
+    private $lines = [];
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     */
+    public function __construct()
+    {
     // Nothing to do.
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Appends a line or lines of code this this code.
-   *
-   * @param null|string|string[] $line The line or lines of code to be appended.
-   * @param bool                 $trim If true the line or lines of code will be trimmed before appending.
-   */
-  public function append($line, $trim = true)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Appends a line or lines of code this this code.
+     *
+     * @param null|string|string[] $line The line or lines of code to be appended.
+     * @param bool                 $trim If true the line or lines of code will be trimmed before appending.
+     */
+    public function append($line, $trim = true)
+    {
     switch (true)
     {
-      case is_string($line):
+        case is_string($line):
         $this->appendLine($line, $trim);
         break;
 
-      case is_array($line):
+        case is_array($line):
         $this->appendLines($line, $trim);
         break;
 
-      case is_null($line):
+        case is_null($line):
         // Nothing to do.
         break;
 
-      default:
+        default:
         throw new RuntimeException('Nor a string or array.');
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Appends a part of code to the last line of code.
-   *
-   * @param string $part The part of code to be to the last line.
-   */
-  public function appendToLastLine($part)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Appends a part of code to the last line of code.
+     *
+     * @param string $part The part of code to be to the last line.
+     */
+    public function appendToLastLine($part)
+    {
     $this->lines[count($this->lines) - 1] .= $part;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns the generated code as a single string.
-   */
-  public function getCode()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns the generated code as a single string.
+     */
+    public function getCode()
+    {
     return implode(PHP_EOL, $this->lines);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns a line of code with the proper amount of indentation.
-   *
-   * @param string $line The line of code.
-   *
-   * @return string The indented line of code.
-   */
-  private function addIndentation($line)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns a line of code with the proper amount of indentation.
+     *
+     * @param string $line The line of code.
+     *
+     * @return string The indented line of code.
+     */
+    private function addIndentation($line)
+    {
     return str_repeat(' ', self::$indentation * $this->indentLevel).$line;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Appends a line of code this this code.
-   *
-   * @param string $line The line of code to be appended.
-   * @param bool   $trim If true the line of code will be trimmed before appending.
-   */
-  private function appendLine($line, $trim)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Appends a line of code this this code.
+     *
+     * @param string $line The line of code to be appended.
+     * @param bool   $trim If true the line of code will be trimmed before appending.
+     */
+    private function appendLine($line, $trim)
+    {
     if ($trim) $line = trim($line);
 
     $words = explode(' ', $line);
     if (count($words)>0)
     {
-      switch ($words[0])
-      {
+        switch ($words[0])
+        {
         case 'begin':
         case 'if':
           $line = $this->addIndentation($line);
-          $this->indentLevel += 1;
-          break;
+            $this->indentLevel += 1;
+            break;
 
         case 'end':
           $this->indentLevel = max(0, $this->indentLevel - 1);
-          $line              = $this->addIndentation($line);
-          break;
+            $line              = $this->addIndentation($line);
+            break;
 
         default:
           $line = $this->addIndentation($line);
-          break;
-      }
+            break;
+        }
     }
 
     $this->lines[] = $line;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Appends lines of code this this code.
-   *
-   * @param string[] $lines The lines of code to be appended.
-   * @param bool     $trim  If true the lines of code will be trimmed before appending.
-   */
-  private function appendLines($lines, $trim)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Appends lines of code this this code.
+     *
+     * @param string[] $lines The lines of code to be appended.
+     * @param bool     $trim  If true the lines of code will be trimmed before appending.
+     */
+    private function appendLines($lines, $trim)
+    {
     foreach ($lines as $line)
     {
-      $this->appendLine($line, $trim);
+        $this->appendLine($line, $trim);
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Braces +3 added lines, -1 removed lines

@@ -111,7 +111,9 @@
    */
   private function appendLine($line, $trim)
   {
-    if ($trim) $line = trim($line);
+    if ($trim) {
+        $line = trim($line);
+    }
 
     $words = explode(' ', $line);
     if (count($words)>0)

src/Command/AboutCommand.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     $this->io->write(<<<EOT
 <info>AuditApplication - Database Auditing</info>
 <comment>Creates audit tables and triggers to track data changes in databases.</comment>
-EOT
+eot
     );
   }
 

Indentation +17 added lines, -17 removed lines

@@ -12,23 +12,23 @@ 
  */
 class AboutCommand extends BaseCommand
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
     $this->setName('about')
-         ->setDescription('Short information about AuditApplication')
-         ->setHelp('<info>audit about</info>');
-  }
+            ->setDescription('Short information about AuditApplication')
+            ->setHelp('<info>audit about</info>');
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
     $this->io = $this->io = new StratumStyle($input, $output);
 
     $this->io->write(<<<EOT
@@ -36,9 +36,9 @@ 
 <comment>Creates audit tables and triggers to track data changes in databases.</comment>
 EOT
     );
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/Command/DiffCommand.php

Doc Comments +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
    *
    * @param array[] $columns The metadata of the columns.
    *
-   * @return array[]
+   * @return \array[]
    */
   private function addHighlighting($columns)
   {
@@ -253,7 +253,7 @@ 
   /**
    * Add not null to audit columns if it not nullable.
    *
-   * @param array $theColumns Audit columns.
+   * @param \array[] $theColumns Audit columns.
    *
    * @return array
    */

Indentation +168 added lines, -168 removed lines

@@ -22,89 +22,89 @@ 
  */
 class DiffCommand extends AuditCommand
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Array with columns for each table.
-   * array [
-   *    table_name [
-   *            column [
-   *                    data table type,
-   *                    audit table type
-   *                    ],
-   *                      ...
-   *               ]
-   *       ]
-   *
-   * @var array[]
-   */
-  private $diffColumns;
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Array with columns for each table.
+     * array [
+     *    table_name [
+     *            column [
+     *                    data table type,
+     *                    audit table type
+     *                    ],
+     *                      ...
+     *               ]
+     *       ]
+     *
+     * @var array[]
+     */
+    private $diffColumns;
 
-  /**
-   * If set all tables and columns are shown.
-   *
-   * @var boolean
-   */
-  private $full;
+    /**
+     * If set all tables and columns are shown.
+     *
+     * @var boolean
+     */
+    private $full;
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Check full full and return array without new or obsolete columns if full not set.
-   *
-   * @param array[] $columns The metadata of the columns of a table.
-   *
-   * @return array[]
-   */
-  private static function removeMatchingColumns($columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Check full full and return array without new or obsolete columns if full not set.
+     *
+     * @param array[] $columns The metadata of the columns of a table.
+     *
+     * @return array[]
+     */
+    private static function removeMatchingColumns($columns)
+    {
     $cleaned = [];
     /** @var ColumnTypes $column */
     foreach ($columns as $column)
     {
-      $columnsArray = $column->getTypes();
-      if (!isset($columnsArray['data_column_type']))
-      {
+        $columnsArray = $column->getTypes();
+        if (!isset($columnsArray['data_column_type']))
+        {
         if ($columnsArray['audit_column_type']!=$columnsArray['config_column_type'])
         {
-          $cleaned[] = $column;
+            $cleaned[] = $column;
+        }
         }
-      }
-      elseif (!isset($columnsArray['config_column_type']))
-      {
+        elseif (!isset($columnsArray['config_column_type']))
+        {
         if (($columnsArray['audit_column_type']!=$columnsArray['data_column_type']) || ($columnsArray['audit_character_set_name']!=$columnsArray['data_character_set_name'] || $columnsArray['audit_collation_name']!=$columnsArray['data_collation_name']))
         {
-          $cleaned[] = $column;
+            $cleaned[] = $column;
+        }
         }
-      }
-      else
-      {
+        else
+        {
         if (($columnsArray['data_column_type']!=$columnsArray['audit_column_type'] && $columnsArray['audit_column_type']!=$columnsArray['config_column_type']) || ($columnsArray['audit_column_type']!=$columnsArray['config_column_type'] && !empty($columnsArray['config_column_type'])))
         {
-          $cleaned[] = $column;
+            $cleaned[] = $column;
+        }
         }
-      }
     }
 
     return $cleaned;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
     $this->setName('diff')
-         ->setDescription('Compares data tables and audit tables')
-         ->addArgument('config file', InputArgument::OPTIONAL, 'The audit configuration file', 'etc/audit.json')
-         ->addOption('full', 'f', InputOption::VALUE_NONE, 'Show all columns');
-  }
+            ->setDescription('Compares data tables and audit tables')
+            ->addArgument('config file', InputArgument::OPTIONAL, 'The audit configuration file', 'etc/audit.json')
+            ->addOption('full', 'f', InputOption::VALUE_NONE, 'Show all columns');
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
     $this->io = new StratumStyle($input, $output);
     // Style for column names with miss matched column types.
     $style = new OutputFormatterStyle(null, 'red');
@@ -133,179 +133,179 @@ 
 
     $this->getDiff();
     $this->printDiff($output);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get the difference between data and audit tables.
-   *
-   * @param Columns $dataColumns  The table columns from data schema.
-   * @param Columns $auditColumns The table columns from audit schema.
-   *
-   * @return \array[]
-   */
-  private function createDiffArray($dataColumns, $auditColumns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get the difference between data and audit tables.
+     *
+     * @param Columns $dataColumns  The table columns from data schema.
+     * @param Columns $auditColumns The table columns from audit schema.
+     *
+     * @return \array[]
+     */
+    private function createDiffArray($dataColumns, $auditColumns)
+    {
     $diff = [];
 
     foreach ($this->config['audit_columns'] as $column)
     {
-      $columnTypes                  = new ColumnTypes($column, 'config');
-      $diff[$column['column_name']] = $columnTypes;
+        $columnTypes                  = new ColumnTypes($column, 'config');
+        $diff[$column['column_name']] = $columnTypes;
     }
 
     foreach ($auditColumns->getColumns() as $column)
     {
-      if (isset($diff[$column['column_name']]))
-      {
+        if (isset($diff[$column['column_name']]))
+        {
         $diff[$column['column_name']]->appendColumnTypes($column, 'audit');
-      }
-      else
-      {
+        }
+        else
+        {
         $columnTypes                  = new ColumnTypes($column, 'audit');
         $diff[$column['column_name']] = $columnTypes;
-      }
+        }
     }
 
     foreach ($dataColumns->getColumns() as $column)
     {
-      if (isset($diff[$column['column_name']]))
-      {
+        if (isset($diff[$column['column_name']]))
+        {
         $diff[$column['column_name']]->appendColumnTypes($column, 'data');
-      }
-      else
-      {
+        }
+        else
+        {
         $columnTypes                  = new ColumnTypes($column, 'data');
         $diff[$column['column_name']] = $columnTypes;
-      }
+        }
     }
 
     return $diff;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Computes the difference between data and audit tables.
-   */
-  private function getDiff()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Computes the difference between data and audit tables.
+     */
+    private function getDiff()
+    {
     foreach ($this->dataSchemaTables as $table)
     {
-      if ($this->config['tables'][$table['table_name']]['audit'])
-      {
+        if ($this->config['tables'][$table['table_name']]['audit'])
+        {
         $res = StaticDataLayer::searchInRowSet('table_name', $table['table_name'], $this->auditSchemaTables);
         if (isset($res))
         {
-          $dataColumns  = new Columns(DataLayer::getTableColumns($this->config['database']['data_schema'], $table['table_name']));
-          $auditColumns = DataLayer::getTableColumns($this->config['database']['audit_schema'], $table['table_name']);
-          $auditColumns = $this->addNotNull($auditColumns);
-          $auditColumns = new Columns($auditColumns);
+            $dataColumns  = new Columns(DataLayer::getTableColumns($this->config['database']['data_schema'], $table['table_name']));
+            $auditColumns = DataLayer::getTableColumns($this->config['database']['audit_schema'], $table['table_name']);
+            $auditColumns = $this->addNotNull($auditColumns);
+            $auditColumns = new Columns($auditColumns);
 
-          $this->diffColumns[$table['table_name']] = $this->createDiffArray($dataColumns, $auditColumns);
+            $this->diffColumns[$table['table_name']] = $this->createDiffArray($dataColumns, $auditColumns);
+        }
         }
-      }
     }
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Add not null to audit columns if it not nullable.
-   *
-   * @param array $theColumns Audit columns.
-   *
-   * @return array
-   */
-  private function addNotNull($theColumns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Add not null to audit columns if it not nullable.
+     *
+     * @param array $theColumns Audit columns.
+     *
+     * @return array
+     */
+    private function addNotNull($theColumns)
+    {
     $modifiedColumns = [];
     foreach ($theColumns as $column)
     {
-      $modifiedColumn = $column;
-      $auditColumn    = StaticDataLayer::searchInRowSet('column_name', $modifiedColumn['column_name'], $this->config['audit_columns']);
-      if (isset($auditColumn))
-      {
+        $modifiedColumn = $column;
+        $auditColumn    = StaticDataLayer::searchInRowSet('column_name', $modifiedColumn['column_name'], $this->config['audit_columns']);
+        if (isset($auditColumn))
+        {
         if ($modifiedColumn['is_nullable']==='NO')
         {
-          $modifiedColumn['column_type'] = sprintf('%s not null', $modifiedColumn['column_type']);
+            $modifiedColumn['column_type'] = sprintf('%s not null', $modifiedColumn['column_type']);
         }
-      }
-      $modifiedColumns[] = $modifiedColumn;
+        }
+        $modifiedColumns[] = $modifiedColumn;
     }
 
     return $modifiedColumns;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Writes the difference between the audit tables and metadata tables to the output.
-   *
-   * @param OutputInterface $output The output.
-   */
-  private function diffTables($output)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Writes the difference between the audit tables and metadata tables to the output.
+     *
+     * @param OutputInterface $output The output.
+     */
+    private function diffTables($output)
+    {
     foreach ($this->config['tables'] as $tableName => $table)
     {
-      $res = StaticDataLayer::searchInRowSet('table_name', $tableName, $this->auditSchemaTables);
-      if ($table['audit'] && !isset($res))
-      {
+        $res = StaticDataLayer::searchInRowSet('table_name', $tableName, $this->auditSchemaTables);
+        if ($table['audit'] && !isset($res))
+        {
         $output->writeln(sprintf('<miss_table>%s</>', $tableName));
-      }
-      else if (!$table['audit'] && isset($res))
-      {
+        }
+        else if (!$table['audit'] && isset($res))
+        {
         $output->writeln(sprintf('<obsolete_table>%s</>', $tableName));
-      }
+        }
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Writes the difference between the audit and data tables to the output.
-   *
-   * @param OutputInterface $output The output.
-   */
-  private function printDiff($output)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Writes the difference between the audit and data tables to the output.
+     *
+     * @param OutputInterface $output The output.
+     */
+    private function printDiff($output)
+    {
     $first = true;
     if (isset($this->diffColumns))
     {
-      foreach ($this->diffColumns as $tableName => $columns)
-      {
+        foreach ($this->diffColumns as $tableName => $columns)
+        {
         // Remove matching columns unless the full option is used.
         if (!$this->full)
         {
-          $columns = self::removeMatchingColumns($columns);
+            $columns = self::removeMatchingColumns($columns);
         }
 
         if (!empty($columns))
         {
-          // Add an empty line between tables.
-          if ($first)
-          {
+            // Add an empty line between tables.
+            if ($first)
+            {
             $first = false;
-          }
-          else
-          {
+            }
+            else
+            {
             $output->writeln('');
-          }
+            }
 
-          // Write table name.
-          $output->writeln($tableName);
+            // Write table name.
+            $output->writeln($tableName);
 
-          // Write table with columns.
-          $rows = new TableHelper($this->config['database']['data_schema'], $this->config['database']['audit_schema'], $tableName, $this->config['audit_columns'], $this->full);
-          $rows->appendRows($columns);
-          $rows->addHighlighting();
-          $table = new Table($output);
-          $table->setHeaders(['column', 'data table', 'audit table', 'config'])
+            // Write table with columns.
+            $rows = new TableHelper($this->config['database']['data_schema'], $this->config['database']['audit_schema'], $tableName, $this->config['audit_columns'], $this->full);
+            $rows->appendRows($columns);
+            $rows->addHighlighting();
+            $table = new Table($output);
+            $table->setHeaders(['column', 'data table', 'audit table', 'config'])
                 ->setRows($rows->getRows());
-          $table->render();
+            $table->render();
+        }
         }
-      }
     }
     $this->diffTables($output);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +4 added lines, -4 removed lines

@@ -63,21 +63,21 @@ 
       $columnsArray = $column->getTypes();
       if (!isset($columnsArray['data_column_type']))
       {
-        if ($columnsArray['audit_column_type']!=$columnsArray['config_column_type'])
+        if ($columnsArray['audit_column_type'] != $columnsArray['config_column_type'])
         {
           $cleaned[] = $column;
         }
       }
       elseif (!isset($columnsArray['config_column_type']))
       {
-        if (($columnsArray['audit_column_type']!=$columnsArray['data_column_type']) || ($columnsArray['audit_character_set_name']!=$columnsArray['data_character_set_name'] || $columnsArray['audit_collation_name']!=$columnsArray['data_collation_name']))
+        if (($columnsArray['audit_column_type'] != $columnsArray['data_column_type']) || ($columnsArray['audit_character_set_name'] != $columnsArray['data_character_set_name'] || $columnsArray['audit_collation_name'] != $columnsArray['data_collation_name']))
         {
           $cleaned[] = $column;
         }
       }
       else
       {
-        if (($columnsArray['data_column_type']!=$columnsArray['audit_column_type'] && $columnsArray['audit_column_type']!=$columnsArray['config_column_type']) || ($columnsArray['audit_column_type']!=$columnsArray['config_column_type'] && !empty($columnsArray['config_column_type'])))
+        if (($columnsArray['data_column_type'] != $columnsArray['audit_column_type'] && $columnsArray['audit_column_type'] != $columnsArray['config_column_type']) || ($columnsArray['audit_column_type'] != $columnsArray['config_column_type'] && !empty($columnsArray['config_column_type'])))
         {
           $cleaned[] = $column;
         }
@@ -224,7 +224,7 @@ 
       $auditColumn    = StaticDataLayer::searchInRowSet('column_name', $modifiedColumn['column_name'], $this->config['audit_columns']);
       if (isset($auditColumn))
       {
-        if ($modifiedColumn['is_nullable']==='NO')
+        if ($modifiedColumn['is_nullable'] === 'NO')
         {
           $modifiedColumn['column_type'] = sprintf('%s not null', $modifiedColumn['column_type']);
         }

Braces +6 added lines, -12 removed lines

@@ -67,15 +67,13 @@ 
         {
           $cleaned[] = $column;
         }
-      }
-      elseif (!isset($columnsArray['config_column_type']))
+      } elseif (!isset($columnsArray['config_column_type']))
       {
         if (($columnsArray['audit_column_type']!=$columnsArray['data_column_type']) || ($columnsArray['audit_character_set_name']!=$columnsArray['data_character_set_name'] || $columnsArray['audit_collation_name']!=$columnsArray['data_collation_name']))
         {
           $cleaned[] = $column;
         }
-      }
-      else
+      } else
       {
         if (($columnsArray['data_column_type']!=$columnsArray['audit_column_type'] && $columnsArray['audit_column_type']!=$columnsArray['config_column_type']) || ($columnsArray['audit_column_type']!=$columnsArray['config_column_type'] && !empty($columnsArray['config_column_type'])))
         {
@@ -159,8 +157,7 @@ 
       if (isset($diff[$column['column_name']]))
       {
         $diff[$column['column_name']]->appendColumnTypes($column, 'audit');
-      }
-      else
+      } else
       {
         $columnTypes                  = new ColumnTypes($column, 'audit');
         $diff[$column['column_name']] = $columnTypes;
@@ -172,8 +169,7 @@ 
       if (isset($diff[$column['column_name']]))
       {
         $diff[$column['column_name']]->appendColumnTypes($column, 'data');
-      }
-      else
+      } else
       {
         $columnTypes                  = new ColumnTypes($column, 'data');
         $diff[$column['column_name']] = $columnTypes;
@@ -249,8 +245,7 @@ 
       if ($table['audit'] && !isset($res))
       {
         $output->writeln(sprintf('<miss_table>%s</>', $tableName));
-      }
-      else if (!$table['audit'] && isset($res))
+      } else if (!$table['audit'] && isset($res))
       {
         $output->writeln(sprintf('<obsolete_table>%s</>', $tableName));
       }
@@ -282,8 +277,7 @@ 
           if ($first)
           {
             $first = false;
-          }
-          else
+          } else
           {
             $output->writeln('');
           }

src/MySql/DataLayer.php

Spacing +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
                                      $auditColumns,
                                      $skipVariable,
                                      $additionSql);
-    $sql    = $helper->buildStatement();
+    $sql = $helper->buildStatement();
 
     self::executeNone($sql);
   }
@@ -128,7 +128,7 @@ 
    */
   public static function disconnect()
   {
-    if (self::$dl!==null)
+    if (self::$dl !== null)
     {
       self::$dl->disconnect();
       self::$dl = null;
@@ -381,7 +381,7 @@ 
   {
     $query = trim($query);
 
-    if (strpos($query, "\n")!==false)
+    if (strpos($query, "\n") !== false)
     {
       // Query is a multi line query.
       self::$io->logVeryVerbose('Executing query:');

Braces +1 added lines, -2 removed lines

@@ -386,8 +386,7 @@
       // Query is a multi line query.
       self::$io->logVeryVerbose('Executing query:');
       self::$io->logVeryVerbose('<sql>%s</sql>', $query);
-    }
-    else
+    } else
     {
       // Query is a single line query.
       self::$io->logVeryVerbose('Executing query: <sql>%s</sql>', $query);

Indentation +279 added lines, -279 removed lines

@@ -15,90 +15,90 @@ 
  */
 class DataLayer
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The connection to the MySQL instance.
-   *
-   * @var StaticDataLayer
-   */
-  private static $dl;
-
-  /**
-   * The Output decorator.
-   *
-   * @var StratumStyle
-   */
-  private static $io;
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Adds new columns to an audit table.
-   *
-   * @param string  $auditSchemaName The name of audit schema.
-   * @param string  $tableName       The name of the table.
-   * @param Columns $columns         The metadata of the new columns.
-   */
-  public static function addNewColumns($auditSchemaName, $tableName, $columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The connection to the MySQL instance.
+     *
+     * @var StaticDataLayer
+     */
+    private static $dl;
+
+    /**
+     * The Output decorator.
+     *
+     * @var StratumStyle
+     */
+    private static $io;
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Adds new columns to an audit table.
+     *
+     * @param string  $auditSchemaName The name of audit schema.
+     * @param string  $tableName       The name of the table.
+     * @param Columns $columns         The metadata of the new columns.
+     */
+    public static function addNewColumns($auditSchemaName, $tableName, $columns)
+    {
     $helper = new AlterAuditTableAddColumns($auditSchemaName, $tableName, $columns);
     $sql    = $helper->buildStatement();
 
     self::executeNone($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Connects to a MySQL instance.
-   *
-   * Wrapper around [mysqli::__construct](http://php.net/manual/mysqli.construct.php), however on failure an exception
-   * is thrown.
-   *
-   * @param string $host     The hostname.
-   * @param string $user     The MySQL user name.
-   * @param string $passWord The password.
-   * @param string $database The default database.
-   * @param int    $port     The port number.
-   */
-  public static function connect($host, $user, $passWord, $database, $port = 3306)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Connects to a MySQL instance.
+     *
+     * Wrapper around [mysqli::__construct](http://php.net/manual/mysqli.construct.php), however on failure an exception
+     * is thrown.
+     *
+     * @param string $host     The hostname.
+     * @param string $user     The MySQL user name.
+     * @param string $passWord The password.
+     * @param string $database The default database.
+     * @param int    $port     The port number.
+     */
+    public static function connect($host, $user, $passWord, $database, $port = 3306)
+    {
     self::$dl = new StaticDataLayer();
 
     self::$dl->connect($host, $user, $passWord, $database, $port);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Creates an audit table.
-   *
-   * @param string  $dataSchemaName  The name of the data schema.
-   * @param string  $auditSchemaName The name of the audit schema.
-   * @param string  $tableName       The name of the table.
-   * @param Columns $columns         The metadata of the columns of the audit table (i.e. the audit columns and columns
-   *                                 of the data table).
-   */
-  public static function createAuditTable($dataSchemaName, $auditSchemaName, $tableName, $columns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Creates an audit table.
+     *
+     * @param string  $dataSchemaName  The name of the data schema.
+     * @param string  $auditSchemaName The name of the audit schema.
+     * @param string  $tableName       The name of the table.
+     * @param Columns $columns         The metadata of the columns of the audit table (i.e. the audit columns and columns
+     *                                 of the data table).
+     */
+    public static function createAuditTable($dataSchemaName, $auditSchemaName, $tableName, $columns)
+    {
     $helper = new CreateAuditTable($dataSchemaName, $auditSchemaName, $tableName, $columns);
     $sql    = $helper->buildStatement();
 
     self::executeNone($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Creates a trigger on a table.
-   *
-   * @param string   $dataSchemaName  The name of the data schema.
-   * @param string   $auditSchemaName The name of the audit schema.
-   * @param string   $tableName       The name of the table.
-   * @param string   $triggerAction   The trigger action (i.e. INSERT, UPDATE, or DELETE).
-   * @param string   $triggerName     The name of the trigger.
-   * @param Columns  $tableColumns    The data table columns.
-   * @param Columns  $auditColumns    The audit table columns.
-   * @param string   $skipVariable    The skip variable.
-   * @param string[] $additionSql     Additional SQL statements.
-   */
-  public static function createAuditTrigger($dataSchemaName,
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Creates a trigger on a table.
+     *
+     * @param string   $dataSchemaName  The name of the data schema.
+     * @param string   $auditSchemaName The name of the audit schema.
+     * @param string   $tableName       The name of the table.
+     * @param string   $triggerAction   The trigger action (i.e. INSERT, UPDATE, or DELETE).
+     * @param string   $triggerName     The name of the trigger.
+     * @param Columns  $tableColumns    The data table columns.
+     * @param Columns  $auditColumns    The audit table columns.
+     * @param string   $skipVariable    The skip variable.
+     * @param string[] $additionSql     Additional SQL statements.
+     */
+    public static function createAuditTrigger($dataSchemaName,
                                             $auditSchemaName,
                                             $tableName,
                                             $triggerAction,
@@ -107,151 +107,151 @@ 
                                             $auditColumns,
                                             $skipVariable,
                                             $additionSql)
-  {
+    {
     $helper = new CreateAuditTrigger($dataSchemaName,
-                                     $auditSchemaName,
-                                     $tableName,
-                                     $triggerAction,
-                                     $triggerName,
-                                     $tableColumns,
-                                     $auditColumns,
-                                     $skipVariable,
-                                     $additionSql);
+                                        $auditSchemaName,
+                                        $tableName,
+                                        $triggerAction,
+                                        $triggerName,
+                                        $tableColumns,
+                                        $auditColumns,
+                                        $skipVariable,
+                                        $additionSql);
     $sql    = $helper->buildStatement();
 
     self::executeNone($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Closes the connection to the MySQL instance, if connected.
-   */
-  public static function disconnect()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Closes the connection to the MySQL instance, if connected.
+     */
+    public static function disconnect()
+    {
     if (self::$dl!==null)
     {
-      self::$dl->disconnect();
-      self::$dl = null;
+        self::$dl->disconnect();
+        self::$dl = null;
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Drops a trigger.
-   *
-   * @param string $triggerSchema The name of the trigger schema.
-   * @param string $triggerName   The mame of trigger.
-   */
-  public static function dropTrigger($triggerSchema, $triggerName)
-  {
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Drops a trigger.
+     *
+     * @param string $triggerSchema The name of the trigger schema.
+     * @param string $triggerName   The mame of trigger.
+     */
+    public static function dropTrigger($triggerSchema, $triggerName)
+    {
     $sql = sprintf('drop trigger `%s`.`%s`', $triggerSchema, $triggerName);
 
     self::executeNone($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * @param string $query The SQL statement.
-   *
-   * @return int The number of affected rows (if any).
-   */
-  public static function executeNone($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * @param string $query The SQL statement.
+     *
+     * @return int The number of affected rows (if any).
+     */
+    public static function executeNone($query)
+    {
     self::logQuery($query);
 
     return self::$dl->executeNone($query);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Executes a query that returns 0 or 1 row.
-   * Throws an exception if the query selects 2 or more rows.
-   *
-   * @param string $query The SQL statement.
-   *
-   * @return array|null The selected row.
-   */
-  public static function executeRow0($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Executes a query that returns 0 or 1 row.
+     * Throws an exception if the query selects 2 or more rows.
+     *
+     * @param string $query The SQL statement.
+     *
+     * @return array|null The selected row.
+     */
+    public static function executeRow0($query)
+    {
     self::logQuery($query);
 
     return self::$dl->executeRow0($query);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Executes a query that returns 1 and only 1 row.
-   * Throws an exception if the query selects none, 2 or more rows.
-   *
-   * @param string $query The SQL statement.
-   *
-   * @return array The selected row.
-   */
-  public static function executeRow1($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Executes a query that returns 1 and only 1 row.
+     * Throws an exception if the query selects none, 2 or more rows.
+     *
+     * @param string $query The SQL statement.
+     *
+     * @return array The selected row.
+     */
+    public static function executeRow1($query)
+    {
     self::logQuery($query);
 
     return self::$dl->executeRow1($query);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Executes a query that returns 0 or more rows.
-   *
-   * @param string $query The SQL statement.
-   *
-   * @return \array[]
-   */
-  public static function executeRows($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Executes a query that returns 0 or more rows.
+     *
+     * @param string $query The SQL statement.
+     *
+     * @return \array[]
+     */
+    public static function executeRows($query)
+    {
     self::logQuery($query);
 
     return self::$dl->executeRows($query);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Executes a query that returns 0 or 1 row.
-   * Throws an exception if the query selects 2 or more rows.
-   *
-   * @param string $query The SQL statement.
-   *
-   * @return int|string|null The selected row.
-   */
-  public static function executeSingleton0($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Executes a query that returns 0 or 1 row.
+     * Throws an exception if the query selects 2 or more rows.
+     *
+     * @param string $query The SQL statement.
+     *
+     * @return int|string|null The selected row.
+     */
+    public static function executeSingleton0($query)
+    {
     self::logQuery($query);
 
     return self::$dl->executeSingleton0($query);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Executes a query that returns 1 and only 1 row with 1 column.
-   * Throws an exception if the query selects none, 2 or more rows.
-   *
-   * @param string $query The SQL statement.
-   *
-   * @return int|string The selected row.
-   */
-  public static function executeSingleton1($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Executes a query that returns 1 and only 1 row with 1 column.
+     * Throws an exception if the query selects none, 2 or more rows.
+     *
+     * @param string $query The SQL statement.
+     *
+     * @return int|string The selected row.
+     */
+    public static function executeSingleton1($query)
+    {
     self::logQuery($query);
 
     return self::$dl->executeSingleton1($query);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Selects metadata of all columns of table.
-   *
-   * @param string $schemaName The name of the table schema.
-   * @param string $tableName  The name of the table.
-   *
-   * @return \array[]
-   */
-  public static function getTableColumns($schemaName, $tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Selects metadata of all columns of table.
+     *
+     * @param string $schemaName The name of the table schema.
+     * @param string $tableName  The name of the table.
+     *
+     * @return \array[]
+     */
+    public static function getTableColumns($schemaName, $tableName)
+    {
     $sql = sprintf('
 select COLUMN_NAME        as column_name
 ,      COLUMN_TYPE        as column_type
@@ -262,23 +262,23 @@ 
 where  TABLE_SCHEMA = %s
 and    TABLE_NAME   = %s
 order by ORDINAL_POSITION',
-                   self::$dl->quoteString($schemaName),
-                   self::$dl->quoteString($tableName));
+                    self::$dl->quoteString($schemaName),
+                    self::$dl->quoteString($tableName));
 
     return self::$dl->executeRows($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Selects table engine, character_set_name and table_collation.
-   *
-   * @param string $schemaName The name of the table schema.
-   * @param string $tableName  The name of the table.
-   *
-   * @return array
-   */
-  public static function getTableOptions($schemaName, $tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Selects table engine, character_set_name and table_collation.
+     *
+     * @param string $schemaName The name of the table schema.
+     * @param string $tableName  The name of the table.
+     *
+     * @return array
+     */
+    public static function getTableOptions($schemaName, $tableName)
+    {
     $sql = sprintf('
 SELECT t1.TABLE_COLLATION    as table_collation
 ,      t1.ENGINE             as engine
@@ -287,45 +287,45 @@ 
 inner join information_schema.COLLATION_CHARACTER_SET_APPLICABILITY t2  on  t2.COLLATION_NAME = t1.TABLE_COLLATION
 WHERE t1.TABLE_SCHEMA = %s
 AND   t1.TABLE_NAME   = %s',
-                   self::$dl->quoteString($schemaName),
-                   self::$dl->quoteString($tableName));
+                    self::$dl->quoteString($schemaName),
+                    self::$dl->quoteString($tableName));
 
     return self::$dl->executeRow1($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Selects all triggers on a table.
-   *
-   * @param string $schemaName The name of the table schema.
-   * @param string $tableName  The name of the table.
-   *
-   * @return \array[]
-   */
-  public static function getTableTriggers($schemaName, $tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Selects all triggers on a table.
+     *
+     * @param string $schemaName The name of the table schema.
+     * @param string $tableName  The name of the table.
+     *
+     * @return \array[]
+     */
+    public static function getTableTriggers($schemaName, $tableName)
+    {
     $sql = sprintf('
 select Trigger_Name as trigger_name
 from   information_schema.TRIGGERS
 where  TRIGGER_SCHEMA     = %s
 and    EVENT_OBJECT_TABLE = %s
 order by Trigger_Name',
-                   self::$dl->quoteString($schemaName),
-                   self::$dl->quoteString($tableName));
+                    self::$dl->quoteString($schemaName),
+                    self::$dl->quoteString($tableName));
 
     return self::$dl->executeRows($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Selects all table names in a schema.
-   *
-   * @param string $schemaName The name of the schema.
-   *
-   * @return \array[]
-   */
-  public static function getTablesNames($schemaName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Selects all table names in a schema.
+     *
+     * @param string $schemaName The name of the schema.
+     *
+     * @return \array[]
+     */
+    public static function getTablesNames($schemaName)
+    {
     $sql = sprintf("
 select TABLE_NAME as table_name
 from   information_schema.TABLES
@@ -334,67 +334,67 @@ 
 order by TABLE_NAME", self::$dl->quoteString($schemaName));
 
     return self::$dl->executeRows($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Acquires a write lock on a table.
-   *
-   * @param string $tableName The table name.
-   */
-  public static function lockTable($tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Acquires a write lock on a table.
+     *
+     * @param string $tableName The table name.
+     */
+    public static function lockTable($tableName)
+    {
     $sql = sprintf('lock tables `%s` write', $tableName);
 
     self::$dl->executeNone($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Sets the Output decorator.
-   *
-   * @param StratumStyle $io The Output decorator.
-   */
-  public static function setIo($io)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Sets the Output decorator.
+     *
+     * @param StratumStyle $io The Output decorator.
+     */
+    public static function setIo($io)
+    {
     self::$io = $io;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Releases all table locks.
-   */
-  public static function unlockTables()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Releases all table locks.
+     */
+    public static function unlockTables()
+    {
     $sql = 'unlock tables';
 
     self::$dl->executeNone($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Logs the query on the console.
-   *
-   * @param string $query The query.
-   */
-  private static function logQuery($query)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Logs the query on the console.
+     *
+     * @param string $query The query.
+     */
+    private static function logQuery($query)
+    {
     $query = trim($query);
 
     if (strpos($query, "\n")!==false)
     {
-      // Query is a multi line query.
-      self::$io->logVeryVerbose('Executing query:');
-      self::$io->logVeryVerbose('<sql>%s</sql>', $query);
+        // Query is a multi line query.
+        self::$io->logVeryVerbose('Executing query:');
+        self::$io->logVeryVerbose('<sql>%s</sql>', $query);
     }
     else
     {
-      // Query is a single line query.
-      self::$io->logVeryVerbose('Executing query: <sql>%s</sql>', $query);
+        // Query is a single line query.
+        self::$io->logVeryVerbose('Executing query: <sql>%s</sql>', $query);
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Sql/CreateAuditTrigger.php

Indentation +156 added lines, -156 removed lines

@@ -14,101 +14,101 @@ 
  */
 class CreateAuditTrigger
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Additional SQL statements.
-   *
-   * @var string[]
-   */
-  private $additionalSql;
-
-  /**
-   * AuditApplication columns from metadata.
-   *
-   * @var Columns
-   */
-  private $auditColumns;
-
-  /**
-   * The name of the audit schema.
-   *
-   * @var string
-   */
-  private $auditSchemaName;
-
-  /**
-   * The generated code.
-   *
-   * @var CompoundSyntaxStore
-   */
-  private $code;
-
-  /**
-   * The name of the data schema.
-   *
-   * @var string
-   */
-  private $dataSchemaName;
-
-  /**
-   * The skip variable.
-   *
-   * @var string
-   */
-  private $skipVariable;
-
-  /**
-   * Table columns from metadata.
-   *
-   * @var Columns
-   */
-  private $tableColumns;
-
-  /**
-   * The name of the data table.
-   *
-   * @var string
-   */
-  private $tableName;
-
-  /**
-   * The trigger action (.e. INSERT, UPDATE, or DELETE).
-   *
-   * @var string
-   */
-  private $triggerAction;
-
-  /**
-   * The name of the trigger.
-   *
-   * @var string
-   */
-  private $triggerName;
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Creates a trigger on a table.
-   *
-   * @param string   $dataSchemaName  The name of the data schema.
-   * @param string   $auditSchemaName The name of the audit schema.
-   * @param string   $tableName       The name of the table.
-   * @param string   $triggerAction   The trigger action (i.e. INSERT, UPDATE, or DELETE).
-   * @param string   $triggerName     The name of the trigger.
-   * @param Columns  $tableColumns    The data table columns.
-   * @param Columns  $auditColumns    The audit table columns.
-   * @param string   $skipVariable    The skip variable.
-   * @param string[] $additionalSql   Additional SQL statements.
-   */
-  public function __construct($dataSchemaName,
-                              $auditSchemaName,
-                              $tableName,
-                              $triggerName,
-                              $triggerAction,
-                              $auditColumns,
-                              $tableColumns,
-                              $skipVariable,
-                              $additionalSql)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Additional SQL statements.
+     *
+     * @var string[]
+     */
+    private $additionalSql;
+
+    /**
+     * AuditApplication columns from metadata.
+     *
+     * @var Columns
+     */
+    private $auditColumns;
+
+    /**
+     * The name of the audit schema.
+     *
+     * @var string
+     */
+    private $auditSchemaName;
+
+    /**
+     * The generated code.
+     *
+     * @var CompoundSyntaxStore
+     */
+    private $code;
+
+    /**
+     * The name of the data schema.
+     *
+     * @var string
+     */
+    private $dataSchemaName;
+
+    /**
+     * The skip variable.
+     *
+     * @var string
+     */
+    private $skipVariable;
+
+    /**
+     * Table columns from metadata.
+     *
+     * @var Columns
+     */
+    private $tableColumns;
+
+    /**
+     * The name of the data table.
+     *
+     * @var string
+     */
+    private $tableName;
+
+    /**
+     * The trigger action (.e. INSERT, UPDATE, or DELETE).
+     *
+     * @var string
+     */
+    private $triggerAction;
+
+    /**
+     * The name of the trigger.
+     *
+     * @var string
+     */
+    private $triggerName;
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Creates a trigger on a table.
+     *
+     * @param string   $dataSchemaName  The name of the data schema.
+     * @param string   $auditSchemaName The name of the audit schema.
+     * @param string   $tableName       The name of the table.
+     * @param string   $triggerAction   The trigger action (i.e. INSERT, UPDATE, or DELETE).
+     * @param string   $triggerName     The name of the trigger.
+     * @param Columns  $tableColumns    The data table columns.
+     * @param Columns  $auditColumns    The audit table columns.
+     * @param string   $skipVariable    The skip variable.
+     * @param string[] $additionalSql   Additional SQL statements.
+     */
+    public function __construct($dataSchemaName,
+                                $auditSchemaName,
+                                $tableName,
+                                $triggerName,
+                                $triggerAction,
+                                $auditColumns,
+                                $tableColumns,
+                                $skipVariable,
+                                $additionalSql)
+    {
     $this->dataSchemaName  = $dataSchemaName;
     $this->auditSchemaName = $auditSchemaName;
     $this->tableName       = $tableName;
@@ -118,35 +118,35 @@ 
     $this->tableColumns    = $tableColumns;
     $this->auditColumns    = $auditColumns;
     $this->additionalSql   = $additionalSql;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns the SQL code for creating an audit trigger.
-   *
-   * @throws FallenException
-   */
-  public function buildStatement()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns the SQL code for creating an audit trigger.
+     *
+     * @throws FallenException
+     */
+    public function buildStatement()
+    {
     $this->code = new CompoundSyntaxStore();
 
     $rowState = [];
     switch ($this->triggerAction)
     {
-      case 'INSERT':
+        case 'INSERT':
         $rowState[] = 'NEW';
         break;
 
-      case 'DELETE':
+        case 'DELETE':
         $rowState[] = 'OLD';
         break;
 
-      case 'UPDATE':
+        case 'UPDATE':
         $rowState[] = 'OLD';
         $rowState[] = 'NEW';
         break;
 
-      default:
+        default:
         throw new FallenException('action', $this->triggerAction);
     }
 
@@ -162,104 +162,104 @@ 
     $this->createInsertStatement($rowState[0]);
     if (sizeof($rowState)==2)
     {
-      $this->createInsertStatement($rowState[1]);
+        $this->createInsertStatement($rowState[1]);
     }
 
     if ($this->skipVariable!==null) $this->code->append('end if;');
     $this->code->append('end');
 
     return $this->code->getCode();
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Adds an insert SQL statement to SQL code for a trigger.
-   *
-   * @param string $rowState The row state (i.e. OLD or NEW).
-   */
-  private function createInsertStatement($rowState)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Adds an insert SQL statement to SQL code for a trigger.
+     *
+     * @param string $rowState The row state (i.e. OLD or NEW).
+     */
+    private function createInsertStatement($rowState)
+    {
     $this->createInsertStatementInto();
     $this->createInsertStatementValues($rowState);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Adds the "insert into" part of an insert SQL statement to SQL code for a trigger.
-   */
-  private function createInsertStatementInto()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Adds the "insert into" part of an insert SQL statement to SQL code for a trigger.
+     */
+    private function createInsertStatementInto()
+    {
     $columnNames = '';
 
     // First the audit columns.
     foreach ($this->auditColumns->getColumns() as $column)
     {
-      if ($columnNames) $columnNames .= ',';
-      $columnNames .= sprintf('`%s`', $column['column_name']);
+        if ($columnNames) $columnNames .= ',';
+        $columnNames .= sprintf('`%s`', $column['column_name']);
     }
 
     // Second the audit columns.
     foreach ($this->tableColumns->getColumns() as $column)
     {
-      if ($columnNames) $columnNames .= ',';
-      $columnNames .= sprintf('`%s`', $column['column_name']);
+        if ($columnNames) $columnNames .= ',';
+        $columnNames .= sprintf('`%s`', $column['column_name']);
     }
 
     $this->code->append(sprintf('insert into `%s`.`%s`(%s)', $this->auditSchemaName, $this->tableName, $columnNames));
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Adds the "values" part of an insert SQL statement to SQL code for a trigger.
-   *
-   * @param string $rowState The row state (i.e. OLD or NEW).
-   */
-  private function createInsertStatementValues($rowState)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Adds the "values" part of an insert SQL statement to SQL code for a trigger.
+     *
+     * @param string $rowState The row state (i.e. OLD or NEW).
+     */
+    private function createInsertStatementValues($rowState)
+    {
     $values = '';
 
     // First the values for the audit columns.
     foreach ($this->auditColumns->getColumns() as $column)
     {
-      if ($values) $values .= ',';
-      switch (true)
-      {
+        if ($values) $values .= ',';
+        switch (true)
+        {
         case (isset($column['audit_value_type'])):
           switch ($column['audit_value_type'])
-          {
+            {
             case 'ACTION':
               $values .= StaticDataLayer::quoteString($this->triggerAction);
-              break;
+                break;
 
             case 'STATE':
               $values .= StaticDataLayer::quoteString($rowState);
-              break;
+                break;
 
             default:
               throw new FallenException('audit_value_type', ($column['audit_value_type']));
-          }
-          break;
+            }
+            break;
 
         case (isset($column['audit_expression'])):
           $values .= $column['audit_expression'];
-          break;
+            break;
 
         default:
           throw new RuntimeException('None of audit_value_type and audit_expression are set.');
-      }
+        }
     }
 
     // Second the values for the audit columns.
     foreach ($this->tableColumns->getColumns() as $column)
     {
-      if ($values) $values .= ',';
-      $values .= sprintf('%s.`%s`', $rowState, $column['column_name']);
+        if ($values) $values .= ',';
+        $values .= sprintf('%s.`%s`', $rowState, $column['column_name']);
     }
 
     $this->code->append(sprintf('values(%s);', $values));
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +3 added lines, -3 removed lines

@@ -155,17 +155,17 @@
     $this->code->append('for each row');
     $this->code->append('begin');
 
-    if ($this->skipVariable!==null) $this->code->append(sprintf('if (%s is null) then', $this->skipVariable));
+    if ($this->skipVariable !== null) $this->code->append(sprintf('if (%s is null) then', $this->skipVariable));
 
     $this->code->append($this->additionalSql);
 
     $this->createInsertStatement($rowState[0]);
-    if (sizeof($rowState)==2)
+    if (sizeof($rowState) == 2)
     {
       $this->createInsertStatement($rowState[1]);
     }
 
-    if ($this->skipVariable!==null) $this->code->append('end if;');
+    if ($this->skipVariable !== null) $this->code->append('end if;');
     $this->code->append('end');
 
     return $this->code->getCode();

Braces +18 added lines, -6 removed lines

@@ -155,7 +155,9 @@ 
     $this->code->append('for each row');
     $this->code->append('begin');
 
-    if ($this->skipVariable!==null) $this->code->append(sprintf('if (%s is null) then', $this->skipVariable));
+    if ($this->skipVariable!==null) {
+        $this->code->append(sprintf('if (%s is null) then', $this->skipVariable));
+    }
 
     $this->code->append($this->additionalSql);
 
@@ -165,7 +167,9 @@ 
       $this->createInsertStatement($rowState[1]);
     }
 
-    if ($this->skipVariable!==null) $this->code->append('end if;');
+    if ($this->skipVariable!==null) {
+        $this->code->append('end if;');
+    }
     $this->code->append('end');
 
     return $this->code->getCode();
@@ -194,14 +198,18 @@ 
     // First the audit columns.
     foreach ($this->auditColumns->getColumns() as $column)
     {
-      if ($columnNames) $columnNames .= ',';
+      if ($columnNames) {
+          $columnNames .= ',';
+      }
       $columnNames .= sprintf('`%s`', $column['column_name']);
     }
 
     // Second the audit columns.
     foreach ($this->tableColumns->getColumns() as $column)
     {
-      if ($columnNames) $columnNames .= ',';
+      if ($columnNames) {
+          $columnNames .= ',';
+      }
       $columnNames .= sprintf('`%s`', $column['column_name']);
     }
 
@@ -221,7 +229,9 @@ 
     // First the values for the audit columns.
     foreach ($this->auditColumns->getColumns() as $column)
     {
-      if ($values) $values .= ',';
+      if ($values) {
+          $values .= ',';
+      }
       switch (true)
       {
         case (isset($column['audit_value_type'])):
@@ -252,7 +262,9 @@ 
     // Second the values for the audit columns.
     foreach ($this->tableColumns->getColumns() as $column)
     {
-      if ($values) $values .= ',';
+      if ($values) {
+          $values .= ',';
+      }
       $values .= sprintf('%s.`%s`', $rowState, $column['column_name']);
     }
 

src/MySql/Sql/AlterAuditTableAddColumns.php

Indentation +52 added lines, -52 removed lines

@@ -11,77 +11,77 @@
  */
 class AlterAuditTableAddColumns
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The name of the audit schema.
-   *
-   * @var string
-   */
-  private $auditSchemaName;
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The name of the audit schema.
+     *
+     * @var string
+     */
+    private $auditSchemaName;
 
-  /**
-   * The array of new columns for adding to table.
-   *
-   * @var Columns
-   */
-  private $columns;
+    /**
+     * The array of new columns for adding to table.
+     *
+     * @var Columns
+     */
+    private $columns;
 
-  /**
-   * The name of the audit table.
-   *
-   * @var string
-   */
-  private $tableName;
+    /**
+     * The name of the audit table.
+     *
+     * @var string
+     */
+    private $tableName;
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param string  $auditSchemaName The name of the audit schema.
-   * @param string  $tableName       The name of the table.
-   * @param Columns $columns         The metadata of the new columns of the audit table (i.e. the audit columns and
-   *                                 columns of the data table).
-   */
-  public function __construct($auditSchemaName, $tableName, $columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param string  $auditSchemaName The name of the audit schema.
+     * @param string  $tableName       The name of the table.
+     * @param Columns $columns         The metadata of the new columns of the audit table (i.e. the audit columns and
+     *                                 columns of the data table).
+     */
+    public function __construct($auditSchemaName, $tableName, $columns)
+    {
     $this->auditSchemaName = $auditSchemaName;
     $this->tableName       = $tableName;
     $this->columns         = $columns;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns a SQL statement for adding new columns to the audit table.
-   *
-   * @return string
-   */
-  public function buildStatement()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns a SQL statement for adding new columns to the audit table.
+     *
+     * @return string
+     */
+    public function buildStatement()
+    {
     $code = new CompoundSyntaxStore();
 
     $code->append(sprintf('alter table `%s`.`%s`', $this->auditSchemaName, $this->tableName));
     foreach ($this->columns->getColumns() as $column)
     {
-      $code->append(sprintf('  add `%s` %s', $column['column_name'], $column['column_type']), false);
-      if (isset($column['after']))
-      {
+        $code->append(sprintf('  add `%s` %s', $column['column_name'], $column['column_type']), false);
+        if (isset($column['after']))
+        {
         $code->appendToLastLine(sprintf(' after `%s`', $column['after']));
-      }
-      else
-      {
+        }
+        else
+        {
         $code->appendToLastLine(' first');
-      }
-      $columns = $this->columns->getColumns();
-      if (end($columns)!==$column)
-      {
+        }
+        $columns = $this->columns->getColumns();
+        if (end($columns)!==$column)
+        {
         $code->appendToLastLine(',');
-      }
+        }
     }
 
     return $code->getCode();
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     foreach ($columns as $column)
     {
       $code->append(sprintf($format, '`'.$column['column_name'].'`', $column['column_type']), false);
-      if (end($columns)!==$column)
+      if (end($columns) !== $column)
       {
         $code->appendToLastLine(',');
       }

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
       {
         $columns[] = ['column_name' => $column['column_name'],
                       'column_type' => $column['column_type']];
-      }
-      else
+      } else
       {
         $columns[] = ['column_name' => $column['column_name'],
                       'column_type' => $column['column_type'].' NULL'];

src/MySql/Sql/CreateAuditTable.php

Indentation +59 added lines, -59 removed lines

@@ -12,64 +12,64 @@ 
  */
 class CreateAuditTable
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The name of the audit schema.
-   *
-   * @var string
-   */
-  private $auditSchemaName;
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The name of the audit schema.
+     *
+     * @var string
+     */
+    private $auditSchemaName;
 
-  /**
-   * The name of the table.
-   *
-   * @var Columns
-   */
-  private $columns;
+    /**
+     * The name of the table.
+     *
+     * @var Columns
+     */
+    private $columns;
 
-  /**
-   * The name of the data schema.
-   *
-   * @var string
-   */
-  private $dataSchemaName;
+    /**
+     * The name of the data schema.
+     *
+     * @var string
+     */
+    private $dataSchemaName;
 
-  /**
-   * The name of the table.
-   *
-   * @var string
-   */
-  private $tableName;
+    /**
+     * The name of the table.
+     *
+     * @var string
+     */
+    private $tableName;
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param string  $dataSchemaName  The name of the data schema.
-   * @param string  $auditSchemaName The name of the audit schema.
-   * @param string  $tableName       The name of the table.
-   * @param Columns $columns         The metadata of the columns of the audit table (i.e. the audit columns and columns
-   *                                 of the data table).
-   */
-  public function __construct($dataSchemaName,
-                              $auditSchemaName,
-                              $tableName,
-                              $columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param string  $dataSchemaName  The name of the data schema.
+     * @param string  $auditSchemaName The name of the audit schema.
+     * @param string  $tableName       The name of the table.
+     * @param Columns $columns         The metadata of the columns of the audit table (i.e. the audit columns and columns
+     *                                 of the data table).
+     */
+    public function __construct($dataSchemaName,
+                                $auditSchemaName,
+                                $tableName,
+                                $columns)
+    {
     $this->dataSchemaName  = $dataSchemaName;
     $this->auditSchemaName = $auditSchemaName;
     $this->tableName       = $tableName;
     $this->columns         = $columns;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns a SQL statement for creating the audit table.
-   *
-   * @return string
-   */
-  public function buildStatement()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns a SQL statement for creating the audit table.
+     *
+     * @return string
+     */
+    public function buildStatement()
+    {
     $code = new CompoundSyntaxStore();
 
     $code->append(sprintf('create table `%s`.`%s`', $this->auditSchemaName, $this->tableName));
@@ -79,7 +79,7 @@ 
     $width   = 0;
     foreach ($columns as $column)
     {
-      $width = max($width, mb_strlen($column['column_name']));
+        $width = max($width, mb_strlen($column['column_name']));
     }
     $format = sprintf('  %%-%ds %%s', $width + 2);
 
@@ -87,24 +87,24 @@ 
     $code->append('(');
     foreach ($columns as $column)
     {
-      $code->append(sprintf($format, '`'.$column['column_name'].'`', $column['column_type']), false);
-      if (end($columns)!==$column)
-      {
+        $code->append(sprintf($format, '`'.$column['column_name'].'`', $column['column_type']), false);
+        if (end($columns)!==$column)
+        {
         $code->appendToLastLine(',');
-      }
+        }
     }
 
     // Create SQL for table options.
     $tableOptions = DataLayer::getTableOptions($this->dataSchemaName, $this->tableName);
     $code->append(sprintf(') engine=%s default charset=%s default collate=%s',
-                          $tableOptions['engine'],
-                          $tableOptions['character_set_name'],
-                          $tableOptions['table_collation']));
+                            $tableOptions['engine'],
+                            $tableOptions['character_set_name'],
+                            $tableOptions['table_collation']));
 
     return $code->getCode();
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     foreach ($columns as $column)
     {
       $code->append(sprintf($format, '`'.$column['column_name'].'`', $column['column_type']), false);
-      if (end($columns)!==$column)
+      if (end($columns) !== $column)
       {
         $code->appendToLastLine(',');
       }