formatting

laravel · Nov 4, 2020 · c43054b · c43054b
1 parent 5c1d55a
commit c43054b
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/Illuminate/Database/Schema/MySqlSchemaState.php b/src/Illuminate/Database/Schema/MySqlSchemaState.php
@@ -69,9 +69,9 @@ protected function appendMigrationData(string $path)
      */
     public function load($path)
     {
-        $cmd = 'mysql '.$this->connectionString().' --database="${:LARAVEL_LOAD_DATABASE}" < "${:LARAVEL_LOAD_PATH}"';
+        $command = 'mysql '.$this->connectionString().' --database="${:LARAVEL_LOAD_DATABASE}" < "${:LARAVEL_LOAD_PATH}"';
 
-        $this->makeProcess($cmd)->mustRun(null, array_merge($this->baseVariables($this->connection->getConfig()), [
+        $this->makeProcess($command)->mustRun(null, array_merge($this->baseVariables($this->connection->getConfig()), [
             'LARAVEL_LOAD_PATH' => $path,
         ]));
     }
@@ -83,13 +83,13 @@ public function load($path)
      */
     protected function baseDumpCommand()
     {
-        $cmd = 'mysqldump '.$this->connectionString().' --skip-add-locks --skip-comments --skip-set-charset --tz-utc';
+        $command = 'mysqldump '.$this->connectionString().' --skip-add-locks --skip-comments --skip-set-charset --tz-utc';
 
         if ($this->connection->isMaria()) {
-            $cmd .= ' --column-statistics=0 --set-gtid-purged=OFF';
+            $command .= ' --column-statistics=0 --set-gtid-purged=OFF';
         }
 
-        return $cmd.' "${:LARAVEL_LOAD_DATABASE}"';
+        return $command.' "${:LARAVEL_LOAD_DATABASE}"';
     }
 
     /**
@@ -138,20 +138,18 @@ protected function executeDumpProcess(Process $process, $output, array $variable
     }
 
     /**
-     * Generate a common connection string (--socket, --host, --port, --user, --password).
+     * Generate a basic connection string (--socket, --host, --port, --user, --password) for the database.
      *
      * @return string
      */
     protected function connectionString()
     {
-        $cmd = ' --user="${:LARAVEL_LOAD_USER}" --password="${:LARAVEL_LOAD_PASSWORD}"';
+        $value = ' --user="${:LARAVEL_LOAD_USER}" --password="${:LARAVEL_LOAD_PASSWORD}"';
 
-        if ($this->connection->getConfig()['unix_socket'] ?? false) {
-            $cmd .= ' --socket="${:LARAVEL_LOAD_SOCKET}"';
-        } else {
-            $cmd .= ' --host="${:LARAVEL_LOAD_HOST}" --port="${:LARAVEL_LOAD_PORT}"';
-        }
+        $value .= $this->connection->getConfig()['unix_socket'] ?? false
+                        ? ' --socket="${:LARAVEL_LOAD_SOCKET}"'
+                        : ' --host="${:LARAVEL_LOAD_HOST}" --port="${:LARAVEL_LOAD_PORT}"';
 
-        return $cmd;
+        return $value;
     }
 }