Sort PHP imports

This commit is contained in:
Bernd Bestel 2026-04-24 19:59:42 +02:00
parent 9b00634248
commit 303eec06b3
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
19 changed files with 23 additions and 24 deletions

View File

@ -1,8 +1,8 @@
<?php <?php
use Grocy\Controllers\ExceptionController; use Grocy\Controllers\ExceptionController;
use Grocy\Helpers\UrlManager;
use Grocy\Helpers\SlimBladeView; use Grocy\Helpers\SlimBladeView;
use Grocy\Helpers\UrlManager;
use Grocy\Middleware\LocaleMiddleware; use Grocy\Middleware\LocaleMiddleware;
use Psr\Container\ContainerInterface as Container; use Psr\Container\ContainerInterface as Container;
use Slim\Factory\AppFactory; use Slim\Factory\AppFactory;

View File

@ -3,8 +3,8 @@
namespace Grocy\Controllers\Api; namespace Grocy\Controllers\Api;
use Grocy\Controllers\Users\User; use Grocy\Controllers\Users\User;
use Grocy\Helpers\WebhookRunner;
use Grocy\Helpers\Grocycode; use Grocy\Helpers\Grocycode;
use Grocy\Helpers\WebhookRunner;
use Grocy\Services\BatteriesService; use Grocy\Services\BatteriesService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -2,8 +2,6 @@
namespace Grocy\Controllers\Api; namespace Grocy\Controllers\Api;
use Grocy\Services\CalendarService;
use Grocy\Services\ApiKeyService;
use Eluceo\iCal\Domain\Entity\Calendar; use Eluceo\iCal\Domain\Entity\Calendar;
use Eluceo\iCal\Domain\Entity\Event; use Eluceo\iCal\Domain\Entity\Event;
use Eluceo\iCal\Domain\Entity\TimeZone; use Eluceo\iCal\Domain\Entity\TimeZone;
@ -12,6 +10,8 @@ use Eluceo\iCal\Domain\ValueObject\DateTime;
use Eluceo\iCal\Domain\ValueObject\SingleDay; use Eluceo\iCal\Domain\ValueObject\SingleDay;
use Eluceo\iCal\Domain\ValueObject\TimeSpan; use Eluceo\iCal\Domain\ValueObject\TimeSpan;
use Eluceo\iCal\Presentation\Factory\CalendarFactory; use Eluceo\iCal\Presentation\Factory\CalendarFactory;
use Grocy\Services\ApiKeyService;
use Grocy\Services\CalendarService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -3,8 +3,8 @@
namespace Grocy\Controllers\Api; namespace Grocy\Controllers\Api;
use Grocy\Controllers\Users\User; use Grocy\Controllers\Users\User;
use Grocy\Helpers\WebhookRunner;
use Grocy\Helpers\Grocycode; use Grocy\Helpers\Grocycode;
use Grocy\Helpers\WebhookRunner;
use Grocy\Services\ChoresService; use Grocy\Services\ChoresService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -4,8 +4,8 @@ namespace Grocy\Controllers\Api;
use Grocy\Controllers\Users\User; use Grocy\Controllers\Users\User;
use Grocy\Services\StockService; use Grocy\Services\StockService;
use Grocy\Services\UsersService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use Grocy\Services\UsersService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -3,8 +3,8 @@
namespace Grocy\Controllers\Api; namespace Grocy\Controllers\Api;
use Grocy\Controllers\Users\User; use Grocy\Controllers\Users\User;
use Grocy\Helpers\WebhookRunner;
use Grocy\Helpers\Grocycode; use Grocy\Helpers\Grocycode;
use Grocy\Helpers\WebhookRunner;
use Grocy\Services\RecipesService; use Grocy\Services\RecipesService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -3,10 +3,10 @@
namespace Grocy\Controllers\Api; namespace Grocy\Controllers\Api;
use Grocy\Controllers\Users\User; use Grocy\Controllers\Users\User;
use Grocy\Helpers\Grocycode;
use Grocy\Helpers\WebhookRunner;
use Grocy\Services\LocalizationService; use Grocy\Services\LocalizationService;
use Grocy\Services\StockService; use Grocy\Services\StockService;
use Grocy\Helpers\WebhookRunner;
use Grocy\Helpers\Grocycode;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -2,12 +2,12 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use DI\Container;
use Grocy\Controllers\Users\User; use Grocy\Controllers\Users\User;
use Grocy\Services\ApplicationService; use Grocy\Services\ApplicationService;
use Grocy\Services\DatabaseService; use Grocy\Services\DatabaseService;
use Grocy\Services\LocalizationService; use Grocy\Services\LocalizationService;
use Grocy\Services\UsersService; use Grocy\Services\UsersService;
use DI\Container;
class BaseController class BaseController
{ {

View File

@ -4,8 +4,8 @@ namespace Grocy\Controllers;
use Grocy\Helpers\Grocycode; use Grocy\Helpers\Grocycode;
use Grocy\Services\BatteriesService; use Grocy\Services\BatteriesService;
use Grocy\Services\UsersService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use Grocy\Services\UsersService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -4,8 +4,8 @@ namespace Grocy\Controllers;
use Grocy\Helpers\Grocycode; use Grocy\Helpers\Grocycode;
use Grocy\Services\ChoresService; use Grocy\Services\ChoresService;
use Grocy\Services\UsersService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use Grocy\Services\UsersService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -2,9 +2,9 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use DI\Container;
use Grocy\Controllers\Api\BaseApiController; use Grocy\Controllers\Api\BaseApiController;
use Grocy\Services\ApplicationService; use Grocy\Services\ApplicationService;
use DI\Container;
use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseFactoryInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;

View File

@ -2,10 +2,10 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use Grocy\Helpers\Grocycode;
use Grocy\Services\RecipesService; use Grocy\Services\RecipesService;
use Grocy\Services\StockService; use Grocy\Services\StockService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use Grocy\Helpers\Grocycode;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -2,13 +2,13 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use DI\Container;
use Grocy\Helpers\Grocycode; use Grocy\Helpers\Grocycode;
use Grocy\Services\LocalizationService; use Grocy\Services\LocalizationService;
use Grocy\Services\RecipesService; use Grocy\Services\RecipesService;
use Grocy\Services\StockService; use Grocy\Services\StockService;
use Grocy\Services\UsersService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use DI\Container; use Grocy\Services\UsersService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -3,8 +3,8 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use Grocy\Services\TasksService; use Grocy\Services\TasksService;
use Grocy\Services\UsersService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use Grocy\Services\UsersService;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -24,9 +24,8 @@ class UrlManager
{ {
return rtrim($this->BasePath, '/') . $relativePath; return rtrim($this->BasePath, '/') . $relativePath;
} }
else else // Is not a resource and URL rewriting is disabled
{ // Is not a resource and URL rewriting is disabled {return rtrim($this->BasePath, '/') . '/index.php' . $relativePath;
return rtrim($this->BasePath, '/') . '/index.php' . $relativePath;
} }
} }

