Skip to content

Commit a76c9b8

Browse files
committed
Upgrade Mitoteam to Beta Version
I had been trapping its errors in test bootstrap, but that no longer seems to work.
1 parent e73fc33 commit a76c9b8

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@
9292
"dealerdirect/phpcodesniffer-composer-installer": "dev-main",
9393
"dompdf/dompdf": "^2.0 || ^3.0",
9494
"friendsofphp/php-cs-fixer": "^3.2",
95-
"mitoteam/jpgraph": "^10.3",
95+
"mitoteam/jpgraph": "^10.3 || 10.5.0-beta",
9696
"mpdf/mpdf": "^8.1.1",
9797
"phpcompatibility/php-compatibility": "^9.3",
9898
"phpstan/phpstan": "^1.1 || ^2.0",
99-
"phpstan/phpstan-phpunit": "^1.0 || ^2.0",
10099
"phpstan/phpstan-deprecation-rules": "^1.0 || ^2.0",
100+
"phpstan/phpstan-phpunit": "^1.0 || ^2.0",
101101
"phpunit/phpunit": "^10.5",
102102
"squizlabs/php_codesniffer": "^3.7",
103103
"tecnickcom/tcpdf": "^6.5"

composer.lock

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

tests/bootstrap.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
function phpunit10ErrorHandler(int $errno, string $errstr, string $filename, int $lineno): bool
88
{
9-
if (strIncrement85(PHP_VERSION_ID, $errno, $errstr, $filename)) {
10-
return true; // message suppressed - stop error handling
11-
}
129
$x = error_reporting() & $errno;
1310
if (
1411
in_array(
@@ -34,18 +31,6 @@ function phpunit10ErrorHandler(int $errno, string $errstr, string $filename, int
3431
return false; // continue error handling
3532
}
3633

37-
function strIncrement85(int $version, int $errno, string $errstr, string $filename): bool
38-
{
39-
if ($version < 80500 || $errno !== E_DEPRECATED) {
40-
return false;
41-
}
42-
if (preg_match('/canonical/', $errstr) === 1 && preg_match('/mitoteam/', $filename) === 1) {
43-
return true;
44-
}
45-
46-
return false;
47-
}
48-
4934
if (!method_exists(PHPUnit\Framework\TestCase::class, 'setOutputCallback')) {
5035
set_error_handler('phpunit10ErrorHandler');
5136
}

0 commit comments

Comments
 (0)