Aligned constructors across controller classes

Since they no longer needed to run the parent contructor
since the parent constructor was no longer needed.
This commit is contained in:
Dan Brown 2020-11-21 17:08:37 +00:00
parent f76a2a69f7
commit 5e01c30882
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
32 changed files with 0 additions and 49 deletions

View File

@ -17,7 +17,6 @@ class BookExportApiController extends ApiController
{ {
$this->bookRepo = $bookRepo; $this->bookRepo = $bookRepo;
$this->exportService = $exportService; $this->exportService = $exportService;
parent::__construct();
} }
/** /**

View File

@ -30,7 +30,6 @@ class BookshelfApiController extends ApiController
/** /**
* BookshelfApiController constructor. * BookshelfApiController constructor.
* @param BookshelfRepo $bookshelfRepo
*/ */
public function __construct(BookshelfRepo $bookshelfRepo) public function __construct(BookshelfRepo $bookshelfRepo)
{ {

View File

@ -17,7 +17,6 @@ class ChapterExportApiController extends ApiController
{ {
$this->chapterRepo = $chapterRepo; $this->chapterRepo = $chapterRepo;
$this->exportService = $exportService; $this->exportService = $exportService;
parent::__construct();
} }
/** /**

View File

@ -25,7 +25,6 @@ class AttachmentController extends Controller
$this->attachmentService = $attachmentService; $this->attachmentService = $attachmentService;
$this->attachment = $attachment; $this->attachment = $attachment;
$this->pageRepo = $pageRepo; $this->pageRepo = $pageRepo;
parent::__construct();
} }

View File

@ -21,15 +21,11 @@ class ConfirmEmailController extends Controller
/** /**
* Create a new controller instance. * Create a new controller instance.
*
* @param EmailConfirmationService $emailConfirmationService
* @param UserRepo $userRepo
*/ */
public function __construct(EmailConfirmationService $emailConfirmationService, UserRepo $userRepo) public function __construct(EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
{ {
$this->emailConfirmationService = $emailConfirmationService; $this->emailConfirmationService = $emailConfirmationService;
$this->userRepo = $userRepo; $this->userRepo = $userRepo;
parent::__construct();
} }

View File

@ -32,7 +32,6 @@ class ForgotPasswordController extends Controller
{ {
$this->middleware('guest'); $this->middleware('guest');
$this->middleware('guard:standard'); $this->middleware('guard:standard');
parent::__construct();
} }

View File

@ -46,7 +46,6 @@ class LoginController extends Controller
$this->socialAuthService = $socialAuthService; $this->socialAuthService = $socialAuthService;
$this->redirectPath = url('/'); $this->redirectPath = url('/');
$this->redirectAfterLogout = url('/login'); $this->redirectAfterLogout = url('/login');
parent::__construct();
} }
public function username() public function username()

View File

@ -51,7 +51,6 @@ class RegisterController extends Controller
$this->redirectTo = url('/'); $this->redirectTo = url('/');
$this->redirectPath = url('/'); $this->redirectPath = url('/');
parent::__construct();
} }
/** /**

View File

@ -34,7 +34,6 @@ class ResetPasswordController extends Controller
{ {
$this->middleware('guest'); $this->middleware('guest');
$this->middleware('guard:standard'); $this->middleware('guard:standard');
parent::__construct();
} }
/** /**

View File

@ -15,7 +15,6 @@ class Saml2Controller extends Controller
*/ */
public function __construct(Saml2Service $samlService) public function __construct(Saml2Service $samlService)
{ {
parent::__construct();
$this->samlService = $samlService; $this->samlService = $samlService;
$this->middleware('guard:saml2'); $this->middleware('guard:saml2');
} }

View File

