Merge pull request #89 from HavokInspiration/fix-mark-migrated

Fix baking snapshots
cakephp · May 29, 2015 · b5758f5 · b5758f5
2 parents f3335bf + 33f56d8
commit b5758f5
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 13 deletions.
diff --git a/src/Shell/MigrationsShell.php b/src/Shell/MigrationsShell.php
@@ -13,6 +13,7 @@
 
 use Cake\Console\Shell;
 use Migrations\MigrationsDispatcher;
+use Symfony\Component\Console\Input\ArgvInput;
 
 /**
  * A wrapper shell for phinx migrations, used to inject our own
@@ -22,6 +23,13 @@
 class MigrationsShell extends Shell
 {
 
+    /**
+     * Array of arguments to run the shell with.
+     *
+     * @var array
+     */
+    public $argv = [];
+
     /**
      * Defines what options can be passed to the shell.
      * This is required because CakePHP validates the passed options
@@ -62,14 +70,29 @@ public function initialize()
      * responsible for parsing the command line from phinx and gives full control of
      * the rest of the flow to it.
      *
+     * The input parameter of the ``MigrationDispatcher::run()`` method is manually built
+     * in case a MigrationsShell is dispatched using ``Shell::dispatch()``.
+     *
      * @return void
      */
     public function main()
     {
-        array_shift($_SERVER['argv']);
-        $_SERVER['argv']--;
         $app = new MigrationsDispatcher(PHINX_VERSION);
-        $app->run();
+        $input = new ArgvInput($this->argv);
+        $app->run($input);
+    }
+
+    /**
+     * Override the default behavior to save the command called
+     * in order to pass it to the command dispatcher
+     *
+     * {@inheritDoc}
+     */
+    public function runCommand($argv, $autoMethod = false)
+    {
+        array_unshift($argv, 'migrations');
+        $this->argv = $argv;
+        return parent::runCommand($argv, $autoMethod);
     }
 
     /**

diff --git a/src/Shell/Task/MigrationSnapshotTask.php b/src/Shell/Task/MigrationSnapshotTask.php
@@ -91,17 +91,18 @@ protected function markSnapshotApplied($path)
         $fileName = pathinfo($path, PATHINFO_FILENAME);
         list($version, ) = explode('_', $fileName, 2);
 
-        $argv = $_SERVER['argv'];
-        $_SERVER['argv'] = [
-            '',
-            'migrations',
-            'mark_migrated',
-            $version
-        ];
+
+        $dispatchCommand = 'migrations mark_migrated ' . $version;
+        if (!empty($this->params['connection'])) {
+            $dispatchCommand .= ' -c ' . $this->params['connection'];
+        }
+
+        if (!empty($this->params['plugin'])) {
+            $dispatchCommand .= ' -p ' . $this->params['plugin'];
+        }
 
         $this->_io->out('Marking the snapshot ' . $fileName . ' as migrated...');
-        $result = $this->dispatchShell('migrations', 'mark_migrated', $version);
-        $_SERVER['argv'] = $argv;
+        $this->dispatchShell($dispatchCommand);
     }
 
     /**

diff --git a/tests/TestCase/Shell/Task/MigrationSnapshotTaskTest.php b/tests/TestCase/Shell/Task/MigrationSnapshotTaskTest.php
@@ -60,12 +60,19 @@ public function setUp()
     public function testNotEmptySnapshot()
     {
         $this->Task->params['require-table'] = false;
+        $this->Task->params['connection'] = 'test';
+        $this->Task->params['plugin'] = 'BogusPlugin';
 
         $version = Util::getCurrentTimestamp();
 
         $this->Task->expects($this->once())
             ->method('dispatchShell')
-            ->with('migrations', 'mark_migrated', $version);
+            ->with(
+                $this->logicalAnd(
+                    $this->stringContains('migrations mark_migrated'),
+                    $this->stringContains('-c test -p BogusPlugin')
+                )
+            );
 
         $result = $this->Task->bake('NotEmptySnapshot');
         $this->assertSameAsFile(__FUNCTION__ . '.php', $result);