Skip to content

Commit 103bc5e

Browse files
authored
Merge pull request #164 from remicollet/issue-report-memleaks
don't use report_memleaks with 8.5+
2 parents 151f3d7 + bd6e132 commit 103bc5e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
operating-system: [ ubuntu-latest ]
14-
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
14+
php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
1515
dependencies: [ 'locked' ]
1616

1717
name: PHP ${{ matrix.php }} on ${{ matrix.operating-system }} with ${{ matrix.dependencies }} dependencies

PEAR/RunTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class PEAR_RunTest
6464
'display_errors=1',
6565
'log_errors=0',
6666
'html_errors=0',
67-
'report_memleaks=0',
6867
'report_zend_debug=0',
6968
'docref_root=',
7069
'docref_ext=.html',
@@ -93,6 +92,9 @@ function __construct($logger = null, $options = array())
9392
$excluded_error_reporting |= E_STRICT;
9493
}
9594
$this->ini_overwrites[] = 'error_reporting=' . (E_ALL & ~$excluded_error_reporting);
95+
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 80500) {
96+
$this->ini_overwrites[] = 'report_memleaks=0';
97+
}
9698
if (is_null($logger)) {
9799
require_once 'PEAR/Common.php';
98100
$logger = new PEAR_Common;

0 commit comments

Comments
 (0)