Depend on the standard library

CHANGELOG.md

@@ -5,14 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.2.0] - 2018-07-31
 ### Added
 - The `ApplicationProvider` now adds container entries for the standard http factories.
 
 ### Changed
 - The `ErrorHandler`, `NotFoundHandler` and `RouterMiddleware` now depend on the standard http factory interfaces.
+- The library now depends on PSR-17 standard library instead of the interop library
 
 ## 0.1.0 - 2018-07-16
 ### Added
 - Initial development release
 
-[Unreleased]: https://github.com/simply-framework/application/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/simply-framework/application/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/simply-framework/application/compare/v0.1.0...v0.2.0

README.md

@@ -8,9 +8,9 @@
 This package provides a bare-bones middleware framework that implements the different PSR standards and
 takes advantage of the Simply Router and Container to create a coherent whole.
 
-The application framework takes advantage of the [PSR-7 HTTP Message Interface], [PSR-11 Container Interface]
-and [PSR-15 HTTP Handlers] while also looking into being compatible with upcoming [PSR-17 HTTP Factories] via
-the http-factory interop.
+The application framework takes advantage of the [PSR-7 HTTP Message Interface], [PSR-11 Container Interface],
+[PSR-15 HTTP Handlers] and [PSR-17 HTTP Factories] standards in order to create an interoperable framework
+based on the community best practices and standards.
 
 NOTE: This package is part of a framework that is still highly experimental in nature. Stable api or proper
 documentation are not to be expected until the framework has been tested in practice.
@@ -26,4 +26,4 @@ See LICENSE for license and copying information.
 [PSR-7 HTTP Message Interface]: https://www.php-fig.org/psr/psr-7
 [PSR-11 Container Interface]: https://www.php-fig.org/psr/psr-11
 [PSR-15 HTTP Handlers]: https://www.php-fig.org/psr/psr-15
-[PSR-17 HTTP Factories]: https://github.com/php-fig/fig-standards/tree/master/proposed/http-factory/
+[PSR-17 HTTP Factories]: https://www.php-fig.org/psr/psr-17

composer.json

@@ -3,6 +3,7 @@
   "type": "library",
   "description": "A simple middleware application framework based on PSR standards",
   "keywords": [
+    "psr-17",
     "psr-15",
     "psr-11",
     "psr-7",
@@ -22,7 +23,7 @@
     "psr/http-server-middleware": "^1.0",
     "psr/container": "^1.0",
     "psr/http-message": "^1.0",
-    "http-interop/http-factory": "dev-master",
+    "psr/http-factory": "^1.0",
     "simply/router": "^0.2.3",
     "simply/container": "^0.2.1",
     "zendframework/zend-diactoros": "^1.8"

src/ApplicationProvider.php

@@ -2,13 +2,13 @@
 
 namespace Simply\Application;
 
-use Interop\Http\Factory\RequestFactoryInterface;
-use Interop\Http\Factory\ResponseFactoryInterface;
-use Interop\Http\Factory\ServerRequestFactoryInterface;
-use Interop\Http\Factory\StreamFactoryInterface;
-use Interop\Http\Factory\UploadedFileFactoryInterface;
-use Interop\Http\Factory\UriFactoryInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UriFactoryInterface;
 use Simply\Application\Handler\ErrorHandler;
 use Simply\Application\Handler\MiddlewareHandler;
 use Simply\Application\Handler\NotFoundHandler;

src/Handler/ErrorHandler.php

@@ -2,10 +2,10 @@
 
 namespace Simply\Application\Handler;
 
-use Interop\Http\Factory\ResponseFactoryInterface;
-use Interop\Http\Factory\StreamFactoryInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 /**

src/Handler/NotFoundHandler.php

@@ -2,10 +2,10 @@
 
 namespace Simply\Application\Handler;
 
-use Interop\Http\Factory\ResponseFactoryInterface;
-use Interop\Http\Factory\StreamFactoryInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
 /**

src/HttpFactory/HttpFactoryInterface.php

@@ -2,16 +2,16 @@
 
 namespace Simply\Application\HttpFactory;
 
-use Interop\Http\Factory\RequestFactoryInterface;
-use Interop\Http\Factory\ResponseFactoryInterface;
-use Interop\Http\Factory\ServerRequestFactoryInterface;
-use Interop\Http\Factory\StreamFactoryInterface;
-use Interop\Http\Factory\UploadedFileFactoryInterface;
-use Interop\Http\Factory\UriFactoryInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UriFactoryInterface;
 
 /**
- * A union interface for http factory interop interfaces.
+ * A union interface for http factory standard interfaces.
  * @author Riikka Kalliomäki <[email protected]>
  * @copyright Copyright (c) 2018 Riikka Kalliomäki
  * @license http://opensource.org/licenses/mit-license.php MIT License

src/Middleware/RouterMiddleware.php

@@ -2,11 +2,11 @@
 
 namespace Simply\Application\Middleware;
 
-use Interop\Http\Factory\ResponseFactoryInterface;
-use Interop\Http\Factory\StreamFactoryInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Simply\Application\Handler\MiddlewareHandler;

tests/tests/ApplicationProviderTest.php

@@ -2,11 +2,11 @@
 
 namespace Simply\Application;
 
-use Interop\Http\Factory\RequestFactoryInterface;
-use Interop\Http\Factory\ServerRequestFactoryInterface;
-use Interop\Http\Factory\UploadedFileFactoryInterface;
-use Interop\Http\Factory\UriFactoryInterface;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\ServerRequestFactoryInterface;
+use Psr\Http\Message\UploadedFileFactoryInterface;
+use Psr\Http\Message\UriFactoryInterface;
 use Simply\Container\ContainerBuilder;
 
 /**