Merge pull request #8 from nanasess/fix-nightly

Fix nightly build

Author: nanasess

src/Util/PHP/Template/TestCaseMethod.tpl.dist

@@ -78,7 +78,7 @@ if ('' !== $configurationFilePath) {
     unset($configuration);
 }
 
-function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext = null)
 {
    return true;
 }

tests/Framework/ConstraintTest.php

@@ -1377,7 +1377,9 @@ public function testConstraintIsResourceTypeEvaluatesCorrectlyWithResources($res
 
         $this->assertTrue($constraint->evaluate($resource, '', true));
 
-        @fclose($resource);
+        if (is_resource($resource)) {
+            fclose($resource);
+        }
     }
 
     /**

tests/Regression/Trac/578.phpt

@@ -1,5 +1,8 @@
 --TEST--
 #578: Double printing of trace line for exceptions from notices and warnings
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID >= 80000) die('Skipped: Error message changed in PHP8 or later'); ?>
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';