Use PHP 7.1 type declarations.

Author: prwater

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-  - '7.0'
   - '7.1'
   - '7.2'
   - nightly

composer.json

@@ -9,11 +9,11 @@
   "type": "tool",
   "license": "MIT",
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=7.1.0",
     "setbased/exception": "^1.0.0",
-    "setbased/helper-code-store-mysql": "^1.0.0",
-    "setbased/php-stratum": "^0.9.0",
-    "symfony/console": "^3.0.0"
+    "setbased/helper-code-store-mysql": "^2.0.0",
+    "setbased/php-stratum": "^0.9.64",
+    "symfony/console": "^3.0.0 || ^4.0.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0.0",

src/Application/AuditApplication.php

@@ -27,7 +27,7 @@ public function __construct()
   /**
    * Gets the default commands that should always be available.
    *
-   * @return Command[] An array of default Command instances.
+   * @return Command[]
    */
   protected function getDefaultCommands()
   {

src/Audit/AlterAuditTable.php

@@ -41,7 +41,7 @@ class AlterAuditTable
    *
    * @param array[] $config The content of the configuration file.
    */
-  public function __construct(&$config)
+  public function __construct(array &$config)
   {
     $this->config    = &$config;
     $this->codeStore = new AlterTableCodeStore();
@@ -57,7 +57,7 @@ public function __construct(&$config)
    *
    * return string
    */
-  public function main()
+  public function main(): string
   {
     $tables = $this->getTableList();
     foreach ($tables as $table)
@@ -74,7 +74,7 @@ public function main()
    *
    * @param string $tableName The name of the table.
    */
-  private function compareTable($tableName)
+  private function compareTable(string $tableName): void
   {
     $dataTable  = $this->getTableMetadata($this->config['database']['data_schema'], $tableName);
     $auditTable = $this->getTableMetadata($this->config['database']['audit_schema'], $tableName);
@@ -94,7 +94,7 @@ private function compareTable($tableName)
    * @param TableMetadata $dataTable  The metadata of the data table.
    * @param TableMetadata $auditTable The metadata of the audit table.
    */
-  private function compareTableColumns($dataTable, $auditTable)
+  private function compareTableColumns(TableMetadata $dataTable, TableMetadata $auditTable): void
   {
     $diff = TableColumnsMetadata::differentColumnTypes($dataTable->getColumns(), $auditTable->getColumns());
 
@@ -136,7 +136,7 @@ private function compareTableColumns($dataTable, $auditTable)
    * @param TableMetadata $dataTable  The metadata of the data table.
    * @param TableMetadata $auditTable The metadata of the audit table.
    */
-  private function compareTableOptions($dataTable, $auditTable)
+  private function compareTableOptions(TableMetadata $dataTable, TableMetadata $auditTable): void
   {
     $options = TableMetadata::compareOptions($dataTable, $auditTable);
 
@@ -178,7 +178,7 @@ private function compareTableOptions($dataTable, $auditTable)
    *
    * @return string[]
    */
-  private function getTableList()
+  private function getTableList(): array
   {
     $tables1 = [];
     foreach ($this->config['tables'] as $tableName => $config)
@@ -215,7 +215,7 @@ private function getTableList()
    *
    * @return TableMetadata
    */
-  private function getTableMetadata($schemaName, $tableName)
+  private function getTableMetadata(string $schemaName, string $tableName): TableMetadata
   {
     $table   = AuditDataLayer::getTableOptions($schemaName, $tableName);
     $columns = AuditDataLayer::getTableColumns($schemaName, $tableName);

src/Audit/Audit.php

@@ -49,13 +49,14 @@ class Audit
   private $io;
 
   //--------------------------------------------------------------------------------------------------------------------
+
   /**
    * Object constructor.
    *
    * @param array[]      $config The content of the configuration file.
    * @param StratumStyle $io     The Output decorator.
    */
-  public function __construct(&$config, $io)
+  public function __construct(array &$config, StratumStyle $io)
   {
     $this->config = &$config;
     $this->io     = $io;
@@ -69,7 +70,7 @@ public function __construct(&$config, $io)
   /**
    * Getting list of all tables from information_schema of database from config file.
    */
-  public function listOfTables()
+  public function listOfTables(): void
   {
     $this->dataSchemaTables  = AuditDataLayer::getTablesNames($this->config['database']['data_schema']);
     $this->auditSchemaTables = AuditDataLayer::getTablesNames($this->config['database']['audit_schema']);
@@ -79,7 +80,7 @@ public function listOfTables()
   /**
    * The main method: executes the auditing actions for tables.
    */
-  public function main()
+  public function main(): void
   {
     $this->listOfTables();
 
@@ -94,7 +95,7 @@ public function main()
   /**
    * Removes tables listed in the config file that are not longer in the data schema from the config file.
    */
-  public function obsoleteTables()
+  public function obsoleteTables(): void
   {
     foreach ($this->config['tables'] as $tableName => $dummy)
     {
@@ -110,7 +111,7 @@ public function obsoleteTables()
   /**
    * Compares the tables listed in the config file and the tables found in the data schema.
    */
-  public function unknownTables()
+  public function unknownTables(): void
   {
     foreach ($this->dataSchemaTables as $table)
     {
@@ -145,7 +146,7 @@ public function unknownTables()
   /**
    * Processed known tables.
    */
-  private function knownTables()
+  private function knownTables(): void
   {
     foreach ($this->dataSchemaTables as $table)
     {

src/Audit/Diff.php

@@ -61,7 +61,7 @@ class Diff
    * @param InputInterface  $input
    * @param OutputInterface $output
    */
-  public function __construct(&$config, $io, $input, $output)
+  public function __construct(array &$config, StratumStyle $io, InputInterface $input, OutputInterface $output)
   {
     $this->io     = $io;
     $this->config = &$config;
@@ -77,7 +77,7 @@ public function __construct(&$config, $io, $input, $output)
   /**
    * The main method: executes the auditing actions for tables.
    */
-  public function main()
+  public function main(): void
   {
     // Style for column names with miss matched column types.
     $style = new OutputFormatterStyle(null, 'red');
@@ -110,7 +110,7 @@ public function main()
    *
    * @param string $tableName The table name.
    */
-  private function currentAuditTable($tableName)
+  private function currentAuditTable(string $tableName): void
   {
     $columns           = AuditDataLayer::getTableColumns($this->config['database']['data_schema'], $tableName);
     $dataTableColumns  = new TableColumnsMetadata($columns);
@@ -147,7 +147,7 @@ private function currentAuditTable($tableName)
    *
    * @param string[] $tableNames The names of the current tables.
    */
-  private function currentAuditTables($tableNames)
+  private function currentAuditTables(array $tableNames): void
   {
     foreach ($tableNames as $tableName)
     {
@@ -161,7 +161,7 @@ private function currentAuditTables($tableNames)
    *
    * @return array[]
    */
-  private function getTableLists()
+  private function getTableLists(): array
   {
     $tables1 = [];
     foreach ($this->config['tables'] as $tableName => $config)
@@ -197,7 +197,7 @@ private function getTableLists()
    *
    * @param string[] $tableNames The names of the obsolete tables.
    */
-  private function missingAuditTables($tableNames)
+  private function missingAuditTables(array $tableNames): void
   {
     if (empty($tableNames)) return;
 
@@ -211,7 +211,7 @@ private function missingAuditTables($tableNames)
    *
    * @param string[] $tableNames The names of the obsolete tables.
    */
-  private function obsoleteAuditTables($tableNames)
+  private function obsoleteAuditTables(array $tableNames): void
   {
     if (empty($tableNames) || !$this->input->getOption('full')) return;