Moar typehinting

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2024-07-04 22:37:58 +01:00
parent 7330bf5832
commit a1eafc108d
18 changed files with 180 additions and 347 deletions
+19 -39
View File
@@ -19,7 +19,8 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
use Illuminate\Validation\Rule;
use Illuminate\View\View;
use Illuminate\Http\RedirectResponse;
use \Illuminate\Contracts\View\View;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Auth;
@@ -49,7 +50,7 @@ class SettingsController extends Controller
*
* @return \Illuminate\Contracts\View\View | \Illuminate\Http\Response
*/
public function getSetupIndex()
public function getSetupIndex() : View
{
$start_settings['php_version_min'] = false;
@@ -123,7 +124,7 @@ class SettingsController extends Controller
* @return bool This method will return true when exceptions (such as curl exception) is thrown.
* Check the log files to see more details about the exception.
*/
protected function dotEnvFileIsExposed()
protected function dotEnvFileIsExposed() : bool
{
try {
return Http::timeout(10)
@@ -153,12 +154,11 @@ class SettingsController extends Controller
* Save the first admin user from Setup.
*
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v3.0]
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postSaveFirstAdmin(SetupUserRequest $request)
public function postSaveFirstAdmin(SetupUserRequest $request) : RedirectResponse
{
{
$user = new User();
$user->first_name = $data['first_name'] = $request->input('first_name');
@@ -214,10 +214,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v3.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getSetupUser()
public function getSetupUser() : View
{
return view('setup/user')
->with('step', 3)
@@ -230,10 +228,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v3.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getSetupDone()
public function getSetupDone() : View
{
return view('setup/done')
->with('step', 4)
@@ -247,10 +243,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v3.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getSetupMigrate()
public function getSetupMigrate() : View
{
Artisan::call('migrate', ['--force' => true]);
if ((! file_exists(storage_path().'/oauth-private.key')) || (! file_exists(storage_path().'/oauth-public.key'))) {
@@ -270,10 +264,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function index()
public function index() : View
{
$settings = Setting::getSettings();
@@ -286,10 +278,9 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getEdit()
public function getEdit() : View
{
$setting = Setting::getSettings();
@@ -302,10 +293,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getSettings()
public function getSettings() : View
{
$setting = Setting::getSettings();
@@ -318,10 +307,9 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
*/
public function postSettings(Request $request)
public function postSettings(Request $request) : RedirectResponse
{
if (is_null($setting = Setting::getSettings())) {
return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
@@ -375,10 +363,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getBranding()
public function getBranding() : View
{
$setting = Setting::getSettings();
@@ -391,10 +377,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View | \Illuminate\Http\RedirectResponse
*/
public function postBranding(ImageUploadRequest $request)
public function postBranding(ImageUploadRequest $request) : RedirectResponse
{
// Something has gone horribly wrong - no settings record exists!
if (is_null($setting = Setting::getSettings())) {
@@ -493,10 +477,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Contracts\View\View
*/
public function getSecurity()
public function getSecurity() : View
{
$setting = Setting::getSettings();
@@ -509,10 +491,8 @@ class SettingsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
*
* @since [v1.0]
*
* @return \Illuminate\Http\RedirectResponse
*/
public function postSecurity(Request $request)
public function postSecurity(Request $request) : RedirectResponse
{
$this->validate($request, [
'pwd_secure_complexity' => 'array',