View File

@ -2,8 +2,8 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\ApiKeyService;
use DI\Container; use DI\Container;
use Grocy\Services\ApiKeyService;
use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseFactoryInterface;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Slim\Routing\RouteContext; use Slim\Routing\RouteContext;

View File

@ -2,8 +2,8 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\ApplicationService;
use DI\Container; use DI\Container;
use Grocy\Services\ApplicationService;
use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseFactoryInterface;
class BaseMiddleware class BaseMiddleware

View File

@ -3,8 +3,8 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\DatabaseService; use Grocy\Services\DatabaseService;
use Grocy\Services\UsersService;
use Grocy\Services\SessionService; use Grocy\Services\SessionService;
use Grocy\Services\UsersService;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
class LdapAuthMiddleware extends AuthMiddleware class LdapAuthMiddleware extends AuthMiddleware

View File

@ -3,8 +3,8 @@
namespace Grocy\Services; namespace Grocy\Services;
use DateTime; use DateTime;
use Mike42\Escpos\PrintConnectors\NetworkPrintConnector;
use Mike42\Escpos\PrintConnectors\FilePrintConnector; use Mike42\Escpos\PrintConnectors\FilePrintConnector;
use Mike42\Escpos\PrintConnectors\NetworkPrintConnector;
use Mike42\Escpos\Printer; use Mike42\Escpos\Printer;
class PrintService extends BaseService class PrintService extends BaseService