fix php7.4 deprecation and remove php7.4 from travis allow_failures since php7.4 is current stable

This commit is contained in:
Simon Wisselink
2020-04-13 00:47:34 +02:00
parent cf8b820f2c
commit a3b5e4eaf9
3 changed files with 3 additions and 4 deletions

View File

@@ -11,11 +11,10 @@ matrix:
- php: 7.1 - php: 7.1
- php: 7.2 - php: 7.2
- php: 7.3 - php: 7.3
- php: 7.4snapshot - php: 7.4
- php: nightly - php: nightly
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: 7.4snapshot
- php: nightly - php: nightly
services: services:

View File

@@ -28,7 +28,7 @@ class IncludePathTest extends PHPUnit_Smarty
*/ */
protected function tearDown() protected function tearDown()
{ {
restore_include_path(); ini_restore('include_path');
$this->smarty->disableSecurity(); $this->smarty->disableSecurity();
parent::tearDown(); parent::tearDown();
} }

View File

@@ -28,7 +28,7 @@ class FileIncludePathTest extends PHPUnit_Smarty
*/ */
protected function tearDown() protected function tearDown()
{ {
restore_include_path(); ini_restore('include_path');
$this->smarty->disableSecurity(); $this->smarty->disableSecurity();
parent::tearDown(); parent::tearDown();
} }