kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 03:25:50 +00:00
Code Issues Projects Releases Wiki Activity

Upgraded package php-di/php-di

Browse Source
This commit is contained in:
Bernd Bestel
2023-07-29 14:02:56 +02:00
parent c263aba6a5
commit e52b1c5f60
7 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -4,7 +4,7 @@
"slim/slim": "^4.0", "slim/slim": "^4.0",
"slim/psr7": "^1.0", "slim/psr7": "^1.0",
"slim/http": "^1.0", "slim/http": "^1.0",
"php-di/php-di": "^6.0", "php-di/php-di": "^7.0.3",
"berrnd/slim-blade-view": "^1.0.0", "berrnd/slim-blade-view": "^1.0.0",
"morris/lessql": "dev-php81", "morris/lessql": "dev-php81",
"gettext/gettext": "dev-php81", "gettext/gettext": "dev-php81",

3
controllers/BaseController.php
View File

@@ -18,10 +18,11 @@ use Grocy\Services\StockService;
use Grocy\Services\TasksService; use Grocy\Services\TasksService;
use Grocy\Services\UserfieldsService; use Grocy\Services\UserfieldsService;
use Grocy\Services\UsersService; use Grocy\Services\UsersService;
use DI\Container;
class BaseController class BaseController
{ {
public function __construct(\DI\Container $container) public function __construct(Container $container)
{ {
$this->AppContainer = $container; $this->AppContainer = $container;
$this->View = $container->get('view'); $this->View = $container->get('view');

3
controllers/ExceptionController.php
View File

@@ -2,6 +2,7 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use DI\Container;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Slim\Exception\HttpException; use Slim\Exception\HttpException;
@@ -11,7 +12,7 @@ use Throwable;
class ExceptionController extends BaseApiController class ExceptionController extends BaseApiController
{ {
public function __construct(\Slim\App $app, \DI\Container $container) public function __construct(\Slim\App $app, Container $container)
{ {
parent::__construct($container); parent::__construct($container);
$this->app = $app; $this->app = $app;

3
middleware/ApiKeyAuthMiddleware.php
View File

@@ -3,13 +3,14 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\ApiKeyService; use Grocy\Services\ApiKeyService;
use DI\Container;
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;
class ApiKeyAuthMiddleware extends AuthMiddleware class ApiKeyAuthMiddleware extends AuthMiddleware
{ {
public function __construct(\DI\Container $container, ResponseFactoryInterface $responseFactory) public function __construct(Container $container, ResponseFactoryInterface $responseFactory)
{ {
parent::__construct($container, $responseFactory); parent::__construct($container, $responseFactory);
$this->ApiKeyHeaderName = $this->AppContainer->get('ApiKeyHeaderName'); $this->ApiKeyHeaderName = $this->AppContainer->get('ApiKeyHeaderName');

3
middleware/AuthMiddleware.php
View File

@@ -3,6 +3,7 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\SessionService; use Grocy\Services\SessionService;
use DI\Container;
use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseFactoryInterface;
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;
@@ -11,7 +12,7 @@ use Slim\Routing\RouteContext;
abstract class AuthMiddleware extends BaseMiddleware abstract class AuthMiddleware extends BaseMiddleware
{ {
public function __construct(\DI\Container $container, ResponseFactoryInterface $responseFactory) public function __construct(Container $container, ResponseFactoryInterface $responseFactory)
{ {
parent::__construct($container); parent::__construct($container);
$this->ResponseFactory = $responseFactory; $this->ResponseFactory = $responseFactory;

3
middleware/BaseMiddleware.php
View File

@@ -3,6 +3,7 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\ApplicationService; use Grocy\Services\ApplicationService;
use DI\Container;
class BaseMiddleware class BaseMiddleware
{ {
@@ -10,7 +11,7 @@ class BaseMiddleware
protected $ApplicationService; protected $ApplicationService;
public function __construct(\DI\Container $container) public function __construct(Container $container)
{ {
$this->AppContainer = $container; $this->AppContainer = $container;
$this->ApplicationService = ApplicationService::getInstance(); $this->ApplicationService = ApplicationService::getInstance();

3
middleware/SessionAuthMiddleware.php
View File

@@ -3,12 +3,13 @@
namespace Grocy\Middleware; namespace Grocy\Middleware;
use Grocy\Services\SessionService; use Grocy\Services\SessionService;
use DI\Container;
use Psr\Http\Message\ResponseFactoryInterface; use Psr\Http\Message\ResponseFactoryInterface;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
class SessionAuthMiddleware extends AuthMiddleware class SessionAuthMiddleware extends AuthMiddleware
{ {
public function __construct(\DI\Container $container, ResponseFactoryInterface $responseFactory) public function __construct(Container $container, ResponseFactoryInterface $responseFactory)
{ {
parent::__construct($container, $responseFactory); parent::__construct($container, $responseFactory);
} }