Skip to content

Commit 1139199

Browse files
splitbrainsplitbrain
committed
added psr/log
This should have been added in the last commit 837fcad but was forgotten.
1 parent d99b345 commit 1139199

21 files changed

Lines changed: 850 additions & 57 deletions

‎composer.lock‎

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

‎deleted.files‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1639,17 +1639,6 @@ vendor/mpdf/mpdf/src/QrCode/data/rsc7.dat
16391639
vendor/mpdf/mpdf/src/RemoteContentFetcher.php
16401640
vendor/myclabs/deep-copy/.github/FUNDING.yml
16411641
vendor/psr/log/.gitignore
1642-
vendor/psr/log/Psr/Log/AbstractLogger.php
1643-
vendor/psr/log/Psr/Log/InvalidArgumentException.php
1644-
vendor/psr/log/Psr/Log/LogLevel.php
1645-
vendor/psr/log/Psr/Log/LoggerAwareInterface.php
1646-
vendor/psr/log/Psr/Log/LoggerAwareTrait.php
1647-
vendor/psr/log/Psr/Log/LoggerInterface.php
1648-
vendor/psr/log/Psr/Log/LoggerTrait.php
1649-
vendor/psr/log/Psr/Log/NullLogger.php
1650-
vendor/psr/log/Psr/Log/Test/DummyTest.php
1651-
vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
1652-
vendor/psr/log/Psr/Log/Test/TestLogger.php
16531642
vendor/psr/log/src/AbstractLogger.php
16541643
vendor/psr/log/src/InvalidArgumentException.php
16551644
vendor/psr/log/src/LogLevel.php

‎vendor/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
require_once __DIR__ . '/composer/autoload_real.php';
2121

22-
return ComposerAutoloaderInitb71fb58cdf4c29fb0d05b258cce42b04::getLoader();
22+
return ComposerAutoloaderInit70e3f425d861b01c41a304e53af0cadc::getLoader();

