diff options
| author | Julien Pauli <jpauli@php.net> | 2016-07-12 15:50:58 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-07-12 15:50:58 +0200 |
| commit | 152d53c8440f7f9f4c97af899ef3d5cf5126084d (patch) | |
| tree | f899f25f18778f80cd3619d7a6109c72c303052a /ext/reflection/php_reflection.c | |
| parent | c96a9ca6f5630495fe2b34ca709111160a156684 (diff) | |
| parent | 1896ca4e88451d5190d3ce921d6f7a52b3ec6e9f (diff) | |
| download | php-git-152d53c8440f7f9f4c97af899ef3d5cf5126084d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
Revert "Fix test for #52384"
Conflicts:
ext/pdo/pdo_stmt.c
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions