Upgrade to psr15 middleware (#18)

* Upgrade to psr15 middleware * Add test for CallableMiddleware constructor
narrowspark · Jan 24, 2018 · 59acc66 · 59acc66
1 parent a298f05
commit 59acc66
Show file tree

Hide file tree

Showing 12 changed files with 750 additions and 485 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,9 +2,18 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/.travis.yml        export-ignore
-/phpunit.xml.dist   export-ignore
-/.scrutinizer.yml   export-ignore
-/tests              export-ignore
+
+.php_cs                        export-ignore
+.gitattributes                 export-ignore
+.gitignore                     export-ignore
+.travis.yml                    export-ignore
+.editorconfig                  export-ignore
+phpstan.neon                   export-ignore
+
+/tests                         export-ignore
+
+CHANGELOG.md                   export-ignore
+CONTRIBUTING.md                export-ignore
+README.md                      export-ignore
+CODE_OF_CONDUCT.md             export-ignore
+
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Narrowspark
+Copyright (c) 2016-2018 Narrowspark
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/composer.json b/composer.json
@@ -21,17 +21,18 @@
     ],
     "require": {
         "php"                                     : "^7.1",
+        "http-interop/http-factory"               : "^0.3",
         "psr/container"                           : "^1.0",
         "psr/http-message"                        : "^1.0",
-        "http-interop/http-middleware"            : "^0.5"
+        "psr/http-server-middleware"              : "^1.0"
     },
     "require-dev": {
-        "guzzlehttp/psr7"                         : "^1.3",
+        "http-interop/http-factory-guzzle"        : "^0.3",
         "fzaninotto/faker"                        : "^1.6",
-        "mockery/mockery"                         : "^0.9",
+        "mockery/mockery"                         : "^1.0",
         "narrowspark/php-cs-fixer-config"         : "^2.0",
         "phpunit/phpunit"                         : "^6.0",
-        "phpstan/phpstan"                         : "^0.7"
+        "phpstan/phpstan"                         : "^0.9"
     },
     "autoload": {
         "psr-4": {
@@ -49,8 +50,10 @@
         "nyholm/nsa"                              : "Required to test your private/protected methods/properties (^1.1)."
     },
     "scripts": {
-        "cs"                                      : "sh vendor/bin/php-cs-fixer fix",
-        "phpstan"                                 : "sh vendor/bin/phpstan analyse -c phpstan.neon -l 6 src/"
+        "cs"                                      : "php-cs-fixer fix",
+        "test"                                    : "phpunit",
+        "coverage"                                : "phpunit --coverage-html=\"build/logs\"",
+        "phpstan"                                 : "phpstan analyse -c phpstan.neon -l 7 src"
     },
     "minimum-stability"                           : "dev",
     "prefer-stable"                               : true