From 9345c191db71a5d0125218b60d333b3ef293df27 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 12 Jul 2019 12:17:24 +0200 Subject: [PATCH] Remove unnecessary uses of restore_include_path() in tests --- ext/standard/tests/file/file_get_contents_variation1.phpt | 1 - ext/standard/tests/file/file_get_contents_variation2.phpt | 1 - ext/standard/tests/file/file_put_contents_variation4.phpt | 1 - ext/standard/tests/file/file_put_contents_variation6.phpt | 1 - ext/standard/tests/file/fopen_variation12.phpt | 1 - ext/standard/tests/file/fopen_variation13.phpt | 1 - ext/standard/tests/file/fopen_variation16.phpt | 1 - ext/standard/tests/file/fopen_variation17.phpt | 1 - ext/standard/tests/file/fopen_variation5.phpt | 1 - ext/standard/tests/file/fopen_variation7.phpt | 1 - ext/standard/tests/file/fopen_variation8.phpt | 1 - ext/standard/tests/file/fopen_variation9.phpt | 1 - ext/standard/tests/file/readfile_variation6.phpt | 1 - ext/standard/tests/file/readfile_variation7.phpt | 1 - ext/zlib/tests/gzfile_variation15.phpt | 1 - ext/zlib/tests/gzopen_variation4.phpt | 1 - ext/zlib/tests/gzopen_variation5.phpt | 1 - ext/zlib/tests/readgzfile_variation15.phpt | 1 - 18 files changed, 18 deletions(-) diff --git a/ext/standard/tests/file/file_get_contents_variation1.phpt b/ext/standard/tests/file/file_get_contents_variation1.phpt index 12bfd325ae7..eb502e05277 100644 --- a/ext/standard/tests/file/file_get_contents_variation1.phpt +++ b/ext/standard/tests/file/file_get_contents_variation1.phpt @@ -28,7 +28,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/file_get_contents_variation2.phpt b/ext/standard/tests/file/file_get_contents_variation2.phpt index c1f07d920fb..8c24246aaac 100644 --- a/ext/standard/tests/file/file_get_contents_variation2.phpt +++ b/ext/standard/tests/file/file_get_contents_variation2.phpt @@ -29,7 +29,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/file_put_contents_variation4.phpt b/ext/standard/tests/file/file_put_contents_variation4.phpt index 339e9b73a7c..c7df0194ff0 100644 --- a/ext/standard/tests/file/file_put_contents_variation4.phpt +++ b/ext/standard/tests/file/file_put_contents_variation4.phpt @@ -28,7 +28,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/file_put_contents_variation6.phpt b/ext/standard/tests/file/file_put_contents_variation6.phpt index 7f963a01fe4..85f2aad3632 100644 --- a/ext/standard/tests/file/file_put_contents_variation6.phpt +++ b/ext/standard/tests/file/file_put_contents_variation6.phpt @@ -29,7 +29,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation12.phpt b/ext/standard/tests/file/fopen_variation12.phpt index 91d482276af..2f79be1b63f 100644 --- a/ext/standard/tests/file/fopen_variation12.phpt +++ b/ext/standard/tests/file/fopen_variation12.phpt @@ -12,7 +12,6 @@ Dave Kelsey set_include_path("rubbish"); testme(); -restore_include_path(); function testme() { diff --git a/ext/standard/tests/file/fopen_variation13.phpt b/ext/standard/tests/file/fopen_variation13.phpt index 76cf084029b..4d613a91454 100644 --- a/ext/standard/tests/file/fopen_variation13.phpt +++ b/ext/standard/tests/file/fopen_variation13.phpt @@ -21,7 +21,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); function runtest() { diff --git a/ext/standard/tests/file/fopen_variation16.phpt b/ext/standard/tests/file/fopen_variation16.phpt index 023586c3968..5888688fa89 100644 --- a/ext/standard/tests/file/fopen_variation16.phpt +++ b/ext/standard/tests/file/fopen_variation16.phpt @@ -25,7 +25,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation17.phpt b/ext/standard/tests/file/fopen_variation17.phpt index 429650564bc..5d639e8236c 100644 --- a/ext/standard/tests/file/fopen_variation17.phpt +++ b/ext/standard/tests/file/fopen_variation17.phpt @@ -25,7 +25,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation5.phpt b/ext/standard/tests/file/fopen_variation5.phpt index b5c7edbfbb1..a3f5c1d3be9 100644 --- a/ext/standard/tests/file/fopen_variation5.phpt +++ b/ext/standard/tests/file/fopen_variation5.phpt @@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); } -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/standard/tests/file/fopen_variation7.phpt b/ext/standard/tests/file/fopen_variation7.phpt index 9cb40a00198..531b27e0bc0 100644 --- a/ext/standard/tests/file/fopen_variation7.phpt +++ b/ext/standard/tests/file/fopen_variation7.phpt @@ -24,7 +24,6 @@ set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/fopen_variation8.phpt b/ext/standard/tests/file/fopen_variation8.phpt index 7e02aa8efe0..36471911289 100644 --- a/ext/standard/tests/file/fopen_variation8.phpt +++ b/ext/standard/tests/file/fopen_variation8.phpt @@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_fopen($mode); } -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/standard/tests/file/fopen_variation9.phpt b/ext/standard/tests/file/fopen_variation9.phpt index bee941eb945..5479ddcf2d2 100644 --- a/ext/standard/tests/file/fopen_variation9.phpt +++ b/ext/standard/tests/file/fopen_variation9.phpt @@ -25,7 +25,6 @@ set_include_path($newpath); runtest(); teardown_relative_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/readfile_variation6.phpt b/ext/standard/tests/file/readfile_variation6.phpt index dca6f4df673..38e0f239586 100644 --- a/ext/standard/tests/file/readfile_variation6.phpt +++ b/ext/standard/tests/file/readfile_variation6.phpt @@ -27,7 +27,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/standard/tests/file/readfile_variation7.phpt b/ext/standard/tests/file/readfile_variation7.phpt index 601453573e2..955d77bd275 100644 --- a/ext/standard/tests/file/readfile_variation7.phpt +++ b/ext/standard/tests/file/readfile_variation7.phpt @@ -27,7 +27,6 @@ $newpath = create_include_path(); set_include_path($newpath); runtest(); teardown_include_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt index 866348efa0e..77028fbd09a 100644 --- a/ext/zlib/tests/gzfile_variation15.phpt +++ b/ext/zlib/tests/gzfile_variation15.phpt @@ -14,7 +14,6 @@ require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 set_include_path($newIncludePath); test_gzfile(); -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt index 1648b75fb96..6a00c30670f 100644 --- a/ext/zlib/tests/gzopen_variation4.phpt +++ b/ext/zlib/tests/gzopen_variation4.phpt @@ -26,7 +26,6 @@ $modes = array("r", "r+", "rt"); foreach($modes as $mode) { test_gzopen($mode); } -restore_include_path(); // remove the directory structure chdir($baseDir); diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt index c223efeb15d..99ba6a0b963 100644 --- a/ext/zlib/tests/gzopen_variation5.phpt +++ b/ext/zlib/tests/gzopen_variation5.phpt @@ -29,7 +29,6 @@ set_include_path($newpath); runtest(); teardown_relative_path(); -restore_include_path(); chdir(".."); rmdir($thisTestDir); diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt index 48115c7fdb8..70f566446ec 100644 --- a/ext/zlib/tests/readgzfile_variation15.phpt +++ b/ext/zlib/tests/readgzfile_variation15.phpt @@ -14,7 +14,6 @@ require_once('reading_include_path.inc'); //define the files to go into these directories, create one in dir2 set_include_path($newIncludePath); test_readgzfile(); -restore_include_path(); // remove the directory structure chdir($baseDir);