com php-src: Deprecate assert() with string argument: Zend/tests/assert/bug70208.phpt Zend/tests/assert/indirect_va r_access_misoptimization.phpt
ext/dom/tests/DOMDocument _loadHTMLfile.phpt ext/dom/tests/DOMDocument_loadHTMLfi le_error1.phpt ext/dom/tests/DOMDocument_loadHTMLfile _error2.phpt
ext/dom/tests/DOMDocument_loadHTMLfile _variation1.phpt ext/dom/tests/DOMDocument_loadHTMLfi le_variation2.phpt ext/dom/tests/DOMNode_insertBefore
_error2.phpt ex

Commit: 6ba720662084306906e125d8f690146d7b86b303 Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 2 Feb 2017 21:40:19 +0100 Parents: a8239ff23272a346f6cb8f01bff384f94a3bcb79 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ba720662084306906e125d8f690146d7b86b303 Log: Deprecate assert() with string argument Changed paths: M Zend/tests/assert/bug70208.phpt M Zend/tests/assert/indirect_var_access_misoptimization.phpt M ext/dom/tests/DOMDocument_loadHTMLfile.phpt M ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt M ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt M ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt M ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt M ext/dom/tests/DOMNode_insertBefore_error2.phpt M ext/dom/tests/DOMNode_insertBefore_error3.phpt M ext/dom/tests/DOMNode_insertBefore_error4.phpt M ext/dom/tests/DOMNode_insertBefore_error5.phpt M ext/dom/tests/DOMNode_insertBefore_error6.phpt M ext/dom/tests/domdocumentload_test_method.php M ext/dom/tests/domdocumentload_test_method_savexml.php M ext/dom/tests/domdocumentloadxml_test_method.php M ext/dom/tests/domdocumentloadxml_test_method_savexml.php M ext/standard/assert.c M ext/standard/tests/assert/assert02.phpt M ext/standard/tests/assert/assert03.phpt M ext/standard/tests/assert/assert_basic.phpt M ext/standard/tests/assert/assert_basic3.phpt M ext/standard/tests/assert/assert_basic5.phpt M ext/standard/tests/assert/assert_basic6.phpt M ext/standard/tests/assert/assert_error.phpt M ext/standard/tests/assert/assert_error1.phpt M ext/standard/tests/assert/assert_error2.phpt M ext/standard/tests/assert/assert_error3.phpt M ext/standard/tests/assert/assert_error4.phpt M ext/standard/tests/assert/assert_variation.phpt M ext/standard/tests/assert/bug73303.phpt M tests/lang/bug23922.phpt

