Applied PHP-CS-Fixer rules

controllers/BaseApiController.php

@@ -44,22 +44,31 @@ class BaseApiController extends BaseController
 	protected function queryData(Result $data, array $query)
 	{
 		if (isset($query['query']))
+		{
 			$data = $this->filter($data, $query['query']);
+		}
 		if (isset($query['limit']))
+		{
 			$data = $data->limit(intval($query['limit']), intval($query['offset'] ?? 0));
+		}
 		if (isset($query['order']))
+		{
 			$data = $data->orderBy($query['order']);
+		}
 		return $data;
 	}
 
 	protected function filter(Result $data, array $query): Result
 	{
-		foreach ($query as $q) {
-			$matches = array();
-			preg_match('/(?P<field>' . self::PATTERN_FIELD . ')'
+		foreach ($query as $q)
+		{
+			$matches = [];
+			preg_match(
+				'/(?P<field>' . self::PATTERN_FIELD . ')'
 				. '(?P<op>' . self::PATTERN_OPERATOR . ')'
 				. '(?P<value>' . self::PATTERN_VALUE . ')/',
-				$q, $matches
+				$q,
+				$matches
 			);
 			error_log(var_export($matches, true));
 			switch ($matches['op']) {
@@ -106,5 +115,4 @@ class BaseApiController extends BaseController
 
 		return $this->OpenApiSpec;
 	}
-
 }

controllers/BaseController.php

@@ -112,18 +112,15 @@ class BaseController
 		$this->View->set('releaseDate', $versionInfo->ReleaseDate);
 
 		$localizationService = $this->getLocalizationService();
-		$this->View->set('__t', function (string $text, ...$placeholderValues) use ($localizationService)
-		{
+		$this->View->set('__t', function (string $text, ...$placeholderValues) use ($localizationService) {
 			return $localizationService->__t($text, $placeholderValues);
 		});
-		$this->View->set('__n', function ($number, $singularForm, $pluralForm) use ($localizationService)
-		{
+		$this->View->set('__n', function ($number, $singularForm, $pluralForm) use ($localizationService) {
 			return $localizationService->__n($number, $singularForm, $pluralForm);
 		});
 		$this->View->set('GettextPo', $localizationService->GetPoAsJsonString());
 
-		$this->View->set('U', function ($relativePath, $isResource = false) use ($container)
-		{
+		$this->View->set('U', function ($relativePath, $isResource = false) use ($container) {
 			return $container->get('UrlManager')->ConstructUrl($relativePath, $isResource);
 		});
 
@@ -144,7 +141,6 @@ class BaseController
 			{
 				unset($constants[$constant]);
 			}
-
 		}
 
 		$this->View->set('featureFlags', $constants);
@@ -172,7 +168,6 @@ class BaseController
 			{
 				$this->View->set('userSettings', null);
 			}
-
 		}
 		catch (\Exception $ex)
 		{
@@ -181,5 +176,4 @@ class BaseController
 
 		return $this->render($response, $page, $data);
 	}
-
 }

controllers/BatteriesApiController.php

@@ -16,7 +16,6 @@ class BatteriesApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -46,7 +45,6 @@ class BatteriesApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function UndoChargeCycle(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -62,12 +60,10 @@ class BatteriesApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/BatteriesController.php

@@ -35,7 +35,6 @@ class BatteriesController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('batteries')
 			]);
 		}
-
 	}
 
 	public function Journal(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -71,5 +70,4 @@ class BatteriesController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/CalendarApiController.php

@@ -47,7 +47,6 @@ class CalendarApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function IcalSharingLink(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -62,12 +61,10 @@ class CalendarApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/ChoresApiController.php

@@ -27,7 +27,6 @@ class ChoresApiController extends BaseApiController
 				{
 					$this->getChoresService()->CalculateNextExecutionAssignment($chore->id);
 				}
-
 			}
 			else
 			{
@@ -40,7 +39,6 @@ class ChoresApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ChoreDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -53,7 +51,6 @@ class ChoresApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function Current(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -95,7 +92,6 @@ class ChoresApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function UndoChoreExecution(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -111,12 +107,10 @@ class ChoresApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/ChoresController.php

@@ -32,7 +32,6 @@ class ChoresController extends BaseController
 				'products' => $this->getDatabase()->products()->orderBy('name')
 			]);
 		}
-
 	}
 
 	public function ChoresList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -85,5 +84,4 @@ class ChoresController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/EquipmentController.php

@@ -23,7 +23,6 @@ class EquipmentController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('equipment')
 			]);
 		}
-
 	}
 
 	public function Overview(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -39,5 +38,4 @@ class EquipmentController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/ExceptionController.php

@@ -73,5 +73,4 @@ class ExceptionController extends BaseApiController
 			'exception' => $exception
 		]);
 	}
-
 }

controllers/FilesApiController.php

@@ -33,7 +33,6 @@ class FilesApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ServeFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -55,13 +54,11 @@ class FilesApiController extends BaseApiController
 			{
 				throw new HttpNotFoundException($request, 'File not found');
 			}
-
 		}
 		catch (\Exception $ex)
 		{
 			throw new HttpNotFoundException($request, $ex->getMessage(), $ex);
 		}
-
 	}
 
 	public function ShowFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -84,13 +81,11 @@ class FilesApiController extends BaseApiController
 			{
 				throw new HttpNotFoundException($request, 'File not found');
 			}
-
 		}
 		catch (\Exception $ex)
 		{
 			throw new HttpNotFoundException($request, $ex->getMessage(), $ex);
 		}
-
 	}
 
 	public function UploadFile(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -108,7 +103,6 @@ class FilesApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
@@ -175,5 +169,4 @@ class FilesApiController extends BaseApiController
 
 		return $filePath;
 	}
-
 }

controllers/GenericEntityApiController.php

@@ -34,13 +34,11 @@ class GenericEntityApiController extends BaseApiController
 			{
 				return $this->GenericErrorResponse($response, $ex->getMessage());
 			}
-
 		}
 		else
 		{
 			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
-
 	}
 
 	public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -59,7 +57,6 @@ class GenericEntityApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -87,13 +84,11 @@ class GenericEntityApiController extends BaseApiController
 			{
 				return $this->GenericErrorResponse($response, $ex->getMessage());
 			}
-
 		}
 		else
 		{
 			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
-
 	}
 
 	public function GetObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -123,7 +118,6 @@ class GenericEntityApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
-
 	}
 
 	public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -143,7 +137,6 @@ class GenericEntityApiController extends BaseApiController
 				{
 					$userfieldKeyValuePairs[$userfield->name] = $userfield->value;
 				}
-
 			}
 
 			$object->userfields = $userfieldKeyValuePairs;
@@ -157,7 +150,6 @@ class GenericEntityApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
-
 	}
 
 	public function GetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -170,7 +162,6 @@ class GenericEntityApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function SearchObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -187,13 +178,11 @@ class GenericEntityApiController extends BaseApiController
 				throw new HttpBadRequestException($request, $ex->getMessage(), $ex);
 				//return $this->GenericErrorResponse($response, 'The given entity has no field "name"', $ex);
 			}
-
 		}
 		else
 		{
 			return $this->GenericErrorResponse($response, 'Entity does not exist or is not exposed');
 		}
-
 	}
 
 	public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -216,7 +205,6 @@ class GenericEntityApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
@@ -233,5 +221,4 @@ class GenericEntityApiController extends BaseApiController
 	{
 		return in_array($entity, $this->getOpenApiSpec()->components->internalSchemas->ExposedEntity->enum);
 	}
-
 }

controllers/GenericEntityController.php

@@ -26,7 +26,6 @@ class GenericEntityController extends BaseController
 				'userentity' => $this->getDatabase()->userentities($args['userentityId'])
 			]);
 		}
