Ignore upgrade error log, only attempt migration if classes exist

MajesteitBart · Dec 8, 2014 · 45f093f · 45f093f
1 parent 83c68cc
commit 45f093f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@
 !/build/packages/.placeholder
 /mockup
 /upgrade
+/upgrade_errors.txt
diff --git a/app/bundles/CoreBundle/Command/ApplyUpdatesCommand.php b/app/bundles/CoreBundle/Command/ApplyUpdatesCommand.php
@@ -165,17 +165,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        // Migrate the database to the current version
-        $command = $this->getApplication()->find('doctrine:migrations:migrate');
-        $input = new ArrayInput(array(
-            'command'          => 'doctrine:migrations:migrate',
-            '--env'            => $options['env'],
-            '--no-interaction' => true
-        ));
-        $exitCode = $command->run($input, $output);
-
-        if ($exitCode !== 0) {
-            $output->writeln('<error>' . $translator->trans('mautic.core.update.error_performing_migration') . '</error>');
+        // Migrate the database to the current version if migrations exist
+        $iterator = new \FilesystemIterator($this->getContainer()->getParameter('kernel.root_dir') . '/migrations', \FilesystemIterator::SKIP_DOTS);
+
+        if (iterator_count($iterator)) {
+            $command = $this->getApplication()->find('doctrine:migrations:migrate');
+            $input = new ArrayInput(array(
+                'command'          => 'doctrine:migrations:migrate',
+                '--env'            => $options['env'],
+                '--no-interaction' => true
+            ));
+            $exitCode = $command->run($input, $output);
+
+            if ($exitCode !== 0) {
+                $output->writeln('<error>' . $translator->trans('mautic.core.update.error_performing_migration') . '</error>');
+            }
         }
 
         // Clear the cached update data and the download package now that we've updated

diff --git a/app/bundles/CoreBundle/Controller/AjaxController.php b/app/bundles/CoreBundle/Controller/AjaxController.php
@@ -414,13 +414,18 @@ protected function updateDatabaseMigrationAction(Request $request)
     {
         $dataArray  = array('success' => 0);
         $translator = $this->factory->getTranslator();
+        $result     = 0;
 
-        $env         = $this->factory->getEnvironment();
-        $noDebug     = ($env == 'prod') ? ' --no-debug' : '';
-        $input       = new ArgvInput(array('console', 'doctrine:migrations:migrate', '--no-interaction --env=' . $env . $noDebug));
-        $application = new Application($this->get('kernel'));
-        $application->setAutoExit(false);
-        $result = $application->run($input);
+        $iterator = new \FilesystemIterator($this->container->getParameter('kernel.root_dir') . '/migrations', \FilesystemIterator::SKIP_DOTS);
+
+        if (iterator_count($iterator)) {
+            $env         = $this->factory->getEnvironment();
+            $noDebug     = ($env == 'prod') ? ' --no-debug' : '';
+            $input       = new ArgvInput(array('console', 'doctrine:migrations:migrate', '--no-interaction --env=' . $env . $noDebug));
+            $application = new Application($this->get('kernel'));
+            $application->setAutoExit(false);
+            $result = $application->run($input);
+        }
 
         if ($result !== 0) {
             $dataArray['stepStatus'] = $translator->trans('mautic.core.update.step.failed');