Merge pull request #12 from stefk/master

Avoid exception if target bundle has no migration directory
claroline · Jan 22, 2016 · 7670743 · 7670743
2 parents 039acb6 + d008d6c
commit 7670743
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/Command/VersionCommand.php b/Command/VersionCommand.php
@@ -36,12 +36,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $status = $this->getManager($output)->getBundleStatus($this->getTargetBundle($input));
 
-        foreach ($status[Migrator::STATUS_AVAILABLE] as $version) {
-            $output->writeln(
-                $version === $status[Migrator::STATUS_CURRENT] ?
-                    "  * {$version} (current)" :
-                    "    {$version}"
-            );
+        if (count($status[Migrator::STATUS_AVAILABLE]) > 0) {
+            foreach ($status[Migrator::STATUS_AVAILABLE] as $version) {
+                $output->writeln(
+                    $version === $status[Migrator::STATUS_CURRENT] ?
+                        "  * {$version} (current)" :
+                        "    {$version}"
+                );
+            }
+        } else {
+            $output->writeln('No migration is available for this bundle.');
         }
     }
 }
diff --git a/Migrator/Migrator.php b/Migrator/Migrator.php
@@ -65,11 +65,18 @@ public function getCurrentVersion(Bundle $bundle)
     public function getMigrationStatus(Bundle $bundle)
     {
         $config = $this->getConfiguration($bundle);
-        $availableVersions = $config->getAvailableVersions();
-        array_unshift($availableVersions, '0');
+
+        if (is_dir($config->getMigrationsDirectory())) {
+            $currentVersion = $config->getCurrentVersion();
+            $availableVersions = $config->getAvailableVersions();
+            array_unshift($availableVersions, '0');
+        } else {
+            $currentVersion = '0';
+            $availableVersions = [];
+        }
 
         return array(
-            self::STATUS_CURRENT => $config->getCurrentVersion(),
+            self::STATUS_CURRENT => $currentVersion,
             self::STATUS_AVAILABLE => $availableVersions
         );
     }