Change exit calls to throwing an exception

This way the error won't be fatal in a unit test

diff --git a/lib/app.php b/lib/app.php
index baacf508d8e280ad185c4a7fe9ca3091a225c938..115b7d60f5e2e2579f4839848207e8f9451e69c1 100644 (file)
--- a/lib/app.php
+++ b/lib/app.php
@@ -839,9 +839,8 @@ class OC_App{
                                        OC_Hook::emit('update', 'success', 'Updated '.$info['name'].' app');
                                }
                                catch (Exception $e) {
-                                       echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"';
                                        OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage());
-                                       die;
+                                       throw new RuntimeException('Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"');
                                }
                                OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
                        }

diff --git a/lib/files.php b/lib/files.php
index f5dffd970d2ca13b817cd96c5c3a65c63dd3a9ab..ce46d13da413154b7b6085738cfacbd035836a44 100644 (file)
--- a/lib/files.php
+++ b/lib/files.php
@@ -62,7 +62,7 @@ class OC_Files {
                        $zip = new ZipArchive();
                        $filename = OC_Helper::tmpFile('.zip');
                        if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
-                               exit("cannot open <$filename>\n");
+                               throw new Exception("cannot open '$filename'\n");
                        }
                        foreach ($files as $file) {
                                $file = $dir . '/' . $file;
@@ -93,7 +93,7 @@ class OC_Files {
                        $zip = new ZipArchive();
                        $filename = OC_Helper::tmpFile('.zip');
                        if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
-                               exit("cannot open <$filename>\n");
+                               throw new Exception("cannot open '$filename'\n");
                        }
                        $file = $dir . '/' . $files;
                        self::zipAddDir($file, $zip);

diff --git a/lib/helper.php b/lib/helper.php
index df0d120976df44e9ef9bff1e701d9efeb9f123cb..ca508e1d9334dd5ad85a308babbd5977ab5b9253 100644 (file)
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -176,8 +176,7 @@ class OC_Helper {
                }elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )) {
                        return OC::$WEBROOT."/core/img/$image";
                }else{
-                       echo('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
-                       die();
+                       throw new RuntimeException('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
                }
        }