kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-13 01:06:23 +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

28
controllers/GenericEntityApiController.php
View File

@@ -6,7 +6,7 @@ use \Grocy\Services\UserfieldsService;
class GenericEntityApiController extends BaseApiController
{
public function __construct(\Slim\Container $container)
public function __construct(\DI\Container $container)
{
parent::__construct($container);
$this->UserfieldsService = new UserfieldsService();
@@ -14,11 +14,11 @@ class GenericEntityApiController extends BaseApiController
protected $UserfieldsService;
public function GetObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function GetObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
{
return $this->ApiResponse($this->Database->{$args['entity']}());
return $this->ApiResponse($response, $this->Database->{$args['entity']}());
}
else
{
@@ -26,11 +26,11 @@ class GenericEntityApiController extends BaseApiController
}
}
public function GetObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function GetObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
{
return $this->ApiResponse($this->Database->{$args['entity']}($args['objectId']));
return $this->ApiResponse($response, $this->Database->{$args['entity']}($args['objectId']));
}
else
{
@@ -38,7 +38,7 @@ class GenericEntityApiController extends BaseApiController
}
}
public function AddObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function AddObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
if ($this->IsValidEntity($args['entity']))
{
@@ -54,7 +54,7 @@ class GenericEntityApiController extends BaseApiController
$newRow = $this->Database->{$args['entity']}()->createRow($requestBody);
$newRow->save();
$success = $newRow->isClean();
return $this->ApiResponse(array(
return $this->ApiResponse($response, array(
'created_object_id' => $this->Database->lastInsertId()
));
}
@@ -69,7 +69,7 @@ class GenericEntityApiController extends BaseApiController
}
}
public function EditObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function EditObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
if ($this->IsValidEntity($args['entity']))
{
@@ -98,7 +98,7 @@ class GenericEntityApiController extends BaseApiController
}
}
public function DeleteObject(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function DeleteObject(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
if ($this->IsValidEntity($args['entity']))
{
@@ -113,13 +113,13 @@ class GenericEntityApiController extends BaseApiController
}
}
public function SearchObjects(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function SearchObjects(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
if ($this->IsValidEntity($args['entity']) && !$this->IsEntityWithPreventedListing($args['entity']))
{
try
{
return $this->ApiResponse($this->Database->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
return $this->ApiResponse($response, $this->Database->{$args['entity']}()->where('name LIKE ?', '%' . $args['searchString'] . '%'));
}
catch (\PDOException $ex)
{
@@ -132,11 +132,11 @@ class GenericEntityApiController extends BaseApiController
}
}
public function GetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function GetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
try
{
return $this->ApiResponse($this->UserfieldsService->GetValues($args['entity'], $args['objectId']));
return $this->ApiResponse($response, $this->UserfieldsService->GetValues($args['entity'], $args['objectId']));
}
catch (\Exception $ex)
{
@@ -144,7 +144,7 @@ class GenericEntityApiController extends BaseApiController
}
}
public function SetUserfields(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
public function SetUserfields(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)
{
$requestBody = $request->getParsedBody();