Merge branch 'hotfix-3.7.1'

Author: Alexandre Guidet

Migrate/Command/AbstractComand.php Migrate/Command/AbstractCommand.phpMigrate/Command/AbstractComand.php renamed to Migrate/Command/AbstractCommand.php

@@ -10,7 +10,7 @@
 use Symfony\Component\Console\Command\Command;
 
 
-class AbstractComand extends Command {
+class AbstractCommand extends Command {
 
     protected $mainDir;
     protected $environmentDir;

Migrate/Command/AbstractEnvCommand.php

@@ -15,7 +15,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class AbstractEnvCommand extends AbstractComand
+class AbstractEnvCommand extends AbstractCommand
 {
 
     protected static $progressBarFormat = '%current%/%max% [%bar%] %percent% % [%message%]';
@@ -283,7 +283,7 @@ protected function filterMigrationsToExecute(InputInterface $input, OutputInterf
         $to = $input->getOption('to');
         if ($to !== null) {
             if (! array_key_exists($to, $toExecute)) {
-                throw new \RuntimeException("Target migration $to does not exists or has already been executed/downed!");
+                throw new \RuntimeException("Target migration $to does not exist or has already been executed/downed!");
             }
 
             $temp = $toExecute;

README.md

@@ -78,7 +78,7 @@ in `./.php-database-migration/environments/[env].yml`.
 Initialization
 --------------
 Once the environment is added, you have to initialize it. This verifies that the database connection works, and
-create a new database table for tracking the current database changes:
+creates a new database table for tracking the current database changes:
 
 ```
 $ ./bin/migrate migrate:init [env]
@@ -116,7 +116,8 @@ $ ./bin/migrate migrate:status [env]
 
 Up and down
 -----------
-You can now up all the pending migrations. If you decided to down a migration, the last one will be downed alone to prevent from mistake. You will be asked to confirm the downgrade of your database before runing the real SQL script.
+You can now up all the pending migrations. If you decide to down a migration, the last one will be downed alone to
+prevent mistakes. You will be asked to confirm the downgrade of your database before running the real SQL script.
 
 ```
 $ ./bin/migrate migrate:up [env]
@@ -128,13 +129,13 @@ You can mark migrations as applied without executing SQL (e.g. if you switched f
 $ ./bin/migrate migrate:up [env] --changelog-only
 ```
 
-For developement purpose, it is also possible to up a single migration without taking care of the other ones:
+For development purposes, it is also possible to up a single migration without taking care of the other ones:
 
 ```
 $ ./bin/migrate migrate:up [env] --only=[migrationid]
 ```
 
-or migrate to specific migration (it will run all migrations including specified migration)
+or migrate to specific migration (it will run all migrations, including the specified migration)
 
 ```
 $ ./bin/migrate migrate:up [env] --to=[migrationid]

tests/Command/UpDownCommandTest.php

@@ -224,26 +224,34 @@ public function testDownOnly()
         $command = self::$application->find('migrate:status');
         $commandTester = new CommandTester($command);
 
-        $currentDate = date('Y-m-d H:i:s');
+        $currentTime = time();
+        $validDates = array();
+        foreach (range(-1, 1) as $i) {
+            $validDates[] = date('Y-m-d H:i:s', $currentTime + $i);
+        }
+        $dateRegex = '(' . implode('|', $validDates) . ') *';
 
         $commandTester->execute(array(
             'command' => $command->getName(),
             'env' => 'testing'
         ));
 
-        $expected =<<<EXPECTED
+        $expected =<<<'EXPECTED'
 connected
 +----+---------+---------------------+-------------+
 | id | version | applied at          | description |
 +----+---------+---------------------+-------------+
-| 0  |         | $currentDate | migration   |
+| 0  |         | DATE_REGEX          | migration   |
 | 1  |         |                     | migration   |
-| 2  |         | $currentDate | migration   |
+| 2  |         | DATE_REGEX          | migration   |
 +----+---------+---------------------+-------------+
 
 EXPECTED;
 
-        $this->assertEquals($expected, $commandTester->getDisplay());
+        $pattern = '/^' . preg_quote($expected, '/') . '$/';
+        $pattern = preg_replace('/DATE_REGEX */', $dateRegex, $pattern);
+
+        $this->assertRegExp($pattern, $commandTester->getDisplay());
 
     }