SetBased / php-audit

src/MySql/DataLayer.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
    *
    * @param string  $auditSchemaName The name of audit schema.
    * @param string  $tableName       The name of the table.
-   * @param array[] $columns         The metadata of the new columns.
+   * @param Columns $columns         The metadata of the new columns.
    */
   public static function addNewColumns($auditSchemaName, $tableName, $columns)
   {

Indentation +279 added lines, -279 removed lines

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

Spacing +3 added lines, -3 removed lines

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

Braces +1 added lines, -2 removed lines

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

src/Columns.php

Indentation +105 added lines, -105 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 
     foreach ($currentColumnsMetadata->columns as $column)
     {
-      if ($column['column_type']!='timestamp')
+      if ($column['column_type'] != 'timestamp')
       {
         $columns[] = ['column_name' => $column['column_name'],
                       'column_type' => $column['column_type']];
@@ -91,7 +91,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;
         }
@@ -153,7 +153,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'] : '';

Braces +1 added lines, -2 removed lines

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

src/Command/DiffCommand.php

Indentation +203 added lines, -203 removed lines

@@ -20,70 +20,70 @@ 
  */
 class DiffCommand extends AuditCommand
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Array with columns for each table.
-   * array [
-   *    table_name [
-   *            column [
-   *                    data table type,
-   *                    audit table type
-   *                    ],
-   *                      ...
-   *               ]
-   *       ]
-   *
-   * @var array[]
-   */
-  private $diffColumns;
-
-  /**
-   * If set all tables and columns are shown.
-   *
-   * @var string
-   */
-  private $full;
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Check full full and return array without new or obsolete columns if full not set.
-   *
-   * @param array[] $columns The metadata of the columns of a table.
-   *
-   * @return array[]
-   */
-  private static function removeMatchingColumns($columns)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Array with columns for each table.
+     * array [
+     *    table_name [
+     *            column [
+     *                    data table type,
+     *                    audit table type
+     *                    ],
+     *                      ...
+     *               ]
+     *       ]
+     *
+     * @var array[]
+     */
+    private $diffColumns;
+
+    /**
+     * If set all tables and columns are shown.
+     *
+     * @var string
+     */
+    private $full;
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Check full full and return array without new or obsolete columns if full not set.
+     *
+     * @param array[] $columns The metadata of the columns of a table.
+     *
+     * @return array[]
+     */
+    private static function removeMatchingColumns($columns)
+    {
     $cleaned = [];
     foreach ($columns as $column)
     {
-      if (($column['data_table_type']!=$column['audit_table_type'] && $column['audit_table_type']!=$column['config_type']) || ($column['audit_table_type']!=$column['config_type'] && !empty($column['config_type'])))
-      {
+        if (($column['data_table_type']!=$column['audit_table_type'] && $column['audit_table_type']!=$column['config_type']) || ($column['audit_table_type']!=$column['config_type'] && !empty($column['config_type'])))
+        {
         $cleaned[] = $column;
-      }
+        }
     }
 
     return $cleaned;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function configure()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
     $this->setName('diff')
-         ->setDescription('Compares data tables and audit tables')
-         ->addArgument('config file', InputArgument::OPTIONAL, 'The audit configuration file', 'etc/audit.json')
-         ->addOption('full', 'f', InputOption::VALUE_NONE, 'Show all columns');
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * {@inheritdoc}
-   */
-  protected function execute(InputInterface $input, OutputInterface $output)
-  {
+            ->setDescription('Compares data tables and audit tables')
+            ->addArgument('config file', InputArgument::OPTIONAL, 'The audit configuration file', 'etc/audit.json')
+            ->addOption('full', 'f', InputOption::VALUE_NONE, 'Show all columns');
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
     $this->io = new StratumStyle($input, $output);
 
     // Style for column names with miss matched column types.
@@ -113,237 +113,237 @@ 
 
     $this->getDiff();
     $this->printDiff($output);
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Add highlighting to columns.
-   *
-   * @param array[] $columns The metadata of the columns.
-   *
-   * @return array[]
-   */
-  private function addHighlighting($columns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Add highlighting to columns.
+     *
+     * @param array[] $columns The metadata of the columns.
+     *
+     * @return array[]
+     */
+    private function addHighlighting($columns)
+    {
     $styledColumns = [];
     foreach ($columns as $column)
     {
-      $styledColumn = $column;
-      // Highlighting for data table column types and audit.
-      if (!empty($column['data_table_type']))
-      {
+        $styledColumn = $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']))
         {
-          $styledColumn['column_name']     = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
-          $styledColumn['data_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
+            $styledColumn['column_name']     = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
+            $styledColumn['data_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
         }
         else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
         {
-          $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['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']))
         {
-          $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']);
+            $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
+            $styledColumn['data_table_type']  = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
+            $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
         }
-      }
-      else
-      {
+        }
+        else
+        {
         // Highlighting for audit table column types and audit_columns in config file.
         $searchColumn = StaticDataLayer::searchInRowSet('column_name', $styledColumn['column_name'], $this->config['audit_columns']);
         if (isset($searchColumn))
         {
-          $configType = $this->config['audit_columns'][$searchColumn]['column_type'];
-          if (isset($configType) && !isset($column['audit_table_type']))
-          {
+            $configType = $this->config['audit_columns'][$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']);
-          }
-          else if (!isset($configType) && isset($column['audit_table_type']))
-          {
+            }
+            else if (!isset($configType) && isset($column['audit_table_type']))
+            {
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
-          }
-          else if (strcmp($configType, $column['audit_table_type']))
-          {
+            }
+            else if (strcmp($configType, $column['audit_table_type']))
+            {
             $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
             $styledColumn['config_type']      = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
-          }
+            }
+        }
         }
-      }
-      $styledColumns[] = $styledColumn;
+        $styledColumns[] = $styledColumn;
     }
 
     return $styledColumns;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Get the difference between data and audit tables.
-   *
-   * @param Columns $dataColumns  The table columns from data schema.
-   * @param Columns $auditColumns The table columns from audit schema.
-   *
-   * @return array[]
-   */
-  private function createDiffArray($dataColumns, $auditColumns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Get the difference between data and audit tables.
+     *
+     * @param Columns $dataColumns  The table columns from data schema.
+     * @param Columns $auditColumns The table columns from audit schema.
+     *
+     * @return array[]
+     */
+    private function createDiffArray($dataColumns, $auditColumns)
+    {
     $diff = [];
 
     foreach ($this->config['audit_columns'] as $column)
     {
-      $diff[$column['column_name']] = ['column_name'      => $column['column_name'],
-                                       'data_table_type'  => null,
-                                       'audit_table_type' => null,
-                                       'config_type'      => $column['column_type']];
+        $diff[$column['column_name']] = ['column_name'      => $column['column_name'],
+                                        'data_table_type'  => null,
+                                        'audit_table_type' => null,
+                                        'config_type'      => $column['column_type']];
     }
 
     foreach ($auditColumns->getColumns() as $column)
     {
-      $config_type = isset($diff[$column['column_name']]) ? $diff[$column['column_name']]['config_type'] : null;
+        $config_type = isset($diff[$column['column_name']]) ? $diff[$column['column_name']]['config_type'] : null;
 
-      $diff[$column['column_name']] = ['column_name'      => $column['column_name'],
-                                       'data_table_type'  => null,
-                                       'audit_table_type' => $auditColumns->getColumnTypeWithCharSetCollation($column['column_name']),
-                                       'config_type'      => $config_type];
+        $diff[$column['column_name']] = ['column_name'      => $column['column_name'],
+                                        'data_table_type'  => null,
+                                        'audit_table_type' => $auditColumns->getColumnTypeWithCharSetCollation($column['column_name']),
+                                        'config_type'      => $config_type];
     }
 
     foreach ($dataColumns->getColumns() as $column)
     {
-      $config_type      = isset($diff[$column['column_name']]) ? $diff[$column['column_name']]['config_type'] : null;
-      $audit_table_type = isset($diff[$column['column_name']]) ? $diff[$column['column_name']]['audit_table_type'] : null;
+        $config_type      = isset($diff[$column['column_name']]) ? $diff[$column['column_name']]['config_type'] : null;
+        $audit_table_type = isset($diff[$column['column_name']]) ? $diff[$column['column_name']]['audit_table_type'] : null;
 
-      $diff[$column['column_name']] = ['column_name'      => $column['column_name'],
-                                       'data_table_type'  => $dataColumns->getColumnTypeWithCharSetCollation($column['column_name']),
-                                       'audit_table_type' => $audit_table_type,
-                                       'config_type'      => $config_type];
+        $diff[$column['column_name']] = ['column_name'      => $column['column_name'],
+                                        'data_table_type'  => $dataColumns->getColumnTypeWithCharSetCollation($column['column_name']),
+                                        'audit_table_type' => $audit_table_type,
+                                        'config_type'      => $config_type];
     }
 
     return $diff;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Computes the difference between data and audit tables.
-   */
-  private function getDiff()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Computes the difference between data and audit tables.
+     */
+    private function getDiff()
+    {
     foreach ($this->dataSchemaTables as $table)
     {
-      if ($this->config['tables'][$table['table_name']]['audit'])
-      {
+        if ($this->config['tables'][$table['table_name']]['audit'])
+        {
         $res = StaticDataLayer::searchInRowSet('table_name', $table['table_name'], $this->auditSchemaTables);
         if (isset($res))
         {
-          $dataColumns  = new Columns(DataLayer::getTableColumns($this->config['database']['data_schema'], $table['table_name']));
-          $auditColumns = DataLayer::getTableColumns($this->config['database']['audit_schema'], $table['table_name']);
-          $auditColumns = $this->addNotNull($auditColumns);
-          $auditColumns = new Columns($auditColumns);
+            $dataColumns  = new Columns(DataLayer::getTableColumns($this->config['database']['data_schema'], $table['table_name']));
+            $auditColumns = DataLayer::getTableColumns($this->config['database']['audit_schema'], $table['table_name']);
+            $auditColumns = $this->addNotNull($auditColumns);
+            $auditColumns = new Columns($auditColumns);
 
-          $this->diffColumns[$table['table_name']] = $this->createDiffArray($dataColumns, $auditColumns);
+            $this->diffColumns[$table['table_name']] = $this->createDiffArray($dataColumns, $auditColumns);
+        }
         }
-      }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Add not null to audit columns if it not nullable.
-   *
-   * @param array $theColumns Audit columns.
-   *
-   * @return array
-   */
-  private function addNotNull($theColumns)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Add not null to audit columns if it not nullable.
+     *
+     * @param array $theColumns Audit columns.
+     *
+     * @return array
+     */
+    private function addNotNull($theColumns)
+    {
     $modifiedColumns = [];
     foreach ($theColumns as $column)
     {
-      $modifiedColumn = $column;
-      $auditColumn    = StaticDataLayer::searchInRowSet('column_name', $modifiedColumn['column_name'], $this->config['audit_columns']);
-      if (isset($auditColumn))
-      {
+        $modifiedColumn = $column;
+        $auditColumn    = StaticDataLayer::searchInRowSet('column_name', $modifiedColumn['column_name'], $this->config['audit_columns']);
+        if (isset($auditColumn))
+        {
         if ($modifiedColumn['is_nullable']==='NO')
         {
-          $modifiedColumn['column_type'] = sprintf('%s not null', $modifiedColumn['column_type']);
+            $modifiedColumn['column_type'] = sprintf('%s not null', $modifiedColumn['column_type']);
+        }
         }
-      }
-      $modifiedColumns[] = $modifiedColumn;
+        $modifiedColumns[] = $modifiedColumn;
     }
 
     return $modifiedColumns;
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Writes the difference between the audit tables and metadata tables to the output.
-   *
-   * @param OutputInterface $output The output.
-   */
-  private function diffTables($output)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Writes the difference between the audit tables and metadata tables to the output.
+     *
+     * @param OutputInterface $output The output.
+     */
+    private function diffTables($output)
+    {
     foreach ($this->config['tables'] as $tableName => $table)
     {
-      $res = StaticDataLayer::searchInRowSet('table_name', $tableName, $this->auditSchemaTables);
-      if ($table['audit'] && !isset($res))
-      {
+        $res = StaticDataLayer::searchInRowSet('table_name', $tableName, $this->auditSchemaTables);
+        if ($table['audit'] && !isset($res))
+        {
         $output->writeln(sprintf('<miss_table>%s</>', $tableName));
-      }
-      else if (!$table['audit'] && isset($res))
-      {
+        }
+        else if (!$table['audit'] && isset($res))
+        {
         $output->writeln(sprintf('<obsolete_table>%s</>', $tableName));
-      }
+        }
+    }
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Writes the difference between the audit and data tables to the output.
-   *
-   * @param OutputInterface $output The output.
-   */
-  private function printDiff($output)
-  {
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Writes the difference between the audit and data tables to the output.
+     *
+     * @param OutputInterface $output The output.
+     */
+    private function printDiff($output)
+    {
     $first = true;
     if (isset($this->diffColumns))
     {
-      foreach ($this->diffColumns as $tableName => $columns)
-      {
+        foreach ($this->diffColumns as $tableName => $columns)
+        {
         // Remove matching columns unless the full option is used.
         if (!$this->full)
         {
-          $columns = self::removeMatchingColumns($columns);
+            $columns = self::removeMatchingColumns($columns);
         }
 
         if (!empty($columns))
         {
-          // Add an empty line between tables.
-          if ($first)
-          {
+            // Add an empty line between tables.
+            if ($first)
+            {
             $first = false;
-          }
-          else
-          {
+            }
+            else
+            {
             $output->writeln('');
-          }
+            }
 
-          // Write table name.
-          $output->writeln($tableName);
+            // Write table name.
+            $output->writeln($tableName);
 
-          // Write table with columns.
-          $columns = $this->addHighlighting($columns);
-          $table   = new Table($output);
-          $table->setHeaders(['column', 'data table', 'audit table', 'config'])
+            // Write table with columns.
+            $columns = $this->addHighlighting($columns);
+            $table   = new Table($output);
+            $table->setHeaders(['column', 'data table', 'audit table', 'config'])
                 ->setRows($columns);
-          $table->render();
+            $table->render();
+        }
         }
-      }
     }
     $this->diffTables($output);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
     $cleaned = [];
     foreach ($columns as $column)
     {
-      if (($column['data_table_type']!=$column['audit_table_type'] && $column['audit_table_type']!=$column['config_type']) || ($column['audit_table_type']!=$column['config_type'] && !empty($column['config_type'])))
+      if (($column['data_table_type'] != $column['audit_table_type'] && $column['audit_table_type'] != $column['config_type']) || ($column['audit_table_type'] != $column['config_type'] && !empty($column['config_type'])))
       {
         $cleaned[] = $column;
       }
@@ -264,7 +264,7 @@ 
       $auditColumn    = StaticDataLayer::searchInRowSet('column_name', $modifiedColumn['column_name'], $this->config['audit_columns']);
       if (isset($auditColumn))
       {
-        if ($modifiedColumn['is_nullable']==='NO')
+        if ($modifiedColumn['is_nullable'] === 'NO')
         {
           $modifiedColumn['column_type'] = sprintf('%s not null', $modifiedColumn['column_type']);
         }

Braces +7 added lines, -14 removed lines

@@ -136,19 +136,16 @@ 
         {
           $styledColumn['column_name']     = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
           $styledColumn['data_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
-        }
-        else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
+        } else if (!isset($column['data_table_type']) && isset($column['audit_table_type']))
         {
           $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
-        }
-        else if (strcmp($column['data_table_type'], $column['audit_table_type']))
+        } else if (strcmp($column['data_table_type'], $column['audit_table_type']))
         {
           $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
           $styledColumn['data_table_type']  = sprintf('<mm_type>%s</>', $styledColumn['data_table_type']);
           $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $styledColumn['audit_table_type']);
         }
-      }
-      else
+      } else
       {
         // Highlighting for audit table column types and audit_columns in config file.
         $searchColumn = StaticDataLayer::searchInRowSet('column_name', $styledColumn['column_name'], $this->config['audit_columns']);
@@ -159,12 +156,10 @@ 
           {
             $styledColumn['column_name'] = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['config_type'] = sprintf('<mm_type>%s</>', $styledColumn['config_type']);
-          }
-          else if (!isset($configType) && isset($column['audit_table_type']))
+          } else if (!isset($configType) && isset($column['audit_table_type']))
           {
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
-          }
-          else if (strcmp($configType, $column['audit_table_type']))
+          } else if (strcmp($configType, $column['audit_table_type']))
           {
             $styledColumn['column_name']      = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
             $styledColumn['audit_table_type'] = sprintf('<mm_type>%s</>', $column['audit_table_type']);
@@ -289,8 +284,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));
       }
@@ -322,8 +316,7 @@ 
           if ($first)
           {
             $first = false;
-          }
-          else
+          } else
           {
             $output->writeln('');
           }