Merge branch 'Psr7-Decorators'

Closes #67
Fixes #66

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
   - nightly
@@ -13,14 +12,14 @@ matrix:
     - php: nightly
 
 before_script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then composer require satooshi/php-coveralls:^0.7 squizlabs/php_codesniffer:^2.5 -n ; fi
-  - if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then composer install -n ; fi
+  - composer require php-coveralls/php-coveralls:^2.1.0
+  - composer install -n
 
 script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then mkdir -p build/logs && phpunit --coverage-clover build/logs/clover.xml ; fi
-  - if [[ "$TRAVIS_PHP_VERSION" != '7.0' ]]; then vendor/bin/phpunit ; fi
-  - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then vendor/bin/phpcs ; fi
-  - vendor/bin/phpstan analyse -l 3 src/
+  - mkdir -p build/logs && phpunit --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit
+  - vendor/bin/phpcs
+  - vendor/bin/phpstan analyse src tests
 
 after_script:
-  - if [[ "$TRAVIS_PHP_VERSION" == '7.0' ]]; then php vendor/bin/coveralls -v ; fi
+  - php vendor/bin/coveralls -v

README.md

@@ -1,7 +1,6 @@
 # Slim-Http
 
-Strict PSR-7 implementation used by the Slim Framework, but you may use it
-separately with any framework compatible with the PSR-7 standard.
+Slim PSR-7 Object Decorators
 
 [![Build Status](https://travis-ci.org/slimphp/Slim-Http.svg?branch=master)](https://travis-ci.org/slimphp/Slim-Http)
 [![Coverage Status](https://coveralls.io/repos/slimphp/Slim-Http/badge.svg?branch=master&service=github)](https://coveralls.io/github/slimphp/Slim-Http?branch=master)
@@ -18,7 +17,7 @@ $ composer require slim/http "^0.1"
 ```
 
 This will install the `slim/http` component and all required dependencies.
-PHP 7.0, or newer, is required.
+PHP 7.1, or newer, is required.
 
 ## Usage
 

composer.json

@@ -1,8 +1,8 @@
 {
   "name": "slim/http",
   "type": "library",
-  "description": "Slim's PSR-7 implementation",
-  "keywords": ["psr7","psr-7","http"],
+  "description": "Slim PSR-7 Object Decorators",
+  "keywords": ["psr7", "psr-7", "http"],
   "homepage": "http://slimframework.com",
   "license": "MIT",
   "authors": [
@@ -23,20 +23,24 @@
     }
   ],
   "require": {
-    "php": ">=7.0.0",
-    "psr/http-message": "^1.0"
+    "ext-json": "*",
+    "ext-libxml": "*",
+    "ext-SimpleXML": "*",
+    "php": "^7.1",
+    "psr/http-factory": "^1.0",
+    "psr/http-message": "^1.0",
+    "php-http/message-factory": "^1.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^2.5",
-    "phpunit/phpunit": "^6.0|^7.0",
-    "php-http/psr7-integration-tests": "dev-master",
-    "phpstan/phpstan": "^0.9"
+    "nyholm/psr7": "^1.0",
+    "phpunit/phpunit": "^7.0",
+    "phpstan/phpstan": "^0.10.3",
+    "squizlabs/php_codesniffer": "^3.3.2",
+    "zendframework/zend-diactoros": "^2.0",
+    "php-http/psr7-integration-tests": "dev-master"
   },
   "provide": {
-    "psr/http-message-implementation": "1.0"
-  },
-  "conflict": {
-    "slim/slim": "^3.0"
+    "php-http/message-factory": "^1.0"
   },
   "autoload": {
     "psr-4": {
@@ -51,9 +55,11 @@
   "scripts": {
       "test": [
           "@phpunit",
-          "@phpcs"
+          "@phpcs",
+          "@phpstan"
       ],
-      "phpunit": "php vendor/bin/phpunit",
-      "phpcs": "php vendor/bin/phpcs"
+      "phpunit": "php vendor/bin/phpunit --process-isolation",
+      "phpcs": "php vendor/bin/phpcs",
+      "phpstan": "php -d memory_limit=-1 vendor/bin/phpstan analyse src tests"
   }
 }

phpstan.neon.dist

@@ -0,0 +1,7 @@
+parameters:
+  level: max
+  ignoreErrors:
+    - '#Access to an undefined property Slim\\Http\\Decorators\\ResponseDecorator::\$foo#'
+    - '#Access to an undefined property Slim\\Http\\Decorators\\ServerRequestDecorator::\$foo#'
+    - '#Access to an undefined property Slim\\Http\\Decorators\\UriDecorator::\$foo#'
+    - '#Parameter \#1 \$port of method Slim\\Http\\Decorators\\UriDecorator::withPort() expects int|null, string given#'