build(deps): bump tedivm/jshrink from 1.7.0 to 1.8.0

Bumps [tedivm/jshrink](https://github.com/tedious/JShrink) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/tedious/JShrink/releases)
- [Commits](https://github.com/tedious/JShrink/compare/v1.7.0...v1.8.0)

---
updated-dependencies:
- dependency-name: tedivm/jshrink
  dependency-version: 1.8.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

@@ -0,0 +1,3 @@
+.git* export-ignore
+bin/ export-ignore
+RELEASE.md export-ignore

.github/dependabot.yml

@@ -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"

.github/workflows/create-snapshot.yml

@@ -0,0 +1,39 @@
+name: Create Snapshot
+
+on:
+  schedule:
+    # Every day at 4pm
+    - cron: "0 16 * * *"
+  workflow_dispatch:
+
+jobs:
+  make-snapshot:
+    name: Make a nightly snapshot
+    runs-on: ubuntu-latest
+    if: github.repository == 'Icinga/icinga-php-thirdparty'
+
+    steps:
+      - name: Checkout code base
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Prepare Git environment
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+          echo '{"github-oauth": {"github.com": "${{ secrets.ICINGABOT_TOKEN }}"}}' > auth.json
+          echo 'auth.json' >> .gitignore
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+
+      - name: Create snapshot/nightly
+        if: success()
+        run: bin/make-snapshot.sh snapshot/nightly
+
+      - name: Push snapshot/nightly
+        if: success()
+        run: git push -f origin snapshot/nightly

.gitignore

@@ -1,3 +1,2 @@
-/vendor/
 /.idea/
 .*.sw[op]

AssetLoader.php

@@ -0,0 +1,14 @@
+<?php
+
+class AssetLoader
+{
+    public static function update(Composer\Script\Event $event)
+    {
+        if (! is_dir('asset/js/jquery')) {
+            mkdir('asset/js/jquery', 0775, true);
+        }
+
+        copy('vendor/components/jquery/jquery.js', 'asset/js/jquery/jquery.js');
+        copy('vendor/components/jquery/jquery.min.js', 'asset/js/jquery/jquery.min.js');
+    }
+}

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 (>= 5.6, 7+ recommended)
+* PHP (>= 8.2)
 
 ## 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.
 
 > **Note**: Do NOT install the GIT master, it will not work! Checking out a
-> branch like `stable/1.0.0` or a tag like `v1.0.0` is fine.
+> branch like `stable/0.13.0` or a tag like `v0.13.0` is fine.
 
 ### Examples
 
@@ -24,8 +24,8 @@ Download or clone this repository there (e.g. `/usr/share/icinga-php/vendor`) an
 
 ```sh
 INSTALL_PATH="/usr/share/icinga-php/vendor"
-INSTALL_VERSION="v1.0.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 - \
    | tar xfz - -C "$INSTALL_PATH" --strip-components 1
 ```
@@ -34,6 +34,6 @@ mkdir "$INSTALL_PATH"
 
 ```
 INSTALL_PATH="/usr/share/icinga-php/vendor"
-INSTALL_VERSION="stable/1.0.0"
+INSTALL_VERSION="stable/0.13.0"
 git clone https://github.com/Icinga/icinga-php-thirdparty.git "$INSTALL_PATH" --branch "$INSTALL_VERSION"
 ```

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

asset/css/vendor/diff-table.less

@@ -0,0 +1,185 @@
+/**
+ * This is based on https://github.com/jfcherng/php-diff/blob/6.10.2/example/diff-table.scss
+ *
+ * It's been converted by performing these steps:
+ *  - npm install less-plugin-sass2less --save-dev
+ *  - ./node_modules/.bin/sass2less -c /usr/share/icinga-php/vendor/vendor/jfcherng/php-diff/example \
+ *    diff-table.scss > /usr/share/icinga-php/vendor/asset/css/vendor/diff-table.less
+ *  - `@diff-text-color: invert(@diff-bg-color)` though had to be changed to `@diff-text-color: black`.
+ *    (`@diff-text-color: spin(@diff-bg-color, 180)` didn't work)
+ */
+
+@diff-bg-color: #fff;
+@diff-text-color: black;
+
+@diff-bg-color-ins-base: #8e8;
+@diff-bg-color-del-base: #e88;
+@diff-bg-color-rep-base: #fbdb65;
+
+@diff-op-highlight-ratio: 90%;
+@diff-op-normal-ratio: 25%;
+
+// emphasized colors for detailed inline difference
+@diff-bg-color-ins-highlight: mix(@diff-bg-color-ins-base, @diff-bg-color, @diff-op-highlight-ratio);
+@diff-bg-color-del-highlight: mix(@diff-bg-color-del-base, @diff-bg-color, @diff-op-highlight-ratio);
+
+// colors for operation rows
+@diff-bg-color-ins: mix(@diff-bg-color-ins-base, @diff-bg-color, @diff-op-normal-ratio);
+@diff-bg-color-del: mix(@diff-bg-color-del-base, @diff-bg-color, @diff-op-normal-ratio);
+@diff-bg-color-rep: mix(@diff-bg-color-rep-base, @diff-bg-color, @diff-op-normal-ratio);
+
+@diff-table-head-color: mix(@diff-bg-color, @diff-text-color, 65%);
+@diff-table-sidebar-color: mix(@diff-bg-color, @diff-text-color, 80%);
+@diff-border-color: @diff-text-color;
+
+// color for the nonexistent block
+// for example, there are a deleted line that has no corresponding one
+@diff-bg-color-none-block: mix(@diff-bg-color, @diff-table-sidebar-color, 80%);
+@diff-bg-color-none-block-alternative: mix(@diff-bg-color, @diff-table-sidebar-color, 55%);
+
+.diff-wrapper.diff {
+  background: repeating-linear-gradient(
+    -45deg,
+    @diff-bg-color-none-block,
+    @diff-bg-color-none-block 0.5em,
+    @diff-bg-color-none-block-alternative 0.5em,
+    @diff-bg-color-none-block-alternative 1em
+  );
+  border-collapse: collapse;
+  border-spacing: 0;
+  border: 1px solid @diff-border-color;
+  color: @diff-text-color;
+  empty-cells: show;
+  font-family: monospace;
+  font-size: 13px;
+  width: 100%;
+  word-break: break-all;
+
+  th {
+    font-weight: 700;
+  }
+
+  td {
+    vertical-align: baseline;
+  }
+
+  td,
+  th {
+    border-collapse: separate;
+    border: none;
+    padding: 1px 2px;
+    background: @diff-bg-color;
+
+    // make empty cell has height
+    &:empty:after {
+      content: " ";
+      visibility: hidden;
+    }
+
+    a {
+      color: #000;
+      cursor: inherit;
+      pointer-events: none;
+    }
+  }
+
+  thead th {
+    background: @diff-table-head-color;
+    border-bottom: 1px solid @diff-border-color;
+    padding: 4px;
+    text-align: left;
+  }
+
+  tbody {
+    &.skipped {
+      border-top: 1px solid @diff-border-color;
+
+      td,
+      th {
+        display: none;
+      }
+    }
+
+    th {
+      background: @diff-table-sidebar-color;
+      border-right: 1px solid @diff-border-color;
+      text-align: right;
+      vertical-align: top;
+      width: 4em;
+
+      &.sign {
+        background: @diff-bg-color;
+        border-right: none;
+        padding: 1px 0;
+        text-align: center;
+        width: 1em;
+
+        &.del {
+          background: @diff-bg-color-del;
+        }
+
+        &.ins {
+          background: @diff-bg-color-ins;
+        }
+      }
+    }
+  }
+
+  &.diff-html {
+    white-space: pre-wrap;
+
+    &.diff-combined {
+      .change.change-rep {
+        .rep {
+          // fixes https://github.com/jfcherng/php-diff/issues/34#issuecomment-671404456
+          white-space: normal;
+        }
+      }
+    }
+
+    .change {
+      &.change-eq {
+        .old,
+        .new {
+          background: @diff-bg-color;
+        }
+      }
+
+      .old {
+        background: @diff-bg-color-del;
+      }
+
+      .new {
+        background: @diff-bg-color-ins;
+      }
+
+      .rep {
+        background: @diff-bg-color-rep;
+      }
+
+      .old,
+      .new,
+      .rep {
+        &.none {
+          background: transparent;
+          cursor: not-allowed;
+        }
+      }
+
+      ins,
+      del {
+        font-weight: bold;
+        text-decoration: none;
+      }
+
+      ins {
+        background: @diff-bg-color-ins-highlight;
+      }
+
+      del {
+        background: @diff-bg-color-del-highlight;
+      }
+    }
+  }
+}
+

asset/js/mbostock/LICENSE

@@ -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.

bin/make-release.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 VERSION="$1"
-NO_TAG="$2"
+NO_OPT="$2"
 
 if [[ -z $VERSION ]]; then
-  echo "USAGE: $0 <version>"
+  echo "USAGE: $0 <version> [--no-tag|--no-checkout]"
   echo " e.g.: $0 0.1.0"
   exit 1
 fi
@@ -23,30 +23,25 @@ if [[ "$TAG" -ne "0" ]]; then
   exit 1
 fi
 
-BRANCH="stable/$VERSION"
+if [ "$NO_OPT" != "--no-checkout" ]; then
-git checkout -b "$BRANCH" || fail "Version branch $BRANCH already exists"
+  BRANCH="stable/$VERSION"
+  git checkout -b "$BRANCH" || fail "Version branch $BRANCH already exists"
+else
+  BRANCH=$(git rev-parse --abbrev-ref HEAD)
+fi
+
 git rm -rf vendor
 rm -rf vendor
-rm -f composer.lock
 composer install || fail "composer install failed"
-find vendor/ -type f -name "*.php" \
+git add vendor
- | grep -v '/examples/' \
+find asset/ -type f | xargs -L1 git add -f
- | 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
 echo "v$VERSION" > VERSION
 git add VERSION
-git add composer.lock -f
 git commit -m "Version v$VERSION"
 
-rm -rf vendor
-git checkout vendor
 composer validate --no-check-all --strict || fail "Composer validate failed"
 
-if [ "$NO_TAG" != "--no-tag" ]; then
+if [ -z "$NO_OPT" ]; then
   git tag -a v$VERSION -m "Version v$VERSION"
   echo "Finished, tagged v$VERSION"
   echo "Now please run:"

bin/make-snapshot.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -xe
+
+BRANCH="$1"
+
+if [ -z $BRANCH ]; then
+  echo "USAGE: $0 <branch>"
+  echo " e.g.: $0 snapshot/nightly"
+  exit 1
+fi
+
+LATEST_TAG=$(git for-each-ref refs/tags --sort=-taggerdate --format='%(refname)' --count=1 | awk -F/ '{print $3}')
+NEXT_VERSION=$(echo "${LATEST_TAG:1}" | awk -F. -v OFS=. '{$3=0}; {++$2}; {print}')
+
+if [[ -n $(git branch | grep $BRANCH) ]]; then
+  git branch -D $BRANCH
+fi
+
+git checkout -b $BRANCH
+
+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

composer.json

@@ -6,42 +6,73 @@
     "license": "MIT",
     "config": {
         "sort-packages": true,
-        "platform": {
+        "allow-plugins": {
-            "php": "5.6.3"
+            "cweagans/composer-patches": true
         }
     },
     "support": {
         "issues": "https://github.com/Icinga/icinga-php-thirdparty/issues"
     },
     "require": {
-        "php": ">=5.6.3",
+        "php": ">=8.2",
         "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",
-        "evenement/evenement": "^2",
+        "components/jquery": "3.7.*",
-        "predis/predis": "^1",
+        "cweagans/composer-patches": "~1.0",
-        "psr/http-message": "^1",
+        "dompdf/dompdf": "^3.1.0",
-        "ramsey/uuid": "^3",
+        "erusev/parsedown": "^1.7.4",
-        "react/child-process": "^0.6",
+        "evenement/evenement": "^3.0.1",
-        "react/datagram": "^1",
+        "ezyang/htmlpurifier": "^4.16",
-        "react/dns": "^1",
+        "guzzlehttp/guzzle": "^7.7",
-        "react/event-loop": "^1",
+        "guzzlehttp/psr7": "^2.5",
-        "react/http": "^1",
+        "jfcherng/php-diff": "^6.10.14",
-        "react/promise": "^2",
+        "predis/predis": "^3.0",
-        "react/promise-stream": "^1",
+        "psr/http-message": "^1.1",
-        "react/promise-timer": "^1",
+        "ramsey/uuid": "^4.2.3",
-        "react/socket": "^1",
+        "react/child-process": "^0.6.5",
-        "react/stream": "^1",
+        "react/datagram": "^1.9",
-        "guzzlehttp/psr7": "^1",
+        "react/dns": "^1.11",
-        "guzzlehttp/guzzle": "^6.5"
+        "react/event-loop": "^1.4",
+        "react/http": "^1.9",
+        "react/promise": "^2.10",
+        "react/promise-stream": "^1.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": {
+    },
+    "autoload": {
+        "psr-0": { "AssetLoader": "" }
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "AssetLoader::update"
+        ],
+        "post-update-cmd": [
+            "AssetLoader::update"
+        ]
+    },
+    "extra": {
+        "composer-exit-on-patch-failure": true,
+        "patches": {
+            "shardj/zf1-future": {
+                "ZF1-Future: ZF backward compatibility": "patches/shardj-zf1-future.patch"
+            }
+        }
     }
 }

patches/ramsey-collection.patch

@@ -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
+

patches/shardj-zf1-future.patch

@@ -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);
+         }