SetBased / php-audit

src/MySql/Helper/CompoundSyntaxStore.php

Spacing +1 added lines, -1 removed lines

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

Indentation +106 added lines, -106 removed lines

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

Braces +3 added lines, -1 removed lines

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

src/Command/AboutCommand.php

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

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

Indentation +17 added lines, -17 removed lines

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

src/MySql/DataLayer.php

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

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

Spacing +3 added lines, -3 removed lines

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

Braces +18 added lines, -6 removed lines

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

Indentation +157 added lines, -157 removed lines

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

src/MySql/Sql/CreateAuditTable.php

Spacing +1 added lines, -1 removed lines

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

Indentation +59 added lines, -59 removed lines

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

src/MySql/Command/MySqlCommand.php

Indentation +17 added lines, -17 removed lines

@@ -11,23 +11,23 @@ 
  */
 class MySqlCommand extends BaseCommand
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Disconnects from MySQL instance.
-   */
-  public function disconnect()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Disconnects from MySQL instance.
+     */
+    public function disconnect()
+    {
     DataLayer::disconnect();
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Connects to a MySQL instance.
-   *
-   * @param array $settings The settings from the configuration file.
-   */
-  protected function connect($settings)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Connects to a MySQL instance.
+     *
+     * @param array $settings The settings from the configuration file.
+     */
+    protected function connect($settings)
+    {
     $host     = $this->getSetting($settings, true, 'database', 'host');
     $user     = $this->getSetting($settings, true, 'database', 'user');
     $password = $this->getSetting($settings, true, 'database', 'password');
@@ -35,9 +35,9 @@ 
 
     DataLayer::setIo($this->io);
     DataLayer::connect($host, $user, $password, $database);
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/MySql/Command/AuditCommand.php

Braces +2 added lines, -4 removed lines

@@ -88,16 +88,14 @@
         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']));
-        }
-        else
+        } else
         {
           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,

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/Application/AuditApplication.php

Indentation +17 added lines, -17 removed lines

@@ -14,23 +14,23 @@ 
  */
 class AuditApplication extends Application
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Object constructor.
-   */
-  public function __construct()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Object constructor.
+     */
+    public function __construct()
+    {
     parent::__construct('AuditApplication');
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Gets the default commands that should always be available.
-   *
-   * @return Command[] An array of default Command instances.
-   */
-  protected function getDefaultCommands()
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Gets the default commands that should always be available.
+     *
+     * @return Command[] An array of default Command instances.
+     */
+    protected function getDefaultCommands()
+    {
     $commands = parent::getDefaultCommands();
 
     $commands[] = new AboutCommand();
@@ -38,9 +38,9 @@ 
     $commands[] = new DiffCommand();
 
     return $commands;
-  }
+    }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

src/Command/BaseCommand.php

Indentation +92 added lines, -92 removed lines

@@ -13,148 +13,148 @@
  */
 class BaseCommand extends Command
 {
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * All config file as array.
-   *
-   * @var array
-   */
-  protected $config;
-
-  /**
-   * The name of the configuration file.
-   *
-   * @var string
-   */
-  protected $configFileName;
-
-  /**
-   * The Output decorator.
-   *
-   * @var StratumStyle
-   */
-  protected $io;
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns the value of a setting.
-   *
-   * @param array  $settings    The settings as returned by parse_ini_file.
-   * @param bool   $mandatory   If set and setting $settingName is not found in section $sectionName an exception
-   *                            will be thrown.
-   * @param string $sectionName The name of the section of the requested setting.
-   * @param string $settingName The name of the setting of the requested setting.
-   *
-   * @return null|string
-   *
-   * @throws RuntimeException
-   */
-  protected static function getSetting($settings, $mandatory, $sectionName, $settingName)
-  {
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * All config file as array.
+     *
+     * @var array
+     */
+    protected $config;
+
+    /**
+     * The name of the configuration file.
+     *
+     * @var string
+     */
+    protected $configFileName;
+
+    /**
+     * The Output decorator.
+     *
+     * @var StratumStyle
+     */
+    protected $io;
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Returns the value of a setting.
+     *
+     * @param array  $settings    The settings as returned by parse_ini_file.
+     * @param bool   $mandatory   If set and setting $settingName is not found in section $sectionName an exception
+     *                            will be thrown.
+     * @param string $sectionName The name of the section of the requested setting.
+     * @param string $settingName The name of the setting of the requested setting.
+     *
+     * @return null|string
+     *
+     * @throws RuntimeException
+     */
+    protected static function getSetting($settings, $mandatory, $sectionName, $settingName)
+    {
     // Test if the section exists.
     if (!array_key_exists($sectionName, $settings))
     {
-      if ($mandatory)
-      {
+        if ($mandatory)
+        {
         throw new RuntimeException("Section '%s' not found in configuration file.", $sectionName);
-      }
-      else
-      {
+        }
+        else
+        {
         return null;
-      }
+        }
     }
 
     // Test if the setting in the section exists.
     if (!array_key_exists($settingName, $settings[$sectionName]))
     {
-      if ($mandatory)
-      {
+        if ($mandatory)
+        {
         throw new RuntimeException("Setting '%s' not found in section '%s' configuration file.",
-                                   $settingName,
-                                   $sectionName);
-      }
-      else
-      {
+                                    $settingName,
+                                    $sectionName);
+        }
+        else
+        {
         return null;
-      }
+        }
     }
 
     return $settings[$sectionName][$settingName];
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Reads configuration parameters from the configuration file.
-   */
-  public function readConfigFile()
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Reads configuration parameters from the configuration file.
+     */
+    public function readConfigFile()
+    {
     $content = file_get_contents($this->configFileName);
 
     $this->config = (array)json_decode($content, true);
     if (json_last_error()!=JSON_ERROR_NONE)
     {
-      throw new RuntimeException("Error decoding JSON: '%s'.", json_last_error_msg());
+        throw new RuntimeException("Error decoding JSON: '%s'.", json_last_error_msg());
     }
 
     if (!is_array($this->config['audit_columns']))
     {
-      $this->config['audit_columns'] = [];
+        $this->config['audit_columns'] = [];
     }
 
     if (!is_array($this->config['additional_sql']))
     {
-      $this->config['additional_sql'] = [];
+        $this->config['additional_sql'] = [];
     }
 
     if (!is_array($this->config['tables']))
     {
-      $this->config['tables'] = [];
+        $this->config['tables'] = [];
     }
 
     foreach ($this->config['tables'] as $table_name => $params)
     {
-      $this->config['tables'][$table_name]['audit'] = filter_var($params['audit'], FILTER_VALIDATE_BOOLEAN);
+        $this->config['tables'][$table_name]['audit'] = filter_var($params['audit'], FILTER_VALIDATE_BOOLEAN);
     }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Writes a file in two phase to the filesystem.
-   *
-   * First write the data to a temporary file (in the same directory) and than renames the temporary file. If the file
-   * already exists and its content is equal to the data that must be written no action  is taken. This has the
-   * following advantages:
-   * * In case of some write error (e.g. disk full) the original file is kept in tact and no file with partially data
-   * is written.
-   * * Renaming a file is atomic. So, running processes will never read a partially written data.
-   *
-   * @param string $filename The name of the file were the data must be stored.
-   * @param string $data     The data that must be written.
-   */
-  protected function writeTwoPhases($filename, $data)
-  {
+    }
+
+    //--------------------------------------------------------------------------------------------------------------------
+    /**
+     * Writes a file in two phase to the filesystem.
+     *
+     * First write the data to a temporary file (in the same directory) and than renames the temporary file. If the file
+     * already exists and its content is equal to the data that must be written no action  is taken. This has the
+     * following advantages:
+     * * In case of some write error (e.g. disk full) the original file is kept in tact and no file with partially data
+     * is written.
+     * * Renaming a file is atomic. So, running processes will never read a partially written data.
+     *
+     * @param string $filename The name of the file were the data must be stored.
+     * @param string $data     The data that must be written.
+     */
+    protected function writeTwoPhases($filename, $data)
+    {
     $write_flag = true;
     if (file_exists($filename))
     {
-      $old_data = file_get_contents($filename);
-      if ($data==$old_data) $write_flag = false;
+        $old_data = file_get_contents($filename);
+        if ($data==$old_data) $write_flag = false;
     }
 
     if ($write_flag)
     {
-      $tmp_filename = $filename.'.tmp';
-      file_put_contents($tmp_filename, $data);
-      rename($tmp_filename, $filename);
+        $tmp_filename = $filename.'.tmp';
+        file_put_contents($tmp_filename, $data);
+        rename($tmp_filename, $filename);
 
-      $this->io->text(sprintf('Wrote <fso>%s</fso>', OutputFormatter::escape($filename)));
+        $this->io->text(sprintf('Wrote <fso>%s</fso>', OutputFormatter::escape($filename)));
     }
     else
     {
-      $this->io->text(sprintf('File <fso>%s</fso> is up to date', OutputFormatter::escape($filename)));
+        $this->io->text(sprintf('File <fso>%s</fso> is up to date', OutputFormatter::escape($filename)));
+    }
     }
-  }
 
-  //--------------------------------------------------------------------------------------------------------------------
+    //--------------------------------------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------------------------------------

Spacing +3 added lines, -3 removed lines

@@ -90,8 +90,8 @@ 
   {
     $content = file_get_contents($this->configFileName);
 
-    $this->config = (array)json_decode($content, true);
-    if (json_last_error()!=JSON_ERROR_NONE)
+    $this->config = (array) json_decode($content, true);
+    if (json_last_error() != JSON_ERROR_NONE)
     {
       throw new RuntimeException("Error decoding JSON: '%s'.", json_last_error_msg());
     }
@@ -137,7 +137,7 @@ 
     if (file_exists($filename))
     {
       $old_data = file_get_contents($filename);
-      if ($data==$old_data) $write_flag = false;
+      if ($data == $old_data) $write_flag = false;
     }
 
     if ($write_flag)

Braces +6 added lines, -7 removed lines

@@ -57,8 +57,7 @@ 
       if ($mandatory)
       {
         throw new RuntimeException("Section '%s' not found in configuration file.", $sectionName);
-      }
-      else
+      } else
       {
         return null;
       }
@@ -72,8 +71,7 @@ 
         throw new RuntimeException("Setting '%s' not found in section '%s' configuration file.",
                                    $settingName,
                                    $sectionName);
-      }
-      else
+      } else
       {
         return null;
       }
@@ -137,7 +135,9 @@ 
     if (file_exists($filename))
     {
       $old_data = file_get_contents($filename);
-      if ($data==$old_data) $write_flag = false;
+      if ($data==$old_data) {
+          $write_flag = false;
+      }
     }
 
     if ($write_flag)
@@ -147,8 +147,7 @@ 
       rename($tmp_filename, $filename);
 
       $this->io->text(sprintf('Wrote <fso>%s</fso>', OutputFormatter::escape($filename)));
-    }
-    else
+    } else
     {
       $this->io->text(sprintf('File <fso>%s</fso> is up to date', OutputFormatter::escape($filename)));
     }