@ -27,8 +27,6 @@ class UserInviteController extends Controller
$this->inviteService = $inviteService; $this->inviteService = $inviteService;
$this->userRepo = $userRepo; $this->userRepo = $userRepo;
parent::__construct();
} }
/** /**

View File

@ -22,7 +22,6 @@ class BookController extends Controller
{ {
$this->bookRepo = $bookRepo; $this->bookRepo = $bookRepo;
$this->entityContextManager = $entityContextManager; $this->entityContextManager = $entityContextManager;
parent::__construct();
} }
/** /**

View File

@ -19,7 +19,6 @@ class BookExportController extends Controller
{ {
$this->bookRepo = $bookRepo; $this->bookRepo = $bookRepo;
$this->exportService = $exportService; $this->exportService = $exportService;
parent::__construct();
} }
/** /**

View File

@ -18,7 +18,6 @@ class BookSortController extends Controller
public function __construct(BookRepo $bookRepo) public function __construct(BookRepo $bookRepo)
{ {
$this->bookRepo = $bookRepo; $this->bookRepo = $bookRepo;
parent::__construct();
} }
/** /**

View File

@ -27,7 +27,6 @@ class BookshelfController extends Controller
$this->bookshelfRepo = $bookshelfRepo; $this->bookshelfRepo = $bookshelfRepo;
$this->entityContextManager = $entityContextManager; $this->entityContextManager = $entityContextManager;
$this->imageRepo = $imageRepo; $this->imageRepo = $imageRepo;
parent::__construct();
} }
/** /**

View File

@ -21,7 +21,6 @@ class ChapterController extends Controller
public function __construct(ChapterRepo $chapterRepo) public function __construct(ChapterRepo $chapterRepo)
{ {
$this->chapterRepo = $chapterRepo; $this->chapterRepo = $chapterRepo;
parent::__construct();
} }
/** /**

View File

@ -18,7 +18,6 @@ class ChapterExportController extends Controller
{ {
$this->chapterRepo = $chapterRepo; $this->chapterRepo = $chapterRepo;
$this->exportService = $exportService; $this->exportService = $exportService;
parent::__construct();
} }
/** /**

View File

@ -14,7 +14,6 @@ class CommentController extends Controller
public function __construct(CommentRepo $commentRepo) public function __construct(CommentRepo $commentRepo)
{ {
$this->commentRepo = $commentRepo; $this->commentRepo = $commentRepo;
parent::__construct();
} }
/** /**

View File

@ -16,11 +16,6 @@ abstract class Controller extends BaseController
{ {
use DispatchesJobs, ValidatesRequests; use DispatchesJobs, ValidatesRequests;
public function __construct()
{
//
}
/** /**
* Check if the current user is signed in. * Check if the current user is signed in.
*/ */

View File

