PHP 8.1 compatibility

* Bump version of `tukio` to `1.3.0`
* Bump version of `laminas/laminas-diactoros` to `2.8.0`
* Add 8.1 version into CI workflows
* Fix `StreamInterface::__toString()` compatibility with PHP 8.1

Closes #92
Closes #93

.ci/deps.json

@@ -23,10 +23,10 @@
     "HTTP_GUZZLE_PSR18_ADAPTER_VERSION": "ade71939e1805b6e5305dbec4fb72b64f983b12d",
     "TUKIO_SHORTNAME": "tukio",
     "TUKIO_REPO": "https://github.com/Crell/Tukio.git",
-    "TUKIO_VERSION": "1.2.0",
+    "TUKIO_VERSION": "1.3.0",
     "LAMINAS_DIACTOROS_SHORTNAME": "laminas-diactoros",
     "LAMINAS_DIACTOROS_REPO": "https://github.com/laminas/laminas-diactoros.git",
-    "LAMINAS_DIACTOROS_VERSION": "2.5.0",
+    "LAMINAS_DIACTOROS_VERSION": "2.8.0",
     "RELAY_SHORTNAME": "relay",
     "RELAY_REPO": "https://github.com/jbboehr/Relay.Relay.git",
     "RELAY_VERSION": "d1b26ae9e1cbfcc713f1e7d328a88fb1fba1ab9b",

.ci/travis_php.sh

@@ -10,7 +10,7 @@ export COVERAGE=${COVERAGE:-true}
 export PHP_VERSION_ID=$(php -r 'echo PHP_VERSION_ID;')
 # error_reporting='E_ALL & ~E_DEPRECATED'
 export PHP_WITH_EXT="`which php` -d error_reporting=24575 -d extension=`pwd`/modules/psr.so"
-export DEFAULT_COMPOSER_FLAGS="--ansi --no-interaction --no-progress --prefer-dist"
+export DEFAULT_COMPOSER_FLAGS="--ansi --no-interaction --no-progress --prefer-dist --ignore-platform-reqs"
 export PHP_VERSION_ID=$(php -r 'echo PHP_VERSION_ID;')
 
 export NO_INTERACTION=1

.github/php-debian.Dockerfile

@@ -1,4 +1,3 @@
-
 ARG PHP_VERSION=7.4
 ARG BASE_IMAGE=php:$PHP_VERSION
 

.github/php-fedora.Dockerfile

@@ -1,4 +1,3 @@
-
 ARG BASE_IMAGE=fedora:latest
 
 # image0

.github/workflows/docker.yml

@@ -28,6 +28,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/linux.yml

@@ -26,6 +26,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         coverage:
           - "true"
           - "false"

.github/workflows/osx.yml

@@ -26,6 +26,7 @@ jobs:
         php-versions:
           - "7.4"
           - "8.0"
+          - "8.1"
     steps:
       - uses: actions/checkout@v2
       - run: bash .github/scripts/osx.sh

.github/workflows/windows.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [windows-2016]
-        php-versions: ["7.4", "8.0"]
+        php-versions: ["7.4", "8.0", "8.1"]
         ts: [ts, nts]
         include:
           - php-versions: "7.4"
@@ -33,6 +33,10 @@ jobs:
             vc_num: "vs16"
             arch: x64
             build_type: Win32
+          - php-versions: "8.1"
+            vc_num: "vs16"
+            arch: x64
+            build_type: Win32
 
     steps:
       - name: Disable Git autocrlf

psr_http_message.h

@@ -142,7 +142,11 @@ PHP_PSR_BEGIN_ARG_INFO(HttpMessage, ServerRequestInterface, withoutAttribute, 1)
     ZEND_ARG_INFO(0, name)
 PHP_PSR_END_ARG_INFO()
 
+#if PHP_VERSION_ID >= 80000
+PHP_PSR_BEGIN_ARG_WITH_RETURN_TYPE_INFO(HttpMessage, StreamInterface, __toString, 0, IS_STRING, 0)
+#else
 PHP_PSR_BEGIN_ARG_INFO(HttpMessage, StreamInterface, __toString, 0)
+#endif
 PHP_PSR_END_ARG_INFO()
 
 PHP_PSR_BEGIN_ARG_INFO(HttpMessage, StreamInterface, close, 0)
@@ -264,7 +268,11 @@ PHP_PSR_BEGIN_ARG_INFO(HttpMessage, UriInterface, withFragment, 1)
     ZEND_ARG_INFO(0, fragment)
 PHP_PSR_END_ARG_INFO()
 
+#if PHP_VERSION_ID >= 80000
+PHP_PSR_BEGIN_ARG_WITH_RETURN_TYPE_INFO(HttpMessage, UriInterface, __toString, 0, IS_STRING, 0)
+#else
 PHP_PSR_BEGIN_ARG_INFO(HttpMessage, UriInterface, __toString, 0)
+#endif
 PHP_PSR_END_ARG_INFO()
 
 #endif /* PSR_HTTP_MESSAGE_H */