diff --git a/composer.json b/composer.json index c23891d6..44693fb4 100644 --- a/composer.json +++ b/composer.json @@ -6,9 +6,6 @@ "license": "MIT", "config": { "sort-packages": true, - "allow-plugins": { - "cweagans/composer-patches": true - }, "platform": { "php": "8.2" } @@ -16,6 +13,12 @@ "support": { "issues": "https://github.com/Icinga/icinga-php-thirdparty/issues" }, + "repositories": [ + { + "type": "git", + "url": "https://github.com/Icinga/zf1" + } + ], "require": { "php": ">=8.2", "ext-curl": "*", @@ -29,13 +32,13 @@ "clue/socks-react": "^1.4", "clue/stdio-react": "^2.6", "components/jquery": "3.7.*", - "cweagans/composer-patches": "~2.0", "dompdf/dompdf": "^3.1.4", "dragonmantank/cron-expression": "^3.6", "evenement/evenement": "^3.0.2", "ezyang/htmlpurifier": "^4.19", "guzzlehttp/guzzle": "^7.10", "guzzlehttp/psr7": "^2.8", + "icinga/zf1": "2.0.0-rc1", "jfcherng/php-diff": "^6.16.2", "parsedown/parsedown": "^1.8", "predis/predis": "^3.4", @@ -55,7 +58,6 @@ "react/promise-timer": "^1.11", "react/socket": "^1.17", "react/stream": "^1.4", - "shardj/zf1-future": "^1.24.4", "simshaun/recurr": "^5.0.3", "tedivm/jshrink": "^1.8.1", "wikimedia/less.php": "^3.2.1", @@ -71,17 +73,5 @@ "post-update-cmd": [ "AssetLoader::update" ] - }, - "extra": { - "composer-exit-on-patch-failure": true, - "patches": { - "shardj/zf1-future": [ - { - "description": "ZF1-Future: ZF backward compatibility", - "url": "patches/shardj-zf1-future.patch", - "depth": 1 - } - ] - } } } diff --git a/composer.lock b/composer.lock index abb85a0d..5855eab5 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": "f8406dcb699e2ff3fdc6c77ab6d21c01", + "content-hash": "4e49858ca4f14ef7860b8969eda5288d", "packages": [ { "name": "brick/math", @@ -931,129 +931,6 @@ }, "time": "2023-09-22T01:43:46+00:00" }, - { - "name": "cweagans/composer-configurable-plugin", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-configurable-plugin.git", - "reference": "15433906511a108a1806710e988629fd24b89974" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-configurable-plugin/zipball/15433906511a108a1806710e988629fd24b89974", - "reference": "15433906511a108a1806710e988629fd24b89974", - "shasum": "" - }, - "require": { - "php": ">=8.0.0" - }, - "require-dev": { - "codeception/codeception": "~4.0", - "codeception/module-asserts": "^2.0", - "composer/composer": "~2.0", - "php-coveralls/php-coveralls": "~2.0", - "php-parallel-lint/php-parallel-lint": "^1.0.0", - "phpro/grumphp": "^1.8.0", - "sebastian/phpcpd": "^6.0", - "squizlabs/php_codesniffer": "^3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a lightweight configuration system for Composer plugins.", - "support": { - "issues": "https://github.com/cweagans/composer-configurable-plugin/issues", - "source": "https://github.com/cweagans/composer-configurable-plugin/tree/2.0.0" - }, - "funding": [ - { - "url": "https://github.com/cweagans", - "type": "github" - } - ], - "time": "2023-02-12T04:58:58+00:00" - }, - { - "name": "cweagans/composer-patches", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-patches.git", - "reference": "bfa6018a5f864653d9ed899b902ea72f858a2cf7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/bfa6018a5f864653d9ed899b902ea72f858a2cf7", - "reference": "bfa6018a5f864653d9ed899b902ea72f858a2cf7", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^2.0", - "cweagans/composer-configurable-plugin": "^2.0", - "ext-json": "*", - "php": ">=8.0.0" - }, - "require-dev": { - "codeception/codeception": "~4.0", - "codeception/module-asserts": "^2.0", - "codeception/module-cli": "^2.0", - "codeception/module-filesystem": "^2.0", - "composer/composer": "~2.0", - "php-coveralls/php-coveralls": "~2.0", - "php-parallel-lint/php-parallel-lint": "^1.0.0", - "phpro/grumphp": "^1.8.0", - "sebastian/phpcpd": "^6.0", - "squizlabs/php_codesniffer": "^4.0" - }, - "type": "composer-plugin", - "extra": { - "_": "The following two lines ensure that composer-patches is loaded as early as possible.", - "class": "cweagans\\Composer\\Plugin\\Patches", - "plugin-modifies-downloads": true, - "plugin-modifies-install-path": true - }, - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a way to patch Composer packages.", - "support": { - "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/2.0.0" - }, - "funding": [ - { - "url": "https://github.com/cweagans", - "type": "github" - } - ], - "time": "2025-10-30T23:44:22+00:00" - }, { "name": "doctrine/collections", "version": "2.6.0", @@ -1896,6 +1773,40 @@ ], "time": "2025-08-23T21:21:41+00:00" }, + { + "name": "icinga/zf1", + "version": "v2.0.0-rc1", + "source": { + "type": "git", + "url": "https://github.com/Icinga/zf1", + "reference": "ec1e99c14715049ca5993dd7fe74d18711e8e67b" + }, + "require": { + "php": ">=8.2", + "symfony/polyfill-php83": "^1.30" + }, + "type": "library", + "autoload": { + "psr-0": { + "Zend_": "library/" + } + }, + "autoload-dev": { + "files": [ + "tests/phar-compat-aliases.php" + ], + "psr-0": { + "Zend_": "tests/", + "resources_": "tests/" + } + }, + "license": [ + "BSD-3-Clause" + ], + "description": "Streamlined Zend Framework 1 fork reduced to the components used by Icinga Web and its ecosystem.", + "homepage": "https://github.com/Icinga/zf1", + "time": "2026-02-20T15:23:10+00:00" + }, { "name": "jfcherng/php-color-output", "version": "3.0.0", @@ -4125,71 +4036,6 @@ }, "time": "2026-02-21T17:12:03+00:00" }, - { - "name": "shardj/zf1-future", - "version": "1.24.4", - "source": { - "type": "git", - "url": "https://github.com/Shardj/zf1-future.git", - "reference": "3582cce4bcf2c820191be56cf17fdef0addf0771" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Shardj/zf1-future/zipball/3582cce4bcf2c820191be56cf17fdef0addf0771", - "reference": "3582cce4bcf2c820191be56cf17fdef0addf0771", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-ctype": "^1.30", - "symfony/polyfill-mbstring": "^1.30", - "symfony/polyfill-php81": "^1.30", - "symfony/polyfill-php83": "^1.30" - }, - "replace": { - "zendframework/zendframework1": ">=1.12.20" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^3", - "php-parallel-lint/php-parallel-lint": "^1.3", - "phpstan/phpstan": "^1.4 || ^2.0", - "phpunit/phpunit": "^7|^8|^9", - "rector/rector": "0.12.19 || ^1.2 || ^2.0", - "yoast/phpunit-polyfills": "^2.0" - }, - "suggest": { - "ext-mbstring": "Multibyte strings handling" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12.x-dev" - } - }, - "autoload": { - "psr-0": { - "Zend_": "library/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "library/" - ], - "license": [ - "BSD-3-Clause" - ], - "description": "Zend Framework 1. The aim is to keep ZF1 working with the latest PHP versions", - "homepage": "https://github.com/Shardj/zf1-future/", - "keywords": [ - "ZF1", - "framework" - ], - "support": { - "issues": "https://github.com/Shardj/zf1-future/issues", - "source": "https://github.com/Shardj/zf1-future/tree/release-1.24.4" - }, - "time": "2025-06-26T19:09:46+00:00" - }, { "name": "simshaun/recurr", "version": "v5.0.3", @@ -4467,171 +4313,6 @@ ], "time": "2024-09-09T11:45:10+00:00" }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.33.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", - "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", - "shasum": "" - }, - "require": { - "ext-iconv": "*", - "php": ">=7.2" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://github.com/nicolas-grekas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-12-23T08:48:59+00:00" - }, - { - "name": "symfony/polyfill-php81", - "version": "v1.33.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", - "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://github.com/nicolas-grekas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-09-09T11:45:10+00:00" - }, { "name": "symfony/polyfill-php83", "version": "v1.33.0", @@ -5323,7 +5004,9 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "icinga/zf1": 5 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/patches/shardj-zf1-future.patch b/patches/shardj-zf1-future.patch deleted file mode 100644 index c144fb89..00000000 --- a/patches/shardj-zf1-future.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/library/Zend/Form/Element.php -+++ b/library/Zend/Form/Element.php -@@ -601,7 +601,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); -@@ -618,7 +618,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); - }