Skip to content

assert() improvements#1088

Closed
dstogov wants to merge 14 commits intophp:masterfrom
dstogov:assert
Closed

assert() improvements#1088
dstogov wants to merge 14 commits intophp:masterfrom
dstogov:assert

Conversation

@dstogov
Copy link
Copy Markdown
Member

@dstogov dstogov commented Feb 16, 2015

krakjoe and others added 5 commits February 2, 2014 12:49
* '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
  ...
Zend/zend_ast.c Outdated
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo... "include"

* master:
  Set PHP_JSON_VERSION to 1.4.0
  Remove unnecessary resource checks in openssl ext
  JSON is now maintained
Zend/zend_ast.c Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"operatiers" looks like a typo

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also priority has a typo

@bwoebi
Copy link
Copy Markdown
Member

bwoebi commented Feb 18, 2015

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?)

Zend/zend_ast.c Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants