Remove unnecessary uses of restore_include_path() in tests

nikic · nikic · commit 9345c191db71 · 2019-07-12T12:54:26.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,6 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ $modes = array("r", "r+", "rt");`
`45`	`45`	`foreach($modes as $mode) {`
`46`	`46`	`test_fopen($mode);`
`47`	`47`	`}`
`48`		`-restore_include_path();`
`49`	`48`
`50`	`49`	`// remove the directory structure`
`51`	`50`	`chdir($baseDir);`