From 35a2b49ef89424ba498dc54239496aa8a790b0e3 Mon Sep 17 00:00:00 2001 From: Kent Richards Date: Tue, 26 Jan 2016 10:42:03 -0800 Subject: [PATCH 1/2] Add request QUERY_STRING to server environment. kentr/php-pm-httpkernel#5, php-pm/php-pm-httpkernel#14 --- Bridges/HttpKernel.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bridges/HttpKernel.php b/Bridges/HttpKernel.php index e5cdde8..81a9fe2 100644 --- a/Bridges/HttpKernel.php +++ b/Bridges/HttpKernel.php @@ -138,6 +138,11 @@ protected static function mapRequest(ReactRequest $reactRequest, $content) $syRequest->setMethod($method); $syRequest->headers->replace($headers); + + // Add server environment. + // @see http://php.net/manual/en/reserved.variables.server.php. + // @see http://www.faqs.org/rfcs/rfc3875.html. + $syRequest->server->set('QUERY_STRING', http_build_query($query)); $syRequest->server->set('REQUEST_URI', $reactRequest->getPath()); $syRequest->server->set('SERVER_NAME', explode(':', $headers['Host'])[0]); From 7a0061cebd0bb90ee2f5a5d9cc6cf08fa965a9c9 Mon Sep 17 00:00:00 2001 From: Kent Richards Date: Tue, 26 Jan 2016 12:01:11 -0800 Subject: [PATCH 2/2] Convert mapRequest() to use SymfonyRequest::create() instead of new SymfonyRequest. Issues: kentr/php-pm-httpkernel#5 php-pm/php-pm-httpkernel#14 --- Bridges/HttpKernel.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Bridges/HttpKernel.php b/Bridges/HttpKernel.php index 81a9fe2..5423d9b 100644 --- a/Bridges/HttpKernel.php +++ b/Bridges/HttpKernel.php @@ -131,21 +131,13 @@ protected static function mapRequest(ReactRequest $reactRequest, $content) } } - $syRequest = new SymfonyRequest( - // $query, $request, $attributes, $cookies, $files, $server, $content - $query, $post, array(), $cookies, array(), array(), $content + $parameters = 'GET' === $method ? $query : $post; + $syRequest = SymfonyRequest::create( + // $uri, $method , $parameters , $cookies , $files , $server , $content + $reactRequest->getPath(), $method, $parameters, $cookies, array(), array(), $content ); - - $syRequest->setMethod($method); $syRequest->headers->replace($headers); - // Add server environment. - // @see http://php.net/manual/en/reserved.variables.server.php. - // @see http://www.faqs.org/rfcs/rfc3875.html. - $syRequest->server->set('QUERY_STRING', http_build_query($query)); - $syRequest->server->set('REQUEST_URI', $reactRequest->getPath()); - $syRequest->server->set('SERVER_NAME', explode(':', $headers['Host'])[0]); - return $syRequest; }