-
 	}
 
 	public function UserfieldEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -48,7 +47,6 @@ class GenericEntityController extends BaseController
 				'entities' => $this->getUserfieldsService()->GetEntities()
 			]);
 		}
-
 	}
 
 	public function UserfieldsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -80,7 +78,6 @@ class GenericEntityController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('userentity-' . $args['userentityName'])
 			]);
 		}
-
 	}
 
 	public function UserobjectsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -99,5 +96,4 @@ class GenericEntityController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/LoginController.php

@@ -37,7 +37,7 @@ class LoginController extends BaseController
 				$sessionKey = $this->getSessionService()->CreateSession($user->id, $stayLoggedInPermanently);
 				setcookie($this->SessionCookieName, $sessionKey, PHP_INT_SIZE == 4 ? PHP_INT_MAX : PHP_INT_MAX >> 32);
 
-// Cookie expires never, but session validity is up to SessionService
+				// Cookie expires never, but session validity is up to SessionService
 
 				if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
 				{
@@ -52,13 +52,11 @@ class LoginController extends BaseController
 			{
 				return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/login?invalid=true'));
 			}
-
 		}
 		else
 		{
 			return $response->withRedirect($this->AppContainer->get('UrlManager')->ConstructUrl('/login?invalid=true'));
 		}
-
 	}
 
 	public function __construct(\DI\Container $container, string $sessionCookieName)
@@ -66,5 +64,4 @@ class LoginController extends BaseController
 		parent::__construct($container);
 		$this->SessionCookieName = $sessionCookieName;
 	}
-
 }

controllers/RecipesApiController.php

@@ -35,7 +35,6 @@ class RecipesApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function GetRecipeFulfillment(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -57,18 +56,15 @@ class RecipesApiController extends BaseApiController
 			{
 				return $this->ApiResponse($response, $recipeResolved);
 			}
-
 		}
 		catch (\Exception $ex)
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/RecipesController.php

@@ -70,7 +70,6 @@ class RecipesController extends BaseController
 				$selectedRecipe = $recipe;
 				break;
 			}
-
 		}
 
 		$selectedRecipePositionsResolved = $this->getDatabase()->recipes_pos_resolved()->where('recipe_id = :1 AND is_nested_recipe_pos = 0', $selectedRecipe->id)->orderBy('ingredient_group', 'ASC', 'product_group', 'ASC');
@@ -160,7 +159,6 @@ class RecipesController extends BaseController
 				'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved()
 			]);
 		}
-
 	}
 
 	public function RecipesSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -172,5 +170,4 @@ class RecipesController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/StockApiController.php

@@ -29,7 +29,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function AddProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -99,7 +98,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function AddProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -113,7 +111,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function AddProductToShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -161,7 +158,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ClearShoppingList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -186,7 +182,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ConsumeProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -266,7 +261,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function CurrentStock(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -346,7 +340,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ExternalBarcodeLookup(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -368,7 +361,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function InventoryProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -424,7 +416,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function InventoryProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -438,7 +429,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function OpenProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -473,7 +463,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function OpenProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -487,7 +476,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ProductBarcodeDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -500,7 +488,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ProductDetails(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -513,7 +500,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ProductDetailsByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -527,7 +513,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ProductPriceHistory(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -540,7 +525,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ProductStockEntries(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -599,7 +583,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function StockBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -619,7 +602,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function StockEntry(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -644,7 +626,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function TransferProduct(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -689,7 +670,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function TransferProductByBarcode(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -703,7 +683,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function UndoBooking(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -719,7 +698,6 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function UndoTransaction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -735,12 +713,10 @@ class StockApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/StockController.php

@@ -67,7 +67,6 @@ class StockController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('locations')
 			]);
 		}
-
 	}
 
 	public function LocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -122,7 +121,6 @@ class StockController extends BaseController
 				'shoppinglocations' => $this->getDatabase()->shopping_locations()->orderBy('name')
 			]);
 		}
-
 	}
 
 	public function ProductEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -159,7 +157,6 @@ class StockController extends BaseController
 				'quConversions' => $this->getDatabase()->quantity_unit_conversions()
 			]);
 		}
