assert() improvements #1088

dstogov · 2015-02-16T15:45:08Z

See https://wiki.php.net/rfc/expectations

* 'expect' of github.com:krakjoe/php-src: import expect Conflicts: Zend/zend_compile.c Zend/zend_execute_API.c Zend/zend_globals.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h ext/opcache/Optimizer/block_pass.c ext/opcache/Optimizer/pass1_5.c ext/standard/assert.c ext/standard/tests/assert/assert_error3.phpt

* master: (25 commits) improve debugability in TS debug builds More UPGRADING, in particular on foreach Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) for master Replace var is introduced abstain from using xmlCleanupParser fix TS build Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) update news Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) Port for for bug #68552 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) Update NEWS Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) - BFN Don't read the local php.ini when Generating Phar When building phar shared, you can end up loading a previous phar.so that isn't compatible with the php cli being used to generate Phar here. - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) Delete json outdated package.xml made ZEND_TSRMLS_CACHE_* macros look like function calls - Fix merge - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de ...

guilhermeblanco · 2015-02-17T21:56:00Z

Zend/zend_ast.c

+ * ====================
+ * proirity  associativity  operatiers
+ * -----------------------------------
+ *   10     left            inclue, include_once, eval, require, require_once


typo... "include"

* master: Set PHP_JSON_VERSION to 1.4.0 Remove unnecessary resource checks in openssl ext JSON is now maintained

smalyshev · 2015-02-18T08:00:56Z

Zend/zend_ast.c

+/*
+ * Operator Precendence
+ * ====================
+ * proirity  associativity  operatiers


"operatiers" looks like a typo

Also priority has a typo

bwoebi · 2015-02-18T09:36:55Z

Could you please add the two new ini settings to the respective default inis?

zend.assertations: -1 for production, 0 for normal and 1 for dev
assert.exception always 1? (The point of assertations is to be immediately caught, no?)

nikic · 2015-02-18T12:18:30Z

Zend/zend_ast.c

+					break;
+			}
+		} else {
+			if (c == '"' || c == '`' || c == '$' || c == '\\') {


This needs to distinguish whether the encaps list is in " or ` and only escape that. E.g. right now the original string "`$a" will be pretty printed as "\`$a", which is different.

nikic · 2015-02-18T13:41:15Z

Zend/zend_ast.c

+		case ZEND_AST_CATCH:
+			smart_str_appends(str, "} catch (");
+			zend_ast_export_ex(str, ast->child[0], 0, indent);
+			zend_ast_export_ex(str, ast->child[1], 0, indent);


Should be $ followed by the string in ast->child[1] (or export_var).

* master: Implemented AST pretty-printer update NEWS to match the actual stuff in 5.6.6 update NEWS to match the actual stuff in 5.5.22 update NEWS(add missing entry for the enchant fix, and reorder the entries a bit) fix typo in bug# update NEWS fix email format update NEWS update 5.6.6 release date in NEWS Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) BFN fix test fix test fix test Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) Updated NEWS add CVE 5.4.39 next Fix associativity to match Perl Blast off to space. Conflicts: Zend/zend_ast.c

* master: (59 commits) Improved ASSIGN_DIM handler Don't inline slow path Revert a part committted by mistake Fixed compilation warnings Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). better name Improve fix for #69038 Update NEWs Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage) Added specialized versions of DO_FCALL handler: DO_ICALL - for internal functions DO_UCALL - for user functions DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods) Use cache_slot offsets instead of indexes (simplify run-time instructions) Split INIT_FCALL_BY_NAME inti INIT_FCALL_BY_NAME(CONST+STRING) and INIT_DYNAMIC_CALL(CONST-STRING|TMPVAR|CV) Support list($a, $b) = $a Avoid unnecassary check Make zend_array_destroy() to free the corresponding zend_array Eliminate check on the fast path Make current() and key() receive argument by value. Use Firebird default home folder, replace Interbase with Firebird Updated NEWS updated NEWS ... Conflicts: Zend/zend_vm_execute.h Zend/zend_vm_opcodes.c Zend/zend_vm_opcodes.h

* master: Fixed C++ support Fixed bug #69115 crash in mail Reorder Update NEWs Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build) Update News Fixed bug #69125 (Array numeric string as key) fix bug#68942's patch Fixed ability to build unspecialized executor Fixed bug #69124 (method name could not be used when by ref) Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). Fixed a bug that header value is not terminated by '\0' when accessed through getenv().

* master: Update NEWS Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize) windows only test Align entries format Align entries format for 5.6.7 Align entries format for 5.5.23 Bump header year Fixed bug #69144 (strtr not replacing with partly matching replace pairs) Fixed test? Revert mktime()/gmmktime()'s arginfo Update NEWS Fixed bug #69141 Missing arguments in reflection info for some builtin functions Add NEWS entry Remove useless date warning Fix ARG_INFO for levenshtein Fix ARG_INFO for levenshtein fix dir separator in tests Update NEWS Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()).

…RT_CHECK

nikic · 2015-03-06T08:34:50Z

Has been merged as 9a20323. The AST pretty printed has been already previously merged as 6b77959.

krakjoe and others added 5 commits February 2, 2014 12:49

import expect

3892eba

Implemented AST pretty-printer to capture expression passed to assert()

4a2d9c0

Fixed assert() in namesapaces

96de5ff

guilhermeblanco reviewed Feb 17, 2015
View reviewed changes

dstogov added 2 commits February 18, 2015 10:17

Fixed typo and white spaces

8473157

Merge branch 'master' into assert

69491e8

* master: Set PHP_JSON_VERSION to 1.4.0 Remove unnecessary resource checks in openssl ext JSON is now maintained

smalyshev reviewed Feb 18, 2015
View reviewed changes

nikic reviewed Feb 18, 2015
View reviewed changes

dstogov added 3 commits February 18, 2015 19:50

Fixed vaeious ptetty-printer issues

5a976c8

fixed pretty-printer (support for "elseif")

07b1f92

jpauli added RFC PHP7 labels Feb 19, 2015

dstogov added 4 commits February 26, 2015 11:26

opcode 137 is used for ZEND_OP_DATA and con't be reused for ZEND_ASSE…

3f3651a

…RT_CHECK

nikic closed this Mar 6, 2015

dstogov deleted the assert branch October 14, 2019 20:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

assert() improvements #1088

assert() improvements #1088

Uh oh!

dstogov commented Feb 16, 2015

Uh oh!

guilhermeblanco Feb 17, 2015

Uh oh!

smalyshev Feb 18, 2015

Uh oh!

staabm Feb 18, 2015

Uh oh!

bwoebi commented Feb 18, 2015

Uh oh!

nikic Feb 18, 2015

Uh oh!

nikic Feb 18, 2015

Uh oh!

nikic commented Mar 6, 2015

Uh oh!

Uh oh!

assert() improvements #1088

assert() improvements #1088

Uh oh!

Conversation

dstogov commented Feb 16, 2015

Uh oh!

guilhermeblanco Feb 17, 2015

Choose a reason for hiding this comment

Uh oh!

smalyshev Feb 18, 2015

Choose a reason for hiding this comment

Uh oh!

staabm Feb 18, 2015

Choose a reason for hiding this comment

Uh oh!

bwoebi commented Feb 18, 2015

Uh oh!

nikic Feb 18, 2015

Choose a reason for hiding this comment

Uh oh!

nikic Feb 18, 2015

Choose a reason for hiding this comment

Uh oh!

nikic commented Mar 6, 2015

Uh oh!

Uh oh!