archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.3' into PHP-5.4

Browse source 
* PHP-5.3:
  Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
This commit is contained in:
Anatoliy Belsky 2012-05-10 17:32:21 +02:00
commit b43d6c8522
2 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ext/standard/tests/general_functions/bug44295-win.phpt Normal file
View file

@ -0,0 +1,29 @@
--TEST--
user defined error handler + set_error_handling(EH_THROW)
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only");
if (!extension_loaded("spl") || is_dir('c:\\not\\exists\\here')) die("skip");
?>
--FILE--
<?php
$dir = 'c:\\not\\exists\\here';
set_error_handler('my_error_handler');
function my_error_handler() {$a = func_get_args(); print "in error handler\n"; }
try {
print "before\n";
$iter = new DirectoryIterator($dir);
print get_class($iter) . "\n";
print "after\n";
} catch (Exception $e) {
print "in catch: ".$e->getMessage()."\n";
}
?>
==DONE==
<?php exit(0); ?>
--EXPECT--
before
in catch: DirectoryIterator::__construct(c:\not\exists\here,c:\not\exists\here): The system cannot find the path specified. (code: 3)
==DONE==

5
ext/standard/tests/general_functions/bug44295.phpt
View file

@ -1,7 +1,10 @@
--TEST--
user defined error handler + set_error_handling(EH_THROW)
--SKIPIF--
<?php if (!extension_loaded("spl") || is_dir('/this/path/does/not/exist')) die("skip"); ?>
<?php
if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows");
if (!extension_loaded("spl") || is_dir('/this/path/does/not/exist')) die("skip");
?>
--FILE--
<?php
$dir = '/this/path/does/not/exist';