-
 	}
 
 	public function ProductGroupEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -179,7 +176,6 @@ class StockController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('product_groups')
 			]);
 		}
-
 	}
 
 	public function ProductGroupsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -254,7 +250,6 @@ class StockController extends BaseController
 				'defaultQuUnit' => $defaultQuUnit
 			]);
 		}
-
 	}
 
 	public function QuantityUnitEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -282,7 +277,6 @@ class StockController extends BaseController
 				'quantityUnits' => $this->getDatabase()->quantity_units()
 			]);
 		}
-
 	}
 
 	public function QuantityUnitPluralFormTesting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -338,7 +332,6 @@ class StockController extends BaseController
 				'mode' => 'edit'
 			]);
 		}
-
 	}
 
 	public function ShoppingListItemEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -360,7 +353,6 @@ class StockController extends BaseController
 				'mode' => 'edit'
 			]);
 		}
-
 	}
 
 	public function ShoppingListSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -385,7 +377,6 @@ class StockController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('shopping_locations')
 			]);
 		}
-
 	}
 
 	public function ShoppingLocationsList(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -451,5 +442,4 @@ class StockController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/SystemApiController.php

@@ -11,10 +11,7 @@ class SystemApiController extends BaseApiController
 			$constants = get_defined_constants();
 
 			// Some GROCY_* constants are not really config settings and therefore should not be exposed
-			unset($constants['GROCY_AUTHENTICATED']);
-			unset($constants['GROCY_DATAPATH']);
-			unset($constants['GROCY_IS_EMBEDDED_INSTALL']);
-			unset($constants['GROCY_USER_ID']);
+			unset($constants['GROCY_AUTHENTICATED'], $constants['GROCY_DATAPATH'], $constants['GROCY_IS_EMBEDDED_INSTALL'], $constants['GROCY_USER_ID']);
 
 			$returnArray = [];
 
@@ -24,7 +21,6 @@ class SystemApiController extends BaseApiController
 				{
 					$returnArray[substr($constant, 6)] = $value;
 				}
-
 			}
 
 			return $this->ApiResponse($response, $returnArray);
@@ -33,7 +29,6 @@ class SystemApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function GetDbChangedTime(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -63,14 +58,11 @@ class SystemApiController extends BaseApiController
 			{
 				return $this->GenericErrorResponse($response, $ex->getMessage());
 			}
-
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/SystemController.php

@@ -59,37 +59,37 @@ class SystemController extends BaseController
 			$entryPage = 'stock';
 		}
 
-// Stock
+		// Stock
 		if ($entryPage === 'stock' && constant('GROCY_FEATURE_FLAG_STOCK'))
 		{
 			return '/stockoverview';
 		}
 
-// Shoppinglist
+		// Shoppinglist
 		if ($entryPage === 'shoppinglist' && constant('GROCY_FEATURE_FLAG_SHOPPINGLIST'))
 		{
 			return '/shoppinglist';
 		}
 
-// Recipes
+		// Recipes
 		if ($entryPage === 'recipes' && constant('GROCY_FEATURE_FLAG_RECIPES'))
 		{
 			return '/recipes';
 		}
 
-// Chores
+		// Chores
 		if ($entryPage === 'chores' && constant('GROCY_FEATURE_FLAG_CHORES'))
 		{
 			return '/choresoverview';
 		}
 
-// Tasks
+		// Tasks
 		if ($entryPage === 'tasks' && constant('GROCY_FEATURE_FLAG_TASKS'))
 		{
 			return '/tasks';
 		}
 
-// Batteries
+		// Batteries
 		if ($entryPage === 'batteries' && constant('GROCY_FEATURE_FLAG_BATTERIES'))
 		{
 			return '/batteriesoverview';
@@ -100,13 +100,13 @@ class SystemController extends BaseController
 			return '/equipment';
 		}
 
