bjori Mon, 29 Aug 2011 14:17:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315702
Advertising
Log:
The Phar class extends RecursiveDirectoryIterator, which has changed the way it
ensures its ctor is called
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/tests/phar_oo_001.phpt
U php/php-src/branches/PHP_5_4/ext/phar/tests/phar_oo_001.phpt
U php/php-src/trunk/ext/phar/tests/phar_oo_001.phpt
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/phar_oo_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_oo_001.phpt
2011-08-29 12:40:03 UTC (rev 315701)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_oo_001.phpt
2011-08-29 14:17:41 UTC (rev 315702)
@@ -30,14 +30,14 @@
$phar = new MyPhar();
var_dump($phar->getVersion());
}
-catch (BadMethodCallException $e)
+catch (LogicException $e)
{
var_dump($e->getMessage());
}
try {
$phar = new Phar('test.phar');
$phar->__construct('oops');
-} catch (BadMethodCallException $e)
+} catch (LogicException $e)
{
var_dump($e->getMessage());
}
@@ -52,6 +52,6 @@
--EXPECT--
string(5) "1.0.0"
int(5)
-string(50) "Cannot call method on an uninitialized Phar object"
+string(103) "In the constructor of MyPhar, parent::__construct() must be
called and its exceptions cannot be cleared"
string(29) "Cannot call constructor twice"
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/phar_oo_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/phar/tests/phar_oo_001.phpt
2011-08-29 12:40:03 UTC (rev 315701)
+++ php/php-src/branches/PHP_5_4/ext/phar/tests/phar_oo_001.phpt
2011-08-29 14:17:41 UTC (rev 315702)
@@ -30,14 +30,14 @@
$phar = new MyPhar();
var_dump($phar->getVersion());
}
-catch (BadMethodCallException $e)
+catch (LogicException $e)
{
var_dump($e->getMessage());
}
try {
$phar = new Phar('test.phar');
$phar->__construct('oops');
-} catch (BadMethodCallException $e)
+} catch (LogicException $e)
{
var_dump($e->getMessage());
}
@@ -52,6 +52,6 @@
--EXPECT--
string(5) "1.0.0"
int(5)
-string(50) "Cannot call method on an uninitialized Phar object"
+string(103) "In the constructor of MyPhar, parent::__construct() must be
called and its exceptions cannot be cleared"
string(29) "Cannot call constructor twice"
===DONE===
Modified: php/php-src/trunk/ext/phar/tests/phar_oo_001.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/phar_oo_001.phpt 2011-08-29 12:40:03 UTC
(rev 315701)
+++ php/php-src/trunk/ext/phar/tests/phar_oo_001.phpt 2011-08-29 14:17:41 UTC
(rev 315702)
@@ -30,14 +30,14 @@
$phar = new MyPhar();
var_dump($phar->getVersion());
}
-catch (BadMethodCallException $e)
+catch (LogicException $e)
{
var_dump($e->getMessage());
}
try {
$phar = new Phar('test.phar');
$phar->__construct('oops');
-} catch (BadMethodCallException $e)
+} catch (LogicException $e)
{
var_dump($e->getMessage());
}
@@ -52,6 +52,6 @@
--EXPECT--
string(5) "1.0.0"
int(5)
-string(50) "Cannot call method on an uninitialized Phar object"
+string(103) "In the constructor of MyPhar, parent::__construct() must be
called and its exceptions cannot be cleared"
string(29) "Cannot call constructor twice"
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
