diff --git a/controllers/BaseApiController.php b/controllers/BaseApiController.php index 56714c91..905de28c 100644 --- a/controllers/BaseApiController.php +++ b/controllers/BaseApiController.php @@ -3,6 +3,7 @@ namespace Grocy\Controllers; use LessQL\Result; +use Psr\Http\Message\ResponseInterface; class BaseApiController extends BaseController { @@ -14,7 +15,7 @@ class BaseApiController extends BaseController protected $OpenApiSpec = null; - protected function ApiResponse(\Psr\Http\Message\ResponseInterface $response, $data, $cache = false) + protected function ApiResponse(ResponseInterface $response, $data, $cache = false) { if ($cache) { @@ -25,19 +26,19 @@ class BaseApiController extends BaseController return $response; } - protected function EmptyApiResponse(\Psr\Http\Message\ResponseInterface $response, $status = 204) + protected function EmptyApiResponse(ResponseInterface $response, $status = 204) { return $response->withStatus($status); } - protected function GenericErrorResponse(\Psr\Http\Message\ResponseInterface $response, $errorMessage, $status = 400) + protected function GenericErrorResponse(ResponseInterface $response, $errorMessage, $status = 400) { return $response->withStatus($status)->withJson([ 'error_message' => $errorMessage ]); } - public function FilteredApiResponse(\Psr\Http\Message\ResponseInterface $response, Result $data, array $query) + public function FilteredApiResponse(ResponseInterface $response, Result $data, array $query) { $data = $this->queryData($data, $query); return $this->ApiResponse($response, $data); diff --git a/controllers/BatteriesApiController.php b/controllers/BatteriesApiController.php index fa054085..3b72d38f 100644 --- a/controllers/BatteriesApiController.php +++ b/controllers/BatteriesApiController.php @@ -5,10 +5,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; use Grocy\Helpers\WebhookRunner; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class BatteriesApiController extends BaseApiController { - public function BatteryDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteryDetails(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -20,12 +22,12 @@ class BatteriesApiController extends BaseApiController } } - public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Current(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->FilteredApiResponse($response, $this->getBatteriesService()->GetCurrent(), $request->getQueryParams()); } - public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TrackChargeCycle(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_BATTERIES_TRACK_CHARGE_CYCLE); @@ -48,7 +50,7 @@ class BatteriesApiController extends BaseApiController } } - public function UndoChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoChargeCycle(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_BATTERIES_UNDO_CHARGE_CYCLE); @@ -63,7 +65,7 @@ class BatteriesApiController extends BaseApiController } } - public function BatteryPrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteryPrintLabel(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { diff --git a/controllers/BatteriesController.php b/controllers/BatteriesController.php index 31fffe66..b5dc275a 100644 --- a/controllers/BatteriesController.php +++ b/controllers/BatteriesController.php @@ -3,12 +3,14 @@ namespace Grocy\Controllers; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class BatteriesController extends BaseController { use GrocycodeTrait; - public function BatteriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteriesList(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -26,12 +28,12 @@ class BatteriesController extends BaseController ]); } - public function BatteriesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteriesSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'batteriessettings'); } - public function BatteryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteryEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['batteryId'] == 'new') { @@ -50,7 +52,7 @@ class BatteriesController extends BaseController } } - public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Journal(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (isset($request->getQueryParams()['months']) && filter_var($request->getQueryParams()['months'], FILTER_VALIDATE_INT) !== false) { @@ -75,7 +77,7 @@ class BatteriesController extends BaseController ]); } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['batteries_due_soon_days']; @@ -110,14 +112,14 @@ class BatteriesController extends BaseController ]); } - public function TrackChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TrackChargeCycle(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'batterytracking', [ 'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE') ]); } - public function BatteryGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteryGrocycodeImage(ServerRequestInterface $request, ResponseInterface $response, array $args) { $gc = new Grocycode(Grocycode::BATTERY, $args['batteryId']); return $this->ServeGrocycodeImage($request, $response, $gc); diff --git a/controllers/CalendarApiController.php b/controllers/CalendarApiController.php index e5196d14..e88fe14d 100644 --- a/controllers/CalendarApiController.php +++ b/controllers/CalendarApiController.php @@ -10,10 +10,12 @@ use Eluceo\iCal\Domain\ValueObject\DateTime; use Eluceo\iCal\Domain\ValueObject\SingleDay; use Eluceo\iCal\Domain\ValueObject\TimeSpan; use Eluceo\iCal\Presentation\Factory\CalendarFactory; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class CalendarApiController extends BaseApiController { - public function Ical(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Ical(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -87,7 +89,7 @@ class CalendarApiController extends BaseApiController } } - public function IcalSharingLink(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function IcalSharingLink(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { diff --git a/controllers/CalendarController.php b/controllers/CalendarController.php index a2ce556e..194623b6 100644 --- a/controllers/CalendarController.php +++ b/controllers/CalendarController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; + class CalendarController extends BaseController { - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'calendar', [ 'fullcalendarEventSources' => $this->getCalendarService()->GetEvents() diff --git a/controllers/ChoresApiController.php b/controllers/ChoresApiController.php index eb9f51fc..fb36380a 100644 --- a/controllers/ChoresApiController.php +++ b/controllers/ChoresApiController.php @@ -5,10 +5,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; use Grocy\Helpers\WebhookRunner; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class ChoresApiController extends BaseApiController { - public function CalculateNextExecutionAssignments(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CalculateNextExecutionAssignments(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -42,7 +44,7 @@ class ChoresApiController extends BaseApiController } } - public function ChoreDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChoreDetails(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -54,12 +56,12 @@ class ChoresApiController extends BaseApiController } } - public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Current(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->FilteredApiResponse($response, $this->getChoresService()->GetCurrent(), $request->getQueryParams()); } - public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TrackChoreExecution(ServerRequestInterface $request, ResponseInterface $response, array $args) { $requestBody = $this->GetParsedAndFilteredRequestBody($request); @@ -99,7 +101,7 @@ class ChoresApiController extends BaseApiController } } - public function UndoChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoChoreExecution(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -114,7 +116,7 @@ class ChoresApiController extends BaseApiController } } - public function ChorePrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChorePrintLabel(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -138,7 +140,7 @@ class ChoresApiController extends BaseApiController } } - public function MergeChores(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MergeChores(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); diff --git a/controllers/ChoresController.php b/controllers/ChoresController.php index 46305fff..c7f5846a 100644 --- a/controllers/ChoresController.php +++ b/controllers/ChoresController.php @@ -3,12 +3,14 @@ namespace Grocy\Controllers; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class ChoresController extends BaseController { use GrocycodeTrait; - public function ChoreEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChoreEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { $usersService = $this->getUsersService(); $users = $usersService->GetUsersAsDto(); @@ -38,7 +40,7 @@ class ChoresController extends BaseController } } - public function ChoresList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChoresList(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -56,12 +58,12 @@ class ChoresController extends BaseController ]); } - public function ChoresSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChoresSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'choressettings'); } - public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Journal(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (isset($request->getQueryParams()['months']) && filter_var($request->getQueryParams()['months'], FILTER_VALIDATE_INT) !== false) { @@ -89,7 +91,7 @@ class ChoresController extends BaseController ]); } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['chores_due_soon_days']; @@ -125,7 +127,7 @@ class ChoresController extends BaseController ]); } - public function TrackChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TrackChoreExecution(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'choretracking', [ 'chores' => $this->getDatabase()->chores()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'), @@ -134,7 +136,7 @@ class ChoresController extends BaseController ]); } - public function ChoreGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChoreGrocycodeImage(ServerRequestInterface $request, ResponseInterface $response, array $args) { $gc = new Grocycode(Grocycode::CHORE, $args['choreId']); return $this->ServeGrocycodeImage($request, $response, $gc); diff --git a/controllers/EquipmentController.php b/controllers/EquipmentController.php index db14fca8..9bbbae80 100644 --- a/controllers/EquipmentController.php +++ b/controllers/EquipmentController.php @@ -2,11 +2,14 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; + class EquipmentController extends BaseController { protected $UserfieldsService; - public function EditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function EditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['equipmentId'] == 'new') { @@ -25,7 +28,7 @@ class EquipmentController extends BaseController } } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'equipment', [ 'equipment' => $this->getDatabase()->equipment()->orderBy('name', 'COLLATE NOCASE'), diff --git a/controllers/FilesApiController.php b/controllers/FilesApiController.php index 45acfce8..dff966f7 100644 --- a/controllers/FilesApiController.php +++ b/controllers/FilesApiController.php @@ -3,11 +3,13 @@ namespace Grocy\Controllers; use Grocy\Services\FilesService; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; use Slim\Exception\HttpNotFoundException; class FilesApiController extends BaseApiController { - public function DeleteFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DeleteFile(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -35,7 +37,7 @@ class FilesApiController extends BaseApiController } } - public function ServeFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ServeFile(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -65,7 +67,7 @@ class FilesApiController extends BaseApiController } } - public function ShowFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShowFile(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -96,7 +98,7 @@ class FilesApiController extends BaseApiController } } - public function UploadFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UploadFile(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { diff --git a/controllers/GenericEntityApiController.php b/controllers/GenericEntityApiController.php index bbaf83c4..bbf70439 100644 --- a/controllers/GenericEntityApiController.php +++ b/controllers/GenericEntityApiController.php @@ -3,11 +3,13 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; use Slim\Exception\HttpBadRequestException; class GenericEntityApiController extends BaseApiController { - public function AddObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddObject(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); @@ -46,7 +48,7 @@ class GenericEntityApiController extends BaseApiController } } - public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DeleteObject(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); @@ -74,7 +76,7 @@ class GenericEntityApiController extends BaseApiController } } - public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function EditObject(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); @@ -116,7 +118,7 @@ class GenericEntityApiController extends BaseApiController } } - public function GetObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetObject(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($this->IsValidExposedEntity($args['entity']) && !$this->IsEntityWithNoListing($args['entity'])) { @@ -142,7 +144,7 @@ class GenericEntityApiController extends BaseApiController } } - public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetObjects(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (!$this->IsValidExposedEntity($args['entity']) || $this->IsEntityWithNoListing($args['entity'])) { @@ -179,7 +181,7 @@ class GenericEntityApiController extends BaseApiController return $this->ApiResponse($response, $objects); } - public function GetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetUserfields(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -191,7 +193,7 @@ class GenericEntityApiController extends BaseApiController } } - public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function SetUserfields(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); diff --git a/controllers/GenericEntityController.php b/controllers/GenericEntityController.php index 2a1b02fe..61b681dd 100644 --- a/controllers/GenericEntityController.php +++ b/controllers/GenericEntityController.php @@ -2,16 +2,19 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; + class GenericEntityController extends BaseController { - public function UserentitiesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserentitiesList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'userentities', [ 'userentities' => $this->getDatabase()->userentities()->orderBy('name', 'COLLATE NOCASE') ]); } - public function UserentityEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserentityEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['userentityId'] == 'new') { @@ -28,7 +31,7 @@ class GenericEntityController extends BaseController } } - public function UserfieldEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserfieldEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['userfieldId'] == 'new') { @@ -49,7 +52,7 @@ class GenericEntityController extends BaseController } } - public function UserfieldsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserfieldsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'userfields', [ 'userfields' => $this->getUserfieldsService()->GetAllFields(), @@ -57,7 +60,7 @@ class GenericEntityController extends BaseController ]); } - public function UserobjectEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserobjectEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { $userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch(); @@ -80,7 +83,7 @@ class GenericEntityController extends BaseController } } - public function UserobjectsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserobjectsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { $userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch(); diff --git a/controllers/LoginController.php b/controllers/LoginController.php index 304b12bc..88ba58dd 100644 --- a/controllers/LoginController.php +++ b/controllers/LoginController.php @@ -3,21 +3,23 @@ namespace Grocy\Controllers; use Grocy\Services\SessionService; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class LoginController extends BaseController { - public function LoginPage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LoginPage(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'login'); } - public function Logout(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Logout(ServerRequestInterface $request, ResponseInterface $response, array $args) { $this->getSessionService()->RemoveSession($_COOKIE[SessionService::SESSION_COOKIE_NAME]); return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/')); } - public function ProcessLogin(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProcessLogin(ServerRequestInterface $request, ResponseInterface $response, array $args) { $authMiddlewareClass = GROCY_AUTH_CLASS; if ($authMiddlewareClass::ProcessLogin($this->GetParsedAndFilteredRequestBody($request))) diff --git a/controllers/OpenApiController.php b/controllers/OpenApiController.php index a39f6ee8..c7a6112d 100644 --- a/controllers/OpenApiController.php +++ b/controllers/OpenApiController.php @@ -3,10 +3,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class OpenApiController extends BaseApiController { - public function ApiKeysList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ApiKeysList(ServerRequestInterface $request, ResponseInterface $response, array $args) { $apiKeys = $this->getDatabase()->api_keys(); if (!User::hasPermissions(User::PERMISSION_ADMIN)) @@ -19,14 +21,14 @@ class OpenApiController extends BaseApiController ]); } - public function CreateNewApiKey(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CreateNewApiKey(ServerRequestInterface $request, ResponseInterface $response, array $args) { $newApiKey = $this->getApiKeyService()->CreateApiKey(); $newApiKeyId = $this->getApiKeyService()->GetApiKeyId($newApiKey); return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl("/manageapikeys?CreatedApiKeyId=$newApiKeyId")); } - public function DocumentationSpec(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DocumentationSpec(ServerRequestInterface $request, ResponseInterface $response, array $args) { $spec = $this->getOpenApiSpec(); @@ -86,7 +88,7 @@ class OpenApiController extends BaseApiController return $this->ApiResponse($response, $spec); } - public function DocumentationUi(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DocumentationUi(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->render($response, 'openapiui'); } diff --git a/controllers/PrintApiController.php b/controllers/PrintApiController.php index 511078ff..c48f0de3 100644 --- a/controllers/PrintApiController.php +++ b/controllers/PrintApiController.php @@ -4,10 +4,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; use Grocy\Services\StockService; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class PrintApiController extends BaseApiController { - public function PrintShoppingListThermal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function PrintShoppingListThermal(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { diff --git a/controllers/RecipesApiController.php b/controllers/RecipesApiController.php index c8a5f433..e017ae00 100644 --- a/controllers/RecipesApiController.php +++ b/controllers/RecipesApiController.php @@ -5,10 +5,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; use Grocy\Helpers\WebhookRunner; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class RecipesApiController extends BaseApiController { - public function AddNotFulfilledProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddNotFulfilledProductsToShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD); @@ -24,7 +26,7 @@ class RecipesApiController extends BaseApiController return $this->EmptyApiResponse($response); } - public function ConsumeRecipe(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ConsumeRecipe(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_CONSUME); @@ -39,7 +41,7 @@ class RecipesApiController extends BaseApiController } } - public function GetRecipeFulfillment(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetRecipeFulfillment(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -65,7 +67,7 @@ class RecipesApiController extends BaseApiController } } - public function CopyRecipe(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CopyRecipe(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -79,7 +81,7 @@ class RecipesApiController extends BaseApiController } } - public function RecipePrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipePrintLabel(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php index 8c6df6c1..942926ae 100644 --- a/controllers/RecipesController.php +++ b/controllers/RecipesController.php @@ -4,12 +4,14 @@ namespace Grocy\Controllers; use Grocy\Services\RecipesService; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class RecipesController extends BaseController { use GrocycodeTrait; - public function MealPlan(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MealPlan(ServerRequestInterface $request, ResponseInterface $response, array $args) { $start = date('Y-m-d'); if (isset($request->getQueryParams()['start']) && IsIsoDate($request->getQueryParams()['start'])) @@ -68,7 +70,7 @@ class RecipesController extends BaseController ]); } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { $recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name', 'COLLATE NOCASE'); $recipesResolved = $this->getRecipesService()->GetRecipesResolved('recipe_id > 0'); @@ -145,7 +147,7 @@ class RecipesController extends BaseController return $this->renderPage($response, 'recipes', $renderArray); } - public function RecipeEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipeEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { $recipeId = $args['recipeId']; @@ -162,7 +164,7 @@ class RecipesController extends BaseController ]); } - public function RecipePosEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipePosEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['recipePosId'] == 'new') { @@ -188,12 +190,12 @@ class RecipesController extends BaseController } } - public function RecipesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipesSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'recipessettings'); } - public function MealPlanSectionEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MealPlanSectionEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['sectionId'] == 'new') { @@ -210,14 +212,14 @@ class RecipesController extends BaseController } } - public function MealPlanSectionsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MealPlanSectionsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'mealplansections', [ 'mealplanSections' => $this->getDatabase()->meal_plan_sections()->where('id > 0')->orderBy('sort_number') ]); } - public function RecipeGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipeGrocycodeImage(ServerRequestInterface $request, ResponseInterface $response, array $args) { $gc = new Grocycode(Grocycode::RECIPE, $args['recipeId']); return $this->ServeGrocycodeImage($request, $response, $gc); diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php index e34d69e0..f0a33fc4 100644 --- a/controllers/StockApiController.php +++ b/controllers/StockApiController.php @@ -6,10 +6,12 @@ use Grocy\Controllers\Users\User; use Grocy\Services\StockService; use Grocy\Helpers\WebhookRunner; use Grocy\Helpers\Grocycode; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class StockApiController extends BaseApiController { - public function AddMissingProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddMissingProductsToShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD); @@ -33,7 +35,7 @@ class StockApiController extends BaseApiController } } - public function AddOverdueProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddOverdueProductsToShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD); @@ -57,7 +59,7 @@ class StockApiController extends BaseApiController } } - public function AddExpiredProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddExpiredProductsToShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD); @@ -81,7 +83,7 @@ class StockApiController extends BaseApiController } } - public function AddProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddProduct(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_PURCHASE); @@ -158,7 +160,7 @@ class StockApiController extends BaseApiController } } - public function AddProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddProductByBarcode(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -171,7 +173,7 @@ class StockApiController extends BaseApiController } } - public function AddProductToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddProductToShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_ADD); @@ -224,7 +226,7 @@ class StockApiController extends BaseApiController } } - public function ClearShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ClearShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_DELETE); @@ -253,7 +255,7 @@ class StockApiController extends BaseApiController } } - public function ConsumeProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ConsumeProduct(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_CONSUME); @@ -324,7 +326,7 @@ class StockApiController extends BaseApiController } } - public function ConsumeProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ConsumeProductByBarcode(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -349,12 +351,12 @@ class StockApiController extends BaseApiController } } - public function CurrentStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CurrentStock(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->ApiResponse($response, $this->getStockService()->GetCurrentStock()); } - public function CurrentVolatileStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CurrentVolatileStock(ServerRequestInterface $request, ResponseInterface $response, array $args) { $nextXDays = 5; @@ -375,7 +377,7 @@ class StockApiController extends BaseApiController ]); } - public function EditStockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function EditStockEntry(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); @@ -433,7 +435,7 @@ class StockApiController extends BaseApiController } } - public function ExternalBarcodeLookup(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ExternalBarcodeLookup(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); @@ -454,7 +456,7 @@ class StockApiController extends BaseApiController } } - public function InventoryProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function InventoryProduct(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_INVENTORY); @@ -524,7 +526,7 @@ class StockApiController extends BaseApiController } } - public function InventoryProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function InventoryProductByBarcode(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -537,7 +539,7 @@ class StockApiController extends BaseApiController } } - public function OpenProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function OpenProduct(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_OPEN); @@ -578,7 +580,7 @@ class StockApiController extends BaseApiController } } - public function OpenProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function OpenProductByBarcode(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -591,7 +593,7 @@ class StockApiController extends BaseApiController } } - public function ProductDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductDetails(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -603,7 +605,7 @@ class StockApiController extends BaseApiController } } - public function ProductDetailsByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductDetailsByBarcode(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -616,7 +618,7 @@ class StockApiController extends BaseApiController } } - public function ProductPriceHistory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductPriceHistory(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -628,7 +630,7 @@ class StockApiController extends BaseApiController } } - public function ProductStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductStockEntries(ServerRequestInterface $request, ResponseInterface $response, array $args) { $allowSubproductSubstitution = false; if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN) !== false) @@ -639,12 +641,12 @@ class StockApiController extends BaseApiController return $this->FilteredApiResponse($response, $this->getStockService()->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution, true), $request->getQueryParams()); } - public function LocationStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LocationStockEntries(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->FilteredApiResponse($response, $this->getStockService()->GetLocationStockEntries($args['locationId']), $request->getQueryParams()); } - public function ProductStockLocations(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductStockLocations(ServerRequestInterface $request, ResponseInterface $response, array $args) { $allowSubproductSubstitution = false; if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN) !== false) @@ -655,7 +657,7 @@ class StockApiController extends BaseApiController return $this->FilteredApiResponse($response, $this->getStockService()->GetProductStockLocations($args['productId'], $allowSubproductSubstitution), $request->getQueryParams()); } - public function ProductPrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductPrintLabel(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -679,7 +681,7 @@ class StockApiController extends BaseApiController } } - public function StockEntryPrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryPrintLabel(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -709,7 +711,7 @@ class StockApiController extends BaseApiController } } - public function RemoveProductFromShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RemoveProductFromShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_DELETE); @@ -750,7 +752,7 @@ class StockApiController extends BaseApiController } } - public function StockBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockBooking(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -769,12 +771,12 @@ class StockApiController extends BaseApiController } } - public function StockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntry(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->ApiResponse($response, $this->getStockService()->GetStockEntry($args['entryId'])); } - public function StockTransactions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockTransactions(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -792,7 +794,7 @@ class StockApiController extends BaseApiController } } - public function TransferProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TransferProduct(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_TRANSFER); @@ -837,7 +839,7 @@ class StockApiController extends BaseApiController } } - public function TransferProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TransferProductByBarcode(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -862,7 +864,7 @@ class StockApiController extends BaseApiController } } - public function UndoBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoBooking(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); @@ -877,7 +879,7 @@ class StockApiController extends BaseApiController } } - public function UndoTransaction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoTransaction(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); @@ -892,7 +894,7 @@ class StockApiController extends BaseApiController } } - public function MergeProducts(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MergeProducts(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); diff --git a/controllers/StockController.php b/controllers/StockController.php index ba3cc738..f10aa7bc 100644 --- a/controllers/StockController.php +++ b/controllers/StockController.php @@ -4,12 +4,14 @@ namespace Grocy\Controllers; use Grocy\Helpers\Grocycode; use Grocy\Services\RecipesService; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class StockController extends BaseController { use GrocycodeTrait; - public function Consume(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Consume(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'consume', [ 'products' => $this->getDatabase()->products()->where('active = 1')->where('id IN (SELECT product_id from stock_current WHERE amount_aggregated > 0)')->orderBy('name'), @@ -21,7 +23,7 @@ class StockController extends BaseController ]); } - public function Inventory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Inventory(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'inventory', [ 'products' => $this->getDatabase()->products()->where('active = 1 AND no_own_stock = 0')->orderBy('name', 'COLLATE NOCASE'), @@ -34,7 +36,7 @@ class StockController extends BaseController ]); } - public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Journal(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (isset($request->getQueryParams()['months']) && filter_var($request->getQueryParams()['months'], FILTER_VALIDATE_INT) !== false) { @@ -66,7 +68,7 @@ class StockController extends BaseController ]); } - public function LocationContentSheet(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LocationContentSheet(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'locationcontentsheet', [ 'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'), @@ -76,7 +78,7 @@ class StockController extends BaseController ]); } - public function LocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LocationEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['locationId'] == 'new') { @@ -95,7 +97,7 @@ class StockController extends BaseController } } - public function LocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LocationsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'locations', [ 'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'), @@ -104,7 +106,7 @@ class StockController extends BaseController ]); } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_due_soon_days']; @@ -120,7 +122,7 @@ class StockController extends BaseController ]); } - public function ProductBarcodesEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductBarcodesEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { $product = null; @@ -155,7 +157,7 @@ class StockController extends BaseController } } - public function ProductEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['productId'] == 'new') { @@ -195,13 +197,13 @@ class StockController extends BaseController } } - public function ProductGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductGrocycodeImage(ServerRequestInterface $request, ResponseInterface $response, array $args) { $gc = new Grocycode(Grocycode::PRODUCT, $args['productId']); return $this->ServeGrocycodeImage($request, $response, $gc); } - public function ProductGroupEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductGroupEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['productGroupId'] == 'new') { @@ -220,7 +222,7 @@ class StockController extends BaseController } } - public function ProductGroupsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductGroupsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'productgroups', [ 'productGroups' => $this->getDatabase()->product_groups()->orderBy('name', 'COLLATE NOCASE'), @@ -230,7 +232,7 @@ class StockController extends BaseController ]); } - public function ProductsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { $products = $this->getDatabase()->products(); if (!isset($request->getQueryParams()['include_disabled'])) @@ -256,7 +258,7 @@ class StockController extends BaseController ]); } - public function Purchase(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Purchase(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'purchase', [ 'products' => $this->getDatabase()->products()->where('active = 1 AND no_own_stock = 0')->orderBy('name', 'COLLATE NOCASE'), @@ -269,7 +271,7 @@ class StockController extends BaseController ]); } - public function QuantityUnitConversionEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitConversionEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { $product = null; @@ -308,7 +310,7 @@ class StockController extends BaseController } } - public function QuantityUnitEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['quantityunitId'] == 'new') { @@ -335,14 +337,14 @@ class StockController extends BaseController } } - public function QuantityUnitPluralFormTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitPluralFormTesting(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'quantityunitpluraltesting', [ 'quantityUnits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE') ]); } - public function QuantityUnitsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'quantityunits', [ 'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'), @@ -351,7 +353,7 @@ class StockController extends BaseController ]); } - public function ShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingList(ServerRequestInterface $request, ResponseInterface $response, array $args) { $listId = 1; @@ -375,7 +377,7 @@ class StockController extends BaseController ]); } - public function ShoppingListEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingListEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['listId'] == 'new') { @@ -394,7 +396,7 @@ class StockController extends BaseController } } - public function ShoppingListItemEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingListItemEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['itemId'] == 'new') { @@ -421,14 +423,14 @@ class StockController extends BaseController } } - public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingListSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'shoppinglistsettings', [ 'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE') ]); } - public function ShoppingLocationEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingLocationEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['shoppingLocationId'] == 'new') { @@ -447,7 +449,7 @@ class StockController extends BaseController } } - public function ShoppingLocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingLocationsList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'shoppinglocations', [ 'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name', 'COLLATE NOCASE'), @@ -456,7 +458,7 @@ class StockController extends BaseController ]); } - public function StockEntryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'stockentryform', [ 'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(), @@ -467,14 +469,14 @@ class StockController extends BaseController ]); } - public function StockEntryGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryGrocycodeImage(ServerRequestInterface $request, ResponseInterface $response, array $args) { $stockEntry = $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(); $gc = new Grocycode(Grocycode::PRODUCT, $stockEntry->product_id, [$stockEntry->stock_id]); return $this->ServeGrocycodeImage($request, $response, $gc); } - public function StockEntryGrocycodeLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryGrocycodeLabel(ServerRequestInterface $request, ResponseInterface $response, array $args) { $stockEntry = $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(); return $this->renderPage($response, 'stockentrylabel', [ @@ -483,7 +485,7 @@ class StockController extends BaseController ]); } - public function StockSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'stocksettings', [ 'locations' => $this->getDatabase()->locations()->orderBy('name', 'COLLATE NOCASE'), @@ -492,7 +494,7 @@ class StockController extends BaseController ]); } - public function Stockentries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Stockentries(ServerRequestInterface $request, ResponseInterface $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_due_soon_days']; @@ -512,7 +514,7 @@ class StockController extends BaseController ]); } - public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Transfer(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'transfer', [ 'products' => $this->getDatabase()->products()->where('active = 1')->where('no_own_stock = 0 AND id IN (SELECT product_id from stock_current WHERE amount_aggregated > 0)')->orderBy('name', 'COLLATE NOCASE'), @@ -523,7 +525,7 @@ class StockController extends BaseController ]); } - public function JournalSummary(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function JournalSummary(ServerRequestInterface $request, ResponseInterface $response, array $args) { $entries = $this->getDatabase()->uihelper_stock_journal_summary(); if (isset($request->getQueryParams()['product_id'])) diff --git a/controllers/SystemApiController.php b/controllers/SystemApiController.php index 913edb95..a430239f 100644 --- a/controllers/SystemApiController.php +++ b/controllers/SystemApiController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; + class SystemApiController extends BaseApiController { - public function GetConfig(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetConfig(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -31,19 +34,19 @@ class SystemApiController extends BaseApiController } } - public function GetDbChangedTime(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetDbChangedTime(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->ApiResponse($response, [ 'changed_time' => $this->getDatabaseService()->GetDbChangedTime() ]); } - public function GetSystemInfo(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetSystemInfo(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->ApiResponse($response, $this->getApplicationService()->GetSystemInfo()); } - public function GetSystemTime(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetSystemTime(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -67,7 +70,7 @@ class SystemApiController extends BaseApiController } } - public function LogMissingLocalization(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LogMissingLocalization(ServerRequestInterface $request, ResponseInterface $response, array $args) { if (GROCY_MODE === 'dev') { @@ -85,7 +88,7 @@ class SystemApiController extends BaseApiController } } - public function GetLocalizationStrings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetLocalizationStrings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->ApiResponse($response, json_decode($this->getLocalizationService()->GetPoAsJsonString()), true); } diff --git a/controllers/SystemController.php b/controllers/SystemController.php index 119964cf..3ee52ab6 100644 --- a/controllers/SystemController.php +++ b/controllers/SystemController.php @@ -4,10 +4,12 @@ namespace Grocy\Controllers; use Grocy\Services\DatabaseMigrationService; use Grocy\Services\DemoDataGeneratorService; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class SystemController extends BaseController { - public function About(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function About(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'about', [ 'system_info' => $this->getApplicationService()->GetSystemInfo(), @@ -15,12 +17,12 @@ class SystemController extends BaseController ]); } - public function BarcodeScannerTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BarcodeScannerTesting(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'barcodescannertesting'); } - public function Root(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Root(ServerRequestInterface $request, ResponseInterface $response, array $args) { // Schema migration is done here $databaseMigrationService = DatabaseMigrationService::getInstance(); diff --git a/controllers/TasksApiController.php b/controllers/TasksApiController.php index 5ccffc0d..5075219d 100644 --- a/controllers/TasksApiController.php +++ b/controllers/TasksApiController.php @@ -3,15 +3,17 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class TasksApiController extends BaseApiController { - public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Current(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->FilteredApiResponse($response, $this->getTasksService()->GetCurrent(), $request->getQueryParams()); } - public function MarkTaskAsCompleted(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MarkTaskAsCompleted(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_TASKS_MARK_COMPLETED); @@ -35,7 +37,7 @@ class TasksApiController extends BaseApiController } } - public function UndoTask(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoTask(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_TASKS_UNDO_EXECUTION); diff --git a/controllers/TasksController.php b/controllers/TasksController.php index 3c6a0282..11a98761 100644 --- a/controllers/TasksController.php +++ b/controllers/TasksController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; + class TasksController extends BaseController { - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(ServerRequestInterface $request, ResponseInterface $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['tasks_due_soon_days']; @@ -48,7 +51,7 @@ class TasksController extends BaseController ]); } - public function TaskCategoriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TaskCategoriesList(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'taskcategories', [ 'taskCategories' => $this->getDatabase()->task_categories()->orderBy('name', 'COLLATE NOCASE'), @@ -57,7 +60,7 @@ class TasksController extends BaseController ]); } - public function TaskCategoryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TaskCategoryEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['categoryId'] == 'new') { @@ -76,7 +79,7 @@ class TasksController extends BaseController } } - public function TaskEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TaskEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['taskId'] == 'new') { @@ -99,7 +102,7 @@ class TasksController extends BaseController } } - public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TasksSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'taskssettings'); } diff --git a/controllers/UsersApiController.php b/controllers/UsersApiController.php index bc724603..44efb233 100644 --- a/controllers/UsersApiController.php +++ b/controllers/UsersApiController.php @@ -3,10 +3,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class UsersApiController extends BaseApiController { - public function AddPermission(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddPermission(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -29,7 +31,7 @@ class UsersApiController extends BaseApiController } } - public function CreateUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CreateUser(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_USERS_CREATE); $requestBody = $this->GetParsedAndFilteredRequestBody($request); @@ -50,7 +52,7 @@ class UsersApiController extends BaseApiController } } - public function DeleteUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DeleteUser(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_USERS_EDIT); try @@ -64,7 +66,7 @@ class UsersApiController extends BaseApiController } } - public function EditUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function EditUser(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['userId'] == GROCY_USER_ID) { @@ -88,7 +90,7 @@ class UsersApiController extends BaseApiController } } - public function GetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetUserSetting(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -101,7 +103,7 @@ class UsersApiController extends BaseApiController } } - public function GetUserSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetUserSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -113,7 +115,7 @@ class UsersApiController extends BaseApiController } } - public function GetUsers(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetUsers(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_USERS_READ); try @@ -126,7 +128,7 @@ class UsersApiController extends BaseApiController } } - public function CurrentUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CurrentUser(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -138,7 +140,7 @@ class UsersApiController extends BaseApiController } } - public function ListPermissions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ListPermissions(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -159,7 +161,7 @@ class UsersApiController extends BaseApiController } } - public function SetPermissions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function SetPermissions(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -204,7 +206,7 @@ class UsersApiController extends BaseApiController } } - public function SetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function SetUserSetting(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { @@ -219,7 +221,7 @@ class UsersApiController extends BaseApiController } } - public function DeleteUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DeleteUserSetting(ServerRequestInterface $request, ResponseInterface $response, array $args) { try { diff --git a/controllers/UsersController.php b/controllers/UsersController.php index 0037f7e5..cb45f061 100644 --- a/controllers/UsersController.php +++ b/controllers/UsersController.php @@ -3,10 +3,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class UsersController extends BaseController { - public function PermissionList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function PermissionList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_USERS_READ); return $this->renderPage($response, 'userpermissions', [ @@ -16,7 +18,7 @@ class UsersController extends BaseController ]); } - public function UserEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserEditForm(ServerRequestInterface $request, ResponseInterface $response, array $args) { if ($args['userId'] == 'new') { @@ -46,7 +48,7 @@ class UsersController extends BaseController } } - public function UserSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserSettings(ServerRequestInterface $request, ResponseInterface $response, array $args) { return $this->renderPage($response, 'usersettings', [ 'languages' => array_filter(scandir(__DIR__ . '/../localization'), function ($item) { @@ -60,7 +62,7 @@ class UsersController extends BaseController ]); } - public function UsersList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UsersList(ServerRequestInterface $request, ResponseInterface $response, array $args) { User::checkPermission($request, User::PERMISSION_USERS_READ); return $this->renderPage($response, 'users', [