kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-15 10:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade Slim Framework to v4 (closes #561)

Browse Source
This commit is contained in:
Bernd Bestel
2020-02-11 17:42:03 +01:00
parent d56aebc9b8
commit d4fa1a64c2
34 changed files with 1169 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/UsersApiController.php
View File

@@ -6,7 +6,7 @@ use \Grocy\Services\UsersService;
class UsersApiController extends BaseApiController
{
public function __construct(\Slim\Container $container)
public function __construct(\DI\Container $container)
{
parent::__construct($container);
$this->UsersService = new UsersService();
@@ -14,11 +14,11 @@ class UsersApiController extends BaseApiController
protected $UsersService;
public function GetUsers(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function GetUsers(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
try
{
return $this->ApiResponse($this->UsersService->GetUsersAsDto());
return $this->ApiResponse($response, $this->UsersService->GetUsersAsDto());
}
catch (\Exception $ex)
{
@@ -26,7 +26,7 @@ class UsersApiController extends BaseApiController
}
}
public function CreateUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function CreateUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
$requestBody = $request->getParsedBody();
@@ -46,7 +46,7 @@ class UsersApiController extends BaseApiController
}
}
public function DeleteUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function DeleteUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
try
{
@@ -59,7 +59,7 @@ class UsersApiController extends BaseApiController
}
}
public function EditUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function EditUser(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
$requestBody = $request->getParsedBody();
@@ -74,12 +74,12 @@ class UsersApiController extends BaseApiController
}
}
public function GetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function GetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
try
{
$value = $this->UsersService->GetUserSetting(GROCY_USER_ID, $args['settingKey']);
return $this->ApiResponse(array('value' => $value));
return $this->ApiResponse($response, array('value' => $value));
}
catch (\Exception $ex)
{
@@ -87,7 +87,7 @@ class UsersApiController extends BaseApiController
}
}
public function SetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function SetUserSetting(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
try
{