diff --git a/Zend/tests/assert/bug70208.phpt b/Zend/tests/assert/bug70208.phpt index ec93253..6b7dfae 100644 --- a/Zend/tests/assert/bug70208.phpt +++ b/Zend/tests/assert/bug70208.phpt @@ -19,5 +19,6 @@ class test { new test; ?> ---EXPECT-- +--EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d int(1) diff --git a/Zend/tests/assert/indirect_var_access_misoptimization.phpt b/Zend/tests/assert/indirect_var_access_misoptimization.phpt index 61c193a..6c05a8c 100644 --- a/Zend/tests/assert/indirect_var_access_misoptimization.phpt +++ b/Zend/tests/assert/indirect_var_access_misoptimization.phpt @@ -15,5 +15,7 @@ test(); ?> --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Notice: Object of class stdClass could not be converted to int in %s on line %d int(2) diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt index 93a6149..0431695 100644 --- a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt +++ b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt @@ -12,6 +12,6 @@ assert.bail=true <?php $doc = new DOMDocument(); $result = $doc->loadHTMLFile(dirname(__FILE__) . "/test.html"); -assert('$result === true'); +assert($result === true); ?> --EXPECT-- diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt index aee5196..9542b69 100644 --- a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt +++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt @@ -12,7 +12,7 @@ assert.bail=true <?php $doc = new DOMDocument(); $result = $doc->loadHTMLFile(dirname(__FILE__) . "/ffff/test.html"); -assert('$result === false'); +assert($result === false); ?> --EXPECTF-- %r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): I/O warning : failed to load external entity %s diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt index e0d0923..55b36e7 100644 --- a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt +++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt @@ -12,10 +12,10 @@ assert.bail=true <?php $doc = new DOMDocument(); $result = $doc->loadHTMLFile(""); -assert('$result === false'); +assert($result === false); $doc = new DOMDocument(); $result = $doc->loadHTMLFile("text.html\0something"); -assert('$result === false'); +assert($result === false); ?> --EXPECTF-- %r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Empty string supplied as input %s diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt index 2535772..9911036 100644 --- a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt +++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt @@ -12,7 +12,7 @@ assert.bail=true <?php $doc = new DOMDocument(); $result = $doc->loadHTMLFile(dirname(__FILE__) . "/empty.html"); -assert('$result === true'); +assert($result === true); ?> --EXPECTF-- %r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Document is empty %s diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt index 829686d..28533bf 100644 --- a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt +++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt @@ -12,6 +12,6 @@ assert.bail=true <?php $doc = new DOMDocument(); $result = $doc->loadHTMLFile(dirname(__FILE__) . "/not_well.html"); -assert('$result === true'); +assert($result === true); ?> --EXPECT-- diff --git a/ext/dom/tests/DOMNode_insertBefore_error2.phpt b/ext/dom/tests/DOMNode_insertBefore_error2.phpt index 5d389f5..835dfa0 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error2.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error2.phpt @@ -15,13 +15,13 @@ assert.bail=true $dom = new DOMDocument(); $doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS); -assert('$doc === true'); +assert($doc === true); $parent_node = $dom->getElementsByTagName("book")->item(0); -assert('!is_null($parent_node)'); +assert(!is_null($parent_node)); $new_node = $dom->createElement('newnode'); -assert('$new_node !== false'); +assert($new_node !== false); // getting a sibling as reference node to insert diff --git a/ext/dom/tests/DOMNode_insertBefore_error3.phpt b/ext/dom/tests/DOMNode_insertBefore_error3.phpt index 0d70a56..a3bad54 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error3.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error3.phpt @@ -15,18 +15,18 @@ assert.bail=true $dom = new DOMDocument(); $doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS); -assert('$doc === true'); +assert($doc === true); $parent_node = $dom->getElementsByTagName("book")->item(0); -assert('!is_null($parent_node)'); +assert(!is_null($parent_node)); $new_node = $dom->createElement('newnode'); -assert('$new_node !== false'); +assert($new_node !== false); // getting the parent node as reference node to insert $ref_node = $dom->getElementsByTagName("book")->item(0)->parentNode; -assert('!is_null($ref_node)'); +assert(!is_null($ref_node)); try { $parent_node->insertBefore($new_node, $ref_node); diff --git a/ext/dom/tests/DOMNode_insertBefore_error4.phpt b/ext/dom/tests/DOMNode_insertBefore_error4.phpt index d063c54..a8d1291 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error4.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error4.phpt @@ -15,13 +15,13 @@ assert.bail=true $dom = new DOMDocument(); $doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS); -assert('$doc === true'); +assert($doc === true); $parent_node = $dom->getElementsByTagName("book")->item(0); -assert('!is_null($parent_node)'); +assert(!is_null($parent_node)); $new_node = $dom->createElement('newnode'); -assert('$new_node !== false'); +assert($new_node !== false); // could be a brand new node diff --git a/ext/dom/tests/DOMNode_insertBefore_error5.phpt b/ext/dom/tests/DOMNode_insertBefore_error5.phpt index 36cc557..c41a9ed 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error5.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error5.phpt @@ -15,13 +15,13 @@ assert.bail=true $dom = new DOMDocument(); $doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS); -assert('$doc === true'); +assert($doc === true); $parent_node = $dom->getElementsByTagName("book")->item(0); -assert('!is_null($parent_node)'); +assert(!is_null($parent_node)); $new_node = $dom->createElement('newnode'); -assert('$new_node !== false'); +assert($new_node !== false); // creating a new node (descendant) and getting it as the refnode diff --git a/ext/dom/tests/DOMNode_insertBefore_error6.phpt b/ext/dom/tests/DOMNode_insertBefore_error6.phpt index 1fb3a96..99c72f8 100644 --- a/ext/dom/tests/DOMNode_insertBefore_error6.phpt +++ b/ext/dom/tests/DOMNode_insertBefore_error6.phpt @@ -15,14 +15,14 @@ assert.bail=true $dom = new DOMDocument(); $doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS); -assert('$doc === true'); +assert($doc === true); $parent_node = $dom->getElementsByTagName("book")->item(0); -assert('!is_null($parent_node)'); +assert(!is_null($parent_node)); $ref_node = $parent_node; $new_node = $dom->createElement('newnode'); -assert('$new_node !== false'); +assert($new_node !== false); try { $parent_node->insertBefore($new_node, $ref_node); diff --git a/ext/dom/tests/domdocumentload_test_method.php b/ext/dom/tests/domdocumentload_test_method.php index 7afce15..a15c9e5 100644 --- a/ext/dom/tests/domdocumentload_test_method.php +++ b/ext/dom/tests/domdocumentload_test_method.php @@ -8,5 +8,5 @@ $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); $result = $doc->load(dirname(__FILE__) . getenv('XML_FILE'), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); -assert('$result === $expectedResult'); +assert($result === $expectedResult); ?> diff --git a/ext/dom/tests/domdocumentload_test_method_savexml.php b/ext/dom/tests/domdocumentload_test_method_savexml.php index 8ffd944..c98ecf9 100644 --- a/ext/dom/tests/domdocumentload_test_method_savexml.php +++ b/ext/dom/tests/domdocumentload_test_method_savexml.php @@ -8,7 +8,7 @@ $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); $result = $doc->load(dirname(__FILE__) . getenv('XML_FILE'), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); -assert('$result === $expectedResult'); +assert($result === $expectedResult); echo $doc->saveXML(); ?> diff --git a/ext/dom/tests/domdocumentloadxml_test_method.php b/ext/dom/tests/domdocumentloadxml_test_method.php index 7c4be85..ed2f38b 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method.php +++ b/ext/dom/tests/domdocumentloadxml_test_method.php @@ -8,5 +8,5 @@ $result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE') $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); -assert('$result === $expectedResult'); +assert($result === $expectedResult); ?> diff --git a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php index 550219f..1ef72d5 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php +++ b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php @@ -8,7 +8,7 @@ $result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE') $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); -assert('$result === $expectedResult'); +assert($result === $expectedResult); echo $doc->saveXML(); ?> diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 573dbc3..850fb82 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -171,6 +171,8 @@ PHP_FUNCTION(assert) RETURN_FALSE; } + php_error_docref(NULL, E_DEPRECATED, "Calling assert() with a string argument is deprecated"); + myeval = Z_STRVAL_P(assertion); if (ASSERTG(quiet_eval)) { diff --git a/ext/standard/tests/assert/assert02.phpt b/ext/standard/tests/assert/assert02.phpt index db60f41..85b7236 100644 --- a/ext/standard/tests/assert/assert02.phpt +++ b/ext/standard/tests/assert/assert02.phpt @@ -33,14 +33,24 @@ echo "done\n"; ?> --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Notice: Undefined variable: a in %sassert02.php(%d) : assert code on line 1 Warning: assert(): Assertion "$a" failed in %sassert02.php on line %d + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d Failure evaluating code: aa=sd+as+safsafasfasafsaf +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Warning: assert(): Assertion "0" failed in %sassert02.php on line %d +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Fatal error: Uncaught ParseError: syntax error, unexpected '=', expecting ';' in %s(%d) : assert code:1 Stack trace: #0 %s(%d): assert('aa=sd+as+safsaf...') @@ -51,4 +61,4 @@ aa=sd+as+safsafasfasafsaf in %s:%d Stack trace: #0 %s(%d): assert('aa=sd+as+safsaf...') #1 {main} - thrown in %s on line %d \ No newline at end of file + thrown in %s on line %d diff --git a/ext/standard/tests/assert/assert03.phpt b/ext/standard/tests/assert/assert03.phpt index d839414..74cdb6e 100644 --- a/ext/standard/tests/assert/assert03.phpt +++ b/ext/standard/tests/assert/assert03.phpt @@ -34,6 +34,9 @@ assert('$a != 0'); ?> ==DONE== --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d assertion failed - a - %d,"$a != 0" + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d assertion failed - b - %d,"$a != 0" ==DONE== diff --git a/ext/standard/tests/assert/assert_basic.phpt b/ext/standard/tests/assert/assert_basic.phpt index 48b5fb6..7db2a13 100644 --- a/ext/standard/tests/assert/assert_basic.phpt +++ b/ext/standard/tests/assert/assert_basic.phpt @@ -22,8 +22,11 @@ var_dump($r2=assert($sa)); var_dump($r2=assert(0)); var_dump($r2=assert(1)); --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f1 called bool(false) + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d bool(true) f1 called bool(false) diff --git a/ext/standard/tests/assert/assert_basic3.phpt b/ext/standard/tests/assert/assert_basic3.phpt index 9fcbbd5..044356c 100644 --- a/ext/standard/tests/assert/assert_basic3.phpt +++ b/ext/standard/tests/assert/assert_basic3.phpt @@ -20,6 +20,8 @@ var_dump($r2=assert($sa)); echo "If this is printed BAIL hasn't worked"; --EXPECTF-- int(0) + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f1 called Warning: assert(): assert($sa): "0 != 0" failed in %s on line 10 diff --git a/ext/standard/tests/assert/assert_basic5.phpt b/ext/standard/tests/assert/assert_basic5.phpt index 745f3e7..ac84a15 100644 --- a/ext/standard/tests/assert/assert_basic5.phpt +++ b/ext/standard/tests/assert/assert_basic5.phpt @@ -24,9 +24,13 @@ var_dump($r2=assert($sa)); var_dump($rao=assert_options(ASSERT_WARNING, 0)); --EXPECTF-- int(0) + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f1 called Warning: assert(): assert($sa): "0 != 0" failed in %s on line 10 bool(false) + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d bool(true) int(1) diff --git a/ext/standard/tests/assert/assert_basic6.phpt b/ext/standard/tests/assert/assert_basic6.phpt index 2a73713..e9b3f04 100644 --- a/ext/standard/tests/assert/assert_basic6.phpt +++ b/ext/standard/tests/assert/assert_basic6.phpt @@ -20,6 +20,8 @@ var_dump($r2 = assert($sa, "0 is 0")); echo "If this is printed BAIL hasn't worked"; --EXPECTF-- int(0) + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f1 called Warning: assert(): 0 is 0: "0 != 0" failed in %s on line 10 diff --git a/ext/standard/tests/assert/assert_error.phpt b/ext/standard/tests/assert/assert_error.phpt index 28655be..bdd47ec 100644 --- a/ext/standard/tests/assert/assert_error.phpt +++ b/ext/standard/tests/assert/assert_error.phpt @@ -21,7 +21,11 @@ var_dump($ra0 = assert_options(ASSERT_QUIET_EVAL, 1)); var_dump($r2=assert($sa)); --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Notice: Use of undefined constant threemeninaboat - assumed 'threemeninaboat' in %s(9) : assert code on line 1 bool(true) int(0) + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d bool(true) diff --git a/ext/standard/tests/assert/assert_error1.phpt b/ext/standard/tests/assert/assert_error1.phpt index 408ede0..6d7248c 100644 --- a/ext/standard/tests/assert/assert_error1.phpt +++ b/ext/standard/tests/assert/assert_error1.phpt @@ -43,3 +43,4 @@ NULL Warning: assert() expects at most 2 parameters, 3 given in %s on line %d NULL +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d diff --git a/ext/standard/tests/assert/assert_error2.phpt b/ext/standard/tests/assert/assert_error2.phpt index f9018db..aea86f5 100644 --- a/ext/standard/tests/assert/assert_error2.phpt +++ b/ext/standard/tests/assert/assert_error2.phpt @@ -22,6 +22,8 @@ echo "If this is printed BAIL hasn't worked"; --EXPECTF-- int(0) +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Warning: assert(): Assertion "0 != 0" failed in %s on line 9 Fatal error: Uncaught ArgumentCountError: Too few arguments to function f1(), 3 passed and exactly 4 expected in %sassert_error2.php:2 diff --git a/ext/standard/tests/assert/assert_error3.phpt b/ext/standard/tests/assert/assert_error3.phpt index 8094742..24538f4 100644 --- a/ext/standard/tests/assert/assert_error3.phpt +++ b/ext/standard/tests/assert/assert_error3.phpt @@ -12,6 +12,7 @@ display_errors = 1 <?php var_dump($r2 = assert("0 $ 0")); --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d Fatal error: Uncaught ParseError: syntax error, unexpected '$', expecting ';' in %s(%d) : assert code:1 Stack trace: @@ -23,4 +24,4 @@ Next Error: Failure evaluating code: Stack trace: #0 %s(%d): assert('0 $ 0') #1 {main} - thrown in %s on line %d \ No newline at end of file + thrown in %s on line %d diff --git a/ext/standard/tests/assert/assert_error4.phpt b/ext/standard/tests/assert/assert_error4.phpt index e4d27ae..59b4df6 100644 --- a/ext/standard/tests/assert/assert_error4.phpt +++ b/ext/standard/tests/assert/assert_error4.phpt @@ -13,6 +13,7 @@ display_errors = 1 $sa = "0 $ 0"; var_dump($r2 = assert($sa, "Describing what was asserted")); --EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d Fatal error: Uncaught ParseError: syntax error, unexpected '$', expecting ';' in %s(%d) : assert code:1 Stack trace: diff --git a/ext/standard/tests/assert/assert_variation.phpt b/ext/standard/tests/assert/assert_variation.phpt index 8ae8434..a23d468 100644 --- a/ext/standard/tests/assert/assert_variation.phpt +++ b/ext/standard/tests/assert/assert_variation.phpt @@ -73,6 +73,8 @@ echo"\n"; --EXPECTF-- Initial values: assert_options(ASSERT_CALLBACK) => [f1] Initial values: ini.get("assert.callback") => [f1] + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f1 called bool(false) @@ -80,6 +82,8 @@ Change callback function using ini.set and test return value string(2) "f1" assert_options(ASSERT_CALLBACK) => [f2] ini.get("assert.callback") => [f2] + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f2 called bool(false) @@ -87,6 +91,8 @@ Change callback function using assert_options and test return value string(2) "f2" assert_options(ASSERT_CALLBACK) => [f3] ini.get("assert.callback") => [f2] + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d f3 called bool(false) @@ -94,6 +100,8 @@ Reset the name of the callback routine to a class method and check that it works string(2) "f3" assert_options(ASSERT_CALLBACK) => [c1] ini.get("assert.callback") => [f2] + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d bool(false) Reset callback options to use a class method @@ -107,6 +115,8 @@ array(2) { ini.get("assert.callback") => [f2] +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d + Deprecated: Non-static method c1::assert() should not be called statically in %s on line 53 Class assertion failed 53, "0 != 0" bool(false) @@ -127,5 +137,7 @@ array(2) { } ini.get("assert.callback") => [f2] + +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d Class assertion failed 61, "0 != 0" bool(false) diff --git a/ext/standard/tests/assert/bug73303.phpt b/ext/standard/tests/assert/bug73303.phpt index 57990ab..7264f5a 100644 --- a/ext/standard/tests/assert/bug73303.phpt +++ b/ext/standard/tests/assert/bug73303.phpt @@ -19,5 +19,6 @@ $obj = new Test(); $obj->main(); ?> ---EXPECT-- +--EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d Success diff --git a/tests/lang/bug23922.phpt b/tests/lang/bug23922.phpt index 1fc6e54..22c4aaa 100644 --- a/tests/lang/bug23922.phpt +++ b/tests/lang/bug23922.phpt @@ -17,4 +17,5 @@ Bug #23922 (scope doesn't properly propagate into internal functions) $foo->as_expr(); $foo->as_string(); ?> ---EXPECT-- +--EXPECTF-- +Deprecated: assert(): Calling assert() with a string argument is deprecated in %s on line %d