Fixed code style with php-cs-fixer.

Carlos Cima · Carlos Cima · commit 1c9bcfc7569f · 2017-11-01T22:10:14.000-04:00
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -6,9 +6,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Class AbstractCommand
- *
- * @package Camcima\MySqlDiff\Command
+ * Class AbstractCommand.
  */
 abstract class AbstractCommand extends Command
 {
diff --git a/src/Command/DiffCommand.php b/src/Command/DiffCommand.php
@@ -10,9 +10,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Class DiffCommand
- *
- * @package Camcima\MySqlDiff\Command
+ * Class DiffCommand.
  */
 class DiffCommand extends AbstractCommand
 {
@@ -43,6 +41,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     *
      * @return int|null|void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/src/Command/MigrateCommand.php b/src/Command/MigrateCommand.php
@@ -10,9 +10,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Class MigrateCommand
- *
- * @package Camcima\MySqlDiff\Command
+ * Class MigrateCommand.
  */
 class MigrateCommand extends AbstractCommand
 {
@@ -55,6 +53,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     *
      * @return int|null|void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/src/Differ.php b/src/Differ.php
@@ -8,9 +8,7 @@
 use Camcima\MySqlDiff\Model\DatabaseDiff;
 
 /**
- * Class Differ
- *
- * @package Camcima\MySqlDiff
+ * Class Differ.
  */
 class Differ
 {
@@ -26,7 +24,6 @@ public function diffDatabases(Database $fromDatabase, Database $toDatabase, arra
         $databaseDiff = new DatabaseDiff();
 
         foreach ($fromDatabase->getTables() as $fromTable) {
-
             if ($this->isTableIgnored($fromTable->getName(), $ignoreList)) {
                 continue;
             }
@@ -46,7 +43,6 @@ public function diffDatabases(Database $fromDatabase, Database $toDatabase, arra
         }
 
         foreach ($toDatabase->getTables() as $toTable) {
-
             if ($this->isTableIgnored($toTable->getName(), $ignoreList)) {
                 continue;
             }
@@ -230,7 +226,7 @@ public function generateMigrationScript(DatabaseDiff $databaseDiff, $displayProg
      */
     public function generateMigrationScriptArray(DatabaseDiff $databaseDiff, $displayProgress = false)
     {
-        $migrationScript = array();
+        $migrationScript = [];
         $migrationScript[] = '# Disable Foreign Keys Check';
         $migrationScript[] = 'SET FOREIGN_KEY_CHECKS = 0;';
         $migrationScript[] = 'SET SQL_MODE = \'\';';
@@ -242,7 +238,6 @@ public function generateMigrationScriptArray(DatabaseDiff $databaseDiff, $displa
             $migrationScript[] = sprintf('-- deleted table `%s`', $deletedTable->getName());
             $migrationScript[] = '';
 
-
             if ($displayProgress) {
                 $migrationScript[] = sprintf("SELECT 'Dropping table %s';", $deletedTable->getName());
             }
diff --git a/src/Model/ChangedTable.php b/src/Model/ChangedTable.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class ChangedTable
- *
- * @package Camcima\MySqlDiff\Model
+ * Class ChangedTable.
  */
 class ChangedTable
 {
@@ -389,7 +387,7 @@ public function generateAlterScript()
         }
 
         if ($this->fromTable->getComment() !== $this->toTable->getComment()) {
-            $tableChanges[] = sprintf('COMMENT=\'%s\'', str_replace('\'','\'\'', $this->toTable->getComment()));
+            $tableChanges[] = sprintf('COMMENT=\'%s\'', str_replace('\'', '\'\'', $this->toTable->getComment()));
         }
 
         $alterScript = sprintf('ALTER TABLE `%s`%s  %s;', $this->getName(), PHP_EOL, implode(',' . PHP_EOL . '  ', $tableChanges));
diff --git a/src/Model/Column.php b/src/Model/Column.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class Column
- *
- * @package Camcima\MySqlDiff\Model
+ * Class Column.
  */
 class Column
 {
@@ -442,7 +440,7 @@ public function generateCreationScript()
         }
 
         if (!empty($this->comment)) {
-            $columnOptions[] = sprintf('COMMENT \'%s\'', str_replace('\'','\'\'', $this->comment));
+            $columnOptions[] = sprintf('COMMENT \'%s\'', str_replace('\'', '\'\'', $this->comment));
         }
 
         return trim(sprintf('`%s` %s %s', $this->name, $this->columnType, implode(' ', $columnOptions)));
diff --git a/src/Model/Database.php b/src/Model/Database.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class Database
- *
- * @package Camcima\MySqlDiff\Model
+ * Class Database.
  */
 class Database
 {
@@ -32,8 +30,10 @@ public function addTable(Table $table)
 
     /**
      * @param string $tableName
-     * @return Table
+     *
      * @throws \RuntimeException
+     *
+     * @return Table
      */
     public function getTableByName($tableName)
     {
diff --git a/src/Model/DatabaseDiff.php b/src/Model/DatabaseDiff.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class DatabaseDiff
- *
- * @package Camcima\MySqlDiff\Model
+ * Class DatabaseDiff.
  */
 class DatabaseDiff
 {
diff --git a/src/Model/ForeignKey.php b/src/Model/ForeignKey.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class ForeignKey
- *
- * @package Camcima\MySqlDiff\Model
+ * Class ForeignKey.
  */
 class ForeignKey
 {
diff --git a/src/Model/Index.php b/src/Model/Index.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class Index
- *
- * @package Camcima\MySqlDiff\Model
+ * Class Index.
  */
 class Index
 {
@@ -102,8 +100,10 @@ public function addIndexColumn(IndexColumn $indexColumn)
 
     /**
      * @param $columnName
-     * @return IndexColumn
+     *
      * @throws \RuntimeException
+     *
+     * @return IndexColumn
      */
     public function getIndexColumnByColumnName($columnName)
     {
diff --git a/src/Model/IndexColumn.php b/src/Model/IndexColumn.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class IndexColumn
- *
- * @package Camcima\MySqlDiff\Model
+ * Class IndexColumn.
  */
 class IndexColumn
 {
diff --git a/src/Model/Table.php b/src/Model/Table.php
@@ -3,9 +3,7 @@
 namespace Camcima\MySqlDiff\Model;
 
 /**
- * Class Table
- *
- * @package Camcima\MySqlDiff\Model
+ * Class Table.
  */
 class Table
 {
@@ -170,8 +168,10 @@ public function addColumn(Column $column)
 
     /**
      * @param string $columnName
-     * @return Column
+     *
      * @throws \RuntimeException
+     *
+     * @return Column
      */
     public function getColumnByName($columnName)
     {
@@ -184,8 +184,10 @@ public function getColumnByName($columnName)
 
     /**
      * @param int $columnOrder
-     * @return Column
+     *
      * @throws \RuntimeException
+     *
+     * @return Column
      */
     public function getColumnByOrder($columnOrder)
     {
@@ -243,8 +245,10 @@ public function addForeignKey(ForeignKey $foreignKey)
 
     /**
      * @param string $foreignKeyName
-     * @return ForeignKey
+     *
      * @throws \RuntimeException
+     *
+     * @return ForeignKey
      */
     public function getForeignKeyByName($foreignKeyName)
     {
@@ -284,8 +288,10 @@ public function addIndex(Index $index)
 
     /**
      * @param string $indexName
-     * @return Index
+     *
      * @throws \RuntimeException
+     *
+     * @return Index
      */
     public function getIndexByName($indexName)
     {
@@ -492,7 +498,7 @@ public function generateCreationScript($ignoreAutoIncrement = false, $sortKeys =
         }
 
         if ($this->comment) {
-            $tableOptions[] = sprintf('COMMENT=\'%s\'', str_replace('\'','\'\'', $this->comment));
+            $tableOptions[] = sprintf('COMMENT=\'%s\'', str_replace('\'', '\'\'', $this->comment));
         }
 
         $implodedTableOptions = implode(' ', $tableOptions);
diff --git a/src/Parser.php b/src/Parser.php
@@ -10,9 +10,7 @@
 use Camcima\MySqlDiff\Model\Table;
 
 /**
- * Class Parser
- *
- * @package Camcima\MySqlDiff
+ * Class Parser.
  */
 class Parser
 {
@@ -161,7 +159,7 @@ public function parseColumns(Table $table)
             }
 
             if (!empty($comment)) {
-                $column->setComment(str_replace('\'\'','\'', $comment));
+                $column->setComment(str_replace('\'\'', '\'', $comment));
             }
 
             if (!empty($characterSet)) {
@@ -327,7 +325,8 @@ private function getColumnLength($intLength, $decimalLength, $doubleLength, $flo
         if (!empty($yearLength)) {
             return (int) $yearLength;
         }
-        return null;
+
+        return;
     }
 
     /**
@@ -348,6 +347,7 @@ private function getColumnPrecision($decimalPrecision, $doublePrecision, $floatP
         if (!empty($floatPrecision)) {
             return (int) $floatPrecision;
         }
-        return null;
+
+        return;
     }
 }
diff --git a/src/RegExpPattern.php b/src/RegExpPattern.php
@@ -2,11 +2,8 @@
 
 namespace Camcima\MySqlDiff;
 
-
 /**
- * Class RegExpPattern
- *
- * @package Camcima\MySqlDiff
+ * Class RegExpPattern.
  */
 class RegExpPattern
 {

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`namespace Camcima\MySqlDiff\Model;`
`4`	`4`
`5`	`5`	`/**`
`6`		`- * Class ChangedTable`
`7`		`- *`
`8`		`- * @package Camcima\MySqlDiff\Model`
	`6`	`+ * Class ChangedTable.`
`9`	`7`	`*/`
`10`	`8`	`class ChangedTable`
`11`	`9`	`{`
`@@ -389,7 +387,7 @@ public function generateAlterScript()`
`389`	`387`	`}`
`390`	`388`
`391`	`389`	`if ($this->fromTable->getComment() !== $this->toTable->getComment()) {`
`392`		`- $tableChanges[] = sprintf('COMMENT=\'%s\'', str_replace('\'','\'\'', $this->toTable->getComment()));`
	`390`	`+ $tableChanges[] = sprintf('COMMENT=\'%s\'', str_replace('\'', '\'\'', $this->toTable->getComment()));`
`393`	`391`	`}`
`394`	`392`
`395`	`393`	$alterScript = sprintf('ALTER TABLE `%s`%s %s;', $this->getName(), PHP_EOL, implode(',' . PHP_EOL . ' ', $tableChanges));