Cleaning up unnecessary use of 'die' and 'exit'

This commit is contained in:
Dan Cryer 2015-02-12 12:37:56 +00:00
commit 2d5659d613
13 changed files with 188 additions and 106 deletions

View file

@ -102,13 +102,15 @@ class SettingsController extends Controller
$this->settings['phpci']['github']['secret'] = $this->getParam('githubsecret', '');
$error = $this->storeSettings();
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
header('Location: ' . PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
} else {
header('Location: ' . PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
}
die;
return $response;
}
/**
@ -123,13 +125,15 @@ class SettingsController extends Controller
$error = $this->storeSettings();
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
header('Location: ' . PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
} else {
header('Location: ' . PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
}
die;
return $response;
}
/**
@ -143,13 +147,15 @@ class SettingsController extends Controller
$error = $this->storeSettings();
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
header('Location: ' . PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
} else {
header('Location: ' . PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
}
die;
return $response;
}
/**
@ -162,13 +168,15 @@ class SettingsController extends Controller
$this->settings['phpci']['basic'] = $this->getParams();
$error = $this->storeSettings();
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
header('Location: ' . PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
} else {
header('Location: ' . PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
}
die;
return $response;
}
/**
@ -183,13 +191,15 @@ class SettingsController extends Controller
$error = $this->storeSettings();
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
header('Location: ' . PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
} else {
header('Location: ' . PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
}
die;
return $response;
}
/**
@ -212,14 +222,15 @@ class SettingsController extends Controller
$this->settings['phpci']['github']['token'] = $resp['access_token'];
$this->storeSettings();
header('Location: ' . PHPCI_URL . 'settings?linked=1');
die;
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'settings?linked=1');
return $response;
}
}
header('Location: ' . PHPCI_URL . 'settings?linked=2');
die;
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'settings?linked=2');
return $response;
}
/**