diff --git a/composer.json b/composer.json index 6e9b396..79d6d79 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,14 @@ { + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/Icinga/pdf-merge" + } + ], "require": { "php": ">=8.2", - "phrity/websocket": "^3.6", - "karriere/pdf-merge": "^3.3" + "karriere/pdf-merge": "dev-master", + "phrity/websocket": "^3.6" }, "config": { "sort-packages": true diff --git a/composer.lock b/composer.lock index 5ec4692..f749ab2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,24 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5cffa2096256d965b5bbedcd5a7b515b", + "content-hash": "5c3df7bceb770cd13e1f582b6dcc2ff5", "packages": [ { "name": "karriere/pdf-merge", - "version": "v3.3.1", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/karriereat/pdf-merge.git", - "reference": "d524a9d261ea96b18bbbab685b5710a7a0fe3a6e" + "url": "https://github.com/Icinga/pdf-merge.git", + "reference": "2903a4fda88466527bbafdfcc4d044e2b00a872f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/karriereat/pdf-merge/zipball/d524a9d261ea96b18bbbab685b5710a7a0fe3a6e", - "reference": "d524a9d261ea96b18bbbab685b5710a7a0fe3a6e", + "url": "https://api.github.com/repos/Icinga/pdf-merge/zipball/2903a4fda88466527bbafdfcc4d044e2b00a872f", + "reference": "2903a4fda88466527bbafdfcc4d044e2b00a872f", "shasum": "" }, "require": { - "php": "8.1.* | 8.2.* | 8.3.* | 8.4.*", + "php": "8.2.* | 8.3.* | 8.4.* | 8.5.*", "tecnickcom/tcpdf": "^6.3" }, "require-dev": { @@ -29,6 +29,7 @@ "pestphp/pest": "^1.22", "phpstan/phpstan": "^1.10" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -40,7 +41,37 @@ "tcpi/tcpdi_parser.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Karriere\\PdfMerge\\Tests\\": "tests" + } + }, + "scripts": { + "analyse": [ + "phpstan analyse --memory-limit 512M" + ], + "lint": [ + "pint --test" + ], + "lint:verbose": [ + "pint -v --test" + ], + "fix": [ + "pint" + ], + "test": [ + "vendor/bin/pest" + ], + "coverage": [ + "vendor/bin/pest --coverage --ci --coverage-html coverage --coverage-clover coverage.xml --log-junit junit.xml" + ], + "report": [ + "vendor/bin/pest --coverage" + ], + "report:html": [ + "vendor/bin/pest --coverage --coverage-html coverage" + ] + }, "license": [ "Apache-2.0" ], @@ -57,10 +88,9 @@ "pdf" ], "support": { - "issues": "https://github.com/karriereat/pdf-merge/issues", - "source": "https://github.com/karriereat/pdf-merge/tree/v3.3.1" + "source": "https://github.com/Icinga/pdf-merge/tree/master" }, - "time": "2025-02-19T11:02:10+00:00" + "time": "2026-01-19T15:39:37+00:00" }, { "name": "phrity/comparison", @@ -647,12 +677,14 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": { + "karriere/pdf-merge": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": ">=8.2" }, "platform-dev": {}, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 8281a73..5af240e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -7,11 +7,11 @@ class ComposerStaticInitff8ca5c94912b5ce3ac82b5c9f2b4776 { public static $prefixLengthsPsr4 = array ( - 'W' => + 'W' => array ( 'WebSocket\\' => 10, ), - 'P' => + 'P' => array ( 'Psr\\Log\\' => 8, 'Psr\\Http\\Message\\' => 17, @@ -20,44 +20,44 @@ class ComposerStaticInitff8ca5c94912b5ce3ac82b5c9f2b4776 'Phrity\\Http\\' => 12, 'Phrity\\Comparison\\' => 18, ), - 'K' => + 'K' => array ( 'Karriere\\PdfMerge\\' => 18, ), ); public static $prefixDirsPsr4 = array ( - 'WebSocket\\' => + 'WebSocket\\' => array ( 0 => __DIR__ . '/..' . '/phrity/websocket/src', ), - 'Psr\\Log\\' => + 'Psr\\Log\\' => array ( 0 => __DIR__ . '/..' . '/psr/log/src', ), - 'Psr\\Http\\Message\\' => + 'Psr\\Http\\Message\\' => array ( 0 => __DIR__ . '/..' . '/psr/http-factory/src', 1 => __DIR__ . '/..' . '/psr/http-message/src', ), - 'Phrity\\Util\\' => + 'Phrity\\Util\\' => array ( 0 => __DIR__ . '/..' . '/phrity/util-errorhandler/src', ), - 'Phrity\\Net\\' => + 'Phrity\\Net\\' => array ( 0 => __DIR__ . '/..' . '/phrity/net-uri/src', 1 => __DIR__ . '/..' . '/phrity/net-stream/src', ), - 'Phrity\\Http\\' => + 'Phrity\\Http\\' => array ( 0 => __DIR__ . '/..' . '/phrity/http/src', ), - 'Phrity\\Comparison\\' => + 'Phrity\\Comparison\\' => array ( 0 => __DIR__ . '/..' . '/phrity/comparison/src', ), - 'Karriere\\PdfMerge\\' => + 'Karriere\\PdfMerge\\' => array ( 0 => __DIR__ . '/..' . '/karriere/pdf-merge/src', ), diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6a2cf90..a87ff1f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,21 +2,21 @@ "packages": [ { "name": "karriere/pdf-merge", - "version": "v3.3.1", - "version_normalized": "3.3.1.0", + "version": "dev-master", + "version_normalized": "dev-master", "source": { "type": "git", - "url": "https://github.com/karriereat/pdf-merge.git", - "reference": "d524a9d261ea96b18bbbab685b5710a7a0fe3a6e" + "url": "https://github.com/Icinga/pdf-merge.git", + "reference": "2903a4fda88466527bbafdfcc4d044e2b00a872f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/karriereat/pdf-merge/zipball/d524a9d261ea96b18bbbab685b5710a7a0fe3a6e", - "reference": "d524a9d261ea96b18bbbab685b5710a7a0fe3a6e", + "url": "https://api.github.com/repos/Icinga/pdf-merge/zipball/2903a4fda88466527bbafdfcc4d044e2b00a872f", + "reference": "2903a4fda88466527bbafdfcc4d044e2b00a872f", "shasum": "" }, "require": { - "php": "8.1.* | 8.2.* | 8.3.* | 8.4.*", + "php": "8.2.* | 8.3.* | 8.4.* | 8.5.*", "tecnickcom/tcpdf": "^6.3" }, "require-dev": { @@ -24,7 +24,8 @@ "pestphp/pest": "^1.22", "phpstan/phpstan": "^1.10" }, - "time": "2025-02-19T11:02:10+00:00", + "time": "2026-01-19T15:39:37+00:00", + "default-branch": true, "type": "library", "installation-source": "dist", "autoload": { @@ -37,7 +38,37 @@ "tcpi/tcpdi_parser.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "Karriere\\PdfMerge\\Tests\\": "tests" + } + }, + "scripts": { + "analyse": [ + "phpstan analyse --memory-limit 512M" + ], + "lint": [ + "pint --test" + ], + "lint:verbose": [ + "pint -v --test" + ], + "fix": [ + "pint" + ], + "test": [ + "vendor/bin/pest" + ], + "coverage": [ + "vendor/bin/pest --coverage --ci --coverage-html coverage --coverage-clover coverage.xml --log-junit junit.xml" + ], + "report": [ + "vendor/bin/pest --coverage" + ], + "report:html": [ + "vendor/bin/pest --coverage --coverage-html coverage" + ] + }, "license": [ "Apache-2.0" ], @@ -54,36 +85,35 @@ "pdf" ], "support": { - "issues": "https://github.com/karriereat/pdf-merge/issues", - "source": "https://github.com/karriereat/pdf-merge/tree/v3.3.1" + "source": "https://github.com/Icinga/pdf-merge/tree/master" }, "install-path": "../karriere/pdf-merge" }, { "name": "phrity/comparison", - "version": "1.4.0", - "version_normalized": "1.4.0.0", + "version": "1.4.1", + "version_normalized": "1.4.1.0", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-comparison.git", - "reference": "aedd44d59db08de7d6c31812d1490c22aab35c92" + "reference": "cf80abb822537eeaaeb4142157cd667ca6372a13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-comparison/zipball/aedd44d59db08de7d6c31812d1490c22aab35c92", - "reference": "aedd44d59db08de7d6c31812d1490c22aab35c92", + "url": "https://api.github.com/repos/sirn-se/phrity-comparison/zipball/cf80abb822537eeaaeb4142157cd667ca6372a13", + "reference": "cf80abb822537eeaaeb4142157cd667ca6372a13", "shasum": "" }, "require": { "php": "^8.1" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, - "time": "2025-05-26T20:12:39+00:00", + "time": "2025-12-05T07:38:30+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -114,38 +144,38 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-comparison/issues", - "source": "https://github.com/sirn-se/phrity-comparison/tree/1.4.0" + "source": "https://github.com/sirn-se/phrity-comparison/tree/1.4.1" }, "install-path": "../phrity/comparison" }, { "name": "phrity/http", - "version": "1.0.0", - "version_normalized": "1.0.0.0", + "version": "1.0.1", + "version_normalized": "1.0.1.0", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-http.git", - "reference": "536e3e46e6220d171a59599ed1f4da9f6b6244fc" + "reference": "8f9d8eb92cd34cf7b9ec092b45730ec3ba668937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-http/zipball/536e3e46e6220d171a59599ed1f4da9f6b6244fc", - "reference": "536e3e46e6220d171a59599ed1f4da9f6b6244fc", + "url": "https://api.github.com/repos/sirn-se/phrity-http/zipball/8f9d8eb92cd34cf7b9ec092b45730ec3ba668937", + "reference": "8f9d8eb92cd34cf7b9ec092b45730ec3ba668937", "shasum": "" }, "require": { "php": "^8.1", "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 | ^2.0" + "psr/http-message": "^1.1 || ^2.0" }, "require-dev": { "guzzlehttp/psr7": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "robiningelbrecht/phpunit-coverage-tools": "^1.9", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, - "time": "2025-09-07T17:04:26+00:00", + "time": "2025-12-05T10:19:08+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -173,39 +203,39 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-http/issues", - "source": "https://github.com/sirn-se/phrity-http/tree/1.0.0" + "source": "https://github.com/sirn-se/phrity-http/tree/1.0.1" }, "install-path": "../phrity/http" }, { "name": "phrity/net-stream", - "version": "2.3.1", - "version_normalized": "2.3.1.0", + "version": "2.3.2", + "version_normalized": "2.3.2.0", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-net-stream.git", - "reference": "c621bb3108a5a02bba64df2e5f0cd7ada02665b5" + "reference": "6d220446043c0b2bf512cfd89caa2494ad9afdd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-net-stream/zipball/c621bb3108a5a02bba64df2e5f0cd7ada02665b5", - "reference": "c621bb3108a5a02bba64df2e5f0cd7ada02665b5", + "url": "https://api.github.com/repos/sirn-se/phrity-net-stream/zipball/6d220446043c0b2bf512cfd89caa2494ad9afdd1", + "reference": "6d220446043c0b2bf512cfd89caa2494ad9afdd1", "shasum": "" }, "require": { "php": "^8.1", "phrity/util-errorhandler": "^1.1", "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 | ^2.0" + "psr/http-message": "^1.1 || ^2.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "phrity/net-uri": "^2.0", - "squizlabs/php_codesniffer": "^3.5" + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, - "time": "2025-08-08T09:51:04+00:00", + "time": "2025-12-06T12:42:13+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -237,23 +267,23 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-net-stream/issues", - "source": "https://github.com/sirn-se/phrity-net-stream/tree/2.3.1" + "source": "https://github.com/sirn-se/phrity-net-stream/tree/2.3.2" }, "install-path": "../phrity/net-stream" }, { "name": "phrity/net-uri", - "version": "2.2.0", - "version_normalized": "2.2.0.0", + "version": "2.2.1", + "version_normalized": "2.2.1.0", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-net-uri.git", - "reference": "08de4cf07e439c4708f572249659f09198ac99f0" + "reference": "0737de026b75177ae302ac9fdbbd0ffc2610f3b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-net-uri/zipball/08de4cf07e439c4708f572249659f09198ac99f0", - "reference": "08de4cf07e439c4708f572249659f09198ac99f0", + "url": "https://api.github.com/repos/sirn-se/phrity-net-uri/zipball/0737de026b75177ae302ac9fdbbd0ffc2610f3b8", + "reference": "0737de026b75177ae302ac9fdbbd0ffc2610f3b8", "shasum": "" }, "require": { @@ -264,16 +294,16 @@ "psr/http-message": "^1.1 | ^2.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "phrity/util-errorhandler": "^1.1", - "squizlabs/php_codesniffer": "^3.5" + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, "suggest": { "ext-intl": "Enables IDN conversion for non-ASCII domains" }, - "time": "2025-05-25T13:05:13+00:00", + "time": "2025-12-05T10:39:22+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -302,35 +332,35 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-net-uri/issues", - "source": "https://github.com/sirn-se/phrity-net-uri/tree/2.2.0" + "source": "https://github.com/sirn-se/phrity-net-uri/tree/2.2.1" }, "install-path": "../phrity/net-uri" }, { "name": "phrity/util-errorhandler", - "version": "1.2.1", - "version_normalized": "1.2.1.0", + "version": "1.2.2", + "version_normalized": "1.2.2.0", "source": { "type": "git", "url": "https://github.com/sirn-se/phrity-util-errorhandler.git", - "reference": "9825f15ef9b4a93252ce53ca8962278832d834da" + "reference": "70a669cc22db2eed6a109ec66fd95168a4332c9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/phrity-util-errorhandler/zipball/9825f15ef9b4a93252ce53ca8962278832d834da", - "reference": "9825f15ef9b4a93252ce53ca8962278832d834da", + "url": "https://api.github.com/repos/sirn-se/phrity-util-errorhandler/zipball/70a669cc22db2eed6a109ec66fd95168a4332c9b", + "reference": "70a669cc22db2eed6a109ec66fd95168a4332c9b", "shasum": "" }, "require": { "php": "^8.1" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, - "time": "2025-08-08T09:48:45+00:00", + "time": "2025-12-05T21:25:36+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -357,23 +387,23 @@ ], "support": { "issues": "https://github.com/sirn-se/phrity-util-errorhandler/issues", - "source": "https://github.com/sirn-se/phrity-util-errorhandler/tree/1.2.1" + "source": "https://github.com/sirn-se/phrity-util-errorhandler/tree/1.2.2" }, "install-path": "../phrity/util-errorhandler" }, { "name": "phrity/websocket", - "version": "3.6.0", - "version_normalized": "3.6.0.0", + "version": "3.6.2", + "version_normalized": "3.6.2.0", "source": { "type": "git", "url": "https://github.com/sirn-se/websocket-php.git", - "reference": "3f16b2564a230bbce716cccaff2f6156a60a8798" + "reference": "b9816ed2b4a10c8c42bd0b6398044ab506869756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirn-se/websocket-php/zipball/3f16b2564a230bbce716cccaff2f6156a60a8798", - "reference": "3f16b2564a230bbce716cccaff2f6156a60a8798", + "url": "https://api.github.com/repos/sirn-se/websocket-php/zipball/b9816ed2b4a10c8c42bd0b6398044ab506869756", + "reference": "b9816ed2b4a10c8c42bd0b6398044ab506869756", "shasum": "" }, "require": { @@ -382,20 +412,19 @@ "phrity/net-stream": "^2.3", "phrity/net-uri": "^2.1", "psr/http-message": "^1.1 | ^2.0", - "psr/log": "^1.0 | ^2.0 | ^3.0" + "psr/log": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "guzzlehttp/psr7": "^2.0", - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "phrity/logger-console": "^1.0", "phrity/net-mock": "^2.3", "phrity/util-errorhandler": "^1.1", "robiningelbrecht/phpunit-coverage-tools": "^1.9", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, - "time": "2025-09-08T16:21:41+00:00", + "time": "2025-12-21T09:58:16+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -426,7 +455,7 @@ ], "support": { "issues": "https://github.com/sirn-se/websocket-php/issues", - "source": "https://github.com/sirn-se/websocket-php/tree/3.6.0" + "source": "https://github.com/sirn-se/websocket-php/tree/3.6.2" }, "install-path": "../phrity/websocket" }, diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 88f772f..61e4d33 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => '__root__', - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => null, + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => '9ce3413e78d2809619557cbe6ea79fafc5dd70c5', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,72 +11,74 @@ ), 'versions' => array( '__root__' => array( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => null, + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => '9ce3413e78d2809619557cbe6ea79fafc5dd70c5', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => false, ), 'karriere/pdf-merge' => array( - 'pretty_version' => 'v3.3.1', - 'version' => '3.3.1.0', - 'reference' => 'd524a9d261ea96b18bbbab685b5710a7a0fe3a6e', + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => '2903a4fda88466527bbafdfcc4d044e2b00a872f', 'type' => 'library', 'install_path' => __DIR__ . '/../karriere/pdf-merge', - 'aliases' => array(), + 'aliases' => array( + 0 => '9999999-dev', + ), 'dev_requirement' => false, ), 'phrity/comparison' => array( - 'pretty_version' => '1.4.0', - 'version' => '1.4.0.0', - 'reference' => 'aedd44d59db08de7d6c31812d1490c22aab35c92', + 'pretty_version' => '1.4.1', + 'version' => '1.4.1.0', + 'reference' => 'cf80abb822537eeaaeb4142157cd667ca6372a13', 'type' => 'library', 'install_path' => __DIR__ . '/../phrity/comparison', 'aliases' => array(), 'dev_requirement' => false, ), 'phrity/http' => array( - 'pretty_version' => '1.0.0', - 'version' => '1.0.0.0', - 'reference' => '536e3e46e6220d171a59599ed1f4da9f6b6244fc', + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', + 'reference' => '8f9d8eb92cd34cf7b9ec092b45730ec3ba668937', 'type' => 'library', 'install_path' => __DIR__ . '/../phrity/http', 'aliases' => array(), 'dev_requirement' => false, ), 'phrity/net-stream' => array( - 'pretty_version' => '2.3.1', - 'version' => '2.3.1.0', - 'reference' => 'c621bb3108a5a02bba64df2e5f0cd7ada02665b5', + 'pretty_version' => '2.3.2', + 'version' => '2.3.2.0', + 'reference' => '6d220446043c0b2bf512cfd89caa2494ad9afdd1', 'type' => 'library', 'install_path' => __DIR__ . '/../phrity/net-stream', 'aliases' => array(), 'dev_requirement' => false, ), 'phrity/net-uri' => array( - 'pretty_version' => '2.2.0', - 'version' => '2.2.0.0', - 'reference' => '08de4cf07e439c4708f572249659f09198ac99f0', + 'pretty_version' => '2.2.1', + 'version' => '2.2.1.0', + 'reference' => '0737de026b75177ae302ac9fdbbd0ffc2610f3b8', 'type' => 'library', 'install_path' => __DIR__ . '/../phrity/net-uri', 'aliases' => array(), 'dev_requirement' => false, ), 'phrity/util-errorhandler' => array( - 'pretty_version' => '1.2.1', - 'version' => '1.2.1.0', - 'reference' => '9825f15ef9b4a93252ce53ca8962278832d834da', + 'pretty_version' => '1.2.2', + 'version' => '1.2.2.0', + 'reference' => '70a669cc22db2eed6a109ec66fd95168a4332c9b', 'type' => 'library', 'install_path' => __DIR__ . '/../phrity/util-errorhandler', 'aliases' => array(), 'dev_requirement' => false, ), 'phrity/websocket' => array( - 'pretty_version' => '3.6.0', - 'version' => '3.6.0.0', - 'reference' => '3f16b2564a230bbce716cccaff2f6156a60a8798', + 'pretty_version' => '3.6.2', + 'version' => '3.6.2.0', + 'reference' => 'b9816ed2b4a10c8c42bd0b6398044ab506869756', 'type' => 'library', 'install_path' => __DIR__ . '/../phrity/websocket', 'aliases' => array(), diff --git a/vendor/karriere/pdf-merge/.github/workflows/ci.yml b/vendor/karriere/pdf-merge/.github/workflows/ci.yml index 3e5deea..131c7ef 100644 --- a/vendor/karriere/pdf-merge/.github/workflows/ci.yml +++ b/vendor/karriere/pdf-merge/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: true matrix: - php: [ "8.1", "8.2", "8.3", "8.4" ] + php: [ "8.2", "8.3", "8.4", "8.5" ] runs-on: ubuntu-latest name: PHP@${{ matrix.php }} @@ -22,7 +22,7 @@ jobs: with: php-version: ${{ matrix.php }} - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Validate composer.json and composer.lock run: composer validate diff --git a/vendor/karriere/pdf-merge/CHANGELOG.md b/vendor/karriere/pdf-merge/CHANGELOG.md index 17f7d90..6d86b06 100644 --- a/vendor/karriere/pdf-merge/CHANGELOG.md +++ b/vendor/karriere/pdf-merge/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.4.1] - 2026-01-19 +### Added +- Support for PHP 8.2 + +## [3.4.0] - 2025-11-21 +### Added +- Support for PHP 8.5 + +### Removed +- Support for PHP 8.1 and 8.2 ## [3.3.1] - 2025-02-19 ### Added diff --git a/vendor/karriere/pdf-merge/composer.json b/vendor/karriere/pdf-merge/composer.json index 0603bd6..47cd368 100644 --- a/vendor/karriere/pdf-merge/composer.json +++ b/vendor/karriere/pdf-merge/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "8.1.* | 8.2.* | 8.3.* | 8.4.*", + "php": "8.2.* | 8.3.* | 8.4.* | 8.5.*", "tecnickcom/tcpdf": "^6.3" }, "require-dev": { diff --git a/vendor/karriere/pdf-merge/tests/files/expected/output.pdf b/vendor/karriere/pdf-merge/tests/files/expected/output.pdf index 9cf3f63..6e32e05 100644 Binary files a/vendor/karriere/pdf-merge/tests/files/expected/output.pdf and b/vendor/karriere/pdf-merge/tests/files/expected/output.pdf differ diff --git a/vendor/karriere/pdf-merge/tests/files/expected/output_mixed_orientation.pdf b/vendor/karriere/pdf-merge/tests/files/expected/output_mixed_orientation.pdf index e20c9c7..24950bf 100644 Binary files a/vendor/karriere/pdf-merge/tests/files/expected/output_mixed_orientation.pdf and b/vendor/karriere/pdf-merge/tests/files/expected/output_mixed_orientation.pdf differ diff --git a/vendor/karriere/pdf-merge/tests/files/expected/output_with_header.pdf b/vendor/karriere/pdf-merge/tests/files/expected/output_with_header.pdf index c36a76a..ca3cef8 100644 Binary files a/vendor/karriere/pdf-merge/tests/files/expected/output_with_header.pdf and b/vendor/karriere/pdf-merge/tests/files/expected/output_with_header.pdf differ diff --git a/vendor/karriere/pdf-merge/tests/files/expected/output_with_header_and_footer.pdf b/vendor/karriere/pdf-merge/tests/files/expected/output_with_header_and_footer.pdf index 6da8603..e5d833c 100644 Binary files a/vendor/karriere/pdf-merge/tests/files/expected/output_with_header_and_footer.pdf and b/vendor/karriere/pdf-merge/tests/files/expected/output_with_header_and_footer.pdf differ diff --git a/vendor/phrity/comparison/composer.json b/vendor/phrity/comparison/composer.json index 9287317..99eb638 100644 --- a/vendor/phrity/comparison/composer.json +++ b/vendor/phrity/comparison/composer.json @@ -26,9 +26,9 @@ "php": "^8.1" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" } } diff --git a/vendor/phrity/http/composer.json b/vendor/phrity/http/composer.json index 9302b94..fa3adae 100644 --- a/vendor/phrity/http/composer.json +++ b/vendor/phrity/http/composer.json @@ -25,14 +25,14 @@ "require": { "php": "^8.1", "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 | ^2.0" + "psr/http-message": "^1.1 || ^2.0" }, "require-dev": { "guzzlehttp/psr7": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "robiningelbrecht/phpunit-coverage-tools": "^1.9", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, "provides": { "psr/http-factory-implementation": "*" diff --git a/vendor/phrity/http/docu.json b/vendor/phrity/http/docu.json deleted file mode 100644 index e217c11..0000000 --- a/vendor/phrity/http/docu.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "name": "Overview", - "source": "README.md" - }, - { - "name": "License", - "source": "LICENSE" - } -] diff --git a/vendor/phrity/net-stream/LICENSE b/vendor/phrity/net-stream/LICENSE new file mode 100644 index 0000000..09eaada --- /dev/null +++ b/vendor/phrity/net-stream/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Sören Jensen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/phrity/net-stream/composer.json b/vendor/phrity/net-stream/composer.json index d3778d4..c6b6227 100644 --- a/vendor/phrity/net-stream/composer.json +++ b/vendor/phrity/net-stream/composer.json @@ -26,13 +26,13 @@ "php": "^8.1", "phrity/util-errorhandler": "^1.1", "psr/http-factory": "^1.0", - "psr/http-message": "^1.1 | ^2.0" + "psr/http-message": "^1.1 || ^2.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "phrity/net-uri": "^2.0", - "squizlabs/php_codesniffer": "^3.5" + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" } } diff --git a/vendor/phrity/net-uri/LICENSE b/vendor/phrity/net-uri/LICENSE new file mode 100644 index 0000000..09eaada --- /dev/null +++ b/vendor/phrity/net-uri/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Sören Jensen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/phrity/net-uri/composer.json b/vendor/phrity/net-uri/composer.json index c0f5294..e9b8347 100644 --- a/vendor/phrity/net-uri/composer.json +++ b/vendor/phrity/net-uri/composer.json @@ -25,11 +25,11 @@ "psr/http-message": "^1.1 | ^2.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "phrity/util-errorhandler": "^1.1", - "squizlabs/php_codesniffer": "^3.5" + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, "suggest": { "ext-intl": "Enables IDN conversion for non-ASCII domains" diff --git a/vendor/phrity/util-errorhandler/LICENSE b/vendor/phrity/util-errorhandler/LICENSE new file mode 100644 index 0000000..09eaada --- /dev/null +++ b/vendor/phrity/util-errorhandler/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Sören Jensen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/vendor/phrity/util-errorhandler/composer.json b/vendor/phrity/util-errorhandler/composer.json index 29a7ae2..4fc377d 100644 --- a/vendor/phrity/util-errorhandler/composer.json +++ b/vendor/phrity/util-errorhandler/composer.json @@ -26,9 +26,9 @@ "php": "^8.1" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", + "robiningelbrecht/phpunit-coverage-tools": "^1.9", + "squizlabs/php_codesniffer": "^3.5 || ^4.0" } } diff --git a/vendor/phrity/websocket/composer.json b/vendor/phrity/websocket/composer.json index 62b3164..fb2aa9b 100644 --- a/vendor/phrity/websocket/composer.json +++ b/vendor/phrity/websocket/composer.json @@ -31,18 +31,17 @@ "phrity/net-uri": "^2.1", "phrity/net-stream": "^2.3", "psr/http-message": "^1.1 | ^2.0", - "psr/log": "^1.0 | ^2.0 | ^3.0" + "psr/log": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "guzzlehttp/psr7": "^2.0", - "php-coveralls/php-coveralls": "^2.0", "phpstan/phpstan": "^2.0", - "phpunit/phpunit": "^10.0 | ^11.0 | ^12.0", + "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0", "phrity/logger-console": "^1.0", "phrity/net-mock": "^2.3", "phrity/util-errorhandler": "^1.1", "robiningelbrecht/phpunit-coverage-tools": "^1.9", - "squizlabs/php_codesniffer": "^3.5" + "squizlabs/php_codesniffer": "^3.5 || ^4.0" }, "suggests": { "ext-zlib": "Required for per-message deflate compression" diff --git a/vendor/phrity/websocket/docu.json b/vendor/phrity/websocket/docu.json deleted file mode 100644 index 4331769..0000000 --- a/vendor/phrity/websocket/docu.json +++ /dev/null @@ -1,102 +0,0 @@ -[ - { - "name": "Overview", - "source": "README.md" - }, - { - "name": "Entry points", - "content": [ - { - "name": "Client", - "source": "docs/Client.md" - }, - { - "name": "Server", - "source": "docs/Server.md" - }, - ], - "name": "Resources", - "content": [ - { - "name": "Connection", - "source": "docs/Connection.md" - }, - { - "name": "Listener", - "source": "docs/Listener.md" - }, - { - "name": "Message", - "source": "docs/Message.md" - }, - { - "name": "Middleware", - "source": "docs/Middleware.md", - "content": [ - { - "name": "Callback", - "source": "docs/Middleware/Callback.md" - }, - { - "name": "Close Handler", - "source": "docs/Middleware/CloseHandler.md" - }, - { - "name": "Compression Extension", - "source": "docs/Middleware/CompressionExtension.md" - }, - { - "name": "Follow Redirect", - "source": "docs/Middleware/FollowRedirect.md" - }, - { - "name": "Ping Interval", - "source": "docs/Middleware/PingInterval.md" - }, - { - "name": "Ping Responder", - "source": "docs/Middleware/PingResponder.md" - }, - { - "name": "Subprotocol Negotiation", - "source": "docs/Middleware/SubprotocolNegotiation.md" - }, - { - "name": "Creating your own middleware", - "source": "docs/Middleware/Creating.md" - }, - ] - }, - ], - "name": "Developer resources", - "content": [ - { - "name": "Changelog", - "source": "docs/Changelog.md" - }, - { - "name": "Contributing", - "source": "docs/Contributing.md" - }, - { - "name": "Examples", - "source": "docs/Examples.md" - }, - { - "name": "Class synopsis", - "source": "docs/Class_Synopsis.md" - }, - ], - "name": "Migration", - "content": [ - { - "name": "Migration v2 -> v3", - "source": "docs/Migrate_2_3.md" - }, - ] - }, - { - "name": "License", - "source": "LICENSE.md" - } -] \ No newline at end of file diff --git a/vendor/phrity/websocket/src/Middleware/CompressionExtension/DeflateCompressor.php b/vendor/phrity/websocket/src/Middleware/CompressionExtension/DeflateCompressor.php index a955631..a5b2257 100644 --- a/vendor/phrity/websocket/src/Middleware/CompressionExtension/DeflateCompressor.php +++ b/vendor/phrity/websocket/src/Middleware/CompressionExtension/DeflateCompressor.php @@ -149,7 +149,8 @@ public function getConfiguration(string $element, bool $isServer): object ]; foreach (explode(';', $element) as $parameter) { $parts = explode('=', $parameter); - $key = trim($parts[0]); + $key = trim(array_shift($parts)); + $value = array_shift($parts); // @todo: Error handling when parsing switch ($key) { case 'permessage-deflate': @@ -162,11 +163,11 @@ public function getConfiguration(string $element, bool $isServer): object $configuration->clientNoContextTakeover = true; break; case 'server_max_window_bits': - $bits = intval($parts[1] ?? self::MAX_WINDOW_SIZE); + $bits = $this->intVal($value); $configuration->serverMaxWindowBits = min($bits, $this->serverMaxWindowBits); break; case 'client_max_window_bits': - $bits = intval($parts[1] ?? self::MAX_WINDOW_SIZE); + $bits = $this->intVal($value); $configuration->clientMaxWindowBits = min($bits, $this->clientMaxWindowBits); break; } @@ -233,4 +234,17 @@ public function decompress(Binary|Text $message, object $configuration): Binary| $message->setPayload($inflated); return $message; } + + private function intVal(string|null $input): int + { + if (is_null($input)) { + return self::MAX_WINDOW_SIZE; + } + preg_match('/([1-9][0-9]*)/', $input, $matches); + if (empty($matches)) { + return self::MAX_WINDOW_SIZE; + } + $value = (int)array_shift($matches); + return min(max($value, self::MIN_WINDOW_SIZE), self::MAX_WINDOW_SIZE); + } } diff --git a/vendor/phrity/websocket/src/Server.php b/vendor/phrity/websocket/src/Server.php index a1f7c2f..6a9bf75 100644 --- a/vendor/phrity/websocket/src/Server.php +++ b/vendor/phrity/websocket/src/Server.php @@ -529,7 +529,7 @@ protected function acceptSocket(SocketServer $socket): void try { /** @var SocketStream $stream */ $stream = $socket->accept(); - $name = $stream->getRemoteName(); + $name = $stream->getRemoteName() ?? 'unknown'; $this->streams()->attach($stream, $name); $connection = new Connection( $stream,