‎vendor/composer/autoload_real.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInitb71fb58cdf4c29fb0d05b258cce42b04
5+
class ComposerAutoloaderInit70e3f425d861b01c41a304e53af0cadc
66
{
77
private static $loader;
88

@@ -24,16 +24,16 @@ public static function getLoader()
2424

2525
require __DIR__ . '/platform_check.php';
2626

27-
spl_autoload_register(array('ComposerAutoloaderInitb71fb58cdf4c29fb0d05b258cce42b04', 'loadClassLoader'), true, true);
27+
spl_autoload_register(array('ComposerAutoloaderInit70e3f425d861b01c41a304e53af0cadc', 'loadClassLoader'), true, true);
2828
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
29-
spl_autoload_unregister(array('ComposerAutoloaderInitb71fb58cdf4c29fb0d05b258cce42b04', 'loadClassLoader'));
29+
spl_autoload_unregister(array('ComposerAutoloaderInit70e3f425d861b01c41a304e53af0cadc', 'loadClassLoader'));
3030

3131
require __DIR__ . '/autoload_static.php';
32-
call_user_func(\Composer\Autoload\ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04::getInitializer($loader));
32+
call_user_func(\Composer\Autoload\ComposerStaticInit70e3f425d861b01c41a304e53af0cadc::getInitializer($loader));
3333

3434
$loader->register(true);
3535

36-
$filesToLoad = \Composer\Autoload\ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04::$files;
36+
$filesToLoad = \Composer\Autoload\ComposerStaticInit70e3f425d861b01c41a304e53af0cadc::$files;
3737
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3838
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3939
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php‎

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

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04
7+
class ComposerStaticInit70e3f425d861b01c41a304e53af0cadc
88
{
99
public static $files = array (
1010
'6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
1111
'db356362850385d08a5381de2638b5fd' => __DIR__ . '/..' . '/mpdf/mpdf/src/functions.php',
1212
);
1313

1414
public static $prefixLengthsPsr4 = array (
15-
's' =>
15+
's' =>
1616
array (
1717
'setasign\\Fpdi\\' => 14,
1818
),
19-
'P' =>
19+
'P' =>
2020
array (
2121
'Psr\\Log\\' => 8,
2222
'Psr\\Http\\Message\\' => 17,
2323
),
24-
'M' =>
24+
'M' =>
2525
array (
2626
'Mpdf\\QrCode\\' => 12,
2727
'Mpdf\\PsrLogAwareTrait\\' => 22,
2828
'Mpdf\\PsrHttpMessageShim\\' => 24,
2929
'Mpdf\\' => 5,
3030
),
31-
'D' =>
31+
'D' =>
3232
array (
3333
'DeepCopy\\' => 9,
3434
),
3535
);
3636

3737
public static $prefixDirsPsr4 = array (
38-
'setasign\\Fpdi\\' =>
38+
'setasign\\Fpdi\\' =>
3939
array (
4040
0 => __DIR__ . '/..' . '/setasign/fpdi/src',
4141
),
42-
'Psr\\Log\\' =>
42+
'Psr\\Log\\' =>
4343
array (
4444
0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
4545
),
46-
'Psr\\Http\\Message\\' =>
46+
'Psr\\Http\\Message\\' =>
4747
array (
4848
0 => __DIR__ . '/..' . '/psr/http-message/src',
4949
),
50-
'Mpdf\\QrCode\\' =>
50+
'Mpdf\\QrCode\\' =>
5151
array (
5252
0 => __DIR__ . '/..' . '/mpdf/qrcode/src',
5353
),
54-
'Mpdf\\PsrLogAwareTrait\\' =>
54+
'Mpdf\\PsrLogAwareTrait\\' =>
5555
array (
5656
0 => __DIR__ . '/..' . '/mpdf/psr-log-aware-trait/src',
5757
),
58-
'Mpdf\\PsrHttpMessageShim\\' =>
58+
'Mpdf\\PsrHttpMessageShim\\' =>
5959
array (
6060
0 => __DIR__ . '/..' . '/mpdf/psr-http-message-shim/src',
6161
),
62-
'Mpdf\\' =>
62+
'Mpdf\\' =>
6363
array (
6464
0 => __DIR__ . '/..' . '/mpdf/mpdf/src',
6565
),
66-
'DeepCopy\\' =>
66+
'DeepCopy\\' =>
6767
array (
6868
0 => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy',
6969
),
@@ -76,9 +76,9 @@ class ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04
7676
public static function getInitializer(ClassLoader $loader)
7777
{
7878
return \Closure::bind(function () use ($loader) {
79-
$loader->prefixLengthsPsr4 = ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04::$prefixLengthsPsr4;
80-
$loader->prefixDirsPsr4 = ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04::$prefixDirsPsr4;
81-
$loader->classMap = ComposerStaticInitb71fb58cdf4c29fb0d05b258cce42b04::$classMap;
79+
$loader->prefixLengthsPsr4 = ComposerStaticInit70e3f425d861b01c41a304e53af0cadc::$prefixLengthsPsr4;
80+
$loader->prefixDirsPsr4 = ComposerStaticInit70e3f425d861b01c41a304e53af0cadc::$prefixDirsPsr4;
81+
$loader->classMap = ComposerStaticInit70e3f425d861b01c41a304e53af0cadc::$classMap;
8282

8383
}, null, ClassLoader::class);
8484
}

‎vendor/composer/installed.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,25 +184,25 @@
184184
},
185185
{
186186
"name": "mpdf/qrcode",
187-
"version": "v1.2.1",
188-
"version_normalized": "1.2.1.0",
187+
"version": "v1.2.2",
188+
"version_normalized": "1.2.2.0",
189189
"source": {
190190
"type": "git",
191191
"url": "https://github.com/mpdf/qrcode.git",
192-
"reference": "5320c512776aa3c199bd8be8f707ec83d9779d85"
192+
"reference": "d4fa19117a7241c30ac84902b6236a02c7a3f268"
193193
},
194194
"dist": {
195195
"type": "zip",
196-
"url": "https://api.github.com/repos/mpdf/qrcode/zipball/5320c512776aa3c199bd8be8f707ec83d9779d85",
197-
"reference": "5320c512776aa3c199bd8be8f707ec83d9779d85",
196+
"url": "https://api.github.com/repos/mpdf/qrcode/zipball/d4fa19117a7241c30ac84902b6236a02c7a3f268",
197+
"reference": "d4fa19117a7241c30ac84902b6236a02c7a3f268",
198198
"shasum": ""
199199
},
200200
"require": {
201201
"paragonie/random_compat": "^1.4|^2.0|^9.99.99",
202202
"php": "^5.6 || ^7.0 || ^8.0"
203203
},
204204
"require-dev": {
205-
"mockery/mockery": "^0.9.5",
205+
"mockery/mockery": "^0.9.5 || ^1.0",
206206
"squizlabs/php_codesniffer": "^3.4",
207207
"tracy/tracy": "^2.5",
208208
"yoast/phpunit-polyfills": "^1.0"
@@ -211,7 +211,7 @@
211211
"ext-gd": "To output QR codes to PNG files",
212212
"ext-simplexml": "To output QR codes to SVG files"
213213
},
214-
"time": "2024-06-04T13:40:39+00:00",
214+
"time": "2025-12-19T16:21:49+00:00",
215215
"type": "library",
216216
"installation-source": "dist",
217217
"autoload": {
@@ -243,7 +243,7 @@
243243
],
244244
"support": {
245245
"issues": "https://github.com/mpdf/qrcode/issues",
246-
"source": "https://github.com/mpdf/qrcode/tree/v1.2.1"
246+
"source": "https://github.com/mpdf/qrcode/tree/v1.2.2"
247247
},
248248
"funding": [
249249
{

‎vendor/composer/installed.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'splitbrain/dw2pdf',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => '212a1ea54602e857db1c810a68e294f2d9486e20',
6+
'reference' => 'de48af63d128621e38f807a2772256d73df280db',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -38,9 +38,9 @@
3838
'dev_requirement' => false,
3939
),
4040
'mpdf/qrcode' => array(
41-
'pretty_version' => 'v1.2.1',
42-
'version' => '1.2.1.0',
43-
'reference' => '5320c512776aa3c199bd8be8f707ec83d9779d85',
41+
'pretty_version' => 'v1.2.2',
42+
'version' => '1.2.2.0',
43+
'reference' => 'd4fa19117a7241c30ac84902b6236a02c7a3f268',
4444
'type' => 'library',
4545
'install_path' => __DIR__ . '/../mpdf/qrcode',
4646
'aliases' => array(),
@@ -91,7 +91,7 @@
9191
'splitbrain/dw2pdf' => array(
9292
'pretty_version' => 'dev-master',
9393
'version' => 'dev-master',
94-
'reference' => '212a1ea54602e857db1c810a68e294f2d9486e20',
94+
'reference' => 'de48af63d128621e38f807a2772256d73df280db',
9595
'type' => 'library',
9696
'install_path' => __DIR__ . '/../../',
9797
'aliases' => array(),

‎vendor/mpdf/qrcode/.github/workflows/tests.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ jobs:
3030
- "7.4"
3131
- "8.0"
3232
- "8.1"
33+
- "8.2"
34+
- "8.3"
35+
- "8.4"
36+
- "8.5"
3337
operating-system: [ubuntu-latest, windows-latest]
3438

3539
steps:
@@ -44,7 +48,7 @@ jobs:
4448
extensions: "mbstring, gd, bcmath, bz2"
4549
tools: composer:v2
4650
ini-values: error_reporting=-1
47-
51+
4852
- name: "Install dependencies"
4953
run: "composer install --no-interaction --no-progress"
5054

‎vendor/mpdf/qrcode/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
"require-dev": {
2929
"yoast/phpunit-polyfills": "^1.0",
30-
"mockery/mockery": "^0.9.5",
30+
"mockery/mockery": "^0.9.5 || ^1.0",
3131
"squizlabs/php_codesniffer": "^3.4",
3232
"tracy/tracy": "^2.5"
3333
},

‎vendor/mpdf/qrcode/src/Output/Png.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ public function output(QrCode $qrCode, $w = 100, $background = [255, 255, 255],
5757
$data = ob_get_contents();
5858
ob_end_clean();
5959

60-
imagedestroy($im);
60+
//This function has been DEPRECATED as of PHP 8.5.0
61+
if (PHP_VERSION_ID < 80500) {
62+
imagedestroy($im);
63+
}
6164

6265
return $data;
6366
}

0 commit comments

Comments
 (0)