Skip to content

EspoCRM – Open Source CRM Application

Response/Request PSR-7 methods

Yuriie400834c6595
diff --git a/application/Espo/Core/Api/Request.php b/application/Espo/Core/Api/Request.php
index e48e8c18f3..5149866a10 100644
--- a/application/Espo/Core/Api/Request.php
+++ b/application/Espo/Core/Api/Request.php
@@ -29,6 +29,7 @@
namespace Espo\Core\Api;
+use Psr\Http\Message\ServerRequestInterface as Psr7Request;
use Psr\Http\Message\UriInterface;
use stdClass;
@@ -125,4 +126,11 @@ interface Request
* @return mixed
*/
public function getServerParam(string $name);
+
+ /**
+ * Get the PSR-7 request.
+ *
+ * @since 10.1.0
+ */
+ public function toPsr7(): Psr7Request;
}
diff --git a/application/Espo/Core/Api/RequestNull.php b/application/Espo/Core/Api/RequestNull.php
index 19113b95a8..d922450c8a 100644
--- a/application/Espo/Core/Api/RequestNull.php
+++ b/application/Espo/Core/Api/RequestNull.php
@@ -31,7 +31,10 @@ namespace Espo\Core\Api;
use Espo\Core\Api\Request as ApiRequest;
+use LogicException;
+use Psr\Http\Message\ServerRequestInterface as Psr7Request;
use Psr\Http\Message\UriInterface;
+use Slim\Psr7\Factory\RequestFactory;
use Slim\Psr7\Factory\UriFactory;
use stdClass;
@@ -130,4 +133,15 @@ class RequestNull implements ApiRequest
{
return null;
}
+
+ public function toPsr7(): Psr7Request
+ {
+ $request = (new RequestFactory())->createRequest(Method::GET, "http://localhost");
+
+ if (!$request instanceof Psr7Request) {
+ throw new LogicException();
+ }
+
+ return $request;
+ }
}
diff --git a/application/Espo/Core/Api/RequestWrapper.php b/application/Espo/Core/Api/RequestWrapper.php
index 80228f8c4b..ad0039dc5d 100644
--- a/application/Espo/Core/Api/RequestWrapper.php
+++ b/application/Espo/Core/Api/RequestWrapper.php
@@ -289,4 +289,9 @@ class RequestWrapper implements ApiRequest
{
return $this->getMethod() === Method::DELETE;
}
+
+ public function toPsr7(): Psr7Request
+ {
+ return $this->psr7Request;
+ }
}
diff --git a/application/Espo/Core/Api/Response.php b/application/Espo/Core/Api/Response.php
index b4dc321068..68dbc3b311 100644
--- a/application/Espo/Core/Api/Response.php
+++ b/application/Espo/Core/Api/Response.php
@@ -29,6 +29,7 @@
namespace Espo\Core\Api;
+use Psr\Http\Message\ResponseInterface as Psr7Response;
use Psr\Http\Message\StreamInterface;
/**
@@ -99,4 +100,11 @@ interface Response
* Get a body.
*/
public function getBody(): StreamInterface;
+
+ /**
+ * Apply a PSR-7 response.
+ *
+ * @since 10.1.0
+ */
+ public function applyPsr7(Psr7Response $psr7Response): self;
}
diff --git a/application/Espo/Core/Api/ResponseWrapper.php b/application/Espo/Core/Api/ResponseWrapper.php
index f814c9417b..64934e46cd 100644
--- a/application/Espo/Core/Api/ResponseWrapper.php
+++ b/application/Espo/Core/Api/ResponseWrapper.php
@@ -129,6 +129,13 @@ class ResponseWrapper implements ApiResponse
return $this->psr7Response->getBody();
}
+ public function applyPsr7(Psr7Response $psr7Response): self
+ {
+ $this->psr7Response = $psr7Response;
+
+ return $this;
+ }
+
public function toPsr7(): Psr7Response
{
return $this->psr7Response;