Merge branch 'hotfix-3.6.5'

Author: Alexandre Guidet

.gitignore

@@ -1,4 +1,3 @@
-nbproject
 environments
 clean.sh
 .project

Migrate/Command/AbstractComand.php

@@ -8,10 +8,6 @@
 namespace Migrate\Command;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
 
 
 class AbstractComand extends Command {

Migrate/Command/AbstractEnvCommand.php

@@ -64,7 +64,7 @@ protected function init(InputInterface $input, OutputInterface $output, $env = n
         $configDirectory = array(getcwd() . '/.php-database-migration/environments');
         $locator = new FileLocator($configDirectory);
 
-        if ($env == null) {
+        if ($env === null) {
             $env = $input->getArgument('env');
         }
 
@@ -86,9 +86,9 @@ protected function init(InputInterface $input, OutputInterface $output, $env = n
         if ($driver == 'sqlite') {
             $uri .= ":$dbname";
         }  else {
-            $uri .= ($dbname == null) ? '' : ":dbname=$dbname";
-            $uri .= ($host == null) ? '' : ";host=$host";
-            $uri .= ($port == null) ? '' : ";port=$port";
+            $uri .= ($dbname === null) ? '' : ":dbname=$dbname";
+            $uri .= ($host === null) ? '' : ";host=$host";
+            $uri .= ($port === null) ? '' : ";port=$port";
         }
         $this->db = new \PDO(
             $uri,
@@ -170,7 +170,6 @@ public function getToUpMigrations()
 
     public function getToDownMigrations()
     {
-        $locales = $this->getLocalMigrations();
         $remotes = $this->getRemoteMigrations();
 
         ksort($remotes);
@@ -272,7 +271,7 @@ protected function filterMigrationsToExecute(InputInterface $input, OutputInterf
         }
 
         $only = $input->getOption('only');
-        if ($only != null) {
+        if ($only !== null) {
             if (! array_key_exists($only, $toExecute)) {
                 throw new \RuntimeException("Impossible to execute migration $only!");
             }
@@ -281,7 +280,7 @@ protected function filterMigrationsToExecute(InputInterface $input, OutputInterf
         }
 
         $to = $input->getOption('to');
-        if ($to != null) {
+        if ($to !== null) {
             if (! array_key_exists($to, $toExecute)) {
                 throw new \RuntimeException("Target migration $to does not exists or has already been executed/downed!");
             }

Migrate/Command/AddEnvCommand.php

@@ -75,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $defaultEditorQuestion = new Question("Please enter the text editor to use by default <info>(default vim)</info>: ", "vim");
         $defaultEditor = $questions->ask($input, $output, $defaultEditorQuestion);
 
-        $confTemplate = file_get_contents(__DIR__ . '/../../templates/env.yml');
+        $confTemplate = file_get_contents(__DIR__ . '/../../templates/env.yml.tpl');
         $confTemplate = str_replace('{DRIVER}', $driver, $confTemplate);
         $confTemplate = str_replace('{HOST}', $dbHost, $confTemplate);
         $confTemplate = str_replace('{PORT}', $dbPort, $confTemplate);

Migrate/Command/CreateCommand.php

@@ -8,11 +8,8 @@
 namespace Migrate\Command;
 
 use Cocur\Slugify\Slugify;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 
@@ -37,7 +34,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $description = $questions->ask($input, $output, $descriptionQuestion);
 
         $editorQuestion = new Question("Please chose which editor to use <info>(default vim)</info>: ", "vim");
-        $editor = $questions->ask($input, $output, $editorQuestion);
+        $questions->ask($input, $output, $editorQuestion);
 
         $slugger = new Slugify();
         $filename = $slugger->slugify($description);

Migrate/Command/DownCommand.php

@@ -8,7 +8,6 @@
 namespace Migrate\Command;
 
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;

Migrate/Command/InitCommand.php

@@ -7,11 +7,8 @@
 
 namespace Migrate\Command;
 
-use Migrate\Utils\ArrayUtil;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class InitCommand extends AbstractEnvCommand {

Migrate/Command/StatusCommand.php

@@ -10,7 +10,6 @@
 
 
 use Migrate\Migration;
-use Migrate\Utils\ArrayUtil;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

Migrate/Command/UpCommand.php

@@ -7,7 +7,6 @@
 
 namespace Migrate\Command;
 
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;

Migrate/Migration.php

@@ -177,7 +177,7 @@ public function toArray()
 
     public function load($migrationDir)
     {
-        @$content = file_get_contents($migrationDir . '/' . $this->getFile());
+        $content = file_get_contents($migrationDir . '/' . $this->getFile());
         if ($content && strpos($content, '@UNDO') > 0) {
             $sql = explode('-- @UNDO', $content);
             $this->setSqlUp($sql[0]);