From a3b5e4eaf940d511f92e51802998c1f5f70680ca Mon Sep 17 00:00:00 2001
From: Simon Wisselink <s.wisselink@iwink.nl>
Date: Mon, 13 Apr 2020 00:47:34 +0200
Subject: [PATCH] fix php7.4 deprecation and remove php7.4 from travis
 allow_failures since php7.4 is current stable

---
 .travis.yml                                                    | 3 +--
 tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php          | 2 +-
 .../ResourceTests/FileIncludePath/FileIncludePathTest.php      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6f58bdb..38b75919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,11 +11,10 @@ matrix:
    - php: 7.1
    - php: 7.2
    - php: 7.3
-   - php: 7.4snapshot
+   - php: 7.4
    - php: nightly
   fast_finish: true
   allow_failures:
-   - php: 7.4snapshot
    - php: nightly
 
 services:
diff --git a/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php b/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php
index 9cacdeed..2a3b46b7 100644
--- a/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php
+++ b/tests/UnitTests/A_Core/LoadPlugin/IncludePathTest.php
@@ -28,7 +28,7 @@ class IncludePathTest extends PHPUnit_Smarty
      */
     protected function tearDown()
     {
-        restore_include_path();
+        ini_restore('include_path');
         $this->smarty->disableSecurity();
         parent::tearDown();
      }
diff --git a/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php b/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php
index 81470ebc..8ba53fb3 100644
--- a/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php
+++ b/tests/UnitTests/ResourceTests/FileIncludePath/FileIncludePathTest.php
@@ -28,7 +28,7 @@ class FileIncludePathTest extends PHPUnit_Smarty
      */
     protected function tearDown()
     {
-        restore_include_path();
+        ini_restore('include_path');
         $this->smarty->disableSecurity();
         parent::tearDown();
      }