Skip to content

Commit

Permalink
small dompdf update
Browse files Browse the repository at this point in the history
  • Loading branch information
@liedekef
liedekef committed Jan 6, 2025
1 parent 7b19858 commit 574af26
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 26 deletions.
6 changes: 3 additions & 3 deletions dompdf/composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions dompdf/vendor/composer/InstalledVersions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ private static function getInstalled()
}

$installed = array();
$copiedLocalDir = false;

if (self::$canGetVendors) {
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
Expand All @@ -330,9 +331,11 @@ private static function getInstalled()
} elseif (is_file($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];
self::$installedByVendor[$vendorDir] = $required;
$installed[] = $required;
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $required;
$copiedLocalDir = true;
}
}
}
Expand All @@ -350,7 +353,7 @@ private static function getInstalled()
}
}

if (self::$installed !== array()) {
if (self::$installed !== array() && !$copiedLocalDir) {
$installed[] = self::$installed;
}

Expand Down
18 changes: 9 additions & 9 deletions dompdf/vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"packages": [
{
"name": "dompdf/dompdf",
"version": "v3.0.1",
"version_normalized": "3.0.1.0",
"version": "v3.0.2",
"version_normalized": "3.0.2.0",
"source": {
"type": "git",
"url": "https://github.com/dompdf/dompdf.git",
"reference": "2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6"
"reference": "baf4084b27c7f4b5b7a221b19a94d11327664eb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6",
"reference": "2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6",
"url": "https://api.github.com/repos/dompdf/dompdf/zipball/baf4084b27c7f4b5b7a221b19a94d11327664eb8",
"reference": "baf4084b27c7f4b5b7a221b19a94d11327664eb8",
"shasum": ""
},
"require": {
Expand All @@ -28,7 +28,7 @@
"ext-json": "*",
"ext-zip": "*",
"mockery/mockery": "^1.3",
"phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10",
"phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11",
"squizlabs/php_codesniffer": "^3.5",
"symfony/process": "^4.4 || ^5.4 || ^6.2 || ^7.0"
},
Expand All @@ -38,7 +38,7 @@
"ext-imagick": "Improves image processing performance",
"ext-zlib": "Needed for pdf stream compression"
},
"time": "2024-12-05T14:59:38+00:00",
"time": "2024-12-27T20:27:37+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -63,7 +63,7 @@
"homepage": "https://github.com/dompdf/dompdf",
"support": {
"issues": "https://github.com/dompdf/dompdf/issues",
"source": "https://github.com/dompdf/dompdf/tree/v3.0.1"
"source": "https://github.com/dompdf/dompdf/tree/v3.0.2"
},
"install-path": "../dompdf/dompdf"
},
Expand Down Expand Up @@ -303,6 +303,6 @@
"install-path": "../sabberworm/php-css-parser"
}
],
"dev": false,
"dev": true,
"dev-package-names": []
}
12 changes: 6 additions & 6 deletions dompdf/vendor/composer/installed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
'name' => '__root__',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => 'ef638f865daa9d60eb899d8e48ce5271a6e7bed3',
'reference' => '7b198583f5c0a07a0b181d0a559d21ca6ff8514c',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev' => false,
'dev' => true,
),
'versions' => array(
'__root__' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => 'ef638f865daa9d60eb899d8e48ce5271a6e7bed3',
'reference' => '7b198583f5c0a07a0b181d0a559d21ca6ff8514c',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev_requirement' => false,
),
'dompdf/dompdf' => array(
'pretty_version' => 'v3.0.1',
'version' => '3.0.1.0',
'reference' => '2d622faf9aa1f8f7f24dd094e49b5cf6c0c5d4e6',
'pretty_version' => 'v3.0.2',
'version' => '3.0.2.0',
'reference' => 'baf4084b27c7f4b5b7a221b19a94d11327664eb8',
'type' => 'library',
'install_path' => __DIR__ . '/../dompdf/dompdf',
'aliases' => array(),
Expand Down
2 changes: 1 addition & 1 deletion dompdf/vendor/dompdf/dompdf/VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.2
2 changes: 1 addition & 1 deletion dompdf/vendor/dompdf/dompdf/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"ext-gd": "*",
"ext-json": "*",
"ext-zip": "*",
"phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10",
"phpunit/phpunit": "^7.5 || ^8 || ^9 || ^10 || ^11",
"squizlabs/php_codesniffer": "^3.5",
"mockery/mockery": "^1.3",
"symfony/process": "^4.4 || ^5.4 || ^6.2 || ^7.0"
Expand Down
9 changes: 8 additions & 1 deletion dompdf/vendor/dompdf/dompdf/lib/res/broken_image.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dompdf/vendor/dompdf/dompdf/src/Image/Cache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function ($parser, $name, $attributes) use ($options, $parsed_url, $full_url) {
}
}
},
false
null
);

if (($fp = fopen($resolved_url, "r")) !== false) {
Expand Down

0 comments on commit 574af26

Please sign in to comment.