diff --git a/controllers/BaseApiController.php b/controllers/BaseApiController.php index e7014962..6fb2a4bf 100644 --- a/controllers/BaseApiController.php +++ b/controllers/BaseApiController.php @@ -3,6 +3,7 @@ namespace Grocy\Controllers; use LessQL\Result; +use Psr\Http\Message\ResponseInterface as Response; 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(Response $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(Response $response, $status = 204) { return $response->withStatus($status); } - protected function GenericErrorResponse(\Psr\Http\Message\ResponseInterface $response, $errorMessage, $status = 400) + protected function GenericErrorResponse(Response $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(Response $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..b5cd7430 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class BatteriesApiController extends BaseApiController { - public function BatteryDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteryDetails(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { try { diff --git a/controllers/BatteriesController.php b/controllers/BatteriesController.php index d5c8519b..9beaaac1 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class BatteriesController extends BaseController { use GrocycodeTrait; - public function BatteriesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function BatteriesList(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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..587b8397 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class CalendarApiController extends BaseApiController { - public function Ical(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Ical(Request $request, Response $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(Request $request, Response $response, array $args) { try { diff --git a/controllers/CalendarController.php b/controllers/CalendarController.php index a2ce556e..5aefd3cc 100644 --- a/controllers/CalendarController.php +++ b/controllers/CalendarController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; + class CalendarController extends BaseController { - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(Request $request, Response $response, array $args) { return $this->renderPage($response, 'calendar', [ 'fullcalendarEventSources' => $this->getCalendarService()->GetEvents() diff --git a/controllers/ChoresApiController.php b/controllers/ChoresApiController.php index eb9f51fc..e8a6d2f7 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class ChoresApiController extends BaseApiController { - public function CalculateNextExecutionAssignments(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function CalculateNextExecutionAssignments(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); diff --git a/controllers/ChoresController.php b/controllers/ChoresController.php index 46305fff..ebed7ab8 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class ChoresController extends BaseController { use GrocycodeTrait; - public function ChoreEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ChoreEditForm(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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..dd638bec 100644 --- a/controllers/EquipmentController.php +++ b/controllers/EquipmentController.php @@ -2,11 +2,14 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; + class EquipmentController extends BaseController { protected $UserfieldsService; - public function EditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function EditForm(Request $request, Response $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(Request $request, Response $response, array $args) { return $this->renderPage($response, 'equipment', [ 'equipment' => $this->getDatabase()->equipment()->orderBy('name', 'COLLATE NOCASE'), diff --git a/controllers/ExceptionController.php b/controllers/ExceptionController.php index 73e6f46b..9e465250 100644 --- a/controllers/ExceptionController.php +++ b/controllers/ExceptionController.php @@ -17,9 +17,6 @@ class ExceptionController extends BaseApiController $this->app = $app; } - /** - * @var \Slim\App - */ private $app; public function __invoke(ServerRequestInterface $request, Throwable $exception, bool $displayErrorDetails, bool $logErrors, bool $logErrorDetails, ?LoggerInterface $logger = null) diff --git a/controllers/FilesApiController.php b/controllers/FilesApiController.php index 45acfce8..ff16f0f7 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; 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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { try { @@ -118,11 +120,6 @@ class FilesApiController extends BaseApiController } } - /** - * @param string $fileName base64-encoded file-name - * @return false|string the decoded file-name - * @throws \Exception if the file-name is invalid. - */ protected function checkFileName(string $fileName) { if (IsValidFileName(base64_decode($fileName))) @@ -137,12 +134,6 @@ class FilesApiController extends BaseApiController return $fileName; } - /** - * @param string $group The group the requested files belongs to. - * @param string $fileName The name of the requested file. - * @param array $queryParams Parameter, e.g. for scaling. Optional. - * @return string - */ protected function getFilePath(string $group, string $fileName, array $queryParams = []) { $forceServeAs = null; diff --git a/controllers/GenericEntityApiController.php b/controllers/GenericEntityApiController.php index c939a6f1..881d690c 100644 --- a/controllers/GenericEntityApiController.php +++ b/controllers/GenericEntityApiController.php @@ -3,11 +3,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; -use Slim\Exception\HttpBadRequestException; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class GenericEntityApiController extends BaseApiController { - public function AddObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddObject(Request $request, Response $response, array $args) { if ($args['entity'] == 'shopping_list' || $args['entity'] == 'shopping_lists') { @@ -71,7 +72,7 @@ class GenericEntityApiController extends BaseApiController } } - public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function DeleteObject(Request $request, Response $response, array $args) { if ($args['entity'] == 'shopping_list' || $args['entity'] == 'shopping_lists') { @@ -121,7 +122,7 @@ class GenericEntityApiController extends BaseApiController } } - public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function EditObject(Request $request, Response $response, array $args) { if ($args['entity'] == 'shopping_list' || $args['entity'] == 'shopping_lists') { @@ -187,7 +188,7 @@ class GenericEntityApiController extends BaseApiController } } - public function GetObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetObject(Request $request, Response $response, array $args) { if ($this->IsValidExposedEntity($args['entity']) && !$this->IsEntityWithNoListing($args['entity'])) { @@ -213,7 +214,7 @@ class GenericEntityApiController extends BaseApiController } } - public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetObjects(Request $request, Response $response, array $args) { if (!$this->IsValidExposedEntity($args['entity']) || $this->IsEntityWithNoListing($args['entity'])) { @@ -250,7 +251,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(Request $request, Response $response, array $args) { try { @@ -262,7 +263,7 @@ class GenericEntityApiController extends BaseApiController } } - public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function SetUserfields(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_MASTER_DATA_EDIT); diff --git a/controllers/GenericEntityController.php b/controllers/GenericEntityController.php index 2a1b02fe..6378d493 100644 --- a/controllers/GenericEntityController.php +++ b/controllers/GenericEntityController.php @@ -2,16 +2,19 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; + class GenericEntityController extends BaseController { - public function UserentitiesList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UserentitiesList(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { $userentity = $this->getDatabase()->userentities()->where('name = :1', $args['userentityName'])->fetch(); diff --git a/controllers/GrocycodeTrait.php b/controllers/GrocycodeTrait.php index 28453a44..fcc38eae 100644 --- a/controllers/GrocycodeTrait.php +++ b/controllers/GrocycodeTrait.php @@ -3,14 +3,14 @@ namespace Grocy\Controllers; use Grocy\Helpers\Grocycode; -use Psr\Http\Message\ServerRequestInterface; -use Psr\Http\Message\ResponseInterface; use jucksearm\barcode\lib\BarcodeFactory; use jucksearm\barcode\lib\DatamatrixFactory; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; trait GrocycodeTrait { - public function ServeGrocycodeImage(ServerRequestInterface $request, ResponseInterface $response, Grocycode $grocycode) + public function ServeGrocycodeImage(Request $request, Response $response, Grocycode $grocycode) { $size = $request->getQueryParam('size', null); diff --git a/controllers/LoginController.php b/controllers/LoginController.php index 304b12bc..f4ee0f65 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class LoginController extends BaseController { - public function LoginPage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LoginPage(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { $authMiddlewareClass = GROCY_AUTH_CLASS; if ($authMiddlewareClass::ProcessLogin($this->GetParsedAndFilteredRequestBody($request))) diff --git a/controllers/OpenApiController.php b/controllers/OpenApiController.php index 1e05f3cd..d7b18f07 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class OpenApiController extends BaseApiController { - public function ApiKeysList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ApiKeysList(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { $spec = $this->getOpenApiSpec(); @@ -36,7 +38,8 @@ class OpenApiController extends BaseApiController $spec->info->description = str_replace('PlaceHolderManageApiKeysUrl', $this->AppContainer->get('UrlManager')->ConstructUrl('/manageapikeys'), $spec->info->description); $spec->servers[0]->url = $this->AppContainer->get('UrlManager')->ConstructUrl('/api'); - $spec->components->schemas->ExposedEntity_IncludingUserEntities = clone $spec->components->schemas->StringEnumTemplate;; + $spec->components->schemas->ExposedEntity_IncludingUserEntities = clone $spec->components->schemas->StringEnumTemplate; + ; foreach ($this->getUserfieldsService()->GetEntities() as $userEntity) { array_push($spec->components->schemas->ExposedEntity_IncludingUserEntities->enum, $userEntity); @@ -87,7 +90,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(Request $request, Response $response, array $args) { return $this->render($response, 'openapiui'); } diff --git a/controllers/PrintApiController.php b/controllers/PrintApiController.php index 511078ff..881b6751 100644 --- a/controllers/PrintApiController.php +++ b/controllers/PrintApiController.php @@ -3,11 +3,12 @@ namespace Grocy\Controllers; use Grocy\Controllers\Users\User; -use Grocy\Services\StockService; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class PrintApiController extends BaseApiController { - public function PrintShoppingListThermal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function PrintShoppingListThermal(Request $request, Response $response, array $args) { try { diff --git a/controllers/RecipesApiController.php b/controllers/RecipesApiController.php index c8a5f433..36e76020 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class RecipesApiController extends BaseApiController { - public function AddNotFulfilledProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddNotFulfilledProductsToShoppingList(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { try { diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php index da65ddeb..87642af7 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class RecipesController extends BaseController { use GrocycodeTrait; - public function MealPlan(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MealPlan(Request $request, Response $response, array $args) { $start = date('Y-m-d'); if (isset($request->getQueryParams()['start']) && IsIsoDate($request->getQueryParams()['start'])) @@ -69,7 +71,7 @@ class RecipesController extends BaseController ]); } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(Request $request, Response $response, array $args) { $recipes = $this->getDatabase()->recipes()->where('type', RecipesService::RECIPE_TYPE_NORMAL)->orderBy('name', 'COLLATE NOCASE'); $recipesResolved = $this->getRecipesService()->GetRecipesResolved('recipe_id > 0'); @@ -147,7 +149,7 @@ class RecipesController extends BaseController return $this->renderPage($response, 'recipes', $viewData); } - public function RecipeEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipeEditForm(Request $request, Response $response, array $args) { $recipeId = $args['recipeId']; @@ -164,7 +166,7 @@ class RecipesController extends BaseController ]); } - public function RecipePosEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipePosEditForm(Request $request, Response $response, array $args) { if ($args['recipePosId'] == 'new') { @@ -190,12 +192,12 @@ class RecipesController extends BaseController } } - public function RecipesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RecipesSettings(Request $request, Response $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(Request $request, Response $response, array $args) { if ($args['sectionId'] == 'new') { @@ -212,14 +214,14 @@ class RecipesController extends BaseController } } - public function MealPlanSectionsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MealPlanSectionsList(Request $request, Response $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(Request $request, Response $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 e92ef452..0def9cd0 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class StockApiController extends BaseApiController { - public function AddMissingProductsToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddMissingProductsToShoppingList(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { try { @@ -603,7 +605,7 @@ class StockApiController extends BaseApiController } } - public function ProductDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductDetails(Request $request, Response $response, array $args) { try { @@ -615,7 +617,7 @@ class StockApiController extends BaseApiController } } - public function ProductDetailsByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductDetailsByBarcode(Request $request, Response $response, array $args) { try { @@ -628,7 +630,7 @@ class StockApiController extends BaseApiController } } - public function ProductPriceHistory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductPriceHistory(Request $request, Response $response, array $args) { try { @@ -640,7 +642,7 @@ class StockApiController extends BaseApiController } } - public function ProductStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductStockEntries(Request $request, Response $response, array $args) { $allowSubproductSubstitution = false; if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN) !== false) @@ -651,12 +653,12 @@ class StockApiController extends BaseApiController return $this->FilteredApiResponse($response, $this->getStockService()->GetProductStockEntries($args['productId'], false, $allowSubproductSubstitution), $request->getQueryParams()); } - public function LocationStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function LocationStockEntries(Request $request, Response $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(Request $request, Response $response, array $args) { $allowSubproductSubstitution = false; if (isset($request->getQueryParams()['include_sub_products']) && filter_var($request->getQueryParams()['include_sub_products'], FILTER_VALIDATE_BOOLEAN) !== false) @@ -667,7 +669,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(Request $request, Response $response, array $args) { try { @@ -691,7 +693,7 @@ class StockApiController extends BaseApiController } } - public function StockEntryPrintLabel(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryPrintLabel(Request $request, Response $response, array $args) { try { @@ -721,7 +723,7 @@ class StockApiController extends BaseApiController } } - public function RemoveProductFromShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function RemoveProductFromShoppingList(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_SHOPPINGLIST_ITEMS_DELETE); @@ -762,7 +764,7 @@ class StockApiController extends BaseApiController } } - public function StockBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockBooking(Request $request, Response $response, array $args) { try { @@ -781,12 +783,12 @@ class StockApiController extends BaseApiController } } - public function StockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntry(Request $request, Response $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(Request $request, Response $response, array $args) { try { @@ -804,7 +806,7 @@ class StockApiController extends BaseApiController } } - public function TransferProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TransferProduct(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_TRANSFER); @@ -849,7 +851,7 @@ class StockApiController extends BaseApiController } } - public function TransferProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TransferProductByBarcode(Request $request, Response $response, array $args) { try { @@ -874,7 +876,7 @@ class StockApiController extends BaseApiController } } - public function UndoBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoBooking(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); @@ -889,7 +891,7 @@ class StockApiController extends BaseApiController } } - public function UndoTransaction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function UndoTransaction(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); @@ -904,7 +906,7 @@ class StockApiController extends BaseApiController } } - public function MergeProducts(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function MergeProducts(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_STOCK_EDIT); diff --git a/controllers/StockController.php b/controllers/StockController.php index 76cad254..46c57197 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class StockController extends BaseController { use GrocycodeTrait; - public function Consume(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Consume(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -113,7 +115,7 @@ class StockController extends BaseController ]); } - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(Request $request, Response $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_due_soon_days']; @@ -129,7 +131,7 @@ class StockController extends BaseController ]); } - public function ProductBarcodesEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductBarcodesEditForm(Request $request, Response $response, array $args) { $product = null; if (isset($request->getQueryParams()['product'])) @@ -163,7 +165,7 @@ class StockController extends BaseController } } - public function ProductEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductEditForm(Request $request, Response $response, array $args) { if ($args['productId'] == 'new') { @@ -205,13 +207,13 @@ class StockController extends BaseController } } - public function ProductGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductGrocycodeImage(Request $request, Response $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(Request $request, Response $response, array $args) { if ($args['productGroupId'] == 'new') { @@ -230,7 +232,7 @@ class StockController extends BaseController } } - public function ProductGroupsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductGroupsList(Request $request, Response $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -249,7 +251,7 @@ class StockController extends BaseController ]); } - public function ProductsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ProductsList(Request $request, Response $response, array $args) { $products = $this->getDatabase()->products(); if (!isset($request->getQueryParams()['include_disabled'])) @@ -279,7 +281,7 @@ class StockController extends BaseController ]); } - public function Purchase(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Purchase(Request $request, Response $response, array $args) { return $this->renderPage($response, 'purchase', [ 'products' => $this->getDatabase()->products()->where('active = 1 AND no_own_stock = 0')->orderBy('name', 'COLLATE NOCASE'), @@ -292,7 +294,7 @@ class StockController extends BaseController ]); } - public function QuantityUnitConversionEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitConversionEditForm(Request $request, Response $response, array $args) { $product = null; if (isset($request->getQueryParams()['product'])) @@ -330,7 +332,7 @@ class StockController extends BaseController } } - public function QuantityUnitEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitEditForm(Request $request, Response $response, array $args) { if ($args['quantityunitId'] == 'new') { @@ -357,14 +359,14 @@ class StockController extends BaseController } } - public function QuantityUnitPluralFormTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitPluralFormTesting(Request $request, Response $response, array $args) { return $this->renderPage($response, 'quantityunitpluraltesting', [ 'quantityUnits' => $this->getDatabase()->quantity_units()->where('active = 1')->orderBy('name', 'COLLATE NOCASE') ]); } - public function QuantityUnitsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitsList(Request $request, Response $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -382,7 +384,7 @@ class StockController extends BaseController ]); } - public function ShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingList(Request $request, Response $response, array $args) { $listId = 1; if (isset($request->getQueryParams()['list'])) @@ -407,7 +409,7 @@ class StockController extends BaseController ]); } - public function ShoppingListEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingListEditForm(Request $request, Response $response, array $args) { if ($args['listId'] == 'new') { @@ -426,7 +428,7 @@ class StockController extends BaseController } } - public function ShoppingListItemEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingListItemEditForm(Request $request, Response $response, array $args) { if ($args['itemId'] == 'new') { @@ -455,14 +457,14 @@ class StockController extends BaseController } } - public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingListSettings(Request $request, Response $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(Request $request, Response $response, array $args) { if ($args['shoppingLocationId'] == 'new') { @@ -481,7 +483,7 @@ class StockController extends BaseController } } - public function ShoppingLocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function ShoppingLocationsList(Request $request, Response $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -499,7 +501,7 @@ class StockController extends BaseController ]); } - public function StockEntryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryEditForm(Request $request, Response $response, array $args) { return $this->renderPage($response, 'stockentryform', [ 'stockEntry' => $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(), @@ -510,14 +512,14 @@ class StockController extends BaseController ]); } - public function StockEntryGrocycodeImage(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockEntryGrocycodeImage(Request $request, Response $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(Request $request, Response $response, array $args) { $stockEntry = $this->getDatabase()->stock()->where('id', $args['entryId'])->fetch(); return $this->renderPage($response, 'stockentrylabel', [ @@ -526,7 +528,7 @@ class StockController extends BaseController ]); } - public function StockSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function StockSettings(Request $request, Response $response, array $args) { return $this->renderPage($response, 'stocksettings', [ 'locations' => $this->getDatabase()->locations()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'), @@ -535,7 +537,7 @@ class StockController extends BaseController ]); } - public function Stockentries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Stockentries(Request $request, Response $response, array $args) { $usersService = $this->getUsersService(); $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_due_soon_days']; @@ -555,7 +557,7 @@ class StockController extends BaseController ]); } - public function Transfer(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Transfer(Request $request, Response $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'), @@ -566,7 +568,7 @@ class StockController extends BaseController ]); } - public function JournalSummary(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function JournalSummary(Request $request, Response $response, array $args) { $entries = $this->getDatabase()->uihelper_stock_journal_summary(); if (isset($request->getQueryParams()['product_id'])) @@ -591,7 +593,7 @@ class StockController extends BaseController ]); } - public function QuantityUnitConversionsResolved(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function QuantityUnitConversionsResolved(Request $request, Response $response, array $args) { $product = null; if (isset($request->getQueryParams()['product'])) diff --git a/controllers/StockReportsController.php b/controllers/StockReportsController.php index 4c81a028..214dd799 100644 --- a/controllers/StockReportsController.php +++ b/controllers/StockReportsController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; + class StockReportsController extends BaseController { - public function Spendings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Spendings(Request $request, Response $response, array $args) { if (isset($request->getQueryParams()['start_date']) && isset($request->getQueryParams()['end_date']) && IsIsoDate($request->getQueryParams()['start_date']) && IsIsoDate($request->getQueryParams()['end_date'])) { diff --git a/controllers/SystemApiController.php b/controllers/SystemApiController.php index 913edb95..b5d62f19 100644 --- a/controllers/SystemApiController.php +++ b/controllers/SystemApiController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; + class SystemApiController extends BaseApiController { - public function GetConfig(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function GetConfig(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { return $this->ApiResponse($response, json_decode($this->getLocalizationService()->GetPoAsJsonString()), true); } diff --git a/controllers/SystemController.php b/controllers/SystemController.php index 4371f632..c5685b21 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class SystemController extends BaseController { - public function About(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function About(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { // Schema migration is done here $databaseMigrationService = DatabaseMigrationService::getInstance(); @@ -35,14 +37,6 @@ class SystemController extends BaseController return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl($this->GetEntryPageRelative())); } - /** - * Get the entry page of the application based on the value of the entry page setting. - * - * We fallback to the about page when no entry page is specified or - * when the specified entry page has been disabled. - * - * @return string - */ private function GetEntryPageRelative() { if (defined('GROCY_ENTRY_PAGE')) diff --git a/controllers/TasksApiController.php b/controllers/TasksApiController.php index 5ccffc0d..ae0d0939 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class TasksApiController extends BaseApiController { - public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Current(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_TASKS_UNDO_EXECUTION); diff --git a/controllers/TasksController.php b/controllers/TasksController.php index 481996db..d46a5428 100644 --- a/controllers/TasksController.php +++ b/controllers/TasksController.php @@ -2,9 +2,12 @@ namespace Grocy\Controllers; +use Psr\Http\Message\ResponseInterface as Response; +use Psr\Http\Message\ServerRequestInterface as Request; + class TasksController extends BaseController { - public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function Overview(Request $request, Response $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(Request $request, Response $response, array $args) { if (isset($request->getQueryParams()['include_disabled'])) { @@ -66,7 +69,7 @@ class TasksController extends BaseController ]); } - public function TaskCategoryEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TaskCategoryEditForm(Request $request, Response $response, array $args) { if ($args['categoryId'] == 'new') { @@ -85,7 +88,7 @@ class TasksController extends BaseController } } - public function TaskEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TaskEditForm(Request $request, Response $response, array $args) { if ($args['taskId'] == 'new') { @@ -108,7 +111,7 @@ class TasksController extends BaseController } } - public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function TasksSettings(Request $request, Response $response, array $args) { return $this->renderPage($response, 'taskssettings'); } diff --git a/controllers/Users/User.php b/controllers/Users/User.php index 6f04c24f..a374e6f3 100644 --- a/controllers/Users/User.php +++ b/controllers/Users/User.php @@ -72,9 +72,6 @@ class User $this->db = DatabaseService::getInstance()->GetDbConnection(); } - /** - * @var \LessQL\Database|null - */ protected $db; public static function PermissionList() diff --git a/controllers/UsersApiController.php b/controllers/UsersApiController.php index bc724603..f93b3947 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class UsersApiController extends BaseApiController { - public function AddPermission(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function AddPermission(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { try { diff --git a/controllers/UsersController.php b/controllers/UsersController.php index 0037f7e5..6b479924 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 as Response; +use Psr\Http\Message\ServerRequestInterface as Request; class UsersController extends BaseController { - public function PermissionList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) + public function PermissionList(Request $request, Response $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(Request $request, Response $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(Request $request, Response $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(Request $request, Response $response, array $args) { User::checkPermission($request, User::PERMISSION_USERS_READ); return $this->renderPage($response, 'users', [ diff --git a/helpers/Grocycode.php b/helpers/Grocycode.php index 6f334946..5016493e 100644 --- a/helpers/Grocycode.php +++ b/helpers/Grocycode.php @@ -27,12 +27,6 @@ class Grocycode public const MAGIC = 'grcy'; - /** - * Constructs a new instance of the Grocycode class. - * - * Because php doesn't support overloading, this is a proxy - * to either setFromCode($code) or setFromData($type, $id, $extra_data = []). - */ public function __construct(...$args) { $argc = count($args); @@ -54,9 +48,6 @@ class Grocycode throw new \Exception('No suitable overload found.'); } - /** - * An array that registers all valid grocycode types. Register yours here by appending to this array. - */ public static $Items = [self::PRODUCT, self::BATTERY, self::CHORE, self::RECIPE]; private $type; @@ -65,13 +56,6 @@ class Grocycode private $extra_data = []; - /** - * Validates a grocycode. - * - * Returns true, if a supplied $code is a valid grocycode, false otherwise. - * - * @return bool - */ public static function Validate(string $code) { try @@ -107,9 +91,6 @@ class Grocycode return implode(':', $arr); } - /** - * Parses a grocycode. - */ private function setFromCode($code) { $parts = array_reverse(explode(':', $code)); @@ -127,9 +108,6 @@ class Grocycode $this->extra_data = array_reverse($parts); } - /** - * Constructs a grocycode from data. - */ private function setFromData($type, $id, $extra_data = []) { if (!is_array($extra_data)) diff --git a/middleware/CorsMiddleware.php b/middleware/CorsMiddleware.php index 52488dde..041ba6a7 100644 --- a/middleware/CorsMiddleware.php +++ b/middleware/CorsMiddleware.php @@ -9,9 +9,6 @@ use Psr\Http\Server\RequestHandlerInterface as RequestHandler; class CorsMiddleware { - /** - * @var ResponseFactoryInterface - */ private $responseFactory; public function __construct(ResponseFactoryInterface $responseFactory) diff --git a/services/ApiKeyService.php b/services/ApiKeyService.php index 2b7a8c39..10676af2 100644 --- a/services/ApiKeyService.php +++ b/services/ApiKeyService.php @@ -8,9 +8,6 @@ class ApiKeyService extends BaseService const API_KEY_TYPE_SPECIAL_PURPOSE_CALENDAR_ICAL = 'special-purpose-calendar-ical'; - /** - * @return string - */ public function CreateApiKey($keyType = self::API_KEY_TYPE_DEFAULT) { $newApiKey = $this->GenerateApiKey(); @@ -67,9 +64,6 @@ class ApiKeyService extends BaseService return null; } - /** - * @return boolean - */ public function IsValidApiKey($apiKey, $keyType = self::API_KEY_TYPE_DEFAULT) { if ($apiKey === null || empty($apiKey)) diff --git a/services/ApplicationService.php b/services/ApplicationService.php index e3c8f687..d3e4e653 100644 --- a/services/ApplicationService.php +++ b/services/ApplicationService.php @@ -102,11 +102,6 @@ class ApplicationService extends BaseService } } - /** - * Returns the response for the API call /system/time - * @param int $offset an offset in seconds to be applied - * @return array - */ public function GetSystemTime(int $offset = 0): array { $timestamp = time() + $offset; diff --git a/services/DatabaseService.php b/services/DatabaseService.php index 2c65e205..be5486b6 100644 --- a/services/DatabaseService.php +++ b/services/DatabaseService.php @@ -3,6 +3,7 @@ namespace Grocy\Services; use Grocy\Services\UsersService; +use LessQL\Database; class DatabaseService { @@ -12,9 +13,6 @@ class DatabaseService private static $instance = null; - /** - * @return boolean|\PDOStatement - */ public function ExecuteDbQuery(string $sql) { $pdo = $this->GetDbConnectionRaw(); @@ -27,9 +25,6 @@ class DatabaseService return false; } - /** - * @return boolean - */ public function ExecuteDbStatement(string $sql) { $pdo = $this->GetDbConnectionRaw(); @@ -47,22 +42,16 @@ class DatabaseService return date('Y-m-d H:i:s', filemtime($this->GetDbFilePath())); } - /** - * @return \LessQL\Database - */ public function GetDbConnection() { if (self::$DbConnection == null) { - self::$DbConnection = new \LessQL\Database($this->GetDbConnectionRaw()); + self::$DbConnection = new Database($this->GetDbConnectionRaw()); } return self::$DbConnection; } - /** - * @return \PDO - */ public function GetDbConnectionRaw() { if (self::$DbConnectionRaw == null) diff --git a/services/PrintService.php b/services/PrintService.php index 220bbb55..4121f381 100644 --- a/services/PrintService.php +++ b/services/PrintService.php @@ -10,12 +10,6 @@ use Mike42\Escpos\Printer; class PrintService extends BaseService { - /** - * @param bool $printHeader Printing of Grocy logo - * @param string[] $lines Items to print - * @return string[] Returns array with result OK if no exception - * @throws Exception If unable to print, an exception is thrown - */ public function printShoppingList(bool $printHeader, array $lines): array { $printer = self::getPrinterHandle(); @@ -43,11 +37,6 @@ class PrintService extends BaseService ]; } - /** - * Initialises the printer - * @return Printer Printer handle - * @throws Exception If unable to connect to printer, an exception is thrown - */ private static function getPrinterHandle() { if (GROCY_TPRINTER_IS_NETWORK_PRINTER) @@ -61,10 +50,6 @@ class PrintService extends BaseService return new Printer($connector); } - /** - * Prints the grocy logo and date - * @param Printer $printer Printer handle - */ private static function printHeader(Printer $printer) { $date = new DateTime(); diff --git a/services/SessionService.php b/services/SessionService.php index ccd3bb85..65e353dd 100644 --- a/services/SessionService.php +++ b/services/SessionService.php @@ -6,9 +6,6 @@ class SessionService extends BaseService { const SESSION_COOKIE_NAME = 'grocy_session'; - /** - * @return string - */ public function CreateSession($userId, $stayLoggedInPermanently = false) { $newSessionKey = $this->GenerateSessionKey(); @@ -46,9 +43,6 @@ class SessionService extends BaseService return null; } - /** - * @return boolean - */ public function IsValidSession($sessionKey) { if ($sessionKey === null || empty($sessionKey)) diff --git a/services/StockService.php b/services/StockService.php index 4c04745c..fdb65885 100644 --- a/services/StockService.php +++ b/services/StockService.php @@ -1159,12 +1159,6 @@ class StockService extends BaseService } } - /** - * Returns the shoppinglist as an array with lines for a printer - * @param int $listId ID of shopping list - * @return string[] Returns an array in the format "[amount] [name of product]" - * @throws \Exception - */ public function GetShoppinglistInPrintableStrings($listId = 1): array { if (!$this->ShoppingListExists($listId)) diff --git a/services/TasksService.php b/services/TasksService.php index 6f545385..2ff0912c 100644 --- a/services/TasksService.php +++ b/services/TasksService.php @@ -2,9 +2,11 @@ namespace Grocy\Services; +use LessQL\Result + class TasksService extends BaseService { - public function GetCurrent(): \LessQL\Result + public function GetCurrent(): Result { $users = $this->getUsersService()->GetUsersAsDto(); $categories = $this->getDatabase()->task_categories()->where('active = 1'); diff --git a/services/UsersService.php b/services/UsersService.php index 94b1912c..d124735d 100644 --- a/services/UsersService.php +++ b/services/UsersService.php @@ -2,6 +2,8 @@ namespace Grocy\Services; +use LessQL\Result; + class UsersService extends BaseService { public function CreateUser(string $username, ?string $firstName, ?string $lastName, string $password, string $pictureFileName = null) @@ -102,7 +104,7 @@ class UsersService extends BaseService return array_merge($GROCY_DEFAULT_USER_SETTINGS, $settings); } - public function GetUsersAsDto(): \LessQL\Result + public function GetUsersAsDto(): Result { return $this->getDatabase()->users_dto(); }