-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add psr7 factory and use psr7 stream and uri interface
- Loading branch information
Showing
15 changed files
with
501 additions
and
640 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,61 +18,24 @@ | |
| * limitations under the License. | ||
| */ | ||
|
|
||
| namespace PSX\Http\Psr; | ||
| namespace PSX\Http\Factory; | ||
|
|
||
| use Psr\Http\Message\RequestInterface as PsrRequestInterface; | ||
| use Psr\Http\Message\ResponseInterface as PsrResponseInterface; | ||
| use Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface; | ||
| use PSX\Http\Request; | ||
| use PSX\Http\RequestInterface; | ||
| use PSX\Http\Response; | ||
| use PSX\Http\ResponseInterface; | ||
| use PSX\Uri; | ||
|
|
||
| /** | ||
| * Factory | ||
| * NativeFactory | ||
| * | ||
| * @author Christoph Kappestein <[email protected]> | ||
| * @license http://www.apache.org/licenses/LICENSE-2.0 | ||
| * @link http://phpsx.org | ||
| */ | ||
| class Factory implements FactoryInterface | ||
| class NativeFactory | ||
| { | ||
| public function getPsrRequest(RequestInterface $request) | ||
| { | ||
| // @TODO wait until the PSR gets accepted and use an open-source | ||
| // implementation | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| public function getPsrServerRequest(RequestInterface $request) | ||
| { | ||
| // @TODO wait until the PSR gets accepted and use an open-source | ||
| // implementation | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| public function getPsrResponse(ResponseInterface $response) | ||
| { | ||
| // @TODO wait until the PSR gets accepted and use an open-source | ||
| // implementation | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| public function getNativeRequest(PsrRequestInterface $psrRequest) | ||
| { | ||
| return new Request( | ||
| new Uri($psrRequest->getUri()), | ||
| $psrRequest->getMethod(), | ||
| $psrRequest->getHeaders(), | ||
| $psrRequest->getBody() | ||
| ); | ||
| } | ||
|
|
||
| public function getNativeServerRequest(PsrServerRequestInterface $psrRequest) | ||
| public static function createRequest(PsrServerRequestInterface $psrRequest) | ||
| { | ||
| $request = new Request( | ||
| new Uri($psrRequest->getUri()), | ||
|
|
@@ -81,10 +44,16 @@ public function getNativeServerRequest(PsrServerRequestInterface $psrRequest) | |
| $psrRequest->getBody() | ||
| ); | ||
|
|
||
| $attributes = $psrRequest->getAttributes(); | ||
| foreach($attributes as $name => $value) | ||
| { | ||
| $request->setAttribute($name, $value); | ||
| } | ||
|
|
||
| return $request; | ||
| } | ||
|
|
||
| public function getNativeResponse(PsrResponseInterface $psrResponse) | ||
| public static function createResponse(PsrResponseInterface $psrResponse) | ||
| { | ||
| return new Response( | ||
| $psrResponse->getStatusCode(), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <?php | ||
| /* | ||
| * PSX is a open source PHP framework to develop RESTful APIs. | ||
| * For the current version and informations visit <http://phpsx.org> | ||
| * | ||
| * Copyright 2010-2015 Christoph Kappestein <[email protected]> | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| namespace PSX\Http\Factory; | ||
|
|
||
| use Zend\Diactoros\Response as PsrResponse; | ||
| use Zend\Diactoros\ServerRequestFactory; | ||
| use PSX\Http\RequestInterface; | ||
| use PSX\Http\ResponseInterface; | ||
|
|
||
| /** | ||
| * Psr7Factory | ||
| * | ||
| * @author Christoph Kappestein <[email protected]> | ||
| * @license http://www.apache.org/licenses/LICENSE-2.0 | ||
| * @link http://phpsx.org | ||
| */ | ||
| class Psr7Factory | ||
| { | ||
| public static function createRequest(RequestInterface $request) | ||
| { | ||
| $psrRequest = ServerRequestFactory::fromGlobals() | ||
| ->withUri($request->getUri()) | ||
| ->withMethod($request->getMethod()) | ||
| ->withBody($request->getBody()); | ||
|
|
||
| foreach($request->getHeaders() as $name => $values) | ||
| { | ||
| $psrRequest = $psrRequest->withHeader($name, $values); | ||
| } | ||
|
|
||
| return $psrRequest; | ||
| } | ||
|
|
||
| public static function createResponse(ResponseInterface $response) | ||
| { | ||
| return new PsrResponse( | ||
| $response->getBody(), | ||
| $response->getStatusCode(), | ||
| $response->getHeaders() | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.