-// Calendar
+		// Calendar
 		if ($entryPage === 'calendar' && constant('GROCY_FEATURE_FLAG_CALENDAR'))
 		{
 			return '/calendar';
 		}
 
-// Meal Plan
+		// Meal Plan
 		if ($entryPage === 'mealplan' && constant('GROCY_FEATURE_FLAG_RECIPES'))
 		{
 			return '/mealplan';
@@ -114,5 +114,4 @@ class SystemController extends BaseController
 
 		return '/about';
 	}
-
 }

controllers/TasksApiController.php

@@ -33,7 +33,6 @@ class TasksApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function UndoTask(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -49,12 +48,10 @@ class TasksApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/TasksController.php

@@ -54,7 +54,6 @@ class TasksController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('task_categories')
 			]);
 		}
-
 	}
 
 	public function TaskEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -78,7 +77,6 @@ class TasksController extends BaseController
 				'userfields' => $this->getUserfieldsService()->GetFields('tasks')
 			]);
 		}
-
 	}
 
 	public function TasksSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -90,5 +88,4 @@ class TasksController extends BaseController
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/Users/User.php

@@ -10,17 +10,13 @@ class User
 	const PERMISSION_ADMIN = 'ADMIN';
 
 	const PERMISSION_BATTERIES = 'BATTERIES';
-
 	const PERMISSION_BATTERIES_TRACK_CHARGE_CYCLE = 'BATTERIES_TRACK_CHARGE_CYCLE';
-
 	const PERMISSION_BATTERIES_UNDO_CHARGE_CYCLE = 'BATTERIES_UNDO_CHARGE_CYCLE';
 
 	const PERMISSION_CALENDAR = 'CALENDAR';
 
 	const PERMISSION_CHORES = 'CHORES';
-
 	const PERMISSION_CHORE_TRACK_EXECUTION = 'CHORE_TRACK_EXECUTION';
-
 	const PERMISSION_CHORE_UNDO_EXECUTION = 'CHORE_UNDO_EXECUTION';
 
 	const PERMISSION_EQUIPMENT = 'EQUIPMENT';
@@ -28,43 +24,28 @@ class User
 	const PERMISSION_MASTER_DATA_EDIT = 'MASTER_DATA_EDIT';
 
 	const PERMISSION_RECIPES = 'RECIPES';
-
 	const PERMISSION_RECIPES_MEALPLAN = 'RECIPES_MEALPLAN';
 
 	const PERMISSION_SHOPPINGLIST = 'SHOPPINGLIST';
-
 	const PERMISSION_SHOPPINGLIST_ITEMS_ADD = 'SHOPPINGLIST_ITEMS_ADD';
-
 	const PERMISSION_SHOPPINGLIST_ITEMS_DELETE = 'SHOPPINGLIST_ITEMS_DELETE';
 
 	const PERMISSION_STOCK = 'STOCK';
-
 	const PERMISSION_STOCK_CONSUME = 'STOCK_CONSUME';
-
 	const PERMISSION_STOCK_EDIT = 'STOCK_EDIT';
-
 	const PERMISSION_STOCK_INVENTORY = 'STOCK_INVENTORY';
-
 	const PERMISSION_STOCK_OPEN = 'STOCK_OPEN';
-
 	const PERMISSION_STOCK_PURCHASE = 'STOCK_PURCHASE';
-
 	const PERMISSION_STOCK_TRANSFER = 'STOCK_TRANSFER';
 
 	const PERMISSION_TASKS = 'TASKS';
-
 	const PERMISSION_TASKS_MARK_COMPLETED = 'TASKS_MARK_COMPLETED';
-
 	const PERMISSION_TASKS_UNDO_EXECUTION = 'TASKS_UNDO_EXECUTION';
 
 	const PERMISSION_USERS = 'USERS';
-
 	const PERMISSION_USERS_CREATE = 'USERS_CREATE';
-
 	const PERMISSION_USERS_EDIT = 'USERS_EDIT';
