Skip to content

Commit

Permalink
Merge branch 'bug40459' into PHP-5.4
Browse files Browse the repository at this point in the history
* bug40459:
  News for bug#40459
  fix bug #40459 - make all stream funcs that create object call ctor
  • Loading branch information
smalyshev committed Aug 9, 2012
2 parents 55b82ab + 128a4bb commit c98a51a
Show file tree
Hide file tree
Showing 4 changed files with 188 additions and 117 deletions.
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ PHP NEWS
the exit value). (Laruence)
. Fixed bug #51363 (Fatal error raised by var_export() not caught by error
handler). (Lonny Kapelushnik)
. Fixed bug #40459 (Stat and Dir stream wrapper methods do not call
constructor). (Stas)

- PDO:
. Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
Expand Down
3 changes: 3 additions & 0 deletions UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,9 @@ PHP 5.4 UPGRADE NOTES
allows for toggling if the list of namespaces starts from the document root
or from the node you call the method on

- Since 5.4.7, ctor is always called when new user stream wrapper object is created.
Before, it was called only when stream_open was called.

==============================
5. Changes to existing classes
==============================
Expand Down
103 changes: 103 additions & 0 deletions ext/standard/tests/streams/bug40459.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
--TEST--
bug 40459 - Test whether the constructor of the user-space stream wrapper is called when stream functions are called
--FILE--
<?php
// Test whether the constructor of the user-space stream wrapper is called when stream functions are called
class testwrapper {
private $constructorCalled = false;
function __construct() {
$this->constructorCalled = true;
}

function stream_open($path, $mode, $options, &$opened_path)
{
echo $this->constructorCalled ? 'yes' : 'no';
return true;
}

function url_stat($url, $flags)
{
echo $this->constructorCalled ? 'yes' : 'no';
return array();
}

function unlink($url)
{
echo $this->constructorCalled ? 'yes' : 'no';
}

function rename($from, $to)
{
echo $this->constructorCalled ? 'yes' : 'no';
}

function mkdir($dir, $mode, $options)
{
echo $this->constructorCalled ? 'yes' : 'no';
}

function rmdir($dir, $options)
{
echo $this->constructorCalled ? 'yes' : 'no';
}

function dir_opendir($url, $options)
{
echo $this->constructorCalled ? 'yes' : 'no';
return TRUE;
}
function stream_metadata()
{
echo $this->constructorCalled ? 'yes' : 'no';
return TRUE;
}
}

stream_wrapper_register('test', 'testwrapper', STREAM_IS_URL);

echo 'stream_open: ';
fopen('test://test', 'r');
echo "\n";

echo 'url_stat: ';
stat('test://test');
echo "\n";

echo 'dir_opendir: ';
opendir('test://test');
echo "\n";

echo 'rmdir: ';
rmdir('test://test');
echo "\n";

echo 'mkdir: ';
mkdir('test://test');
echo "\n";

echo 'rename: ';
rename('test://test', 'test://test2');
echo "\n";

echo 'unlink: ';
unlink('test://test');
echo "\n";

echo 'touch: ';
touch('test://test', time());
echo "\n";



?>
==DONE==
--EXPECT--
stream_open: yes
url_stat: yes
dir_opendir: yes
rmdir: yes
mkdir: yes
rename: yes
unlink: yes
touch: yes
==DONE==
Loading

0 comments on commit c98a51a

Please sign in to comment.