From c295786e43735802a1a22d22bc6d72153d19af46 Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Sat, 12 Sep 2020 21:37:31 +0200 Subject: Fixes for php8.0.0beta3 (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Set $errcontext argument optional to support PHP 8 - Argument is optional and deprecated in PHP 7.2 * Getting ready for PHP8, handling changed error levels/handlers mostly * php5 compat syntax * Updated UndefinedTemplateVarTest for PHP8 (and disabled a check for PHP<5.6) and re-enabled php:nightly in travis config * Attempt to fix travis runs for (almost) all php versions supported * Fix unit tests for php8, force composer to think we are still php7 to pick a supported phpunit and being less specific about an error msg because PHP8 is in active development and the exact wording is changing. * Fixed a unit test that accidentally passed on phpunit < 7 because of sloppy string comparison. * changelog * run travis in xenial where possible for latest php versions. Fix unit tests from freakingo over inconsistent error messages in php8-beta. * Incorporated AnrDaemons suggestions, making composer figure out the required phpunit version instead of specifying it explicitly and removing a unneeded error supression (@). Co-authored-by: Jorge Sá Pereira --- tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php | 4 ++-- tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/UnitTests/SmartyMethodsTests/ClearAssign') diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php index 17a0ed5f..b9867627 100644 --- a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php +++ b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignBCTest.php @@ -33,14 +33,14 @@ class ClearAssignBCTest extends PHPUnit_Smarty } public function testSmarty2ClearAssign() { - $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE)); + $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)); $this->smartyBC->clear_assign('blar'); $this->assertEquals('foobar', $this->smartyBC->fetch('eval:{$foo}{$bar}{$blar}')); } public function testSmarty2ArrayClearAssign() { - $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE)); + $this->smartyBC->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)); $this->smartyBC->clear_assign(array('blar', 'foo')); $this->assertEquals('bar', $this->smartyBC->fetch('eval:{$foo}{$bar}{$blar}')); } diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php index d47e9da6..2b466928 100644 --- a/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php +++ b/tests/UnitTests/SmartyMethodsTests/ClearAssign/ClearAssignTest.php @@ -36,7 +36,7 @@ class ClearAssignTest extends PHPUnit_Smarty */ public function testClearAssign() { - $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE)); + $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)); $this->smarty->clearAssign('blar'); $this->assertEquals('foobar', $this->smarty->fetch('eval:{$foo}{$bar}{$blar}')); } @@ -46,7 +46,7 @@ class ClearAssignTest extends PHPUnit_Smarty */ public function testArrayClearAssign() { - $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE)); + $this->smarty->setErrorReporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE | E_WARNING)); $this->smarty->clearAssign(array('blar', 'foo')); $this->assertEquals('bar', $this->smarty->fetch('eval:{$foo}{$bar}{$blar}')); } -- cgit v1.3