-
 	const PERMISSION_USERS_EDIT_SELF = 'USERS_EDIT_SELF';
-
 	const PERMISSION_USERS_READ = 'USERS_READ';
 
 	/**
@@ -81,10 +62,9 @@ class User
 	public function __construct()
 	{
 		$this->db = DatabaseService::getInstance()->GetDbConnection();
-
 	}
 
-	public static function checkPermission($request, string...$permissions): void
+	public static function checkPermission($request, string ...$permissions): void
 	{
 		$user = new self();
 
@@ -94,9 +74,7 @@ class User
 			{
 				throw new PermissionMissingException($request, $permission);
 			}
-
 		}
-
 	}
 
 	public function getPermissionList()
@@ -106,14 +84,14 @@ class User
 
 	public function hasPermission(string $permission): bool
 	{
-// global $PERMISSION_CACHE;
+		// global $PERMISSION_CACHE;
 
-// if(isset($PERMISSION_CACHE[$permission]))
+		// if(isset($PERMISSION_CACHE[$permission]))
 		//	return $PERMISSION_CACHE[$permission];
 		return $this->getPermissions()->where('permission_name', $permission)->fetch() !== null;
 	}
 
-	public static function hasPermissions(string...$permissions)
+	public static function hasPermissions(string ...$permissions)
 	{
 		$user = new self();
 
@@ -123,7 +101,6 @@ class User
 			{
 				return false;
 			}
-
 		}
 
 		return true;
@@ -133,5 +110,4 @@ class User
 	{
 		return $this->db->user_permissions_resolved()->where('user_id', GROCY_USER_ID);
 	}
-
 }

controllers/UsersApiController.php

@@ -8,7 +8,8 @@ class UsersApiController extends BaseApiController
 {
 	public function AddPermission(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		try {
+		try
+		{
 			User::checkPermission($request, User::PERMISSION_ADMIN);
 			$requestBody = $request->getParsedBody();
 
@@ -26,7 +27,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function CreateUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -48,7 +48,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function DeleteUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -63,7 +62,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function EditUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -88,7 +86,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function GetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -102,7 +99,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function GetUserSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -115,7 +111,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function GetUsers(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -129,15 +124,16 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function ListPermissions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		try {
+		try
+		{
 			User::checkPermission($request, User::PERMISSION_ADMIN);
 
-			return $this->ApiResponse($response,
+			return $this->ApiResponse(
+				$response,
 				$this->getDatabase()->user_permissions()->where($args['userId'])
 			);
 		}
@@ -149,12 +145,12 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function SetPermissions(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
-		try {
+		try
+		{
 			User::checkPermission($request, User::PERMISSION_ADMIN);
 			$requestBody = $request->getParsedBody();
 			$db = $this->getDatabase();
@@ -184,7 +180,6 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function SetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
@@ -200,12 +195,10 @@ class UsersApiController extends BaseApiController
 		{
 			return $this->GenericErrorResponse($response, $ex->getMessage());
 		}
-
 	}
 
 	public function __construct(\DI\Container $container)
 	{
 		parent::__construct($container);
 	}
-
 }

controllers/UsersController.php

@@ -41,14 +41,12 @@ class UsersController extends BaseController
 				'mode' => 'edit'
 			]);
 		}
-
 	}
 
 	public function UserSettings(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
 	{
 		return $this->renderPage($response, 'usersettings', [
-			'languages' => array_filter(scandir(__DIR__ . '/../localization'), function ($item)
-			{
+			'languages' => array_filter(scandir(__DIR__ . '/../localization'), function ($item) {
 				if ($item == '.' || $item == '..')
 				{
 					return false;
@@ -56,7 +54,6 @@ class UsersController extends BaseController
 
 				return is_dir(__DIR__ . '/../localization/' . $item);
 			})
-
 		]);
 	}
 
@@ -67,5 +64,4 @@ class UsersController extends BaseController
 			'users' => $this->getDatabase()->users()->orderBy('username')
 		]);
 	}
-
 }