Compare commits

...

6 Commits

Author SHA1 Message Date
Johannes Meyer
ac844e6464 composer.json: Raise ipl/orm requirement 2025-07-14 13:53:18 +02:00
Johannes Meyer
2afd0f67eb Update README.md 2025-05-22 13:18:57 +02:00
Johannes Meyer
84c91fbac0 composer.json: Raise ipl-web requirement 2025-05-22 12:57:40 +02:00
Johannes Meyer
3e895ee7e6 RELEASE.md: Update docker example 2025-05-22 11:25:22 +02:00
Johannes Meyer
7b1ea02863 Remove patch for ramsey/collection
It's obsolte now since the raise to PHP 8.2
2025-05-21 13:15:39 +02:00
Johannes Meyer
ce45fede7e Raise required PHP version to 8.2 2025-05-21 13:15:29 +02:00
4 changed files with 9 additions and 58 deletions

View File

@ -5,7 +5,7 @@ This project bundles all Icinga PHP libraries into one piece and can be integrat
## Requirements
* [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.9)
* PHP (>= 7.2)
* PHP (>= 8.2)
## Bundled Parts
@ -26,7 +26,7 @@ path for Icinga Web 2 installations is: `/usr/share/icinga-php`
Download or clone this repository there (e.g. `/usr/share/icinga-php/ipl`) and you're done.
> **Note**: Do NOT use the default branch, it will not work! Checking out a
> branch like `stable/0.10.1` or a tag like `v0.10.1` is fine.
> branch like `stable/0.16.0` or a tag like `v0.16.0` is fine.
### Examples
@ -34,7 +34,7 @@ Download or clone this repository there (e.g. `/usr/share/icinga-php/ipl`) and y
```sh
INSTALL_PATH="/usr/share/icinga-php/ipl"
INSTALL_VERSION="v0.10.1"
INSTALL_VERSION="v0.16.0"
mkdir "$INSTALL_PATH" \
&& wget -q "https://github.com/Icinga/icinga-php-library/archive/$INSTALL_VERSION.tar.gz" -O - \
| tar xfz - -C "$INSTALL_PATH" --strip-components 1
@ -44,6 +44,6 @@ mkdir "$INSTALL_PATH" \
```
INSTALL_PATH="/usr/share/icinga-php/ipl"
INSTALL_VERSION="stable/0.10.1"
INSTALL_VERSION="stable/0.16.0"
git clone https://github.com/Icinga/icinga-php-library.git "$INSTALL_PATH" --branch "$INSTALL_VERSION"
```

View File

@ -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_web72 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_web82 bin/make-release.sh 1.0.0 --no-tag

View File

@ -7,23 +7,19 @@
"config": {
"sort-packages": true,
"platform": {
"php": "7.2.9"
},
"allow-plugins": {
"cweagans/composer-patches": true
"php": "8.2"
}
},
"require": {
"php": ">=7.2",
"php": ">=8.2",
"ipl/html": "^0.8.0",
"ipl/i18n": "^0.2.0",
"ipl/orm": "^0.6.0",
"ipl/orm": "^0.7.0",
"ipl/scheduler": "^0.1.0",
"ipl/sql": "^0.7.0",
"ipl/stdlib": "^0.14.0",
"ipl/validator": "^0.5.0",
"ipl/web": "^0.10.0",
"cweagans/composer-patches": "~1.0"
"ipl/web": "^0.11.0"
},
"require-dev": {
},
@ -34,13 +30,5 @@
"post-update-cmd": [
"AssetLoader::update"
]
},
"extra": {
"composer-exit-on-patch-failure": true,
"patches": {
"ramsey/collection": {
"Collection: Add PHP 8.1 support": "patches/ramsey-collection.patch"
}
}
}
}

View File

@ -1,37 +0,0 @@
--- a/vendor/ramsey/collection/src/AbstractArray.php
+++ b/vendor/ramsey/collection/src/AbstractArray.php
@@ -84,6 +84,7 @@ abstract class AbstractArray implements ArrayInterface
* @return T|null the value stored at the offset, or null if the offset
* does not exist.
*/
+ #[\ReturnTypeWillChange]
public function offsetGet($offset)
{
return $this->data[$offset] ?? null;
@@ -132,6 +133,11 @@ abstract class AbstractArray implements ArrayInterface
return serialize($this->data);
}
+ public function __serialize()
+ {
+ return $this->serialize();
+ }
+
/**
* Converts a serialized string representation into an instance object.
*
@@ -149,6 +155,11 @@ abstract class AbstractArray implements ArrayInterface
$this->data = $data;
}
+ public function __unserialize(array $data)
+ {
+ $this->unserialize($data);
+ }
+
/**
* Returns the number of items in this array.
*
--
2.41.0