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)
   {

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/MySql/DataLayer.php

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/ColumnTypes.php

Indentation +48 added lines, -48 removed lines

@@ -8,73 +8,73 @@
  */
 class ColumnTypes
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The metadata of the columns.
-   *
-   * @var array[]
-   */
-  private $columnTypes = [];
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The metadata of the columns.
+     *
+     * @var array[]
+     */
+    private $columnTypes = [];
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param array[]     $columnTypes The metadata of the column.
-   * @param null|string $typePrefix  Prefix for column type name.
-   */
-  public function __construct($columnTypes, $typePrefix = null)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param array[]     $columnTypes The metadata of the column.
+     * @param null|string $typePrefix  Prefix for column type name.
+     */
+    public function __construct($columnTypes, $typePrefix = null)
+    {
     $this->appendColumnTypes($columnTypes, $typePrefix);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Return array with all columns types.
-   *
-   * @param array[] $columnTypes The metadata of the column.
-   * @param string  $typePrefix  Prefix for column type name.
-   *
-   * @return \array[]
-   */
-  public function appendColumnTypes($columnTypes, $typePrefix = null)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Return array with all columns types.
+     *
+     * @param array[] $columnTypes The metadata of the column.
+     * @param string  $typePrefix  Prefix for column type name.
+     *
+     * @return \array[]
+     */
+    public function appendColumnTypes($columnTypes, $typePrefix = null)
+    {
     foreach ($columnTypes as $typeName => $typeValue)
     {
-      if ($typeName=='column_name')
-      {
+        if ($typeName=='column_name')
+        {
         if (!isset($this->columnTypes['column_name']))
         {
-          $this->columnTypes[$typeName] = $typeValue;
+            $this->columnTypes[$typeName] = $typeValue;
+        }
         }
-      }
-      else
-      {
+        else
+        {
         $format = '%s_%s';
         if (isset($typePrefix))
         {
-          $this->columnTypes[sprintf($format, $typePrefix, $typeName)] = $typeValue;
+            $this->columnTypes[sprintf($format, $typePrefix, $typeName)] = $typeValue;
         }
         else
         {
-          $this->columnTypes[$typeName] = $typeValue;
+            $this->columnTypes[$typeName] = $typeValue;
+        }
         }
-      }
     }
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get columns types.
-   *
-   * @return array[]
-   */
-  public function getTypes()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get columns types.
+     *
+     * @return array[]
+     */
+    public function getTypes()
+    {
     return $this->columnTypes;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
   {
     foreach ($columnTypes as $typeName => $typeValue)
     {
-      if ($typeName=='column_name')
+      if ($typeName == 'column_name')
       {
         if (!isset($this->columnTypes['column_name']))
         {

Braces +2 added lines, -4 removed lines

@@ -47,15 +47,13 @@
         {
           $this->columnTypes[$typeName] = $typeValue;
         }
-      }
-      else
+      } else
       {
         $format = '%s_%s';
         if (isset($typePrefix))
         {
           $this->columnTypes[sprintf($format, $typePrefix, $typeName)] = $typeValue;
-        }
-        else
+        } else
         {
           $this->columnTypes[$typeName] = $typeValue;
         }

src/Command/DiffCommand.php

Indentation +167 added lines, -167 removed lines

@@ -22,70 +22,70 @@ 
  */
 class DiffCommand extends AuditCommand
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * 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 string
-   */
-  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)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * 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 string
+     */
+    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)
+    {
     $cleaned = [];
     foreach ($columns as $column)
     {
-      if (($column['data_table_type']!=$column['audit_table_type'] && $column['audit_table_type']!=$column['config_type']) || ($column['audit_table_type']!=$column['config_type'] && !empty($column['config_type'])))
-      {
+        if (($column['data_table_type']!=$column['audit_table_type'] && $column['audit_table_type']!=$column['config_type']) || ($column['audit_table_type']!=$column['config_type'] && !empty($column['config_type'])))
+        {
         $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');
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output)
-  {
+            ->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)
+    {
     $this->io = new StratumStyle($input, $output);
 
     // Style for column names with miss matched column types.
@@ -115,179 +115,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']);
-          $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']);
+            $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);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Braces +4 added lines, -8 removed lines

@@ -141,8 +141,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;
@@ -154,8 +153,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;
@@ -231,8 +229,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));
       }
@@ -264,8 +261,7 @@ 
           if ($first)
           {
             $first = false;
-          }
-          else
+          } else
           {
             $output->writeln('');
           }

src/MySql/Helper/TableHelper.php

Indentation +103 added lines, -103 removed lines

@@ -13,160 +13,160 @@
  */
 class TableHelper
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Array with rows for table.
-   *
-   * @var \array[]
-   */
-  private $rows = [];
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Array with rows for table.
+     *
+     * @var \array[]
+     */
+    private $rows = [];
 
-  /**
-   * Audit columns from config file.
-   *
-   * @var array
-   */
-  private $auditColumns;
+    /**
+     * Audit columns from config file.
+     *
+     * @var array
+     */
+    private $auditColumns;
 
-  /**
-   * Table options from audit schema.
-   *
-   * @var array
-   */
-  private $auditTableOptions;
+    /**
+     * Table options from audit schema.
+     *
+     * @var array
+     */
+    private $auditTableOptions;
 
-  /**
-   * Table options from data schema.
-   *
-   * @var array
-   */
-  private $dataTableOptions;
+    /**
+     * Table options from data schema.
+     *
+     * @var array
+     */
+    private $dataTableOptions;
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param string  $dataSchema      Data schema name.
-   * @param string  $auditSchema     Audit schema name.
-   * @param string  $tableName       The table name.
-   * @param array[] $theAuditColumns Audit columns from config file.
-   */
-  public function __construct($dataSchema, $auditSchema, $tableName, $theAuditColumns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param string  $dataSchema      Data schema name.
+     * @param string  $auditSchema     Audit schema name.
+     * @param string  $tableName       The table name.
+     * @param array[] $theAuditColumns Audit columns from config file.
+     */
+    public function __construct($dataSchema, $auditSchema, $tableName, $theAuditColumns)
+    {
     $this->auditColumns      = $theAuditColumns;
     $this->auditTableOptions = DataLayer::getTableOptions($auditSchema, $tableName);
     $this->dataTableOptions  = DataLayer::getTableOptions($dataSchema, $tableName);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Append row with table option.
-   *
-   * @param string $theOption
-   */
-  public function appendTableOption($theOption)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Append row with table option.
+     *
+     * @param string $theOption
+     */
+    public function appendTableOption($theOption)
+    {
     $tableRow               = ['column_name'        => $theOption,
-                               'data_column_type'   => $this->dataTableOptions[$theOption],
-                               'audit_column_type'  => $this->auditTableOptions[$theOption],
-                               'config_column_type' => null];
+                                'data_column_type'   => $this->dataTableOptions[$theOption],
+                                'audit_column_type'  => $this->auditTableOptions[$theOption],
+                                'config_column_type' => null];
     $this->rows[$theOption] = RowHelper::createTableRow($tableRow);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Appends rows.
-   *
-   * @param \array[] $theRows
-   */
-  public function appendRows($theRows)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Appends rows.
+     *
+     * @param \array[] $theRows
+     */
+    public function appendRows($theRows)
+    {
     /** @var ColumnTypes $row */
     foreach ($theRows as $row)
     {
-      RowHelper::appendRow($this->rows, $row);
+        RowHelper::appendRow($this->rows, $row);
     }
     $this->rows[] = new TableSeparator();
     $this->appendTableOption('engine');
     $this->appendTableOption('character_set_name');
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Add highlighting to columns.
-   *
-   * @return array[]
-   */
-  public function addHighlighting()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Add highlighting to columns.
+     *
+     * @return array[]
+     */
+    public function addHighlighting()
+    {
     $styledColumns = [];
     foreach ($this->rows as $column)
     {
-      $styledColumn = $column;
-      if (is_array($column))
-      {
+        $styledColumn = $column;
+        if (is_array($column))
+        {
         // Highlighting for data table column types and audit.
         if (!empty($column['data_table_type']))
         {
-          if (isset($column['data_table_type']) && !isset($column['audit_table_type']))
-          {
+            if (isset($column['data_table_type']) && !isset($column['audit_table_type']))
+            {
             $styledColumn['column_name']     = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['data_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
-          }
-          else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
-          {
+            }
+            else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
+            {
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
-          }
-          else if (strcmp($column['data_table_type'], $column['audit_table_type']))
-          {
+            }
+            else if (strcmp($column['data_table_type'], $column['audit_table_type']))
+            {
             $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['data_table_type']  = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
-          }
+            }
         }
         else
         {
-          // Highlighting for audit table column types and audit_columns in config file.
-          $searchColumn = StaticDataLayer::searchInRowSet('column_name', $styledColumn['column_name'], $this->auditColumns);
-          if (isset($searchColumn))
-          {
+            // Highlighting for audit table column types and audit_columns in config file.
+            $searchColumn = StaticDataLayer::searchInRowSet('column_name', $styledColumn['column_name'], $this->auditColumns);
+            if (isset($searchColumn))
+            {
             $configType = $this->auditColumns[$searchColumn]['column_type'];
             if (isset($configType) && !isset($column['audit_table_type']))
             {
-              $styledColumn['column_name'] = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
-              $styledColumn['config_type'] = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
+                $styledColumn['column_name'] = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
+                $styledColumn['config_type'] = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
             }
             else if (!isset($configType) && isset($column['audit_table_type']))
             {
-              $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
+                $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
             }
             else if (strcmp($configType, $column['audit_table_type']))
             {
-              $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
-              $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
-              $styledColumn['config_type']      = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
+                $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
+                $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
+                $styledColumn['config_type']      = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
             }
-          }
+            }
+        }
         }
-      }
-      $styledColumns[] = $styledColumn;
+        $styledColumns[] = $styledColumn;
     }
 
     $this->rows = $styledColumns;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get rows.
-   *
-   * @return \array[]
-   */
-  public function getRows()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get rows.
+     *
+     * @return \array[]
+     */
+    public function getRows()
+    {
     return $this->rows;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
    */
   public function appendTableOption($theOption)
   {
-    $tableRow               = ['column_name'        => $theOption,
+    $tableRow = ['column_name'        => $theOption,
                                'data_column_type'   => $this->dataTableOptions[$theOption],
                                'audit_column_type'  => $this->auditTableOptions[$theOption],
                                'config_column_type' => null];

Braces +5 added lines, -10 removed lines

@@ -112,19 +112,16 @@ 
           {
             $styledColumn['column_name']     = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['data_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
-          }
-          else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
+          } else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
           {
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
-          }
-          else if (strcmp($column['data_table_type'], $column['audit_table_type']))
+          } else if (strcmp($column['data_table_type'], $column['audit_table_type']))
           {
             $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['data_table_type']  = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
           }
-        }
-        else
+        } else
         {
           // Highlighting for audit table column types and audit_columns in config file.
           $searchColumn = StaticDataLayer::searchInRowSet('column_name', $styledColumn['column_name'], $this->auditColumns);
@@ -135,12 +132,10 @@ 
             {
               $styledColumn['column_name'] = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
               $styledColumn['config_type'] = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
-            }
-            else if (!isset($configType) && isset($column['audit_table_type']))
+            } else if (!isset($configType) && isset($column['audit_table_type']))
             {
               $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
-            }
-            else if (strcmp($configType, $column['audit_table_type']))
+            } else if (strcmp($configType, $column['audit_table_type']))
             {
               $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
               $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);

src/MySql/Helper/RowHelper.php

Indentation +72 added lines, -72 removed lines

@@ -11,16 +11,16 @@ 
  */
 class RowHelper
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create table row.
-   *
-   * @param array[] $theRow Data for table row.
-   *
-   * @return \string
-   */
-  public static function createColumnOptionsRow($theRow)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create table row.
+     *
+     * @param array[] $theRow Data for table row.
+     *
+     * @return \string
+     */
+    public static function createColumnOptionsRow($theRow)
+    {
     $dataCharsetName   = isset($theRow['data_character_set_name']) ? $theRow['data_character_set_name'] : null;
     $dataCollationName = isset($theRow['data_collation_name']) ? $theRow['data_collation_name'] : null;
 
@@ -29,97 +29,97 @@ 
 
 
     $tableRow = ['column_name'      => null,
-                 'data_table_type'  => self::styledOptionsRow($dataCharsetName, $dataCollationName),
-                 'audit_table_type' => self::styledOptionsRow($auditCharsetName, $auditCollationName),
-                 'config_type'      => null];
+                    'data_table_type'  => self::styledOptionsRow($dataCharsetName, $dataCollationName),
+                    'audit_table_type' => self::styledOptionsRow($auditCharsetName, $auditCollationName),
+                    'config_type'      => null];
 
     return $tableRow;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create table row.
-   *
-   * @param $theCharacterSetName
-   * @param $theCollationName
-   *
-   * @return string
-   */
-  public static function styledOptionsRow($theCharacterSetName, $theCollationName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create table row.
+     *
+     * @param $theCharacterSetName
+     * @param $theCollationName
+     *
+     * @return string
+     */
+    public static function styledOptionsRow($theCharacterSetName, $theCollationName)
+    {
     $charsetName   = isset($theCharacterSetName) ? '['.$theCharacterSetName.']' : null;
     $collationName = isset($theCollationName) ? '['.$theCollationName.']' : null;
 
     return trim(sprintf('%s %s', $charsetName, $collationName));
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create table row.
-   *
-   * @param array[] $theRow Data for table row.
-   *
-   * @return \array[]
-   */
-  public static function createTableRow($theRow)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create table row.
+     *
+     * @param array[] $theRow Data for table row.
+     *
+     * @return \array[]
+     */
+    public static function createTableRow($theRow)
+    {
     $tableRow = ['column_name'      => isset($theRow['column_name']) ? $theRow['column_name'] : null,
-                 'data_table_type'  => isset($theRow['data_column_type']) ? $theRow['data_column_type'] : null,
-                 'audit_table_type' => isset($theRow['audit_column_type']) ? $theRow['audit_column_type'] : null,
-                 'config_type'      => isset($theRow['config_column_type']) ? $theRow['config_column_type'] : null];
+                    'data_table_type'  => isset($theRow['data_column_type']) ? $theRow['data_column_type'] : null,
+                    'audit_table_type' => isset($theRow['audit_column_type']) ? $theRow['audit_column_type'] : null,
+                    'config_type'      => isset($theRow['config_column_type']) ? $theRow['config_column_type'] : null];
 
     return $tableRow;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Check isset options(collation, character set name) from row.
-   *
-   * @param array[] $theRow Row for append.
-   *
-   * @return bool
-   */
-  private static function checkOptions($theRow)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Check isset options(collation, character set name) from row.
+     *
+     * @param array[] $theRow Row for append.
+     *
+     * @return bool
+     */
+    private static function checkOptions($theRow)
+    {
     if (isset($theRow['audit_character_set_name']))
     {
-      return true;
+        return true;
     }
     if (isset($theRow['data_character_set_name']))
     {
-      return true;
+        return true;
     }
     if (isset($theRow['audit_collation_name']))
     {
-      return true;
+        return true;
     }
     if (isset($theRow['data_collation_name']))
     {
-      return true;
+        return true;
     }
 
     return false;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Append a row.
-   *
-   * @param \array[]    $theExistRows Exist rows array for appending.
-   * @param ColumnTypes $theRow       Row for append.
-   */
-  public static function appendRow(&$theExistRows, $theRow)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Append a row.
+     *
+     * @param \array[]    $theExistRows Exist rows array for appending.
+     * @param ColumnTypes $theRow       Row for append.
+     */
+    public static function appendRow(&$theExistRows, $theRow)
+    {
     $theRow         = $theRow->getTypes();
     $theExistRows[] = self::createTableRow($theRow);
     if (self::checkOptions($theRow))
     {
-      $theRow         = self::createColumnOptionsRow($theRow);
-      $theExistRows[] = $theRow;
+        $theRow         = self::createColumnOptionsRow($theRow);
+        $theExistRows[] = $theRow;
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------