diff --git a/README.md b/README.md index 6992564..ffc7ab7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ which can be integrated as library into Icinga Web 2. ## Requirements * [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.9) -* PHP (>= 7.1.3) +* PHP (>= 7.2) ## Installation diff --git a/RELEASE.md b/RELEASE.md index c28863e..db94aeb 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,4 +8,4 @@ e.g. ## Docker Example - docker run -it -v $(pwd):/tmp/pwd -w /tmp/pwd -v $(realpath ~/.gitconfig):/tmp/user/.gitconfig -e "HOME=/tmp/user" -u $(id -u):$(id -g) dev-docker_web56 bin/make-release.sh 1.0.0 --no-tag + docker run -it -v $(pwd):/tmp/pwd -w /tmp/pwd -v $(realpath ~/.gitconfig):/tmp/user/.gitconfig -e "HOME=/tmp/user" -u $(id -u):$(id -g) dev-docker_web72 bin/make-release.sh 1.0.0 --no-tag diff --git a/composer.json b/composer.json index ce10ba3..a0ec7a0 100644 --- a/composer.json +++ b/composer.json @@ -7,14 +7,17 @@ "config": { "sort-packages": true, "platform": { - "php": "7.1.3" + "php": "7.2" + }, + "allow-plugins": { + "cweagans/composer-patches": true } }, "support": { "issues": "https://github.com/Icinga/icinga-php-thirdparty/issues" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2 <=8.1", "ext-curl": "*", "clue/block-react": "^1", "clue/connection-manager-extra": "^1", @@ -25,7 +28,8 @@ "clue/socket-raw": "^1", "clue/socks-react": "^1", "clue/stdio-react": "^2", - "evenement/evenement": "^2", + "cweagans/composer-patches": "~1.0", + "evenement/evenement": "^3", "predis/predis": "^1", "psr/http-message": "^1", "ramsey/uuid": "^3", @@ -53,5 +57,13 @@ "post-update-cmd": [ "AssetLoader::update" ] + }, + "extra": { + "composer-exit-on-patch-failure": true, + "patches": { + "ramsey/uuid": { + "Uuid: Add PHP 8.1 support": "patches/ramsey-uuid.patch" + } + } } } diff --git a/patches/ramsey-uuid.patch b/patches/ramsey-uuid.patch new file mode 100644 index 0000000..2715351 --- /dev/null +++ b/patches/ramsey-uuid.patch @@ -0,0 +1,10 @@ +--- a/vendor/ramsey/uuid/src/Uuid.php ++++ b/vendor/ramsey/uuid/src/Uuid.php +@@ -212,6 +212,7 @@ class Uuid implements UuidInterface + * @return string + * @link http://php.net/manual/en/class.jsonserializable.php + */ ++ #[\ReturnTypeWillChange] + public function jsonSerialize() + { + return $this->toString();