request parsed body cloning

This commit is contained in:
Yuri Kuznetsov
2021-01-30 14:06:11 +02:00
parent 2f4422f719
commit 424df8d4fe
3 changed files with 140 additions and 1 deletions

View File

@@ -162,7 +162,7 @@ class RequestWrapper implements ApiRequest
$this->initParsedBody();
}
return $this->parsedBody;
return Util::cloneObject($this->parsedBody);
}
protected function initParsedBody()

View File

@@ -0,0 +1,69 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM - Open Source CRM application.
* Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
* Website: https://www.espocrm.com
*
* EspoCRM is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* EspoCRM is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with EspoCRM. If not, see http://www.gnu.org/licenses/.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU General Public License version 3.
*
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace Espo\Core\Api;
use StdClass;
class Util
{
public static function cloneObject(StdClass $source) : StdClass
{
$cloned = (object) [];
foreach (get_object_vars($source) as $k => $v) {
$cloned->$k = self::cloneObjectItem($v);
}
return $cloned;
}
private static function cloneObjectItem($item)
{
if (is_array($item)) {
$cloned = [];
foreach ($item as $v) {
$cloned[] = self::cloneObjectItem($v);
}
return $cloned;
}
if ($item instanceof StdClass) {
return self::cloneObject($item);
}
if (is_object($item)) {
return clone $item;
}
return $item;
}
}

View File

@@ -31,6 +31,7 @@ namespace tests\unit\Espo\Core\Api;
use Psr\Http\Message\{
ServerRequestInterface as Psr7Request,
StreamInterface,
};
use Espo\Core\Api\RequestWrapper;
@@ -112,4 +113,73 @@ class RequestTest extends \PHPUnit\Framework\TestCase
$this->assertEquals('2', $request->get('id'));
}
protected function createRequestWithBody(string $contents) : RequestWrapper
{
$body = $this->createMock(StreamInterface::class);
$body
->expects($this->any())
->method('getContents')
->willReturn($contents);
$this->request
->expects($this->any())
->method('getBody')
->willReturn($body);
$this->request
->expects($this->any())
->method('hasHeader')
->with('Content-Type')
->willReturn(true);
$this->request
->expects($this->any())
->method('getHeader')
->with('Content-Type')
->willReturn(['application/json']);
return new RequestWrapper($this->request);
}
public function testGetParsedBody()
{
$original = (object) [
'key1' => '1',
'key2' => (object) [
'key21' => [
'211',
'212',
(object) [
'2111' => '1',
],
],
],
'key3' => [
'31',
'32',
null,
],
'key4' => null,
];
$contents = json_encode($original);
$request = $this->createRequestWithBody($contents);
$parsed = $request->getParsedBody();
$anotherParsed = $request->getParsedBody();
$this->assertEquals($parsed, $original);
$this->assertEquals($parsed, $anotherParsed);
$this->assertNotSame($parsed, $anotherParsed);
$this->assertNotSame($parsed->key2, $anotherParsed->key2);
$this->assertNotSame($parsed->key2->key21[2], $anotherParsed->key2->key21[2]);
}
}