@ -15,7 +15,6 @@ class DrawioImageController extends Controller
public function __construct(ImageRepo $imageRepo) public function __construct(ImageRepo $imageRepo)
{ {
$this->imageRepo = $imageRepo; $this->imageRepo = $imageRepo;
parent::__construct();
} }
/** /**

View File

@ -18,7 +18,6 @@ class GalleryImageController extends Controller
public function __construct(ImageRepo $imageRepo) public function __construct(ImageRepo $imageRepo)
{ {
$this->imageRepo = $imageRepo; $this->imageRepo = $imageRepo;
parent::__construct();
} }
/** /**

View File

@ -1,14 +1,11 @@
<?php namespace BookStack\Http\Controllers\Images; <?php namespace BookStack\Http\Controllers\Images;
use BookStack\Entities\Page;
use BookStack\Exceptions\ImageUploadException; use BookStack\Exceptions\ImageUploadException;
use BookStack\Http\Controllers\Controller; use BookStack\Http\Controllers\Controller;
use BookStack\Entities\Repos\PageRepo;
use BookStack\Uploads\Image; use BookStack\Uploads\Image;
use BookStack\Uploads\ImageRepo; use BookStack\Uploads\ImageRepo;
use Exception; use Exception;
use Illuminate\Filesystem\Filesystem as File; use Illuminate\Filesystem\Filesystem as File;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
@ -26,7 +23,6 @@ class ImageController extends Controller
$this->image = $image; $this->image = $image;
$this->file = $file; $this->file = $file;
$this->imageRepo = $imageRepo; $this->imageRepo = $imageRepo;
parent::__construct();
} }
/** /**

View File

@ -1,7 +1,5 @@
<?php namespace BookStack\Http\Controllers; <?php namespace BookStack\Http\Controllers;
use Activity;
use BookStack\Actions\ActivityType;
use BookStack\Entities\Managers\BookContents; use BookStack\Entities\Managers\BookContents;
use BookStack\Entities\Managers\PageContent; use BookStack\Entities\Managers\PageContent;
use BookStack\Entities\Managers\PageEditActivity; use BookStack\Entities\Managers\PageEditActivity;
@ -27,7 +25,6 @@ class PageController extends Controller
public function __construct(PageRepo $pageRepo) public function __construct(PageRepo $pageRepo)
{ {
$this->pageRepo = $pageRepo; $this->pageRepo = $pageRepo;
parent::__construct();
} }
/** /**

View File

@ -16,14 +16,11 @@ class PageExportController extends Controller
/** /**
* PageExportController constructor. * PageExportController constructor.
* @param PageRepo $pageRepo
* @param ExportService $exportService
*/ */
public function __construct(PageRepo $pageRepo, ExportService $exportService) public function __construct(PageRepo $pageRepo, ExportService $exportService)
{ {
$this->pageRepo = $pageRepo; $this->pageRepo = $pageRepo;
$this->exportService = $exportService; $this->exportService = $exportService;
parent::__construct();
} }
/** /**

View File

@ -1,10 +1,8 @@
<?php namespace BookStack\Http\Controllers; <?php namespace BookStack\Http\Controllers;
use BookStack\Actions\ActivityType;
use BookStack\Entities\Managers\PageContent; use BookStack\Entities\Managers\PageContent;
use BookStack\Entities\Repos\PageRepo; use BookStack\Entities\Repos\PageRepo;
use BookStack\Exceptions\NotFoundException; use BookStack\Exceptions\NotFoundException;
use BookStack\Facades\Activity;
use GatherContent\Htmldiff\Htmldiff; use GatherContent\Htmldiff\Htmldiff;
class PageRevisionController extends Controller class PageRevisionController extends Controller
@ -18,7 +16,6 @@ class PageRevisionController extends Controller
public function __construct(PageRepo $pageRepo) public function __construct(PageRepo $pageRepo)
{ {
$this->pageRepo = $pageRepo; $this->pageRepo = $pageRepo;
parent::__construct();
} }
/** /**

View File

@ -16,7 +16,6 @@ class PageTemplateController extends Controller
public function __construct(PageRepo $pageRepo) public function __construct(PageRepo $pageRepo)
{ {
$this->pageRepo = $pageRepo; $this->pageRepo = $pageRepo;
parent::__construct();
} }
/** /**

View File

@ -20,7 +20,6 @@ class RecycleBinController extends Controller
$this->checkPermission('restrictions-manage-all'); $this->checkPermission('restrictions-manage-all');
return $next($request); return $next($request);
}); });
parent::__construct();
} }

View File

@ -17,7 +17,6 @@ class RoleController extends Controller
public function __construct(PermissionsRepo $permissionsRepo) public function __construct(PermissionsRepo $permissionsRepo)
{ {
$this->permissionsRepo = $permissionsRepo; $this->permissionsRepo = $permissionsRepo;
parent::__construct();
} }
/** /**

View File

@ -26,7 +26,6 @@ class SearchController extends Controller
$this->viewService = $viewService; $this->viewService = $viewService;
$this->searchService = $searchService; $this->searchService = $searchService;
$this->entityContextManager = $entityContextManager; $this->entityContextManager = $entityContextManager;
parent::__construct();
} }
/** /**

View File

@ -15,7 +15,6 @@ class SettingController extends Controller
public function __construct(ImageRepo $imageRepo) public function __construct(ImageRepo $imageRepo)
{ {
$this->imageRepo = $imageRepo; $this->imageRepo = $imageRepo;
parent::__construct();
} }
/** /**

View File

@ -14,7 +14,6 @@ class TagController extends Controller
public function __construct(TagRepo $tagRepo) public function __construct(TagRepo $tagRepo)
{ {
$this->tagRepo = $tagRepo; $this->tagRepo = $tagRepo;
parent::__construct();
} }
/** /**

View File

@ -27,7 +27,6 @@ class UserController extends Controller
$this->userRepo = $userRepo; $this->userRepo = $userRepo;
$this->inviteService = $inviteService; $this->inviteService = $inviteService;
$this->imageRepo = $imageRepo; $this->imageRepo = $imageRepo;
parent::__construct();
} }
/** /**