mirror of
https://github.com/Icinga/icinga-php-thirdparty.git
synced 2025-08-14 06:08:18 +02:00
Compare commits
59 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ff25a12ed0 | ||
|
3ffc4e5833 | ||
|
2d8baeafe4 | ||
|
50f68d3fc3 | ||
|
3bc4158c81 | ||
|
63e153614d | ||
|
a3a9a0f9a8 | ||
|
6c862b2ab8 | ||
|
426e244015 | ||
|
a843109028 | ||
|
3a4ac0eae4 | ||
|
12de4298b3 | ||
|
0105d75397 | ||
|
17eacc0fa0 | ||
|
54f11ae3ed | ||
|
21f1fd0331 | ||
|
48424f5a88 | ||
|
60dc3cb74b | ||
|
d7dec5a35c | ||
|
515540e633 | ||
|
818b63f028 | ||
|
3efc86e9bc | ||
|
a33308e27f | ||
|
c614ddb31f | ||
|
d2a9d65913 | ||
|
83837dd07c | ||
|
76f8bce8d2 | ||
|
3a9e74ef58 | ||
|
2cb7b445bc | ||
|
79c1847b87 | ||
|
048c339cc9 | ||
|
8b455aa764 | ||
|
16df93679e | ||
|
6ba9c56b2c | ||
|
e509effd2f | ||
|
a46ad9ca72 | ||
|
b79a796867 | ||
|
f5ec92fb63 | ||
|
a737bf6c14 | ||
|
d6ba1c49b5 | ||
|
bd24853dbb | ||
|
445fef27e5 | ||
|
4230555a1e | ||
|
eae38fcabf | ||
|
f70b33a8ab | ||
|
852798998b | ||
|
44cd0d4612 | ||
|
891534ddf5 | ||
|
effa84a827 | ||
|
14a5202063 | ||
|
1ac4ad5e6c | ||
|
2e6cbc7590 | ||
|
257d966dd9 | ||
|
a8635b8871 | ||
|
231b334b37 | ||
|
f99236d0df | ||
|
5e93bacc09 | ||
|
126e5a1c67 | ||
|
d63a12ba2c |
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
.git* export-ignore
|
||||||
|
bin/ export-ignore
|
||||||
|
RELEASE.md export-ignore
|
11
.github/dependabot.yml
vendored
Normal file
11
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "composer"
|
||||||
|
directory: "/"
|
||||||
|
open-pull-requests-limit: 20 # Roughly half the number of dependencies
|
||||||
|
groups:
|
||||||
|
composer:
|
||||||
|
update-types:
|
||||||
|
- "patch"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
4
.github/workflows/create-snapshot.yml
vendored
4
.github/workflows/create-snapshot.yml
vendored
@ -14,7 +14,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code base
|
- name: Checkout code base
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
@ -28,7 +28,7 @@ jobs:
|
|||||||
- name: Setup PHP
|
- name: Setup PHP
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: '5.6'
|
php-version: '8.2'
|
||||||
|
|
||||||
- name: Create snapshot/nightly
|
- name: Create snapshot/nightly
|
||||||
if: success()
|
if: success()
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,2 @@
|
|||||||
/vendor/
|
|
||||||
/.idea/
|
/.idea/
|
||||||
.*.sw[op]
|
.*.sw[op]
|
||||||
|
@ -6,7 +6,7 @@ which can be integrated as library into Icinga Web 2.
|
|||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
* [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.9)
|
* [Icinga Web 2](https://github.com/Icinga/icingaweb2) (>= 2.9)
|
||||||
* PHP (>= 7.2)
|
* PHP (>= 8.2)
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ path for Icinga Web 2 installations is: `/usr/share/icinga-php`
|
|||||||
Download or clone this repository there (e.g. `/usr/share/icinga-php/vendor`) and you're done.
|
Download or clone this repository there (e.g. `/usr/share/icinga-php/vendor`) and you're done.
|
||||||
|
|
||||||
> **Note**: Do NOT install the GIT master, it will not work! Checking out a
|
> **Note**: Do NOT install the GIT master, it will not work! Checking out a
|
||||||
> branch like `stable/0.10.0` or a tag like `v0.10.0` is fine.
|
> branch like `stable/0.13.0` or a tag like `v0.13.0` is fine.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@ -24,7 +24,7 @@ Download or clone this repository there (e.g. `/usr/share/icinga-php/vendor`) an
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
INSTALL_PATH="/usr/share/icinga-php/vendor"
|
INSTALL_PATH="/usr/share/icinga-php/vendor"
|
||||||
INSTALL_VERSION="v0.10.0"
|
INSTALL_VERSION="v0.13.0"
|
||||||
mkdir "$INSTALL_PATH" \
|
mkdir "$INSTALL_PATH" \
|
||||||
&& wget -q "https://github.com/Icinga/icinga-php-thirdparty/archive/$INSTALL_VERSION.tar.gz" -O - \
|
&& wget -q "https://github.com/Icinga/icinga-php-thirdparty/archive/$INSTALL_VERSION.tar.gz" -O - \
|
||||||
| tar xfz - -C "$INSTALL_PATH" --strip-components 1
|
| tar xfz - -C "$INSTALL_PATH" --strip-components 1
|
||||||
@ -34,6 +34,6 @@ mkdir "$INSTALL_PATH" \
|
|||||||
|
|
||||||
```
|
```
|
||||||
INSTALL_PATH="/usr/share/icinga-php/vendor"
|
INSTALL_PATH="/usr/share/icinga-php/vendor"
|
||||||
INSTALL_VERSION="stable/0.10.0"
|
INSTALL_VERSION="stable/0.13.0"
|
||||||
git clone https://github.com/Icinga/icinga-php-thirdparty.git "$INSTALL_PATH" --branch "$INSTALL_VERSION"
|
git clone https://github.com/Icinga/icinga-php-thirdparty.git "$INSTALL_PATH" --branch "$INSTALL_VERSION"
|
||||||
```
|
```
|
||||||
|
@ -8,4 +8,4 @@ e.g.
|
|||||||
|
|
||||||
## Docker Example
|
## 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
|
||||||
|
13
asset/js/mbostock/LICENSE
Normal file
13
asset/js/mbostock/LICENSE
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Copyright 2010-2023 Mike Bostock
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and/or distribute this software for any purpose
|
||||||
|
with or without fee is hereby granted, provided that the above copyright notice
|
||||||
|
and this permission notice appear in all copies.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||||
|
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||||
|
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||||
|
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||||
|
OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||||
|
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
||||||
|
THIS SOFTWARE.
|
20625
asset/js/mbostock/d3.js
vendored
Normal file
20625
asset/js/mbostock/d3.js
vendored
Normal file
File diff suppressed because it is too large
Load Diff
2
asset/js/mbostock/d3.min.js
vendored
Normal file
2
asset/js/mbostock/d3.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -32,24 +32,13 @@ fi
|
|||||||
|
|
||||||
git rm -rf vendor
|
git rm -rf vendor
|
||||||
rm -rf vendor
|
rm -rf vendor
|
||||||
rm -f composer.lock
|
|
||||||
composer install || fail "composer install failed"
|
composer install || fail "composer install failed"
|
||||||
find vendor/ -type f -name "*.php" \
|
git add vendor
|
||||||
| grep -v '/examples/' \
|
|
||||||
| grep -v '/example/' \
|
|
||||||
| grep -v '/tests/' \
|
|
||||||
| grep -v '/test/' \
|
|
||||||
| xargs -L1 git add -f
|
|
||||||
find vendor/ -type f -name LICENSE | xargs -L1 git add -f
|
|
||||||
find vendor/ -type f -name '*.json' | xargs -L1 git add -f
|
|
||||||
find asset/ -type f | xargs -L1 git add -f
|
find asset/ -type f | xargs -L1 git add -f
|
||||||
echo "v$VERSION" > VERSION
|
echo "v$VERSION" > VERSION
|
||||||
git add VERSION
|
git add VERSION
|
||||||
git add composer.lock -f
|
|
||||||
git commit -m "Version v$VERSION"
|
git commit -m "Version v$VERSION"
|
||||||
|
|
||||||
rm -rf vendor
|
|
||||||
git checkout vendor
|
|
||||||
composer validate --no-check-all --strict || fail "Composer validate failed"
|
composer validate --no-check-all --strict || fail "Composer validate failed"
|
||||||
|
|
||||||
if [ -z "$NO_OPT" ]; then
|
if [ -z "$NO_OPT" ]; then
|
||||||
|
@ -18,7 +18,11 @@ if [[ -n $(git branch | grep $BRANCH) ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
git checkout -b $BRANCH
|
git checkout -b $BRANCH
|
||||||
git merge --no-ff -m "Merge latest tag, to make it reachable for git-describe" $LATEST_TAG
|
|
||||||
|
|
||||||
git commit -a -m "Require dev-master everywhere"
|
git mv composer.lock composer.lock.bak
|
||||||
|
git commit -am "Backup composer.lock"
|
||||||
|
git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG || (git checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit)
|
||||||
|
git mv -f composer.lock.bak composer.lock
|
||||||
|
git commit -am "Restore composer.lock" || true # in case composer.lock was not modified
|
||||||
|
|
||||||
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout
|
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout
|
||||||
|
@ -6,9 +6,6 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"config": {
|
"config": {
|
||||||
"sort-packages": true,
|
"sort-packages": true,
|
||||||
"platform": {
|
|
||||||
"php": "7.2"
|
|
||||||
},
|
|
||||||
"allow-plugins": {
|
"allow-plugins": {
|
||||||
"cweagans/composer-patches": true
|
"cweagans/composer-patches": true
|
||||||
}
|
}
|
||||||
@ -17,36 +14,45 @@
|
|||||||
"issues": "https://github.com/Icinga/icinga-php-thirdparty/issues"
|
"issues": "https://github.com/Icinga/icinga-php-thirdparty/issues"
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2 <=8.1",
|
"php": ">=8.2",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
"clue/block-react": "^1",
|
"clue/block-react": "^1.5",
|
||||||
"clue/connection-manager-extra": "^1",
|
"clue/connection-manager-extra": "^1.3",
|
||||||
"clue/http-proxy-react": "^1",
|
"clue/http-proxy-react": "^1.8",
|
||||||
"clue/mq-react": "^1",
|
"clue/mq-react": "^1.5",
|
||||||
"clue/redis-react": "^2",
|
"clue/redis-react": "^2.6",
|
||||||
"clue/soap-react": "^1",
|
"clue/soap-react": "^2",
|
||||||
"clue/socket-raw": "^1",
|
"clue/socket-raw": "^1.6",
|
||||||
"clue/socks-react": "^1",
|
"clue/socks-react": "^1.4",
|
||||||
"clue/stdio-react": "^2",
|
"clue/stdio-react": "^2.6",
|
||||||
|
"components/jquery": "3.7.*",
|
||||||
"cweagans/composer-patches": "~1.0",
|
"cweagans/composer-patches": "~1.0",
|
||||||
"evenement/evenement": "^3",
|
"dompdf/dompdf": "^3.1.0",
|
||||||
"predis/predis": "^1",
|
"erusev/parsedown": "^1.7.4",
|
||||||
"psr/http-message": "^1",
|
"evenement/evenement": "^3.0.1",
|
||||||
"ramsey/uuid": "^3",
|
"ezyang/htmlpurifier": "^4.16",
|
||||||
"react/child-process": "^0.6",
|
"guzzlehttp/guzzle": "^7.7",
|
||||||
"react/datagram": "^1",
|
"guzzlehttp/psr7": "^2.5",
|
||||||
"react/dns": "^1",
|
"jfcherng/php-diff": "^6.10.14",
|
||||||
"react/event-loop": "^1",
|
"predis/predis": "^3.0",
|
||||||
"react/http": "^1",
|
"psr/http-message": "^1.1",
|
||||||
"react/promise": "^2",
|
"ramsey/uuid": "^4.2.3",
|
||||||
"react/promise-stream": "^1",
|
"react/child-process": "^0.6.5",
|
||||||
"react/promise-timer": "^1",
|
"react/datagram": "^1.9",
|
||||||
"react/socket": "^1",
|
"react/dns": "^1.11",
|
||||||
"react/stream": "^1",
|
"react/event-loop": "^1.4",
|
||||||
"guzzlehttp/psr7": "^1",
|
"react/http": "^1.9",
|
||||||
"guzzlehttp/guzzle": "^6.5",
|
"react/promise": "^2.10",
|
||||||
"jfcherng/php-diff": "^6.10",
|
"react/promise-stream": "^1.6",
|
||||||
"components/jquery": "3.6.*"
|
"react/promise-timer": "^1.9",
|
||||||
|
"react/socket": "^1.13",
|
||||||
|
"react/stream": "^1.3",
|
||||||
|
"shardj/zf1-future": "^1.23.5",
|
||||||
|
"tedivm/jshrink": "^1.6.8",
|
||||||
|
"wikimedia/less.php": "^3.2.1",
|
||||||
|
"simshaun/recurr": "^5",
|
||||||
|
"dragonmantank/cron-expression": "^3",
|
||||||
|
"psr/log": "^1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
},
|
},
|
||||||
@ -54,6 +60,9 @@
|
|||||||
"psr-0": { "AssetLoader": "" }
|
"psr-0": { "AssetLoader": "" }
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"post-install-cmd": [
|
||||||
|
"AssetLoader::update"
|
||||||
|
],
|
||||||
"post-update-cmd": [
|
"post-update-cmd": [
|
||||||
"AssetLoader::update"
|
"AssetLoader::update"
|
||||||
]
|
]
|
||||||
@ -61,8 +70,8 @@
|
|||||||
"extra": {
|
"extra": {
|
||||||
"composer-exit-on-patch-failure": true,
|
"composer-exit-on-patch-failure": true,
|
||||||
"patches": {
|
"patches": {
|
||||||
"ramsey/uuid": {
|
"shardj/zf1-future": {
|
||||||
"Uuid: Add PHP 8.1 support": "patches/ramsey-uuid.patch"
|
"ZF1-Future: ZF backward compatibility": "patches/shardj-zf1-future.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4416
composer.lock
generated
Normal file
4416
composer.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
37
patches/ramsey-collection.patch
Normal file
37
patches/ramsey-collection.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
--- 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
|
||||||
|
|
@ -1,10 +0,0 @@
|
|||||||
--- 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();
|
|
22
patches/shardj-zf1-future.patch
Normal file
22
patches/shardj-zf1-future.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
--- a/vendor/shardj/zf1-future/library/Zend/Form/Element.php
|
||||||
|
+++ b/vendor/shardj/zf1-future/library/Zend/Form/Element.php
|
||||||
|
@@ -595,7 +595,7 @@ class Zend_Form_Element implements Zend_Validate_Interface
|
||||||
|
* @param string $key
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
- protected function _filterValue(&$value, $key)
|
||||||
|
+ protected function _filterValue(&$value, &$key)
|
||||||
|
{
|
||||||
|
foreach ($this->getFilters() as $filter) {
|
||||||
|
$value = $filter->filter($value);
|
||||||
|
@@ -612,7 +612,9 @@ class Zend_Form_Element implements Zend_Validate_Interface
|
||||||
|
$valueFiltered = $this->_value;
|
||||||
|
|
||||||
|
if ($this->isArray() && is_array($valueFiltered)) {
|
||||||
|
- array_walk_recursive($valueFiltered, [$this, '_filterValue']);
|
||||||
|
+ array_walk_recursive($valueFiltered, function (&$val, $key) {
|
||||||
|
+ $this->_filterValue($val, $key);
|
||||||
|
+ });
|
||||||
|
} else {
|
||||||
|
$this->_filterValue($valueFiltered, $valueFiltered);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user