Don't catch patch exceptions in the command, but let it bubble up to the application so the correct exit code will be generated.

Author: Tjeerd

src/DbPatch/Command/Patch/PHP.php

@@ -95,18 +95,11 @@ public function apply()
             return false;
         }
 
-        try {
-
-            $env = new DbPatch_Command_Patch_PHP_Environment();
-            $env->setDb($this->getDb()->getAdapter())
-                ->setWriter($this->getWriter())
-                ->setConfig($this->getConfig())
-                ->install($phpFile);
-
-        } catch (Exception $e) {
-            $this->getWriter()->line(sprintf('error php patch: %s', $e->getMessage()));
-            return false;
-        }
+        $env = new DbPatch_Command_Patch_PHP_Environment();
+        $env->setDb($this->getDb()->getAdapter())
+            ->setWriter($this->getWriter())
+            ->setConfig($this->getConfig())
+            ->install($phpFile);
 
         return true;
     }

src/DbPatch/Command/Patch/SQL.php

@@ -92,17 +92,12 @@ public function apply()
             return false;
         }
 
-        try {
-            $db = $this->getDb();
-            $db->import($this->data['filename']);
+        $db = $this->getDb();
+        $db->import($this->data['filename']);
 
-            // SQLite needs a reconnect after changing scheme
-            $this->fixSqliteSchemaChangedBug();
+        // SQLite needs a reconnect after changing scheme
+        $this->fixSqliteSchemaChangedBug();
 
-        } catch (Exception $e) {
-            $this->writer->error($e->getMessage());
-            return false;
-        }
         return true;
     }
 

src/DbPatch/Command/Update.php

@@ -107,14 +107,14 @@ public function execute()
         foreach ($patchFiles as $patchNr => $patchFile)
         {
             if (($patchFile->patch_number <> $latestPatchNumber + 1) && !$force) {
-                $this->writer->error(
-                    sprintf('expected patch number %d instead of %d (%s). Use --force to override this check.',
-                            $latestPatchNumber + 1,
-                            $patchFile->patch_number,
-                            $patchFile->basename
+                throw new DbPatch_Exception(
+                    sprintf(
+                        'expected patch number %d instead of %d (%s). Use --force to override this check.',
+                        $latestPatchNumber + 1,
+                        $patchFile->patch_number,
+                        $patchFile->basename
                     )
                 );
-                return;
             }
 
             if (in_array($patchNr, $patchNumbersToSkip)) {
@@ -130,12 +130,11 @@ public function execute()
                     ->apply();
 
             if (!$result) {
-                return;
+                throw new DbPatch_Exception(sprintf('Running patch %d failed!', $patchNr));
             }
 
             $this->addToChangelog($patchFile);
             $latestPatchNumber = $patchFile->patch_number;
-
         }
     }