From d9ee563676e9b71b3c99720ee6277737f44572dd Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 6 Apr 2022 08:06:18 +1000 Subject: [PATCH] Update DOMPDF to 1.2.1 and update composer-compile-plugin as per master --- composer.json | 2 +- composer.lock | 106 ++++++++++++++++++++++++++------------------------ 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/composer.json b/composer.json index ee14ec3d60..fb483b5ab4 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "require": { "php": "~7.2 || ~8", "cache/integration-tests": "~0.17.0", - "dompdf/dompdf" : "~1.0.0", + "dompdf/dompdf" : "~1.2.1", "firebase/php-jwt": ">=3 <6", "electrolinux/phpquery": "^0.9.6", "symfony/config": "~3.0 || ~4.4", diff --git a/composer.lock b/composer.lock index c4ab86139b..e7b2331801 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": "48877e974546416099daaec465ba5205", + "content-hash": "402dd55dab077e5d7e9fa56441001e1c", "packages": [ { "name": "adrienrn/php-mimetyper", @@ -398,21 +398,21 @@ }, { "name": "civicrm/composer-compile-plugin", - "version": "v0.15", + "version": "v0.18", "source": { "type": "git", "url": "https://github.com/civicrm/composer-compile-plugin.git", - "reference": "af9686c4511ad4d2dde3c32aafa4637579e1085d" + "reference": "158be6061320c2f481e1aa8f821be5c7e0eea220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/af9686c4511ad4d2dde3c32aafa4637579e1085d", - "reference": "af9686c4511ad4d2dde3c32aafa4637579e1085d", + "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/158be6061320c2f481e1aa8f821be5c7e0eea220", + "reference": "158be6061320c2f481e1aa8f821be5c7e0eea220", "shasum": "" }, "require": { "composer-plugin-api": "^1.1 || ^2.0", - "php": ">=7.1", + "php": ">=7.2", "totten/lurkerlite": "^1.3" }, "require-dev": { @@ -441,9 +441,9 @@ "description": "Define a 'compile' event for all packages in the dependency-graph", "support": { "issues": "https://github.com/civicrm/composer-compile-plugin/issues", - "source": "https://github.com/civicrm/composer-compile-plugin/tree/v0.15" + "source": "https://github.com/civicrm/composer-compile-plugin/tree/v0.18" }, - "time": "2021-01-13T05:12:30+00:00" + "time": "2022-04-01T08:01:29+00:00" }, { "name": "civicrm/composer-downloads-plugin", @@ -608,23 +608,23 @@ }, { "name": "dompdf/dompdf", - "version": "v1.0.2", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "8768448244967a46d6e67b891d30878e0e15d25c" + "reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c", - "reference": "8768448244967a46d6e67b891d30878e0e15d25c", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c6dfd9bb8b0040609f04754f729d4cb3016e0575", + "reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "phenx/php-font-lib": "^0.5.2", - "phenx/php-svg-lib": "^0.3.3", + "phenx/php-font-lib": "^0.5.4", + "phenx/php-svg-lib": "^0.3.3 || ^0.4.0", "php": "^7.1 || ^8.0" }, "require-dev": { @@ -639,11 +639,6 @@ "ext-zlib": "Needed for pdf stream compression" }, "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.7-dev" - } - }, "autoload": { "psr-4": { "Dompdf\\": "src/" @@ -674,9 +669,9 @@ "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v1.0.2" + "source": "https://github.com/dompdf/dompdf/tree/v1.2.1" }, - "time": "2021-01-08T14:18:52+00:00" + "time": "2022-03-24T12:57:42+00:00" }, { "name": "electrolinux/phpquery", @@ -2438,20 +2433,23 @@ }, { "name": "phenx/php-font-lib", - "version": "0.5.2", + "version": "0.5.4", "source": { "type": "git", - "url": "https://github.com/PhenX/php-font-lib.git", - "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8" + "url": "https://github.com/dompdf/php-font-lib.git", + "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8", - "reference": "ca6ad461f032145fff5971b5985e5af9e7fa88d8", + "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4", + "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4", "shasum": "" }, + "require": { + "ext-mbstring": "*" + }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5 || ^6 || ^7" + "symfony/phpunit-bridge": "^3 || ^4 || ^5" }, "type": "library", "autoload": { @@ -2472,30 +2470,32 @@ "description": "A library to read, parse, export and make subsets of different types of font files.", "homepage": "https://github.com/PhenX/php-font-lib", "support": { - "issues": "https://github.com/PhenX/php-font-lib/issues", - "source": "https://github.com/PhenX/php-font-lib/tree/0.5.2" + "issues": "https://github.com/dompdf/php-font-lib/issues", + "source": "https://github.com/dompdf/php-font-lib/tree/0.5.4" }, - "time": "2020-03-08T15:31:32+00:00" + "time": "2021-12-17T19:44:54+00:00" }, { "name": "phenx/php-svg-lib", - "version": "v0.3.3", + "version": "0.4.1", "source": { "type": "git", - "url": "https://github.com/PhenX/php-svg-lib.git", - "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32" + "url": "https://github.com/dompdf/php-svg-lib.git", + "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", - "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", + "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/4498b5df7b08e8469f0f8279651ea5de9626ed02", + "reference": "4498b5df7b08e8469f0f8279651ea5de9626ed02", "shasum": "" }, "require": { - "sabberworm/php-css-parser": "^8.3" + "ext-mbstring": "*", + "php": "^7.1 || ^7.2 || ^7.3 || ^7.4 || ^8.0", + "sabberworm/php-css-parser": "^8.4" }, "require-dev": { - "phpunit/phpunit": "^5.5|^6.5" + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5" }, "type": "library", "autoload": { @@ -2516,10 +2516,10 @@ "description": "A library to read, parse and export to PDF SVG files.", "homepage": "https://github.com/PhenX/php-svg-lib", "support": { - "issues": "https://github.com/PhenX/php-svg-lib/issues", - "source": "https://github.com/PhenX/php-svg-lib/tree/master" + "issues": "https://github.com/dompdf/php-svg-lib/issues", + "source": "https://github.com/dompdf/php-svg-lib/tree/0.4.1" }, - "time": "2019-09-11T20:02:13+00:00" + "time": "2022-03-07T12:52:04+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -3255,29 +3255,33 @@ }, { "name": "sabberworm/php-css-parser", - "version": "8.3.1", + "version": "8.4.0", "source": { "type": "git", "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "d217848e1396ef962fb1997cf3e2421acba7f796" + "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796", - "reference": "d217848e1396ef962fb1997cf3e2421acba7f796", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30", + "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30", "shasum": "" }, "require": { - "php": ">=5.3.2" + "ext-iconv": "*", + "php": ">=5.6.20" }, "require-dev": { "codacy/coverage": "^1.4", - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.36" + }, + "suggest": { + "ext-mbstring": "for parsing UTF-8 CSS" }, "type": "library", "autoload": { - "psr-0": { - "Sabberworm\\CSS": "lib/" + "psr-4": { + "Sabberworm\\CSS\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3290,7 +3294,7 @@ } ], "description": "Parser for CSS Files written in PHP", - "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser", + "homepage": "https://www.sabberworm.com/blog/2010/6/10/php-css-parser", "keywords": [ "css", "parser", @@ -3298,9 +3302,9 @@ ], "support": { "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", - "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.3.1" + "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0" }, - "time": "2020-06-01T09:10:00+00:00" + "time": "2021-12-11T13:40:54+00:00" }, { "name": "scssphp/scssphp", -- 2.25.1