gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PSR-7 implementation for GET and test implementation for POST

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2023-01-20 13:12:22 +04:00
parent 137488d4c2
commit 89adbcfe9b
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 100 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/classes/Http/Factory/ServerRequestFactory.php
View File

@ -94,27 +94,38 @@ class ServerRequestFactory
/** @var ServerRequestInterface $serverRequest */
$serverRequest = LaminasServerRequestFactory::fromGlobals();
} else {
$serverRequest = self::createServerRequestFromGlobals();
$creator = new self();
$serverRequest = self::createServerRequestFromGlobals($creator);
}
return new ServerRequest($serverRequest);
}
private static function createServerRequestFromGlobals(): ServerRequestInterface
/**
* @return array<string, string>
*/
protected function getallheaders(): array
{
/** @var array<string, string> $headers */
$headers = function_exists('getallheaders') ? getallheaders() : [];
return $headers;
}
private static function createServerRequestFromGlobals(self $creator): ServerRequestInterface
{
$creator = new self();
$serverRequest = $creator->serverRequestFactory->createServerRequest(
$_SERVER['REQUEST_METHOD'] ?? 'GET',
$creator->createUriFromGlobals($_SERVER),
$_SERVER
);
/** @var array<string, string> $headers */
$headers = function_exists('getallheaders') ? getallheaders() : [];
foreach ($headers as $name => $value) {
foreach ($creator->getallheaders() as $name => $value) {
$serverRequest = $serverRequest->withAddedHeader($name, $value);
}
$serverRequest = $serverRequest->withQueryParams($_GET);
if ($serverRequest->getMethod() !== 'POST') {
return $serverRequest;
}

5
phpstan-baseline.neon
View File

@ -10560,6 +10560,11 @@ parameters:
count: 1
path: test/classes/Http/Factory/ServerRequestFactoryTest.php
-
message: "#^Parameter \\#1 \\$serverRequest of class PhpMyAdmin\\\\Http\\\\ServerRequest constructor expects Psr\\\\Http\\\\Message\\\\ServerRequestInterface, mixed given\\.$#"
count: 1
path: test/classes/Http/Factory/ServerRequestFactoryTest.php
-
message: "#^Method PhpMyAdmin\\\\Tests\\\\ImportTest\\:\\:provDetectType\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1

81
test/classes/Http/Factory/ServerRequestFactoryTest.php
View File

@ -8,6 +8,7 @@ use GuzzleHttp\Psr7\HttpFactory as GuzzleHttpFactory;
use Laminas\Diactoros\ServerRequestFactory as LaminasServerRequestFactory;
use Nyholm\Psr7\Factory\Psr17Factory as NyholmPsr17Factory;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Http\ServerRequest;
use PhpMyAdmin\Tests\AbstractTestCase;
use Psr\Http\Message\ServerRequestFactoryInterface;
use Slim\Psr7\Factory\ServerRequestFactory as SlimServerRequestFactory;
@ -72,19 +73,20 @@ class ServerRequestFactoryTest extends AbstractTestCase
*
* @dataProvider dataProviderPsr7Implementations
*/
public function testPsr7Implementation(string $className, string $humanName): void
public function testPsr7ImplementationGet(string $className, string $humanName): void
{
$this->testOrSkip($className, $humanName);
$_GET['foo'] = 'bar';
$_GET['blob'] = 'baz';
$_SERVER['QUERY_STRING'] = 'foo=bar&blob=baz';
$_SERVER['REQUEST_URI'] = '/test-page.php';
$_SERVER['REQUEST_METHOD'] = 'PATCH';
$_SERVER['REQUEST_METHOD'] = 'GET';
$_SERVER['HTTP_HOST'] = 'phpmyadmin.local';
$request = ServerRequestFactory::createFromGlobals();
$this->assertSame(
'PATCH',
'GET',
$request->getMethod()
);
$this->assertSame(
@ -112,6 +114,79 @@ class ServerRequestFactoryTest extends AbstractTestCase
], $request->getQueryParams());
}
public function testCreateServerRequestFromGlobals(): void
{
$_GET['foo'] = 'bar';
$_GET['blob'] = 'baz';
$_POST['input1'] = 'value1';
$_POST['input2'] = 'value2';
$_POST['input3'] = '';
$_SERVER['QUERY_STRING'] = 'foo=bar&blob=baz';
$_SERVER['REQUEST_URI'] = '/test-page.php';
$_SERVER['REQUEST_METHOD'] = 'POST';
$_SERVER['HTTP_HOST'] = 'phpmyadmin.local';
$creator = $this->getMockBuilder(ServerRequestFactory::class)
->setMethods(['getallheaders'])
->getMock();
$creator
->method('getallheaders')
->willReturn(['Content-Type' => 'application/x-www-form-urlencoded']);
$serverRequest = $this->callFunction(
$creator,
ServerRequestFactory::class,
'createServerRequestFromGlobals',
[$creator]
);
$request = new ServerRequest($serverRequest);
$this->assertSame(
['application/x-www-form-urlencoded'],
$request->getHeader('Content-Type')
);
$this->assertSame(
'POST',
$request->getMethod()
);
$this->assertSame(
'http://phpmyadmin.local/test-page.php?foo=bar&blob=baz',
$request->getUri()->__toString()
);
$this->assertTrue(
$request->isPost()
);
$this->assertSame(
'default',
$request->getParam('not-exists', 'default')
);
$this->assertSame(
'bar',
$request->getParam('foo')
);
$this->assertSame(
'baz',
$request->getParam('blob')
);
$this->assertSame([
'foo' => 'bar',
'blob' => 'baz',
], $request->getQueryParams());
$this->assertSame([
'input1' => 'value1',
'input2' => 'value2',
'input3' => '',
], $request->getParsedBody());
$this->assertNull($request->getParsedBodyParam('foo'));
$this->assertSame('value1', $request->getParsedBodyParam('input1'));
$this->assertSame('value2', $request->getParsedBodyParam('input2'));
$this->assertSame('', $request->getParsedBodyParam('input3', 'default'));
}
/**
* @phpstan-param class-string $className
*