Skip to content

Commit 42e607b

Browse files
sukhwinder33445sukhwinder33445
committed
Upgrade karriere/pdf-merge to version ^3.4 for php 8.5
- PHP8.5 supoort was introduced in v3.4 - run composer update, which also install missing `phrity/websocket`
1 parent e847853 commit 42e607b

26 files changed

Lines changed: 222 additions & 253 deletions

File tree

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"require": {
33
"php": ">=8.2",
4-
"phrity/websocket": "^3.6",
5-
"karriere/pdf-merge": "^3.3"
4+
"karriere/pdf-merge": "^3.3 || ^3.4",
5+
"phrity/websocket": "^3.6"
66
},
77
"config": {
88
"sort-packages": true

‎composer.lock‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/composer/autoload_static.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
class ComposerStaticInitff8ca5c94912b5ce3ac82b5c9f2b4776
88
{
99
public static $prefixLengthsPsr4 = array (
10-
'W' =>
10+
'W' =>
1111
array (
1212
'WebSocket\\' => 10,
1313
),
14-
'P' =>
14+
'P' =>
1515
array (
1616
'Psr\\Log\\' => 8,
1717
'Psr\\Http\\Message\\' => 17,
@@ -20,44 +20,44 @@ class ComposerStaticInitff8ca5c94912b5ce3ac82b5c9f2b4776
2020
'Phrity\\Http\\' => 12,
2121
'Phrity\\Comparison\\' => 18,
2222
),
23-
'K' =>
23+
'K' =>
2424
array (
2525
'Karriere\\PdfMerge\\' => 18,
2626
),
2727
);
2828

2929
public static $prefixDirsPsr4 = array (
30-
'WebSocket\\' =>
30+
'WebSocket\\' =>
3131
array (
3232
0 => __DIR__ . '/..' . '/phrity/websocket/src',
3333
),
34-
'Psr\\Log\\' =>
34+
'Psr\\Log\\' =>
3535
array (
3636
0 => __DIR__ . '/..' . '/psr/log/src',
3737
),
38-
'Psr\\Http\\Message\\' =>
38+
'Psr\\Http\\Message\\' =>
3939
array (
4040
0 => __DIR__ . '/..' . '/psr/http-factory/src',
4141
1 => __DIR__ . '/..' . '/psr/http-message/src',
4242
),
43-
'Phrity\\Util\\' =>
43+
'Phrity\\Util\\' =>
4444
array (
4545
0 => __DIR__ . '/..' . '/phrity/util-errorhandler/src',
4646
),
47-
'Phrity\\Net\\' =>
47+
'Phrity\\Net\\' =>
4848
array (
4949
0 => __DIR__ . '/..' . '/phrity/net-uri/src',
5050
1 => __DIR__ . '/..' . '/phrity/net-stream/src',
5151
),
52-
'Phrity\\Http\\' =>
52+
'Phrity\\Http\\' =>
5353
array (
5454
0 => __DIR__ . '/..' . '/phrity/http/src',
5555
),
56-
'Phrity\\Comparison\\' =>
56+
'Phrity\\Comparison\\' =>
5757
array (
5858
0 => __DIR__ . '/..' . '/phrity/comparison/src',
5959
),
60-
'Karriere\\PdfMerge\\' =>
60+
'Karriere\\PdfMerge\\' =>
6161
array (
6262
0 => __DIR__ . '/..' . '/karriere/pdf-merge/src',
6363
),

‎vendor/composer/installed.json‎

Lines changed: 69 additions & 70 deletions
Large diffs are not rendered by default.

‎vendor/composer/installed.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,63 +20,63 @@
2020
'dev_requirement' => false,
2121
),
2222
'karriere/pdf-merge' => array(
23-
'pretty_version' => 'v3.3.1',
24-
'version' => '3.3.1.0',
25-
'reference' => 'd524a9d261ea96b18bbbab685b5710a7a0fe3a6e',
23+
'pretty_version' => 'v3.4.0',
24+
'version' => '3.4.0.0',
25+
'reference' => '13e6f60fe42c0fac238a65b9e19d69875658379b',
2626
'type' => 'library',
2727
'install_path' => __DIR__ . '/../karriere/pdf-merge',
2828
'aliases' => array(),
2929
'dev_requirement' => false,
3030
),
3131
'phrity/comparison' => array(
32-
'pretty_version' => '1.4.0',
33-
'version' => '1.4.0.0',
34-
'reference' => 'aedd44d59db08de7d6c31812d1490c22aab35c92',
32+
'pretty_version' => '1.4.1',
33+
'version' => '1.4.1.0',
34+
'reference' => 'cf80abb822537eeaaeb4142157cd667ca6372a13',
3535
'type' => 'library',
3636
'install_path' => __DIR__ . '/../phrity/comparison',
3737
'aliases' => array(),
3838
'dev_requirement' => false,
3939
),
4040
'phrity/http' => array(
41-
'pretty_version' => '1.0.0',
42-
'version' => '1.0.0.0',
43-
'reference' => '536e3e46e6220d171a59599ed1f4da9f6b6244fc',
41+
'pretty_version' => '1.0.1',
42+
'version' => '1.0.1.0',
43+
'reference' => '8f9d8eb92cd34cf7b9ec092b45730ec3ba668937',
4444
'type' => 'library',
4545
'install_path' => __DIR__ . '/../phrity/http',
4646
'aliases' => array(),
4747
'dev_requirement' => false,
4848
),
4949
'phrity/net-stream' => array(
50-
'pretty_version' => '2.3.1',
51-
'version' => '2.3.1.0',
52-
'reference' => 'c621bb3108a5a02bba64df2e5f0cd7ada02665b5',
50+
'pretty_version' => '2.3.2',
51+
'version' => '2.3.2.0',
52+
'reference' => '6d220446043c0b2bf512cfd89caa2494ad9afdd1',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../phrity/net-stream',
5555
'aliases' => array(),
5656
'dev_requirement' => false,
5757
),
5858
'phrity/net-uri' => array(
59-
'pretty_version' => '2.2.0',
60-
'version' => '2.2.0.0',
61-
'reference' => '08de4cf07e439c4708f572249659f09198ac99f0',
59+
'pretty_version' => '2.2.1',
60+
'version' => '2.2.1.0',
61+
'reference' => '0737de026b75177ae302ac9fdbbd0ffc2610f3b8',
6262
'type' => 'library',
6363
'install_path' => __DIR__ . '/../phrity/net-uri',
6464
'aliases' => array(),
6565
'dev_requirement' => false,
6666
),
6767
'phrity/util-errorhandler' => array(
68-
'pretty_version' => '1.2.1',
69-
'version' => '1.2.1.0',
70-
'reference' => '9825f15ef9b4a93252ce53ca8962278832d834da',
68+
'pretty_version' => '1.2.2',
69+
'version' => '1.2.2.0',
70+
'reference' => '70a669cc22db2eed6a109ec66fd95168a4332c9b',
7171
'type' => 'library',
7272
'install_path' => __DIR__ . '/../phrity/util-errorhandler',
7373
'aliases' => array(),
7474
'dev_requirement' => false,
7575
),
7676
'phrity/websocket' => array(
77-
'pretty_version' => '3.6.0',
78-
'version' => '3.6.0.0',
79-
'reference' => '3f16b2564a230bbce716cccaff2f6156a60a8798',
77+
'pretty_version' => '3.6.2',
78+
'version' => '3.6.2.0',
79+
'reference' => 'b9816ed2b4a10c8c42bd0b6398044ab506869756',
8080
'type' => 'library',
8181
'install_path' => __DIR__ . '/../phrity/websocket',
8282
'aliases' => array(),

‎vendor/composer/platform_check.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
$issues = array();
66

7-
if (!(PHP_VERSION_ID >= 80200)) {
8-
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.2.0". You are running ' . PHP_VERSION . '.';
7+
if (!(PHP_VERSION_ID >= 80300)) {
8+
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.3.0". You are running ' . PHP_VERSION . '.';
99
}
1010

1111
if ($issues) {

‎vendor/karriere/pdf-merge/.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
php: [ "8.1", "8.2", "8.3", "8.4" ]
15+
php: [ "8.3", "8.4", "8.5" ]
1616

1717
runs-on: ubuntu-latest
1818
name: PHP@${{ matrix.php }}

‎vendor/karriere/pdf-merge/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [3.4.0] - 2025-11-21
8+
### Added
9+
- Support for PHP 8.5
10+
11+
### Removed
12+
- Support for PHP 8.1 and 8.2
713

814
## [3.3.1] - 2025-02-19
915
### Added

‎vendor/karriere/pdf-merge/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"require": {
14-
"php": "8.1.* | 8.2.* | 8.3.* | 8.4.*",
14+
"php": "8.3.* | 8.4.* | 8.5.*",
1515
"tecnickcom/tcpdf": "^6.3"
1616
},
1717
"require-dev": {

‎vendor/karriere/pdf-merge/tests/files/expected/output.pdf‎

4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)