SetBased / php-audit

src/MySql/DataLayer.php

Spacing +4 added lines, -4 removed lines

@@ -118,7 +118,7 @@ 
                                      $auditColumns,
                                      $skipVariable,
                                      $additionSql);
-    $sql    = $helper->buildStatement();
+    $sql = $helper->buildStatement();
 
     self::executeNone($sql);
   }
@@ -129,7 +129,7 @@ 
    */
   public static function disconnect()
   {
-    if (self::$dl!==null)
+    if (self::$dl !== null)
     {
       self::$dl->disconnect();
       self::$dl = null;
@@ -310,7 +310,7 @@ 
     foreach ($auditColumns as $column)
     {
       $sql->append(sprintf('%s %s', $column['column_name'], $column['column_type']));
-      if (end($auditColumns)!==$column)
+      if (end($auditColumns) !== $column)
       {
         $sql->appendToLastLine(',');
       }
@@ -424,7 +424,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:');

Indentation +319 added lines, -319 removed lines

@@ -16,90 +16,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 \SetBased\Audit\MySql\Table\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 \SetBased\Audit\MySql\Table\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 \SetBased\Audit\MySql\Table\Columns $tableColumns    The data table columns.
-   * @param \SetBased\Audit\MySql\Table\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 \SetBased\Audit\MySql\Table\Columns $tableColumns    The data table columns.
+     * @param \SetBased\Audit\MySql\Table\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,
@@ -108,151 +108,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
@@ -263,23 +263,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
@@ -288,100 +288,100 @@ 
 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);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create temp table for getting column type information for audit columns.
-   *
-   * @param string  $schemaName   The name of the table schema.
-   * @param string  $tableName    The table name.
-   * @param array[] $auditColumns Audit columns from config file.
-   */
-  public static function createTemporaryTable($schemaName, $tableName, $auditColumns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create temp table for getting column type information for audit columns.
+     *
+     * @param string  $schemaName   The name of the table schema.
+     * @param string  $tableName    The table name.
+     * @param array[] $auditColumns Audit columns from config file.
+     */
+    public static function createTemporaryTable($schemaName, $tableName, $auditColumns)
+    {
     $sql = new CompoundSyntaxStore();
     $sql->append(sprintf('create temporary table `%s`.`%s` (', $schemaName, $tableName));
     foreach ($auditColumns as $column)
     {
-      $sql->append(sprintf('%s %s', $column['column_name'], $column['column_type']));
-      if (end($auditColumns)!==$column)
-      {
+        $sql->append(sprintf('%s %s', $column['column_name'], $column['column_type']));
+        if (end($auditColumns)!==$column)
+        {
         $sql->appendToLastLine(',');
-      }
+        }
     }
     $sql->append(')');
 
     self::$dl->executeNone($sql->getCode());
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Drop table.
-   *
-   * @param string $schemaName The name of the table schema.
-   * @param string $tableName  The name of the table.
-   *
-   * @return \array[]
-   */
-  public static function showColumns($schemaName, $tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Drop table.
+     *
+     * @param string $schemaName The name of the table schema.
+     * @param string $tableName  The name of the table.
+     *
+     * @return \array[]
+     */
+    public static function showColumns($schemaName, $tableName)
+    {
     $sql = sprintf('SHOW COLUMNS FROM `%s`.`%s`', $schemaName, $tableName);
 
     return self::$dl->executeRows($sql);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Drop table.
-   *
-   * @param string $schemaName The name of the table schema.
-   * @param string $tableName  The name of the table.
-   */
-  public static function dropTemporaryTable($schemaName, $tableName)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Drop table.
+     *
+     * @param string $schemaName The name of the table schema.
+     * @param string $tableName  The name of the table.
+     */
+    public static function dropTemporaryTable($schemaName, $tableName)
+    {
     $sql = sprintf('drop temporary table `%s`.`%s`', $schemaName, $tableName);
 
     self::$dl->executeNone($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
@@ -390,67 +390,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/Command/DiffCommand.php

Doc Comments +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
    *
    * @param array[] $columns The metadata of the columns of a table.
    *
-   * @return array[]
+   * @return \array[]
    */
   private static function removeMatchingColumns($columns)
   {
@@ -145,7 +145,7 @@ 
    * @param Columns $dataColumns  The table columns from data schema.
    * @param Columns $auditColumns The table columns from audit schema.
    *
-   * @return \array[]
+   * @return ColumnTypesExtended
    */
   private function createDiffArray($dataColumns, $auditColumns)
   {
@@ -182,7 +182,7 @@ 
   /**
    * Add not null to audit columns if it not nullable.
    *
-   * @param array $theColumns Audit columns.
+   * @param \array[] $theColumns Audit columns.
    *
    * @return array
    */

Braces +4 added lines, -8 removed lines

@@ -68,15 +68,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'])))
         {
@@ -220,8 +218,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));
       }
@@ -258,8 +255,7 @@ 
           if ($first)
           {
             $first = false;
-          }
-          else
+          } else
           {
             $output->writeln('');
           }

Indentation +159 added lines, -159 removed lines

@@ -23,90 +23,90 @@ 
  */
 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 ColumnTypesHelper $column */
     foreach ($columns as $column)
     {
-      $columnsArray = $column->getTypes();
-      var_dump($columnsArray);
-      if (!isset($columnsArray['data_column_type']))
-      {
+        $columnsArray = $column->getTypes();
+        var_dump($columnsArray);
+        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');
@@ -137,152 +137,152 @@ 
 
     $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 = new ColumnTypesExtended($this->config['audit_columns'], $auditColumns, $dataColumns);
 
     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))
     {
-      /**
-       * @var ColumnTypesExtended $columns
-       */
-      foreach ($this->diffColumns as $tableName => $columns)
-      {
+        /**
+         * @var ColumnTypesExtended $columns
+         */
+        foreach ($this->diffColumns as $tableName => $columns)
+        {
         $columns = $columns->getTypes();
         // Remove matching columns unless the full option is used.
         if (!$this->full)
         {
-          /** @var array[] $columns */
-          $columns = self::removeMatchingColumns($columns);
+            /** @var array[] $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);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Helper/ColumnTypesHelper.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace SetBased\Audit\MySql\Helper;
 
 //----------------------------------------------------------------------------------------------------------------------
-use SetBased\Audit\MySql\Table\Columns;
 use SetBased\Audit\MySQl\Table\ColumnType;
 
 /**

Indentation +46 added lines, -46 removed lines

@@ -11,72 +11,72 @@
  */
 class ColumnTypesHelper
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The metadata of the column.
-   *
-   * @var array[]
-   */
-  protected $columnTypes = [];
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The metadata of the column.
+     *
+     * @var array[]
+     */
+    protected $columnTypes = [];
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param array[]|ColumnType $columnTypes The metadata of the column.
-   * @param null|string        $typePrefix  Prefix for column type name.
-   */
-  public function __construct($columnTypes, $typePrefix)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param array[]|ColumnType $columnTypes The metadata of the column.
+     * @param null|string        $typePrefix  Prefix for column type name.
+     */
+    public function __construct($columnTypes, $typePrefix)
+    {
     $this->extendColumnTypes($columnTypes, $typePrefix);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create array with all columns types.
-   *
-   * @param array[]|ColumnType $columnTypes The metadata of the column.
-   * @param null|string     $typePrefix  Prefix for column type name.
-   */
-  public function extendColumnTypes($columnTypes, $typePrefix)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create array with all columns types.
+     *
+     * @param array[]|ColumnType $columnTypes The metadata of the column.
+     * @param null|string     $typePrefix  Prefix for column type name.
+     */
+    public function extendColumnTypes($columnTypes, $typePrefix)
+    {
     $columnTypes = $columnTypes->getType();
     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 type.
-   *
-   * @return \array[]
-   */
-  public function getTypes()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get columns type.
+     *
+     * @return \array[]
+     */
+    public function getTypes()
+    {
     return $this->columnTypes;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Table/Columns.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,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;
         }
@@ -135,7 +135,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'] : '';
@@ -160,7 +160,7 @@ 
     $columns = array_keys($this->columns);
     $key     = array_search($columnName, $columns);
 
-    if ($key>=1)
+    if ($key >= 1)
     {
       return $columns[$key - 1];
     }

Indentation +120 added lines, -120 removed lines

@@ -8,188 +8,188 @@
  */
 class Columns
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The metadata of the columns.
-   *
-   * @var array<string,ColumnType>
-   */
-  private $columns = [];
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param array[] $columns The metadata of the columns as returned by DataLayer::getTableColumns().
-   */
-  public function __construct($columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The metadata of the columns.
+     *
+     * @var array<string,ColumnType>
+     */
+    private $columns = [];
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param array[] $columns The metadata of the columns as returned by DataLayer::getTableColumns().
+     */
+    public function __construct($columns)
+    {
     foreach ($columns as $column)
     {
-      if (!is_array($column))
-      {
+        if (!is_array($column))
+        {
         /** @var ColumnType $column */
         $column = $column->getType();
-      }
-      /** @var array $column */
-      $this->columns[$column['column_name']] = new ColumnType($column);
+        }
+        /** @var array $column */
+        $this->columns[$column['column_name']] = new ColumnType($column);
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * 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;
+        $columns[] = $column;
     }
 
     foreach ($currentColumnsMetadata->columns as $column)
     {
-      $columns[] = $column;
+        $columns[] = $column;
     }
 
     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 (!is_array($column2))
-      {
+        if (!is_array($column2))
+        {
         /** @var ColumnType $column2 */
         $column2 = $column2->getType();
-      }
-      if (isset($columns1->columns[$column2['column_name']]))
-      {
+        }
+        if (isset($columns1->columns[$column2['column_name']]))
+        {
         $column1 = $columns1->columns[$column2['column_name']];
         if (!is_array($column1))
         {
-          /** @var ColumnType $column1 */
-          $column1 = $column1->getType();
+            /** @var ColumnType $column1 */
+            $column1 = $column1->getType();
         }
         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 (!is_array($column1))
         {
-          /** @var ColumnType $column1 */
-          $column1 = $column1->getType();
+            /** @var ColumnType $column1 */
+            $column1 = $column1->getType();
         }
         if (!isset($columns2->columns[$column1['column_name']]))
         {
-          $diff[] = $column1;
+            $diff[] = $column1;
+        }
         }
-      }
     }
 
     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;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Table/ColumnType.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     if (isset($this->columnType['column_type']))
     {
-      if ($this->columnType['column_type']==='timestamp')
+      if ($this->columnType['column_type'] === 'timestamp')
       {
         $this->columnType['column_type'] = $this->columnType['column_type'].' NULL';
       }

Indentation +41 added lines, -41 removed lines

@@ -8,63 +8,63 @@
  */
 class ColumnType
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * The metadata of the column.
-   *
-   * @var array[]
-   */
-  protected $columnType = [];
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * The metadata of the column.
+     *
+     * @var array[]
+     */
+    protected $columnType = [];
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   *
-   * @param array[]|Columns $columnProperties The metadata of the column.
-   */
-  public function __construct($columnProperties)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     *
+     * @param array[]|Columns $columnProperties The metadata of the column.
+     */
+    public function __construct($columnProperties)
+    {
     $this->columnType = $columnProperties;
 
     if (isset($this->columnType['column_type']))
     {
-      if ($this->columnType['column_type']==='timestamp')
-      {
+        if ($this->columnType['column_type']==='timestamp')
+        {
         $this->columnType['column_type'] = $this->columnType['column_type'].' NULL';
-      }
+        }
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get columns type.
-   *
-   * @return array[]
-   */
-  public function getType()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get columns type.
+     *
+     * @return array[]
+     */
+    public function getType()
+    {
     return $this->columnType;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get column property.
-   *
-   * @param string $propertyName The property name.
-   *
-   * @return string|null
-   */
-  public function getProperty($propertyName)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get column property.
+     *
+     * @param string $propertyName The property name.
+     *
+     * @return string|null
+     */
+    public function getProperty($propertyName)
+    {
     if (isset($this->columnType[$propertyName]))
     {
-      return $this->columnType[$propertyName];
+        return $this->columnType[$propertyName];
     }
 
     return null;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Command/AuditCommand.php

Spacing +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
                                   $this->config['audit_columns'],
                                   $this->config['tables'][$table['table_name']]['alias'],
                                   $this->config['tables'][$table['table_name']]['skip']);
-        $res          = StaticDataLayer::searchInRowSet('table_name', $currentTable->getTableName(), $this->auditSchemaTables);
+        $res = StaticDataLayer::searchInRowSet('table_name', $currentTable->getTableName(), $this->auditSchemaTables);
         if (!isset($res))
         {
           $currentTable->createMissingAuditTable();
@@ -191,7 +191,7 @@ 
       if (isset($key))
       {
         $this->config['audit_columns'][$key]['column_type'] = $column['Type'];
-        if ($column['Null']==='NO')
+        if ($column['Null'] === 'NO')
         {
           $this->config['audit_columns'][$key]['column_type'] = sprintf('%s not null', $this->config['audit_columns'][$key]['column_type']);
         }

Indentation +117 added lines, -117 removed lines

@@ -17,113 +17,113 @@ 
  */
 class AuditCommand extends MySqlCommand
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * All tables in the in the audit schema.
-   *
-   * @var array
-   */
-  protected $auditSchemaTables;
-
-  /**
-   * Array of tables from data schema.
-   *
-   * @var array
-   */
-  protected $dataSchemaTables;
-
-  /**
-   * If true remove all column information from config file.
-   *
-   * @var boolean
-   */
-  private $pruneOption;
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Compares the tables listed in the config file and the tables found in the audit schema
-   *
-   * @param string                              $tableName Name of table
-   * @param \SetBased\Audit\MySql\Table\Columns $columns   The table columns.
-   */
-  public function getColumns($tableName, $columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * All tables in the in the audit schema.
+     *
+     * @var array
+     */
+    protected $auditSchemaTables;
+
+    /**
+     * Array of tables from data schema.
+     *
+     * @var array
+     */
+    protected $dataSchemaTables;
+
+    /**
+     * If true remove all column information from config file.
+     *
+     * @var boolean
+     */
+    private $pruneOption;
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Compares the tables listed in the config file and the tables found in the audit schema
+     *
+     * @param string                              $tableName Name of table
+     * @param \SetBased\Audit\MySql\Table\Columns $columns   The table columns.
+     */
+    public function getColumns($tableName, $columns)
+    {
     $newColumns = [];
     /** @var ColumnType $column */
     foreach ($columns->getColumns() as $column)
     {
-      $newColumns[] = $column->getType();
+        $newColumns[] = $column->getType();
     }
     $this->config['table_columns'][$tableName] = $newColumns;
 
     if ($this->pruneOption)
     {
-      $this->config['table_columns'] = [];
+        $this->config['table_columns'] = [];
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Getting list of all tables from information_schema of database from config file.
-   */
-  public function listOfTables()
-  {
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Getting list of all tables from information_schema of database from config file.
+     */
+    public function listOfTables()
+    {
     $this->dataSchemaTables = DataLayer::getTablesNames($this->config['database']['data_schema']);
 
     $this->auditSchemaTables = DataLayer::getTablesNames($this->config['database']['audit_schema']);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Found tables in config file
-   *
-   * Compares the tables listed in the config file and the tables found in the data schema
-   */
-  public function unknownTables()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Found tables in config file
+     *
+     * Compares the tables listed in the config file and the tables found in the data schema
+     */
+    public function unknownTables()
+    {
     foreach ($this->dataSchemaTables as $table)
     {
-      if (isset($this->config['tables'][$table['table_name']]))
-      {
+        if (isset($this->config['tables'][$table['table_name']]))
+        {
         if (!isset($this->config['tables'][$table['table_name']]['audit']))
         {
-          $this->io->writeln(sprintf('<info>AuditApplication flag is not set in table %s</info>', $table['table_name']));
+            $this->io->writeln(sprintf('<info>AuditApplication flag is not set in table %s</info>', $table['table_name']));
         }
         else
         {
-          if ($this->config['tables'][$table['table_name']]['audit'])
-          {
+            if ($this->config['tables'][$table['table_name']]['audit'])
+            {
             $this->config['tables'][$table['table_name']]['alias'] = Table::getRandomAlias();
-          }
+            }
         }
-      }
-      else
-      {
+        }
+        else
+        {
         $this->io->writeln(sprintf('<info>Found new table %s</info>', $table['table_name']));
         $this->config['tables'][$table['table_name']] = ['audit' => false,
-                                                         'alias' => null,
-                                                         'skip'  => null];
-      }
+                                                            'alias' => null,
+                                                            'skip'  => null];
+        }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
     $this->setName('audit')
-         ->setDescription('Create (missing) audit table and (re)creates audit triggers')
-         ->addArgument('config file', InputArgument::OPTIONAL, 'The audit configuration file', 'etc/audit.json');
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output)
-  {
+            ->setDescription('Create (missing) audit table and (re)creates audit triggers')
+            ->addArgument('config file', InputArgument::OPTIONAL, 'The audit configuration file', 'etc/audit.json');
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
     $this->io = new StratumStyle($input, $output);
 
     $this->configFileName = $input->getArgument('config file');
@@ -140,77 +140,77 @@ 
 
     foreach ($this->dataSchemaTables as $table)
     {
-      if ($this->config['tables'][$table['table_name']]['audit'])
-      {
+        if ($this->config['tables'][$table['table_name']]['audit'])
+        {
         $tableColumns = [];
         if (isset($this->config['table_columns'][$table['table_name']]))
         {
-          $tableColumns = $this->config['table_columns'][$table['table_name']];
+            $tableColumns = $this->config['table_columns'][$table['table_name']];
         }
         $currentTable = new Table($this->io,
-                                  $table['table_name'],
-                                  $this->config['database']['data_schema'],
-                                  $this->config['database']['audit_schema'],
-                                  $tableColumns,
-                                  $this->config['audit_columns'],
-                                  $this->config['tables'][$table['table_name']]['alias'],
-                                  $this->config['tables'][$table['table_name']]['skip']);
+                                    $table['table_name'],
+                                    $this->config['database']['data_schema'],
+                                    $this->config['database']['audit_schema'],
+                                    $tableColumns,
+                                    $this->config['audit_columns'],
+                                    $this->config['tables'][$table['table_name']]['alias'],
+                                    $this->config['tables'][$table['table_name']]['skip']);
         $res          = StaticDataLayer::searchInRowSet('table_name', $currentTable->getTableName(), $this->auditSchemaTables);
         if (!isset($res))
         {
-          $currentTable->createMissingAuditTable();
+            $currentTable->createMissingAuditTable();
         }
 
         $columns        = $currentTable->main($this->config['additional_sql']);
         $alteredColumns = $columns['altered_columns']->getColumns();
         if (empty($alteredColumns))
         {
-          $this->getColumns($currentTable->getTableName(), $columns['full_columns']);
+            $this->getColumns($currentTable->getTableName(), $columns['full_columns']);
+        }
         }
-      }
     }
 
     // Drop database connection
     DataLayer::disconnect();
 
     $this->rewriteConfig();
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get canonical column types for audit columns.
-   */
-  protected function auditColumnTypes()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get canonical column types for audit columns.
+     */
+    protected function auditColumnTypes()
+    {
     $schema    = $this->config['database']['audit_schema'];
     $tableName = 'TMP_'.uniqid();
     DataLayer::createTemporaryTable($schema, $tableName, $this->config['audit_columns']);
     $auditColumns = DataLayer::showColumns($schema, $tableName);
     foreach ($auditColumns as $column)
     {
-      $key = StaticDataLayer::searchInRowSet('column_name', $column['Field'], $this->config['audit_columns']);
-      if (isset($key))
-      {
+        $key = StaticDataLayer::searchInRowSet('column_name', $column['Field'], $this->config['audit_columns']);
+        if (isset($key))
+        {
         $this->config['audit_columns'][$key]['column_type'] = $column['Type'];
         if ($column['Null']==='NO')
         {
-          $this->config['audit_columns'][$key]['column_type'] = sprintf('%s not null', $this->config['audit_columns'][$key]['column_type']);
+            $this->config['audit_columns'][$key]['column_type'] = sprintf('%s not null', $this->config['audit_columns'][$key]['column_type']);
+        }
         }
-      }
     }
     DataLayer::dropTemporaryTable($schema, $tableName);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Write new data to config file.
-   */
-  private function rewriteConfig()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Write new data to config file.
+     */
+    private function rewriteConfig()
+    {
     $this->writeTwoPhases($this->configFileName, json_encode($this->config, JSON_PRETTY_PRINT));
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Helper/ColumnTypesExtended.php

Indentation +44 added lines, -44 removed lines

@@ -11,71 +11,71 @@
  */
 class ColumnTypesExtended
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Contains all column types from audit and data schemas.
-   *
-   * @var array[]
-   */
-  private $columnTypes = [];
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Contains all column types from audit and data schemas.
+     *
+     * @var array[]
+     */
+    private $columnTypes = [];
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor
-   *
-   * @param array[] $configColumns The table columns from config file.
-   * @param Columns $auditColumns  The table columns from audit schema.
-   * @param Columns $dataColumns   The table columns from data schema.
-   */
-  public function __construct($configColumns, $auditColumns, $dataColumns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor
+     *
+     * @param array[] $configColumns The table columns from config file.
+     * @param Columns $auditColumns  The table columns from audit schema.
+     * @param Columns $dataColumns   The table columns from data schema.
+     */
+    public function __construct($configColumns, $auditColumns, $dataColumns)
+    {
     $auditConfigTypes = new Columns($configColumns);
     $auditTypes       = $auditColumns;
     $dataTypes        = $dataColumns;
     $allTypes         = ['config' => $auditConfigTypes, 'audit' => $auditTypes, 'data' => $dataTypes];
 
     $this->appendColumnTypes($allTypes);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Add to array all columns types.
-   *
-   * @param array[] $columnTypes The metadata of the column.
-   */
-  private function appendColumnTypes($columnTypes)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Add to array all columns types.
+     *
+     * @param array[] $columnTypes The metadata of the column.
+     */
+    private function appendColumnTypes($columnTypes)
+    {
     /** @var Columns $typesArray */
     foreach ($columnTypes as $typePrefix => $typesArray)
     {
-      $typesArray = $typesArray->getColumns();
-      /** @var ColumnType $type */
-      foreach ($typesArray as $type)
-      {
+        $typesArray = $typesArray->getColumns();
+        /** @var ColumnType $type */
+        foreach ($typesArray as $type)
+        {
         if (isset($this->columnTypes[$type->getProperty('column_name')]))
         {
-          $this->columnTypes[$type->getProperty('column_name')]->extendColumnTypes($type, $typePrefix);
+            $this->columnTypes[$type->getProperty('column_name')]->extendColumnTypes($type, $typePrefix);
         }
         else
         {
-          $this->columnTypes[$type->getProperty('column_name')] = new ColumnTypesHelper($type, $typePrefix);
+            $this->columnTypes[$type->getProperty('column_name')] = new ColumnTypesHelper($type, $typePrefix);
         }
-      }
+        }
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get columns types.
-   *
-   * @return array[]
-   */
-  public function getTypes()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get columns types.
+     *
+     * @return array[]
+     */
+    public function getTypes()
+    {
     return $this->columnTypes;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if (isset($this->columnTypes[$type->getProperty('column_name')]))
         {
           $this->columnTypes[$type->getProperty('column_name')]->extendColumnTypes($type, $typePrefix);
-        }
-        else
+        } else
         {
           $this->columnTypes[$type->getProperty('column_name')] = new ColumnTypesHelper($type, $typePrefix);
         }

src/MySql/Helper/RowHelper.php

Indentation +68 added lines, -68 removed lines

@@ -8,16 +8,16 @@ 
  */
 class RowHelper
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Create table row.
-   *
-   * @param array[] $theRow Data for table row.
-   *
-   * @return array<string,null|string>
-   */
-  public static function createColumnOptionsRow($theRow)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create table row.
+     *
+     * @param array[] $theRow Data for table row.
+     *
+     * @return array<string,null|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;
 
@@ -25,98 +25,98 @@ 
     $auditCollationName = isset($theRow['audit_collation_name']) ? $theRow['audit_collation_name'] : null;
 
     $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<string,null|string>
-   */
-  public static function createTableRow($theRow)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Create table row.
+     *
+     * @param array[] $theRow Data for table row.
+     *
+     * @return array<string,null|string>
+     */
+    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 ColumnTypesHelper $theRow       Row for append.
-   */
-  public static function appendRow(&$theExistRows, $theRow)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Append a row.
+     *
+     * @param \array[]          $theExistRows Exist rows array for appending.
+     * @param ColumnTypesHelper $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);
+        $theRow         = self::createColumnOptionsRow($theRow);
 
-      $theExistRows[] = $theRow;
+        $theExistRows[] = $theRow;
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Helper/TableHelper.php

Indentation +125 added lines, -125 removed lines

@@ -12,194 +12,194 @@
  */
 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;
 
-  /**
-   * Full option.
-   *
-   * @var bool
-   */
-  private $fullOption;
+    /**
+     * Full option.
+     *
+     * @var bool
+     */
+    private $fullOption;
 
-  /**
-   * Check existing separator.
-   *
-   * @var bool
-   */
-  private $existSeparator = false;
+    /**
+     * Check existing separator.
+     *
+     * @var bool
+     */
+    private $existSeparator = false;
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * 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.
-   * @param bool    $fullOption      If set append table options to rows.
-   */
-  public function __construct($dataSchema, $auditSchema, $tableName, $theAuditColumns, $fullOption)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * 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.
+     * @param bool    $fullOption      If set append table options to rows.
+     */
+    public function __construct($dataSchema, $auditSchema, $tableName, $theAuditColumns, $fullOption)
+    {
     $this->auditColumns      = $theAuditColumns;
     $this->fullOption        = $fullOption;
     $this->auditTableOptions = DataLayer::getTableOptions($auditSchema, $tableName);
     $this->dataTableOptions  = DataLayer::getTableOptions($dataSchema, $tableName);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Append row with table option.
-   *
-   * @param string      $theOption The option.
-   * @param null|string $theName   Display name.
-   */
-  public function appendTableOption($theOption, $theName = null)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Append row with table option.
+     *
+     * @param string      $theOption The option.
+     * @param null|string $theName   Display name.
+     */
+    public function appendTableOption($theOption, $theName = null)
+    {
     if ($this->dataTableOptions[$theOption]!=$this->auditTableOptions[$theOption] || $this->fullOption)
     {
-      if (!$this->existSeparator)
-      {
+        if (!$this->existSeparator)
+        {
         $this->rows[]         = new TableSeparator();
         $this->existSeparator = true;
-      }
-      if ($theName===null)
-      {
+        }
+        if ($theName===null)
+        {
         $theName = $theOption;
-      }
-      $tableRow               = ['column_name'        => $theName,
-                                 'data_column_type'   => $this->dataTableOptions[$theOption],
-                                 'audit_column_type'  => $this->auditTableOptions[$theOption],
-                                 'config_column_type' => null];
-      $this->rows[$theOption] = RowHelper::createTableRow($tableRow);
+        }
+        $tableRow               = ['column_name'        => $theName,
+                                    '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 Rows array.
-   */
-  public function appendRows($theRows)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Appends rows.
+     *
+     * @param \array[] $theRows Rows array.
+     */
+    public function appendRows($theRows)
+    {
     foreach ($theRows as $row)
     {
-      RowHelper::appendRow($this->rows, $row);
+        RowHelper::appendRow($this->rows, $row);
     }
     $this->appendTableOption('engine');
     $this->appendTableOption('character_set_name', 'character set');
     $this->appendTableOption('table_collation', 'collation');
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Add highlighting to columns.
-   */
-  public function addHighlighting()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Add highlighting to columns.
+     */
+    public function addHighlighting()
+    {
     $styledColumns = [];
     foreach ($this->rows as $key => $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']))
+            {
             if (!isset($column['column_name']))
             {
-              $styledColumns[$key - 1]['column_name'] = sprintf('<mm_column>%s</>', $styledColumns[$key - 1]['column_name']);
+                $styledColumns[$key - 1]['column_name'] = sprintf('<mm_column>%s</>', $styledColumns[$key - 1]['column_name']);
             }
             $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']))
+            {
             if (!isset($column['column_name']))
             {
-              $styledColumns[$key - 1]['column_name'] = sprintf('<mm_column>%s</>', $styledColumns[$key - 1]['column_name']);
+                $styledColumns[$key - 1]['column_name'] = sprintf('<mm_column>%s</>', $styledColumns[$key - 1]['column_name']);
             }
             $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;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------