Merge remote-tracking branch 'origin/master'

Author: francescobianco

src/MysqlImport.php

@@ -121,7 +121,7 @@ public function __construct($env, $argv)
 
         // Set fix host port
         if (preg_match('/:([0-9]+)$/', $this->host, $matches)) {
-            $this->host = substr($this->host, 0 , -1 - strlen($matches[1]));
+            $this->host = substr($this->host, 0, -1 - strlen($matches[1]));
             $this->port = $matches[1];
         }
 
@@ -358,7 +358,7 @@ protected function messageDatabaseNotBlank()
     {
         $this->exitCode = 0;
 
-        return $this->message("required blank database for import.");
+        return $this->message('required blank database for import.');
     }
 
     /**
@@ -380,7 +380,7 @@ protected function messageConnectionProblem($user)
     /**
      * Get exit code after run.
      *
-     * @return integer
+     * @return int
      */
     public function getExitCode()
     {
@@ -393,10 +393,10 @@ public function getExitCode()
     public function getInfo()
     {
         return [
-            'state' => $this->state,
-            'host' => $this->host,
-            'port' => $this->port,
-            'database' => $this->database
+            'state'    => $this->state,
+            'host'     => $this->host,
+            'port'     => $this->port,
+            'database' => $this->database,
         ];
     }
 

tests/MysqlImportTest.php

@@ -53,7 +53,7 @@ public function testDropAndCreateDatabase()
     public function testNotBlankDatabase()
     {
         $sqlFile = __DIR__.'/fixtures/database.sql';
-        $message = "[mysql-import] required blank database for import.";
+        $message = '[mysql-import] required blank database for import.';
 
         $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'secret'], [$sqlFile]);
         $app->run();
@@ -85,9 +85,9 @@ public function testConnectionProblemWrongHost()
         $this->assertStringStartsWith($message, $app->run());
 
         $app = new MysqlImport([
-            'MYSQL_HOST' => 'wrong',
-            'MYSQL_USER' => 'root',
-            'MYSQL_PASSWORD' => 'wrong'],
+            'MYSQL_HOST'     => 'wrong',
+            'MYSQL_USER'     => 'root',
+            'MYSQL_PASSWORD' => 'wrong', ],
             [$sqlFile]
         );
         $this->assertStringStartsWith($message, $app->run());
@@ -118,10 +118,10 @@ public function testHostPortFix()
 
         $app = new MysqlImport(['WORDPRESS_DB_HOST' => 'db:10101'], [$sqlFile]);
         $this->assertEquals([
-            'state' => 'ready',
-            'host' => 'db',
-            'port' => 10101,
-            'database' => 'database'
+            'state'    => 'ready',
+            'host'     => 'db',
+            'port'     => 10101,
+            'database' => 'database',
         ], $app->getInfo());
     }
 
@@ -131,17 +131,17 @@ public function testDefaultDatabaseName()
 
         $app = new MysqlImport(['WORDPRESS_DB_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertEquals([
-            'state' => 'ready',
-            'host' => 'mysql',
-            'port' => 3306,
-            'database' => 'wordpress'
+            'state'    => 'ready',
+            'host'     => 'mysql',
+            'port'     => 3306,
+            'database' => 'wordpress',
         ], $app->getInfo());
     }
 
     public function testSyntaxError()
     {
         $sqlFile = __DIR__.'/fixtures/syntax_error.sql';
-        $message = "[mysql-import] You have an error in your SQL syntax; check the manual that corresponds to";
+        $message = '[mysql-import] You have an error in your SQL syntax; check the manual that corresponds to';
 
         $app = new MysqlImport(['MYSQL_ROOT_PASSWORD' => 'secret'], [$sqlFile]);
         $this->assertStringStartsWith($message, $app->run());