]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:24 +0000 (00:29 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:21 +0000 (00:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:18 +0000 (00:29 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'pull-request/2061' into PHP-5.6
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:11 +0000 (00:29 -0700)]
Merge branch 'pull-request/2061' into PHP-5.6

* pull-request/2061:
  Recognize TDS versions 7.3 and 7.4

8 years agoMerge branch 'pull-request/2095'
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:59 +0000 (00:19 -0700)]
Merge branch 'pull-request/2095'

* pull-request/2095:
  Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:39 +0000 (00:19 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:34 +0000 (00:19 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:26 +0000 (00:19 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use integer placeholders, since values can vary with the TDS version

8 years agoUse integer placeholders, since values can vary with the TDS version
Adam Baratz [Wed, 24 Aug 2016 22:44:55 +0000 (18:44 -0400)]
Use integer placeholders, since values can vary with the TDS version

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 06:24:36 +0000 (23:24 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 06:24:31 +0000 (23:24 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.

8 years agophpdbg: couple of network function return checks. Possible
David Carlier [Tue, 28 Jun 2016 06:48:58 +0000 (07:48 +0100)]
phpdbg: couple of network function return checks. Possible
overflow when copy the socket_path configuration.

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 03:59:00 +0000 (20:59 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Same issue as #72926 in another place.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 03:58:09 +0000 (20:58 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Same issue as #72926 in another place.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 03:57:46 +0000 (20:57 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Same issue as #72926 in another place.

8 years agoSame issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 03:49:34 +0000 (20:49 -0700)]
Same issue as #72926 in another place.

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Mon, 5 Sep 2016 02:16:05 +0000 (19:16 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Sync fix for bug #72910 with current upstream

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:45 +0000 (19:15 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Sync fix for bug #72910 with current upstream

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:30 +0000 (19:15 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Sync fix for bug #72910 with current upstream

8 years agoSync fix for bug #72910 with current upstream
Stanislav Malyshev [Mon, 5 Sep 2016 02:13:22 +0000 (19:13 -0700)]
Sync fix for bug #72910 with current upstream

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sun, 4 Sep 2016 14:53:45 +0000 (16:53 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 4 Sep 2016 14:47:55 +0000 (16:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 4 Sep 2016 14:39:45 +0000 (16:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72994: mbc_to_code() out of bounds read
Christoph M. Becker [Sun, 4 Sep 2016 14:37:06 +0000 (16:37 +0200)]
Fix #72994: mbc_to_code() out of bounds read

We're backporting commit 999a3553 to the still supported PHP 5.6.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 4 Sep 2016 12:28:47 +0000 (14:28 +0200)]
Merge branch 'PHP-7.1'

8 years agoBump PHP_API_VERSION
Nikita Popov [Sun, 4 Sep 2016 12:27:28 +0000 (14:27 +0200)]
Bump PHP_API_VERSION

8 years agoDrop some pieces of commented-out code
Nikita Popov [Sun, 4 Sep 2016 10:43:29 +0000 (12:43 +0200)]
Drop some pieces of commented-out code

8 years agoSync convert_to_null with VM cast behavior
Nikita Popov [Sun, 4 Sep 2016 10:36:16 +0000 (12:36 +0200)]
Sync convert_to_null with VM cast behavior

Do not call cast_object, this is useless and we haven't been doing
it in the VM as of 7.0.

8 years agoDrop SXE_ELEMENT_BY_NAME
Nikita Popov [Sun, 4 Sep 2016 10:29:46 +0000 (12:29 +0200)]
Drop SXE_ELEMENT_BY_NAME

Effectively commented out code

8 years agoDrop unnecessary macro redefinition
Nikita Popov [Sun, 4 Sep 2016 10:28:00 +0000 (12:28 +0200)]
Drop unnecessary macro redefinition

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 3 Sep 2016 21:31:20 +0000 (23:31 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 3 Sep 2016 21:31:05 +0000 (23:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #72996
Nikita Popov [Sat, 3 Sep 2016 21:30:23 +0000 (23:30 +0200)]
Fix bug #72996

8 years agoRemove support for ORIGINAL_LIB_JPEG
Christoph M. Becker [Sat, 3 Sep 2016 19:33:40 +0000 (21:33 +0200)]
Remove support for ORIGINAL_LIB_JPEG

This had already been removed in GD 2.1.0, and wouldn't compile anyway.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 18:11:15 +0000 (20:11 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 18:01:06 +0000 (20:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 17:52:19 +0000 (19:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #67325: imagetruecolortopalette: white is duplicated in palette
Christoph M. Becker [Sat, 3 Sep 2016 17:46:38 +0000 (19:46 +0200)]
Fix #67325: imagetruecolortopalette: white is duplicated in palette

gdImageTrueColorToPalette() is sometimes wasteful by putting multiple white
color entries into the palette. This is caused by an obvious typo, where
to avoid a division by zero when `total` is zero, `count` is checked instead
of `total`.

We fix this issue to improve the quality of the color quantization.

Cf. <https://github.com/libgd/libgd/commit/24b4550f>

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 3 Sep 2016 15:05:28 +0000 (17:05 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix leak and error check order

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 3 Sep 2016 15:04:43 +0000 (17:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix leak and error check order

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sat, 3 Sep 2016 15:03:55 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak and error check order

8 years agofix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 14:59:17 +0000 (16:59 +0200)]
fix leak and error check order

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 12:01:39 +0000 (14:01 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 11:53:07 +0000 (13:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 11:46:03 +0000 (13:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix proto comment
Christoph M. Becker [Sat, 3 Sep 2016 11:31:13 +0000 (13:31 +0200)]
Fix proto comment

While we're at it, we also change a related comment to use American English
consistently.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 10:01:15 +0000 (12:01 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'pull-request/2114' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 10:00:46 +0000 (12:00 +0200)]
Merge branch 'pull-request/2114' into PHP-7.1

8 years agoReplace `dirname(__FILE__)` with `__DIR__` in tests
Christoph M. Becker [Fri, 2 Sep 2016 22:55:12 +0000 (00:55 +0200)]
Replace `dirname(__FILE__)` with `__DIR__` in tests

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 2 Sep 2016 22:41:33 +0000 (00:41 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 2 Sep 2016 22:40:05 +0000 (00:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMake test case more resilient
Christoph M. Becker [Fri, 2 Sep 2016 22:18:19 +0000 (00:18 +0200)]
Make test case more resilient

When ran from a root directory the test case failed, because the open_basedir
restriction for "../[…]" won't kick in. Therefore we change the current
working directory to the test case's directory, as discussed on internals,
see <http://news.php.net/php.internals/95585>.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 2 Sep 2016 22:06:36 +0000 (00:06 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix double free

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 2 Sep 2016 22:06:16 +0000 (00:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix double free

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 2 Sep 2016 22:05:02 +0000 (00:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix double free

8 years agofix double free
Anatol Belski [Fri, 2 Sep 2016 22:01:04 +0000 (00:01 +0200)]
fix double free

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 2 Sep 2016 21:55:22 +0000 (23:55 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  improve fix
  fix leak
  fix leak

8 years agoimprove fix
Anatol Belski [Fri, 2 Sep 2016 21:33:43 +0000 (23:33 +0200)]
improve fix

8 years agofix leak
Anatol Belski [Fri, 2 Sep 2016 21:31:26 +0000 (23:31 +0200)]
fix leak

8 years agofix leak
Anatol Belski [Fri, 2 Sep 2016 18:20:37 +0000 (20:20 +0200)]
fix leak

8 years agoUpdate UPGRADING wrt. RFC: Implement socket_getaddrinfo()
Christoph M. Becker [Fri, 2 Sep 2016 18:19:09 +0000 (20:19 +0200)]
Update UPGRADING wrt. RFC: Implement socket_getaddrinfo()

8 years agoMerge branch 'pull-request/2078'
Christoph M. Becker [Fri, 2 Sep 2016 18:12:55 +0000 (20:12 +0200)]
Merge branch 'pull-request/2078'

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 2 Sep 2016 17:47:08 +0000 (19:47 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add skipifs to some mb path tests
  fix leak
  fix mem leak

8 years agoAdd skipifs to some mb path tests
Anatol Belski [Fri, 2 Sep 2016 17:37:31 +0000 (19:37 +0200)]
Add skipifs to some mb path tests

These were invented primarily to test the multibyte path handling
patch on Windows. How it turns out by PR #2105, some test issues
on some filesystems are possible. Particularly HFS is configurable
to use different ways to save filenames, see
https://developer.apple.com/library/mac/qa/qa1173/_index.html
This makes it impossible to test the filenames byte wise, while
the results are still correct. There are still several other tests
using UTF-8 file names spread over other extensions. So far no
false positives are to see, they don't need to be touched.

8 years agofix leak
Anatol Belski [Fri, 2 Sep 2016 09:34:50 +0000 (11:34 +0200)]
fix leak

8 years agofix mem leak
Anatol Belski [Fri, 2 Sep 2016 09:33:17 +0000 (11:33 +0200)]
fix mem leak

8 years agoImplement FAST_ZPP support for imagecolorat() and imagesetpixel()
Christoph M. Becker [Fri, 2 Sep 2016 17:06:26 +0000 (19:06 +0200)]
Implement FAST_ZPP support for imagecolorat() and imagesetpixel()

These functions may be used in tight loops to do image manipulation in
userland. Using FAST_ZPP is supposed to bring considerable performance
improvements in this case; we've been able to measure up to 25%.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Fri, 2 Sep 2016 16:00:06 +0000 (18:00 +0200)]
Merge branch 'PHP-7.1'

8 years agoUpdate to SQLite 3.14.1
Christoph M. Becker [Fri, 2 Sep 2016 15:38:44 +0000 (17:38 +0200)]
Update to SQLite 3.14.1

8 years agoRevert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag...
Julien Pauli [Fri, 2 Sep 2016 15:57:17 +0000 (17:57 +0200)]
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."

This reverts commit 04115b4e3f37f24bdefb853c5c31eebd40ffff64.

8 years agoRevert "PHP 7 compat"
Julien Pauli [Fri, 2 Sep 2016 15:57:09 +0000 (17:57 +0200)]
Revert "PHP 7 compat"

This reverts commit 24a57ee03b5b8803a2dcffd458b8a56c13ec6293.

8 years agoFix typo
Christoph M. Becker [Fri, 2 Sep 2016 15:34:11 +0000 (17:34 +0200)]
Fix typo

8 years agoFix typo in UPGRADING
Stephan Muggli [Fri, 2 Sep 2016 15:04:58 +0000 (15:04 +0000)]
Fix typo in UPGRADING

8 years agoMerge branch 'PHP-7.1'
Julien Pauli [Fri, 2 Sep 2016 15:02:43 +0000 (17:02 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix warning about sign-mismatch comparisons

8 years agoPHP 7 compat
Julien Pauli [Thu, 1 Sep 2016 11:44:54 +0000 (13:44 +0200)]
PHP 7 compat

8 years agoFixes #52384: Adds parameter value to dumped output. Also adds output flag indicating...
Bishop Bettini [Tue, 21 Jun 2016 12:16:51 +0000 (08:16 -0400)]
Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.

Conflicts:
ext/pdo/pdo_stmt.c

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Julien Pauli [Fri, 2 Sep 2016 15:02:25 +0000 (17:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix warning about sign-mismatch comparisons

8 years agoFix warning about sign-mismatch comparisons
Julien Pauli [Fri, 2 Sep 2016 15:01:52 +0000 (17:01 +0200)]
Fix warning about sign-mismatch comparisons

8 years agoMerge branch 'PHP-7.1'
Stanislav Malyshev [Fri, 2 Sep 2016 06:29:45 +0000 (23:29 -0700)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "Fix closure tests using ReflectionType::__toString()"
  Revert "Append \ to class name returned from ReflectionType::__toString()"

8 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Fri, 2 Sep 2016 06:29:34 +0000 (23:29 -0700)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Fri, 2 Sep 2016 06:29:17 +0000 (23:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next

8 years agoMerge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
Stanislav Malyshev [Fri, 2 Sep 2016 06:28:56 +0000 (23:28 -0700)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:php-src: (134 commits)
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol
  Revert  39587c4817522f40a639f32f77f49595fab066f9  8b7f594a2bcd67154274c5533274fe4d83a676fd Because of  24fdffdacbfeaa20e8f08d44c7c61e3fb7ba9ac5
  add extra test to protected behavior of compact and array string key order
  fix unintentional bc break with compact('this') behavior
  Fix some grammatical errors in PHP 7.1 Upgrade Notes
  Update NEWS
  Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
  Update NEWS and UPGRADING
  Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc""
  Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id""
  Revert "Revert "Add tests""
  Revert "Fix NEWS"
  Fix bug #72940 properly. Reduce needless branches
  ...

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Fri, 2 Sep 2016 06:28:44 +0000 (23:28 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #72910
  5.6.27 will be next

8 years agoFix bug #72910
Stanislav Malyshev [Fri, 2 Sep 2016 06:27:06 +0000 (23:27 -0700)]
Fix bug #72910

Merge upstream patch from https://github.com/kkos/oniguruma/commit/65bdf2a0d160d06556415e5f396a75f6b11bad5c

8 years agoAllow array input for mb_check_encoding()
Yasuo Ohgaki [Fri, 2 Sep 2016 05:15:47 +0000 (14:15 +0900)]
Allow array input for mb_check_encoding()

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol

8 years agofix useless assignment
Anatol Belski [Thu, 1 Sep 2016 21:31:06 +0000 (23:31 +0200)]
fix useless assignment

8 years agoavoid needless function call
Anatol Belski [Thu, 1 Sep 2016 21:13:42 +0000 (23:13 +0200)]
avoid needless function call

8 years agoremove useless assignment
Anatol Belski [Thu, 1 Sep 2016 20:52:43 +0000 (22:52 +0200)]
remove useless assignment

8 years agoremove unused assignment
Anatol Belski [Thu, 1 Sep 2016 20:36:03 +0000 (22:36 +0200)]
remove unused assignment

8 years agorewrite the getcwd part
Anatol Belski [Thu, 1 Sep 2016 19:31:40 +0000 (21:31 +0200)]
rewrite the getcwd part

Also fixes a possible memory leak. Still not ideal, as seems CWD
longer than MAX_PATH is still not supported. But a heap allocation
is not needed anyway, as MAXPATHLEN value is the maximum supported.

8 years agofix leak
Anatol Belski [Thu, 1 Sep 2016 18:48:33 +0000 (20:48 +0200)]
fix leak

8 years agofix unused assignment
Anatol Belski [Thu, 1 Sep 2016 14:31:15 +0000 (16:31 +0200)]
fix unused assignment

8 years agoremove duplicated symbol
Anatol Belski [Wed, 31 Aug 2016 10:38:31 +0000 (12:38 +0200)]
remove duplicated symbol

8 years ago5.6.27 will be next
Ferenc Kovacs [Thu, 1 Sep 2016 18:27:19 +0000 (20:27 +0200)]
5.6.27 will be next

8 years agoMerge branch 'PHP-7.1'
Remi Collet [Thu, 1 Sep 2016 13:23:35 +0000 (15:23 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert  39587c4817522f40a639f32f77f49595fab066f9  8b7f594a2bcd67154274c5533274fe4d83a676fd Because of  24fdffdacbfeaa20e8f08d44c7c61e3fb7ba9ac5

8 years agoRevert
Remi Collet [Thu, 1 Sep 2016 13:21:45 +0000 (15:21 +0200)]
Revert
39587c4817522f40a639f32f77f49595fab066f9
8b7f594a2bcd67154274c5533274fe4d83a676fd
Because of
24fdffdacbfeaa20e8f08d44c7c61e3fb7ba9ac5

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Thu, 1 Sep 2016 11:01:58 +0000 (13:01 +0200)]
Merge branch 'PHP-7.1'

8 years agoadd extra test to protected behavior of compact and array string key order
Márcio Almada [Thu, 1 Sep 2016 07:52:54 +0000 (03:52 -0400)]
add extra test to protected behavior of compact and array string key order