summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 13:23:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-14 13:23:33 +0000
commitbb67835ffbe96ce9e4fd65a9f90522b471c1c5b4 (patch)
tree3f8bba299b6a657c7656fac151fe4182ed7f591c
parentAdding upstream version 0.20.0. (diff)
downloadicingaweb2-module-incubator-upstream.tar.xz
icingaweb2-module-incubator-upstream.zip
Adding upstream version 0.22.0.upstream/0.22.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--README.md10
-rwxr-xr-xbin/make-release.sh16
-rw-r--r--composer.json2
-rw-r--r--composer.lock16
-rw-r--r--module.info2
-rw-r--r--public/css/combined.less464
-rw-r--r--vendor/autoload.php20
-rw-r--r--vendor/composer/ClassLoader.php137
-rw-r--r--vendor/composer/InstalledVersions.php42
-rw-r--r--vendor/composer/autoload_classmap.php2
-rw-r--r--vendor/composer/autoload_namespaces.php2
-rw-r--r--vendor/composer/autoload_psr4.php2
-rw-r--r--vendor/composer/autoload_real.php33
-rw-r--r--vendor/composer/autoload_static.php8
-rw-r--r--vendor/composer/installed.json14
-rw-r--r--vendor/composer/installed.php68
-rw-r--r--vendor/gipfl/systemd/src/NotificationSocket.php8
-rw-r--r--vendor/gipfl/web/src/Form.php9
18 files changed, 449 insertions, 406 deletions
diff --git a/README.md b/README.md
index c99da5f..2783a18 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Sample Tarball installation
```sh
MODULE_NAME=incubator
-MODULE_VERSION=v0.20.0
+MODULE_VERSION=v0.22.0
MODULES_PATH="/usr/share/icingaweb2/modules"
MODULE_PATH="${MODULES_PATH}/${MODULE_NAME}"
RELEASES="https://github.com/Icinga/icingaweb2-module-${MODULE_NAME}/archive"
@@ -27,7 +27,7 @@ Sample GIT installation
```sh
MODULE_NAME=incubator
-MODULE_VERSION=v0.20.0
+MODULE_VERSION=v0.22.0
REPO="https://github.com/Icinga/icingaweb2-module-${MODULE_NAME}"
MODULES_PATH="/usr/share/icingaweb2/modules"
git clone ${REPO} "${MODULES_PATH}/${MODULE_NAME}" --branch "${MODULE_VERSION}"
@@ -47,11 +47,15 @@ Developer Documentation
e.g.
- ./bin/make-release.sh 0.20.0
+ ./bin/make-release.sh 0.22.0
Changes
-------
+### v0.22.0
+
+* raised gipfl/systemd for PHP 8.2
+
### v0.20.0
* improved am/pm formatting
diff --git a/bin/make-release.sh b/bin/make-release.sh
index fa3e48e..1f1b388 100755
--- a/bin/make-release.sh
+++ b/bin/make-release.sh
@@ -1,9 +1,10 @@
#!/bin/bash
VERSION="$1"
+NO_OPT="$2"
if [[ -z $VERSION ]]; then
- echo "USAGE: $0 <version>"
+ echo "USAGE: $0 <version> [--no-tag]"
echo " e.g.: $0 0.1.0"
exit 1
fi
@@ -45,7 +46,14 @@ rm -rf vendor
git checkout vendor
composer validate --no-check-all --strict || fail "Composer validate failed"
-git tag -a v$VERSION -m "Version v$VERSION"
-echo "Finished, tagged v$VERSION"
-echo "Now please run:"
+if [ -z "$NO_OPT" ]; then
+ git tag -a v$VERSION -m "Version v$VERSION"
+ echo "Finished, tagged v$VERSION"
+ echo "Now please run:"
+else
+ echo "Finished, but not tagged yet"
+ echo "Now please run:"
+ echo "git tag -s v$VERSION -m \"Version v$VERSION\""
+fi
+
echo "git push -u origin "$BRANCH":"$BRANCH" && git push --tags"
diff --git a/composer.json b/composer.json
index e9974eb..0763735 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"gipfl/simple-daemon": ">=0.6",
"gipfl/socket": ">=0.4",
"gipfl/stream": ">=0.2",
- "gipfl/systemd": ">=0.3",
+ "gipfl/systemd": ">=0.4",
"gipfl/translation": ">=0.1.1",
"gipfl/web": ">=0.11",
"gipfl/zfdb": ">=0.4",
diff --git a/composer.lock b/composer.lock
index 0a04339..4a8964a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "0f8615637bf4546ebf9fb8223d79bd6f",
+ "content-hash": "d791d914c52e10e927a018bc9954cb62",
"packages": [
{
"name": "gipfl/calendar",
@@ -1029,16 +1029,16 @@
},
{
"name": "gipfl/systemd",
- "version": "v0.3.0",
+ "version": "v0.4.0",
"source": {
"type": "git",
"url": "https://github.com/gipfl/systemd.git",
- "reference": "ccfabb352a9ea9fd33d4cb426bc3793a651bf466"
+ "reference": "b61bfe7b6dc3873a274621501ddd35d93a21fb36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/gipfl/systemd/zipball/ccfabb352a9ea9fd33d4cb426bc3793a651bf466",
- "reference": "ccfabb352a9ea9fd33d4cb426bc3793a651bf466",
+ "url": "https://api.github.com/repos/gipfl/systemd/zipball/b61bfe7b6dc3873a274621501ddd35d93a21fb36",
+ "reference": "b61bfe7b6dc3873a274621501ddd35d93a21fb36",
"shasum": ""
},
"require": {
@@ -1066,9 +1066,9 @@
"description": "SystemD-related library",
"support": {
"issues": "https://github.com/gipfl/systemd/issues",
- "source": "https://github.com/gipfl/systemd/tree/v0.3.0"
+ "source": "https://github.com/gipfl/systemd/tree/v0.4.0"
},
- "time": "2020-11-13T22:35:11+00:00"
+ "time": "2023-10-19T09:40:01+00:00"
},
{
"name": "gipfl/translation",
@@ -1279,5 +1279,5 @@
"platform-overrides": {
"php": "5.6.3"
},
- "plugin-api-version": "2.1.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/module.info b/module.info
index 6a78bbb..614dac4 100644
--- a/module.info
+++ b/module.info
@@ -1,5 +1,5 @@
Name: Incubator
-Version: 0.20.0
+Version: 0.22.0
Depends: ipl (>=0.5.0), reactbundle (>=0.8.0)
Description: Incubator provides bleeding-edge libraries
This repository ships libraries useful for Icinga Web 2 modules. Please download
diff --git a/public/css/combined.less b/public/css/combined.less
index 422a94c..75c5fc3 100644
--- a/public/css/combined.less
+++ b/public/css/combined.less
@@ -131,6 +131,23 @@
}
}
}
+form.gipfl-quicksearch {
+ display: block;
+ input.search {
+ width: 8em;
+ min-width: unset;
+ border: none;
+ background-color: inherit;
+ padding-left: 2em;
+ margin-left: 1.5em;
+ font-size: 0.75em;
+ font-weight: normal;
+ &:focus {
+ width: 16em;
+ border: none;
+ }
+ }
+}
div.gipfl-action-bar {
> * {
vertical-align: middle;
@@ -236,31 +253,6 @@ div.gipfl-action-bar > ul {
}
}
/** END of dropdown in action bar **/
-form.gipfl-quicksearch {
- display: block;
- input.search {
- width: 8em;
- min-width: unset;
- border: none;
- background-color: inherit;
- padding-left: 2em;
- margin-left: 1.5em;
- font-size: 0.75em;
- font-weight: normal;
- &:focus {
- width: 16em;
- border: none;
- }
- }
-}
-@gipfl-color-low-sat-blue: #dae3e6;
-// map Icinga vars, to avoid warnings in other files
-@gipfl-color-main: @icinga-blue;
-@gipfl-color-text: @text-color;
-@gipfl-color-gray-light: @gray-light;
-@gipfl-bg-element: #f2f1f0;
-@gipfl-bg-element: @low-sat-blue;
-@gipfl-icon-font: 'ifont';
/**
* Lightweight support for small collapsible components
*
@@ -316,159 +308,6 @@ ul.gipfl-collapsible {
line-height: 2em;
}
}
-/**
- * State Hints
- *
- * @since v0.6.0
- */
-div.gipfl-widget-hint {
- border: 1px solid @text-color;
- padding: 0.5em;
- line-height: 2em;
- max-width: 60em;
- border-left-width: 3em;
- border-radius: 0.25em;
- margin-bottom: 1em;
- background-color: @body-bg-color;
- box-shadow: fade(@text-color, 30%) 1em 0 1.5em 0;
- &:before {
- position: relative;
- margin-left: -1.4em;
- margin-right: 0.5em;
- height: 100%;
- vertical-align: middle;
- font-family: 'ifont';
- color: white;
- font-size: 2em;
- }
- &.ok {
- border-color: @color-ok;
- box-shadow: fade(@color-ok, 30%) 1em 0 1.5em 0;
- }
- &.info {
- border-color: @color-pending;
- box-shadow: fade(@color-pending, 30%) 1em 0 1.5em 0;
- }
- &.warning {
- border-color: @color-warning;
- box-shadow: fade(@color-warning, 30%) 1em 0 1.5em 0;
- }
- &.error {
- border-color: @color-critical;
- box-shadow: fade(@color-critical, 30%) 1em 0 1.5em 0;
- }
- &.critical:before, &.error:before {
- content: '\e881';
- }
- &.warning:before {
- content: '\e881';
- }
- &.info:before {
- content: '\e87d';
- }
- &.ok:before {
- content: '\e803';
- }
- a {
- text-decoration: underline;
- }
-}
-table.gipfl-name-value-table {
- width: 100%;
- > tbody > tr > th {
- color: @text-color-light;
- // Reset default font-weight
- font-weight: bold;
- padding-left: 0;
- text-align: right;
- vertical-align: top;
- width: 12em;
- }
- > tbody > tr > td {
- vertical-align: top;
- }
-}
-
-table.gipfl-name-value-table a {
- color: @icinga-blue;
-}
-
-table.gipfl-name-value-table pre {
- background-color: transparent;
- margin: 0;
- padding: 0;
- font-size: unset;
- display: inline;
-}
-form.gipfl-form {
- input[type="submit"] {
- margin-right: 0.5em;
- }
- input[type="submit"]:first-of-type {
- background-color: @icinga-blue;
- color: @text-color-inverted;
- border: 2px solid @icinga-blue;
- font-weight: bold;
- }
-
- select:not([multiple]) {
- padding-right: 1.5625em;
- background-image: url(../img/select-icon.svg);
- background-repeat: no-repeat;
- background-position: right center;
- background-size: contain;
- }
-
- input.validated {
- background-color: fade(@color-ok, 30%);
- border-color: @color-ok;
- }
-
- :not(output):-moz-ui-invalid, :not(output).invalid {
- background-color: fade(@color-critical, 30%);
- border-color: @color-critical;
- box-shadow: none;
- }
-
- input[type=text].input-with-button {
- max-width: 30em;
- min-width: 18em;
- width: 80%;
- margin: 0;
- border-top-right-radius: unset;
- border-bottom-right-radius: unset;
- border-right-style: none;
- &:focus {
- border-right-style: none;
- }
- }
-
- input[type=submit].input-element-related-button {
- width: 20%;
- max-width: 6em;
- background-color: @icinga-blue;
- color: @text-color-inverted;
- border: 1px solid @icinga-blue;
- border-radius: 0 3px 3px 0;
- -moz-border-radius: 0 3px 3px 0;
- -webkit-border-radius: 0 3px 3px 0;
- line-height: 2em;
- height: 2.4em;
- padding: 0;
- margin: 0 1em 0 0;
- &:hover {
- background-color: @text-color-inverted;
- color: @icinga-blue;
- border-color: @icinga-blue;
- }
- }
- p.gipfl-widget-hint {
- max-width: 52.5em;
- }
- p.gipfl-element-description {
- max-width: 36em;
- }
-}
form.gipfl-form {
label {
line-height: 2em;
@@ -808,67 +647,97 @@ form.gipfl-form {
}
}
-#layout.minimal-layout div.content form.gipfl-form {
- ul.extensible-set {
- max-width: unset;
- border: 1px solid @gray-light;
- }
-
- dd.active ul.extensible-set {
- border: 1px solid @icinga-blue;
-
- input[type=submit]:first-of-type {
- border-width: 1px;
+@gipfl-color-low-sat-blue: #dae3e6;
+// map Icinga vars, to avoid warnings in other files
+@gipfl-color-main: @icinga-blue;
+@gipfl-color-text: @text-color;
+@gipfl-color-gray-light: @gray-light;
+@gipfl-bg-element: #f2f1f0;
+@gipfl-bg-element: @low-sat-blue;
+@gipfl-icon-font: 'ifont';
+/**
+ * State Hints
+ *
+ * @since v0.6.0
+ */
+div.gipfl-widget-hint {
+ border: 1px solid @text-color;
+ padding: 0.5em;
+ line-height: 2em;
+ max-width: 60em;
+ border-left-width: 3em;
+ border-radius: 0.25em;
+ margin-bottom: 1em;
+ background-color: @body-bg-color;
+ box-shadow: fade(@text-color, 30%) 1em 0 1.5em 0;
+ &:before {
+ position: relative;
+ margin-left: -1.4em;
+ margin-right: 0.5em;
+ height: 100%;
+ vertical-align: middle;
+ font-family: 'ifont';
+ color: white;
+ font-size: 2em;
}
- }
-
- dd input.related-action[type='submit'] {
- display: none;
- }
-
- dd.active li.active input.related-action[type='submit'] {
- display: inline-block;
- }
-
- dd.active ul.extensible-set, ul.extensible-set.sortable {
- input[type=text], select {
- width: 100%;
+ &.ok {
+ border-color: @color-ok;
+ box-shadow: fade(@color-ok, 30%) 1em 0 1.5em 0;
}
-
- input[type=text] {
- // background-color: white;
- border: 1px solid white;
+ &.info {
+ border-color: @color-pending;
+ box-shadow: fade(@color-pending, 30%) 1em 0 1.5em 0;
}
+ &.warning {
+ border-color: @color-warning;
+ box-shadow: fade(@color-warning, 30%) 1em 0 1.5em 0;
+ }
+ &.error {
+ border-color: @color-critical;
+ box-shadow: fade(@color-critical, 30%) 1em 0 1.5em 0;
+ }
+ &.critical:before, &.error:before {
+ content: '\e881';
+ }
+ &.warning:before {
+ content: '\e881';
+ }
+ &.info:before {
+ content: '\e87d';
+ }
+ &.ok:before {
+ content: '\e803';
+ }
+ a {
+ text-decoration: underline;
+ }
+}
+table.gipfl-name-value-table {
+ width: 100%;
+ > tbody > tr > th {
+ color: @text-color-light;
+ // Reset default font-weight
+ font-weight: bold;
+ padding-left: 0;
+ text-align: right;
+ vertical-align: top;
+ width: 12em;
+ }
+ > tbody > tr > td {
+ vertical-align: top;
}
}
-form.gipfl-inline-form {
- display: inline-block;
- select {
- width: auto;
- min-width: unset;
- max-width: unset;
- border: none;
- padding: 0 0.5em;
- margin: 0;
- line-height: unset;
- box-sizing:border-box;
- height: 1.5em;
- &:hover {
- border: none;
- }
+table.gipfl-name-value-table a {
+ color: @icinga-blue;
+}
- &:focus {
- border: none;
- }
- }
- input[type=submit] {
- padding: 0 0.25em;
- margin: 0 1em 0 0;
- border: none;
- line-height: unset;
- box-sizing: border-box;
- }
+table.gipfl-name-value-table pre {
+ background-color: transparent;
+ margin: 0;
+ padding: 0;
+ font-size: unset;
+ display: inline;
}
.Differences {
width: 100%;
@@ -967,3 +836,134 @@ form.gipfl-inline-form {
.DifferencesInline .ChangeReplace del {
background: #e99;
}
+form.gipfl-form {
+ input[type="submit"] {
+ margin-right: 0.5em;
+ }
+ input[type="submit"]:first-of-type {
+ background-color: @icinga-blue;
+ color: @text-color-inverted;
+ border: 2px solid @icinga-blue;
+ font-weight: bold;
+ }
+
+ select:not([multiple]) {
+ padding-right: 1.5625em;
+ background-image: url(../img/select-icon.svg);
+ background-repeat: no-repeat;
+ background-position: right center;
+ background-size: contain;
+ }
+
+ input.validated {
+ background-color: fade(@color-ok, 30%);
+ border-color: @color-ok;
+ }
+
+ :not(output):-moz-ui-invalid, :not(output).invalid {
+ background-color: fade(@color-critical, 30%);
+ border-color: @color-critical;
+ box-shadow: none;
+ }
+
+ input[type=text].input-with-button {
+ max-width: 30em;
+ min-width: 18em;
+ width: 80%;
+ margin: 0;
+ border-top-right-radius: unset;
+ border-bottom-right-radius: unset;
+ border-right-style: none;
+ &:focus {
+ border-right-style: none;
+ }
+ }
+
+ input[type=submit].input-element-related-button {
+ width: 20%;
+ max-width: 6em;
+ background-color: @icinga-blue;
+ color: @text-color-inverted;
+ border: 1px solid @icinga-blue;
+ border-radius: 0 3px 3px 0;
+ -moz-border-radius: 0 3px 3px 0;
+ -webkit-border-radius: 0 3px 3px 0;
+ line-height: 2em;
+ height: 2.4em;
+ padding: 0;
+ margin: 0 1em 0 0;
+ &:hover {
+ background-color: @text-color-inverted;
+ color: @icinga-blue;
+ border-color: @icinga-blue;
+ }
+ }
+ p.gipfl-widget-hint {
+ max-width: 52.5em;
+ }
+ p.gipfl-element-description {
+ max-width: 36em;
+ }
+}
+#layout.minimal-layout div.content form.gipfl-form {
+ ul.extensible-set {
+ max-width: unset;
+ border: 1px solid @gray-light;
+ }
+
+ dd.active ul.extensible-set {
+ border: 1px solid @icinga-blue;
+
+ input[type=submit]:first-of-type {
+ border-width: 1px;
+ }
+ }
+
+ dd input.related-action[type='submit'] {
+ display: none;
+ }
+
+ dd.active li.active input.related-action[type='submit'] {
+ display: inline-block;
+ }
+
+ dd.active ul.extensible-set, ul.extensible-set.sortable {
+ input[type=text], select {
+ width: 100%;
+ }
+
+ input[type=text] {
+ // background-color: white;
+ border: 1px solid white;
+ }
+ }
+}
+form.gipfl-inline-form {
+ display: inline-block;
+ select {
+ width: auto;
+ min-width: unset;
+ max-width: unset;
+ border: none;
+ padding: 0 0.5em;
+ margin: 0;
+ line-height: unset;
+ box-sizing:border-box;
+ height: 1.5em;
+
+ &:hover {
+ border: none;
+ }
+
+ &:focus {
+ border: none;
+ }
+ }
+ input[type=submit] {
+ padding: 0 0.25em;
+ margin: 0 1em 0 0;
+ border: none;
+ line-height: unset;
+ box-sizing: border-box;
+ }
+}
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 4be7d28..4c9bf32 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,6 +2,24 @@
// autoload.php @generated by Composer
+if (PHP_VERSION_ID < 50600) {
+ if (!headers_sent()) {
+ header('HTTP/1.1 500 Internal Server Error');
+ }
+ $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+ if (!ini_get('display_errors')) {
+ if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+ fwrite(STDERR, $err);
+ } elseif (!headers_sent()) {
+ echo $err;
+ }
+ }
+ trigger_error(
+ $err,
+ E_USER_ERROR
+ );
+}
+
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit684800034bdac0af606e9381dda72632::getLoader();
+return ComposerAutoloaderInitd791d914c52e10e927a018bc9954cb62::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 0cd6055..7824d8f 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,35 +42,37 @@ namespace Composer\Autoload;
*/
class ClassLoader
{
- /** @var ?string */
+ /** @var \Closure(string):void */
+ private static $includeFile;
+
+ /** @var string|null */
private $vendorDir;
// PSR-4
/**
- * @var array[]
- * @psalm-var array<string, array<string, int>>
+ * @var array<string, array<string, int>>
*/
private $prefixLengthsPsr4 = array();
/**
- * @var array[]
- * @psalm-var array<string, array<int, string>>
+ * @var array<string, list<string>>
*/
private $prefixDirsPsr4 = array();
/**
- * @var array[]
- * @psalm-var array<string, string>
+ * @var list<string>
*/
private $fallbackDirsPsr4 = array();
// PSR-0
/**
- * @var array[]
- * @psalm-var array<string, array<string, string[]>>
+ * List of PSR-0 prefixes
+ *
+ * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+ *
+ * @var array<string, array<string, list<string>>>
*/
private $prefixesPsr0 = array();
/**
- * @var array[]
- * @psalm-var array<string, string>
+ * @var list<string>
*/
private $fallbackDirsPsr0 = array();
@@ -78,8 +80,7 @@ class ClassLoader
private $useIncludePath = false;
/**
- * @var string[]
- * @psalm-var array<string, string>
+ * @var array<string, string>
*/
private $classMap = array();
@@ -87,29 +88,29 @@ class ClassLoader
private $classMapAuthoritative = false;
/**
- * @var bool[]
- * @psalm-var array<string, bool>
+ * @var array<string, bool>
*/
private $missingClasses = array();
- /** @var ?string */
+ /** @var string|null */
private $apcuPrefix;
/**
- * @var self[]
+ * @var array<string, self>
*/
private static $registeredLoaders = array();
/**
- * @param ?string $vendorDir
+ * @param string|null $vendorDir
*/
public function __construct($vendorDir = null)
{
$this->vendorDir = $vendorDir;
+ self::initializeIncludeClosure();
}
/**
- * @return string[]
+ * @return array<string, list<string>>
*/
public function getPrefixes()
{
@@ -121,8 +122,7 @@ class ClassLoader
}
/**
- * @return array[]
- * @psalm-return array<string, array<int, string>>
+ * @return array<string, list<string>>
*/
public function getPrefixesPsr4()
{
@@ -130,8 +130,7 @@ class ClassLoader
}
/**
- * @return array[]
- * @psalm-return array<string, string>
+ * @return list<string>
*/
public function getFallbackDirs()
{
@@ -139,8 +138,7 @@ class ClassLoader
}
/**
- * @return array[]
- * @psalm-return array<string, string>
+ * @return list<string>
*/
public function getFallbackDirsPsr4()
{
@@ -148,8 +146,7 @@ class ClassLoader
}
/**
- * @return string[] Array of classname => path
- * @psalm-var array<string, string>
+ * @return array<string, string> Array of classname => path
*/
public function getClassMap()
{
@@ -157,8 +154,7 @@ class ClassLoader
}
/**
- * @param string[] $classMap Class to filename map
- * @psalm-param array<string, string> $classMap
+ * @param array<string, string> $classMap Class to filename map
*
* @return void
*/
@@ -175,24 +171,25 @@ class ClassLoader
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
- * @param string $prefix The prefix
- * @param string[]|string $paths The PSR-0 root directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix
+ * @param list<string>|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
*
* @return void
*/
public function add($prefix, $paths, $prepend = false)
{
+ $paths = (array) $paths;
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
- (array) $paths,
+ $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
- (array) $paths
+ $paths
);
}
@@ -201,19 +198,19 @@ class ClassLoader
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
- $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+ $this->prefixesPsr0[$first][$prefix] = $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
- (array) $paths,
+ $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
- (array) $paths
+ $paths
);
}
}
@@ -222,9 +219,9 @@ class ClassLoader
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param string[]|string $paths The PSR-4 base directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param list<string>|string $paths The PSR-4 base directories
+ * @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*
@@ -232,17 +229,18 @@ class ClassLoader
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
+ $paths = (array) $paths;
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
- (array) $paths,
+ $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
- (array) $paths
+ $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -252,18 +250,18 @@ class ClassLoader
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
- $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ $this->prefixDirsPsr4[$prefix] = $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
- (array) $paths,
+ $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
- (array) $paths
+ $paths
);
}
}
@@ -272,8 +270,8 @@ class ClassLoader
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
- * @param string $prefix The prefix
- * @param string[]|string $paths The PSR-0 base directories
+ * @param string $prefix The prefix
+ * @param list<string>|string $paths The PSR-0 base directories
*
* @return void
*/
@@ -290,8 +288,8 @@ class ClassLoader
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param string[]|string $paths The PSR-4 base directories
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param list<string>|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*
@@ -425,7 +423,8 @@ class ClassLoader
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
- includeFile($file);
+ $includeFile = self::$includeFile;
+ $includeFile($file);
return true;
}
@@ -476,9 +475,9 @@ class ClassLoader
}
/**
- * Returns the currently registered loaders indexed by their corresponding vendor directories.
+ * Returns the currently registered loaders keyed by their corresponding vendor directories.
*
- * @return self[]
+ * @return array<string, self>
*/
public static function getRegisteredLoaders()
{
@@ -555,18 +554,26 @@ class ClassLoader
return false;
}
-}
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
- include $file;
+ /**
+ * @return void
+ */
+ private static function initializeIncludeClosure()
+ {
+ if (self::$includeFile !== null) {
+ return;
+ }
+
+ /**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ *
+ * @param string $file
+ * @return void
+ */
+ self::$includeFile = \Closure::bind(static function($file) {
+ include $file;
+ }, null, null);
+ }
}
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 7c5502c..51e734a 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -21,11 +21,26 @@ use Composer\Semver\VersionParser;
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
*
* To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
*/
class InstalledVersions
{
+ /**
+ * @var mixed[]|null
+ * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+ */
private static $installed;
+
+ /**
+ * @var bool|null
+ */
private static $canGetVendors;
+
+ /**
+ * @var array[]
+ * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+ */
private static $installedByVendor = array();
/**
@@ -83,7 +98,7 @@ class InstalledVersions
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
- return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+ return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
}
}
@@ -104,7 +119,7 @@ class InstalledVersions
*/
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
- $constraint = $parser->parseConstraints($constraint);
+ $constraint = $parser->parseConstraints((string) $constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
return $provided->matches($constraint);
@@ -228,7 +243,7 @@ class InstalledVersions
/**
* @return array
- * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+ * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
*/
public static function getRootPackage()
{
@@ -242,7 +257,7 @@ class InstalledVersions
*
* @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
* @return array[]
- * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}
+ * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
*/
public static function getRawData()
{
@@ -265,7 +280,7 @@ class InstalledVersions
* Returns the raw data of all installed.php which are currently loaded for custom implementations
*
* @return array[]
- * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+ * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
*/
public static function getAllRawData()
{
@@ -288,7 +303,7 @@ class InstalledVersions
* @param array[] $data A vendor/composer/installed.php data set
* @return void
*
- * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>} $data
+ * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
*/
public static function reload($data)
{
@@ -298,7 +313,7 @@ class InstalledVersions
/**
* @return array[]
- * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+ * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
*/
private static function getInstalled()
{
@@ -313,7 +328,9 @@ class InstalledVersions
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
- $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+ $required = require $vendorDir.'/composer/installed.php';
+ $installed[] = self::$installedByVendor[$vendorDir] = $required;
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $installed[count($installed) - 1];
}
@@ -325,12 +342,17 @@ class InstalledVersions
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
- self::$installed = require __DIR__ . '/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+ $required = require __DIR__ . '/installed.php';
+ self::$installed = $required;
} else {
self::$installed = array();
}
}
- $installed[] = self::$installed;
+
+ if (self::$installed !== array()) {
+ $installed[] = self::$installed;
+ }
return $installed;
}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index b26f1b1..0fb0a2c 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b7fc012..15a2ff3 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index b3948b3..5666a61 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 2fe188a..0559ce2 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit684800034bdac0af606e9381dda72632
+class ComposerAutoloaderInitd791d914c52e10e927a018bc9954cb62
{
private static $loader;
@@ -24,31 +24,12 @@ class ComposerAutoloaderInit684800034bdac0af606e9381dda72632
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInit684800034bdac0af606e9381dda72632', 'loadClassLoader'), true, true);
- self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInit684800034bdac0af606e9381dda72632', 'loadClassLoader'));
-
- $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
- if ($useStaticLoader) {
- require __DIR__ . '/autoload_static.php';
-
- call_user_func(\Composer\Autoload\ComposerStaticInit684800034bdac0af606e9381dda72632::getInitializer($loader));
- } else {
- $map = require __DIR__ . '/autoload_namespaces.php';
- foreach ($map as $namespace => $path) {
- $loader->set($namespace, $path);
- }
-
- $map = require __DIR__ . '/autoload_psr4.php';
- foreach ($map as $namespace => $path) {
- $loader->setPsr4($namespace, $path);
- }
-
- $classMap = require __DIR__ . '/autoload_classmap.php';
- if ($classMap) {
- $loader->addClassMap($classMap);
- }
- }
+ spl_autoload_register(array('ComposerAutoloaderInitd791d914c52e10e927a018bc9954cb62', 'loadClassLoader'), true, true);
+ self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+ spl_autoload_unregister(array('ComposerAutoloaderInitd791d914c52e10e927a018bc9954cb62', 'loadClassLoader'));
+
+ require __DIR__ . '/autoload_static.php';
+ call_user_func(\Composer\Autoload\ComposerStaticInitd791d914c52e10e927a018bc9954cb62::getInitializer($loader));
$loader->register(true);
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 688c590..48cd3d1 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit684800034bdac0af606e9381dda72632
+class ComposerStaticInitd791d914c52e10e927a018bc9954cb62
{
public static $prefixLengthsPsr4 = array (
'g' =>
@@ -170,9 +170,9 @@ class ComposerStaticInit684800034bdac0af606e9381dda72632
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit684800034bdac0af606e9381dda72632::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit684800034bdac0af606e9381dda72632::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInit684800034bdac0af606e9381dda72632::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitd791d914c52e10e927a018bc9954cb62::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitd791d914c52e10e927a018bc9954cb62::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInitd791d914c52e10e927a018bc9954cb62::$classMap;
}, null, ClassLoader::class);
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 961123c..31c3d20 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1091,17 +1091,17 @@
},
{
"name": "gipfl/systemd",
- "version": "v0.3.0",
- "version_normalized": "0.3.0.0",
+ "version": "v0.4.0",
+ "version_normalized": "0.4.0.0",
"source": {
"type": "git",
"url": "https://github.com/gipfl/systemd.git",
- "reference": "ccfabb352a9ea9fd33d4cb426bc3793a651bf466"
+ "reference": "b61bfe7b6dc3873a274621501ddd35d93a21fb36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/gipfl/systemd/zipball/ccfabb352a9ea9fd33d4cb426bc3793a651bf466",
- "reference": "ccfabb352a9ea9fd33d4cb426bc3793a651bf466",
+ "url": "https://api.github.com/repos/gipfl/systemd/zipball/b61bfe7b6dc3873a274621501ddd35d93a21fb36",
+ "reference": "b61bfe7b6dc3873a274621501ddd35d93a21fb36",
"shasum": ""
},
"require": {
@@ -1110,7 +1110,7 @@
"php": ">=5.6.3",
"react/event-loop": "^1.0"
},
- "time": "2020-11-13T22:35:11+00:00",
+ "time": "2023-10-19T09:40:01+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1131,7 +1131,7 @@
"description": "SystemD-related library",
"support": {
"issues": "https://github.com/gipfl/systemd/issues",
- "source": "https://github.com/gipfl/systemd/tree/v0.3.0"
+ "source": "https://github.com/gipfl/systemd/tree/v0.4.0"
},
"install-path": "../gipfl/systemd"
},
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index f7e4184..26c2302 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -1,12 +1,12 @@
<?php return array(
'root' => array(
+ 'name' => 'icinga/incubator',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
+ 'reference' => 'd5a1d686e46438ffaca751d3f348baa21691940c',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '03cc0aac078de25564d09c13ae7de6f0ce9c1b3b',
- 'name' => 'icinga/incubator',
'dev' => true,
),
'versions' => array(
@@ -97,253 +97,253 @@
'gipfl/calendar' => array(
'pretty_version' => 'v0.3.1',
'version' => '0.3.1.0',
+ 'reference' => 'fd57d12aa97dd4c2a115e5cae36097ffaed220b8',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/calendar',
'aliases' => array(),
- 'reference' => 'fd57d12aa97dd4c2a115e5cae36097ffaed220b8',
'dev_requirement' => false,
),
'gipfl/cli' => array(
'pretty_version' => 'v0.6.0',
'version' => '0.6.0.0',
+ 'reference' => '536dec1fa605aa98aef32421cd70bf71e46406d0',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/cli',
'aliases' => array(),
- 'reference' => '536dec1fa605aa98aef32421cd70bf71e46406d0',
'dev_requirement' => false,
),
'gipfl/curl' => array(
'pretty_version' => 'v0.3.0',
'version' => '0.3.0.0',
+ 'reference' => 'bc1373dff8ab247c734d019d0fe7d94521660b1f',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/curl',
'aliases' => array(),
- 'reference' => 'bc1373dff8ab247c734d019d0fe7d94521660b1f',
'dev_requirement' => false,
),
'gipfl/data-type' => array(
'pretty_version' => 'v0.3.0',
'version' => '0.3.0.0',
+ 'reference' => 'eb81eaeef93adb15c6c5522154516eae0e2a8e48',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/data-type',
'aliases' => array(),
- 'reference' => 'eb81eaeef93adb15c6c5522154516eae0e2a8e48',
'dev_requirement' => false,
),
'gipfl/db-migration' => array(
'pretty_version' => 'v0.1.1',
'version' => '0.1.1.0',
+ 'reference' => '12be94b0c83a5e018c9d3d42fe8e98b4cbe248ee',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/db-migration',
'aliases' => array(),
- 'reference' => '12be94b0c83a5e018c9d3d42fe8e98b4cbe248ee',
'dev_requirement' => false,
),
'gipfl/diff' => array(
'pretty_version' => 'v0.3.0',
'version' => '0.3.0.0',
+ 'reference' => 'f9decb9cf20735d6cbe6f508aafd8a720922804b',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/diff',
'aliases' => array(),
- 'reference' => 'f9decb9cf20735d6cbe6f508aafd8a720922804b',
'dev_requirement' => false,
),
'gipfl/format' => array(
'pretty_version' => 'v0.4.0',
'version' => '0.4.0.0',
+ 'reference' => '87bd240f80baac73d18aeaf11ef389d94c56c8a0',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/format',
'aliases' => array(),
- 'reference' => '87bd240f80baac73d18aeaf11ef389d94c56c8a0',
'dev_requirement' => false,
),
'gipfl/icinga-bundles' => array(
'pretty_version' => 'v0.7.0',
'version' => '0.7.0.0',
+ 'reference' => 'd28e12218c07174795e07d7ad235d3fac2a6be53',
'type' => 'metapackage',
'install_path' => NULL,
'aliases' => array(),
- 'reference' => 'd28e12218c07174795e07d7ad235d3fac2a6be53',
'dev_requirement' => false,
),
'gipfl/icinga-cli-daemon' => array(
'pretty_version' => 'v0.3.2',
'version' => '0.3.2.0',
+ 'reference' => '19e1b203108fda37de39488fd8ff7ea392a42f03',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/icinga-cli-daemon',
'aliases' => array(),
- 'reference' => '19e1b203108fda37de39488fd8ff7ea392a42f03',
'dev_requirement' => false,
),
'gipfl/icingaweb2' => array(
'pretty_version' => 'v0.10.0',
'version' => '0.10.0.0',
+ 'reference' => '36a2ca4739a0de7ffc365e625bcb81979aca3435',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/icingaweb2',
'aliases' => array(),
- 'reference' => '36a2ca4739a0de7ffc365e625bcb81979aca3435',
'dev_requirement' => false,
),
'gipfl/influxdb' => array(
'pretty_version' => 'v0.5.0',
'version' => '0.5.0.0',
+ 'reference' => '0b7b46ceecb1a6c9fcd738973f773d23d97b374a',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/influxdb',
'aliases' => array(),
- 'reference' => '0b7b46ceecb1a6c9fcd738973f773d23d97b374a',
'dev_requirement' => false,
),
'gipfl/json' => array(
'pretty_version' => 'v0.2.0',
'version' => '0.2.0.0',
+ 'reference' => '5635790a19150beeece9edc67e82ecddc52ff4fb',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/json',
'aliases' => array(),
- 'reference' => '5635790a19150beeece9edc67e82ecddc52ff4fb',
'dev_requirement' => false,
),
'gipfl/linux-health' => array(
'pretty_version' => 'v0.2.0',
'version' => '0.2.0.0',
+ 'reference' => '4d212535565f353f88c9eef3ecb54e20c40b8b37',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/linux-health',
'aliases' => array(),
- 'reference' => '4d212535565f353f88c9eef3ecb54e20c40b8b37',
'dev_requirement' => false,
),
'gipfl/log' => array(
'pretty_version' => 'v0.7.0',
'version' => '0.7.0.0',
+ 'reference' => 'df770bdc9c09b0428831345af7ce7d45a0c3a1bb',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/log',
'aliases' => array(),
- 'reference' => 'df770bdc9c09b0428831345af7ce7d45a0c3a1bb',
'dev_requirement' => false,
),
'gipfl/openrpc' => array(
'pretty_version' => 'v0.2.1',
'version' => '0.2.1.0',
+ 'reference' => 'a29b8da2cdaf7d757d86aa0fe6d719cf68fb95ad',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/openrpc',
'aliases' => array(),
- 'reference' => 'a29b8da2cdaf7d757d86aa0fe6d719cf68fb95ad',
'dev_requirement' => false,
),
'gipfl/process' => array(
'pretty_version' => 'v0.4.0',
'version' => '0.4.0.0',
+ 'reference' => 'ddbc3971cf56b35ce17d7cc8aaf241e87a792938',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/process',
'aliases' => array(),
- 'reference' => 'ddbc3971cf56b35ce17d7cc8aaf241e87a792938',
'dev_requirement' => false,
),
'gipfl/protocol' => array(
'pretty_version' => 'v0.2.0',
'version' => '0.2.0.0',
+ 'reference' => 'bf1a0e160fe6f74c6be60be569c466d57551e73d',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/protocol',
'aliases' => array(),
- 'reference' => 'bf1a0e160fe6f74c6be60be569c466d57551e73d',
'dev_requirement' => false,
),
'gipfl/protocol-jsonrpc' => array(
'pretty_version' => 'v0.11.0',
'version' => '0.11.0.0',
+ 'reference' => '30b0241c67019746fce0b464543d8f936bdb9b68',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/protocol-jsonrpc',
'aliases' => array(),
- 'reference' => '30b0241c67019746fce0b464543d8f936bdb9b68',
'dev_requirement' => false,
),
'gipfl/protocol-netstring' => array(
'pretty_version' => 'v0.1.1',
'version' => '0.1.1.0',
+ 'reference' => 'c0021ea9d69883760ac176121041a05c9a51ca11',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/protocol-netstring',
'aliases' => array(),
- 'reference' => 'c0021ea9d69883760ac176121041a05c9a51ca11',
'dev_requirement' => false,
),
'gipfl/react-utils' => array(
'pretty_version' => 'v0.3.0',
'version' => '0.3.0.0',
+ 'reference' => '37ff2daa4bcc36aced4cc9df5198caad519d7bdb',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/react-utils',
'aliases' => array(),
- 'reference' => '37ff2daa4bcc36aced4cc9df5198caad519d7bdb',
'dev_requirement' => false,
),
'gipfl/simple-daemon' => array(
'pretty_version' => 'v0.6.0',
'version' => '0.6.0.0',
+ 'reference' => 'b7cd3be54c171d20c6692dbb331a3ae6fe90f276',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/simple-daemon',
'aliases' => array(),
- 'reference' => 'b7cd3be54c171d20c6692dbb331a3ae6fe90f276',
'dev_requirement' => false,
),
'gipfl/socket' => array(
'pretty_version' => 'v0.4.0',
'version' => '0.4.0.0',
+ 'reference' => '1a2c78709e0bcf7de2469860fbfa807a4bcee555',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/socket',
'aliases' => array(),
- 'reference' => '1a2c78709e0bcf7de2469860fbfa807a4bcee555',
'dev_requirement' => false,
),
'gipfl/stream' => array(
'pretty_version' => 'v0.2.0',
'version' => '0.2.0.0',
+ 'reference' => 'ae0f8f4fd47a6dcc57885b232e239b0ba82889a3',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/stream',
'aliases' => array(),
- 'reference' => 'ae0f8f4fd47a6dcc57885b232e239b0ba82889a3',
'dev_requirement' => false,
),
'gipfl/systemd' => array(
- 'pretty_version' => 'v0.3.0',
- 'version' => '0.3.0.0',
+ 'pretty_version' => 'v0.4.0',
+ 'version' => '0.4.0.0',
+ 'reference' => 'b61bfe7b6dc3873a274621501ddd35d93a21fb36',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/systemd',
'aliases' => array(),
- 'reference' => 'ccfabb352a9ea9fd33d4cb426bc3793a651bf466',
'dev_requirement' => false,
),
'gipfl/translation' => array(
'pretty_version' => 'v0.1.1',
'version' => '0.1.1.0',
+ 'reference' => 'e974e6a2f0b524678b6554ee0046b5dd5f70a25d',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/translation',
'aliases' => array(),
- 'reference' => 'e974e6a2f0b524678b6554ee0046b5dd5f70a25d',
'dev_requirement' => false,
),
'gipfl/web' => array(
'pretty_version' => 'v0.11.0',
'version' => '0.11.0.0',
+ 'reference' => 'd331fe195f7bab08561ee015ba56edeb334a1533',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/web',
'aliases' => array(),
- 'reference' => 'd331fe195f7bab08561ee015ba56edeb334a1533',
'dev_requirement' => false,
),
'gipfl/zfdb' => array(
'pretty_version' => 'v0.4.0',
'version' => '0.4.0.0',
+ 'reference' => 'beb7ceabc80e8c81f0e237afcfb064a67e1432d6',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/zfdb',
'aliases' => array(),
- 'reference' => 'beb7ceabc80e8c81f0e237afcfb064a67e1432d6',
'dev_requirement' => false,
),
'gipfl/zfdbstore' => array(
'pretty_version' => 'v0.3.0',
'version' => '0.3.0.0',
+ 'reference' => '5296226865a0c053f29f57a1bccd50b17cab5248',
'type' => 'library',
'install_path' => __DIR__ . '/../gipfl/zfdbstore',
'aliases' => array(),
- 'reference' => '5296226865a0c053f29f57a1bccd50b17cab5248',
'dev_requirement' => false,
),
'guzzlehttp/psr7' => array(
@@ -355,10 +355,10 @@
'icinga/incubator' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
+ 'reference' => 'd5a1d686e46438ffaca751d3f348baa21691940c',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '03cc0aac078de25564d09c13ae7de6f0ce9c1b3b',
'dev_requirement' => false,
),
'ipl/html' => array(
@@ -418,10 +418,10 @@
'psr/log' => array(
'pretty_version' => '1.1.4',
'version' => '1.1.4.0',
+ 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
'type' => 'library',
'install_path' => __DIR__ . '/../psr/log',
'aliases' => array(),
- 'reference' => 'd49695b909c3b7628b6289db5479a1c204601f11',
'dev_requirement' => false,
),
'ralouphie/getallheaders' => array(
diff --git a/vendor/gipfl/systemd/src/NotificationSocket.php b/vendor/gipfl/systemd/src/NotificationSocket.php
index fe4a687..3e28dd6 100644
--- a/vendor/gipfl/systemd/src/NotificationSocket.php
+++ b/vendor/gipfl/systemd/src/NotificationSocket.php
@@ -11,6 +11,12 @@ class NotificationSocket
/** @var resource */
protected $socket;
+ /** @var string */
+ protected $path;
+
+ /**
+ * @param string $path
+ */
public function __construct($path)
{
if (@file_exists($path) && is_writable($path)) {
@@ -82,7 +88,7 @@ class NotificationSocket
* Connect to the discovered socket
*
* Will be /run/systemd/notify or similar. No async logic, as this
- * shouldn't block. If systemd blocks we're dead anyways, so who cares
+ * shouldn't block. If systemd blocks we're dead anyway, so who cares
*/
protected function connect()
{
diff --git a/vendor/gipfl/web/src/Form.php b/vendor/gipfl/web/src/Form.php
index e5e52f9..348ec9d 100644
--- a/vendor/gipfl/web/src/Form.php
+++ b/vendor/gipfl/web/src/Form.php
@@ -201,8 +201,9 @@ class Form extends iplForm
protected function addCsrfElement()
{
- $element = new HiddenElement('__CSRF__', [
+ $element = new HiddenElement('__FORM_CSRF', [
'ignore' => true,
+ 'required' => true
]);
$element->setValidators([
new PhpSessionBasedCsrfTokenValidator()
@@ -210,11 +211,7 @@ class Form extends iplForm
// prepend / register -> avoid decorator
$this->prepend($element);
$this->registerElement($element);
- if ($this->hasBeenSent()) {
- if (! $element->isValid()) {
- $element->setValue(PhpSessionBasedCsrfTokenValidator::generateCsrfValue());
- }
- } else {
+ if (! $this->hasBeenSent()) {
$element->setValue(PhpSessionBasedCsrfTokenValidator::generateCsrfValue());
}
}