fix datatype mismatches

especially spl_dual_it_object current.pos should have the same datatype as
limit.offset, also this doesn't increase the struct size.

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #68128

Conflicts:
ext/spl/spl_iterators.c

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #68128

Fixed bug #68128

Three issues are addressed:

- RecursiveRegexIterator::accept() should accept non-empty arrays without
applying any regular expression and RegexIterator::accep

Fixed bug #68128

Three issues are addressed:

- RecursiveRegexIterator::accept() should accept non-empty arrays without
applying any regular expression and RegexIterator::accept() should not accept
an array.
- RegexIterator::accept() should not accept an atom that fails to match
anything, even when PREG_PATTERN_ORDER is used (which would return an array
of empty arrays).
- RecursiveRegexIterator::getChildren() should pass all constructor arguments
to its child iterator instead of just the regular expression.

show more ...

Remove zend_get_class_entry function

Move smart_str implementation into Zend/

So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just m

Move smart_str implementation into Zend/

So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.

show more ...

s/PHP 5/PHP 7/

Avoid double IS_INTERNED() check

first show to make 's' work with size_t

master renames phase 1

mostly fixes to spl, but also some other

fix macros in the 5 basic extensions

cleanup

Merge branch 'master' into phpng

* master:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct

Merge branch 'master' into phpng

* master:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)

show more ...

Merge branch 'PHP-5.6'

Merge branch 'PHP-5.5' into PHP-5.6

Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)

update zend_make_printable_zval to take TSRM context

Merge branch 'master' into phpng

* master: (46 commits)
PHP_INT_MIN and _MAX tests
NEWS and UPGRADING
Added PHP_INT_MIN
Fix wrong lenght size
Bug #51096 - Remov

Merge branch 'master' into phpng

* master: (46 commits)
PHP_INT_MIN and _MAX tests
NEWS and UPGRADING
Added PHP_INT_MIN
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
add missing entry to NEWS
...

Conflicts:
Zend/tests/errmsg_040.phpt
Zend/tests/ns_059.phpt
Zend/zend_language_parser.y
Zend/zend_vm_def.h
ext/openssl/openssl.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_directory.c
ext/spl/spl_iterators.c
ext/sqlite3/sqlite3.c
ext/standard/array.c

show more ...

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix SPL objects initialization checks

Fix SPL objects initialization checks

Changed zend_make_printable_zval() to return "use_copy" instead of additional reference argument.
Improved branch prediction.

Fixed add_ref

Merge branch 'master' into phpng

Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c

Merge branch 'PHP-5.6'