Merge branch 'PSR7-Decoupling' into 4.x

Closes #2529

.travis.yml

@@ -6,24 +6,26 @@ dist: trusty
 
 matrix:
   include:
-    - php: 7.0
-    - php: 7.1
-      env: ANALYSIS='true'
-    - php: 7.2
-    - php: nightly
+  - php: 7.1
+    env: ANALYSIS='true'
+  - php: 7.2
+  - php: 7.3
+  - php: nightly
   allow_failures:
-    - php: nightly
+  - php: nightly
 
 before_script:
-  - composer update
+- composer require php-coveralls/php-coveralls:^2.1.0
+- composer install -n
 
 script:
-  - if [[ "$ANALYSIS" != 'true' ]]; then vendor/bin/phpunit ; fi
-  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
-  - if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpcs ; fi
+- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
+- vendor/bin/phpunit
+- vendor/bin/phpcs
+- vendor/bin/phpstan analyse Slim
 
-after_script:
-  - if [[ "$ANALYSIS" == 'true' ]]; then php vendor/bin/coveralls --coverage_clover=clover.xml -v ; fi
+after_success:
+- if [[ "$ANALYSIS" == 'true' ]]; then vendor/bin/php-coveralls --coverage_clover=clover.xml -v ; fi
 
 notifications:
   slack: slimphp:0RNzx2JuhkAqIf0MXcUZ0asT

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 ### Added
 
+- [#2529](https://github.com/slimphp/Slim/pull/2529) Slim no longer ships with a PSR-7 implementation. You need to provide a PSR-7 ServerRequest and a PSR-17 ResponseFactory to run Slim.
 - [#2497](https://github.com/slimphp/Slim/pull/2497) PSR-15 RequestHandlers can now be used as route callables
 - [#2496](https://github.com/slimphp/Slim/pull/2496) A Slim App can now be used as PSR-15 Request Handler
 - [#2405](https://github.com/slimphp/Slim/pull/2405) RoutingMiddleware now adds the `routingResults` request attribute to hold the results of routing

README.md

@@ -15,24 +15,162 @@ It's recommended that you use [Composer](https://getcomposer.org/) to install Sl
 $ composer require slim/slim "^4.0"
 ```
 
-This will install Slim and all required dependencies. Slim requires PHP 7.0.0 or newer.
+This will install Slim and all required dependencies. Slim requires PHP 7.1 or newer.
 
-## Usage
+## Choose a PSR-7 Implementation
 
-Create an index.php file with the following contents:
+Before you can get up and running with Slim you will need to choose a PSR-7 implementation that best fits your application. A few notable ones:
+- [Nyholm/psr7](https://github.com/Nyholm/psr7) - This is the fastest, strictest and most lightweight implementation at the moment
+- [Guzzle/psr7](https://github.com/guzzle/psr7) - This is the implementation used by the Guzzle Client. It is not as strict but adds some nice functionality for Streams and file handling. It is the second fastest implementation but is a bit bulkier
+- [zend-diactoros](https://github.com/zendframework/zend-diactoros) - This is the Zend implementation. It is the slowest implementation of the 3. 
 
+## Example Usage With Nyholm/psr7 and Nyholm/psr7-server
 ```php
 <?php
+require 'vendor/autoload.php';
+
+use Nyholm\Psr7\Factory\Psr17Factory;
+use Nyholm\Psr7Server\ServerRequestCreator;
+
+/**
+ * We need to instantiate our factories before instantiating Slim\App
+ * In the case of Nyholm/psr7 the Psr17Factory provides all the Http-Factories in one class
+ * which includes ResponseFactoryInterface
+ */
+$psr17Factory = new Psr17Factory();
+$serverRequestFactory = new ServerRequestCreator(
+    $psr17Factory,
+    $psr17Factory,
+    $psr17Factory,
+    $psr17Factory
+);
+
+/**
+ * The App::__constructor() method takes 1 mandatory parameter and 2 optional parameters
+ * @param ResponseFactoryInterface Any implementation of a ResponseFactory
+ * @param ContainerInterface|null Any implementation of a Container
+ * @param array Settings array
+ */
+$app = new Slim\App($psr17Factory);
+$app->get('/hello/{name}', function ($request, $response, $args) {
+    return $response->getBody()->write("Hello, " . $args['name']);
+});
+
+/**
+ * The App::run() method takes 1 parameter
+ * @param ServerRequestInterface An instantiation of a ServerRequest
+ */
+$request = $serverRequestFactory->fromGlobals();
+$app->run($request);
+```
+
+## Example Usage With Zend Diactoros & Zend HttpHandleRunner Response Emitter
+```php
+<?php
+require 'vendor/autoload.php';
+
+use Zend\Diactoros\ResponseFactory;
+use Zend\Diactoros\ServerRequestFactory;
+use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
+
+$responseFactory = new ResponseFactory();
+$serverRequestFactory = new ServerRequestFactory();
+
+/**
+ * The App::__constructor() method takes 1 mandatory parameter and 2 optional parameters
+ * @param ResponseFactoryInterface Any implementation of a ResponseFactory
+ * @param ContainerInterface|null Any implementation of a Container
+ * @param array Settings array
+ */
+$app = new Slim\App($responseFactory);
+$app->get('/hello/{name}', function ($request, $response, $args) {
+    return $response->getBody()->write("Hello, " . $args['name']);
+});
 
+/**
+ * The App::handle() method takes 1 parameter
+ * Note we are using handle() and not run() since we want to emit the response using Zend's Response Emitter
+ * @param ServerRequestInterface An instantiation of a ServerRequest
+ */
+$request = ServerRequestFactory::fromGlobals();
+$response = $app->handle($request);
+
+/**
+ * Once you have obtained the ResponseInterface from App::handle()
+ * You will need to emit the response by using an emitter of your choice
+ * We will use Zend HttpHandleRunner SapiEmitter for this example
+ */
+$responseEmitter = new SapiEmitter();
+$responseEmitter->emit($response);
+```
+
+## Example Usage With Slim-Http Decorators and Zend Diactoros
+```php
+<?php
 require 'vendor/autoload.php';
 
-$app = new Slim\App();
+use Slim\Http\Factory\DecoratedResponseFactory;
+use Slim\Http\Decorators\ServerRequestDecorator;
+use Zend\Diactoros\ResponseFactory;
+use Zend\Diactoros\ServerRequestFactory;
+use Zend\Diactoros\StreamFactory;
+
+$responseFactory = new ResponseFactory();
+$streamFactory = new StreamFactory();
+$decoratedResponseFactory = new DecoratedResponseFactory($responseFactory, $streamFactory);
+$serverRequestFactory = new ServerRequestFactory();
+
+/**
+ * The App::__constructor() method takes 1 mandatory parameter and 2 optional parameters
+ * Note that we pass in the decorated response factory which will give us access to the Slim\Http
+ * decorated Response methods like withJson()
+ * @param ResponseFactoryInterface Any implementation of a ResponseFactory
+ * @param ContainerInterface|null Any implementation of a Container
+ * @param array Settings array
+ */
+$app = new Slim\App($decoratedResponseFactory);
+$app->get('/hello/{name}', function ($request, $response, $args) {
+    return $response->withJson(['Hello' => 'World']);
+});
+
+/**
+ * The App::run() method takes 1 parameter
+ * Note that we pass in the decorated server request object which will give us access to the Slim\Http
+ * decorated ServerRequest methods like withRedirect()
+ * @param ServerRequestInterface An instantiation of a ServerRequest
+ */
+$request = ServerRequestFactory::fromGlobals();
+$decoratedServerRequest = new ServerRequestDecorator($request);
+$app->run($decoratedServerRequest);
+```
 
+## Example Usage With Guzzle PSR-7 and Guzzle HTTP Factory
+```php
+<?php
+require 'vendor/autoload.php';
+
+use GuzzleHttp\Psr7\ServerRequest;
+use Http\Factory\Guzzle\ResponseFactory;
+
+$responseFactory = new ResponseFactory();
+
+/**
+ * The App::__constructor() method takes 1 mandatory parameter and 2 optional parameters
+ * @param ResponseFactoryInterface Any implementation of a ResponseFactory
+ * @param ContainerInterface|null Any implementation of a Container
+ * @param array Settings array
+ */
+$app = new Slim\App($responseFactory);
 $app->get('/hello/{name}', function ($request, $response, $args) {
-    return $response->write("Hello, " . $args['name']);
+    return $response->getBody()->write("Hello, " . $args['name']);
 });
 
-$app->run();
+/**
+ * The App::run() method takes 1 parameter
+ * @param ServerRequestInterface An instantiation of a ServerRequest
+ */
+$request = ServerRequest::fromGlobals();
+$app->run($request);
 ```
 
 You may quickly test this using the built-in PHP server:
@@ -45,11 +183,12 @@ Going to http://localhost:8000/hello/world will now display "Hello, world".
 For more information on how to configure your web server, see the [Documentation](https://www.slimframework.com/docs/start/web-servers.html).
 
 ## Tests
-
-To execute the test suite, you'll need phpunit.
+To execute the test suite, you'll need to install all development dependencies.
 
 ```bash
-$ phpunit
+$ git clone https://github.com/slimphp/Slim-Http
+$ composer install
+$ composer test
 ```
 
 ## Contributing
@@ -75,6 +214,7 @@ If you discover security related issues, please email security@slimframework.com
 - [Josh Lockhart](https://github.com/codeguy)
 - [Andrew Smith](https://github.com/silentworks)
 - [Rob Allen](https://github.com/akrabat)
+- [Pierre Bérubé](https://github.com/l0gicgate)
 - [Gabriel Manricks](https://github.com/gmanricks)
 - [All Contributors](../../contributors)