Upgrade mitoteam/jpgraph for Php8.2 Usage (#3058)

They just released a Php8.2-compatible version. We should use that version going forward. Some tests had been disabled in 8.2 due to the problems which the new release fixes; these are now restored.
This commit is contained in:
oleibman 2022-09-12 08:23:43 -07:00 committed by GitHub
parent b5f70de61d
commit 2fe66d097f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 17 deletions

View File

@ -81,7 +81,7 @@
"dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
"dompdf/dompdf": "^1.0 || ^2.0", "dompdf/dompdf": "^1.0 || ^2.0",
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.1", "mitoteam/jpgraph": "10.2.2",
"mpdf/mpdf": "8.1.1", "mpdf/mpdf": "8.1.1",
"phpcompatibility/php-compatibility": "^9.3", "phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1", "phpstan/phpstan": "^1.1",

23
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "dd19bb54ddc39f5b24f564818cb46c7e", "content-hash": "8512207f173cb137bc2085b7fdf698bc",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",
@ -1342,20 +1342,23 @@
}, },
{ {
"name": "mitoteam/jpgraph", "name": "mitoteam/jpgraph",
"version": "10.1.3", "version": "10.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mitoteam/jpgraph.git", "url": "https://github.com/mitoteam/jpgraph.git",
"reference": "425a2a0f0c97a28fe0aca60a4384ce85880e438a" "reference": "6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/425a2a0f0c97a28fe0aca60a4384ce85880e438a", "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf",
"reference": "425a2a0f0c97a28fe0aca60a4384ce85880e438a", "reference": "6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5" "php": ">=5.5 <=8.2"
},
"replace": {
"jpgraph/jpgraph": "4.0.2"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -1372,16 +1375,16 @@
"name": "JpGraph team" "name": "JpGraph team"
} }
], ],
"description": "Composer compatible version of JpGraph library with PHP 8.1 support", "description": "Composer compatible version of JpGraph library with PHP 8.2 support",
"homepage": "https://github.com/mitoteam/jpgraph", "homepage": "https://github.com/mitoteam/jpgraph",
"keywords": [ "keywords": [
"jpgraph" "jpgraph"
], ],
"support": { "support": {
"issues": "https://github.com/mitoteam/jpgraph/issues", "issues": "https://github.com/mitoteam/jpgraph/issues",
"source": "https://github.com/mitoteam/jpgraph/tree/10.1.3" "source": "https://github.com/mitoteam/jpgraph/tree/10.2.2"
}, },
"time": "2022-07-05T16:46:34+00:00" "time": "2022-09-09T08:16:10+00:00"
}, },
{ {
"name": "mpdf/mpdf", "name": "mpdf/mpdf",
@ -5265,5 +5268,5 @@
"ext-zlib": "*" "ext-zlib": "*"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.2.0"
} }

View File

@ -27,12 +27,6 @@ class SampleTest extends TestCase
{ {
$skipped = [ $skipped = [
]; ];
if (PHP_VERSION_ID >= 80200) {
// Hopefully temporary. Continue to try
// 32_chart_read_write_PDF/HTML
// so as not to lose track of the problem.
$skipped[] = 'Chart/35_Chart_render.php';
}
// Unfortunately some tests are too long to run with code-coverage // Unfortunately some tests are too long to run with code-coverage
// analysis on GitHub Actions, so we need to exclude them // analysis on GitHub Actions, so we need to exclude them