]> granicus.if.org Git - php/log
php
9 years agoAdded NEWS entry
Dmitry Stogov [Tue, 8 Dec 2015 09:44:51 +0000 (12:44 +0300)]
Added NEWS entry

9 years agoImplemented the RFC `Support Class Constant Visibility`.
Dmitry Stogov [Tue, 8 Dec 2015 09:40:42 +0000 (12:40 +0300)]
Implemented the RFC `Support Class Constant Visibility`.

Squashed commit of the following:

commit f11ca0e7a57793fa0e3e7f6d451720e6c42bb0b9
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Dec 8 12:38:42 2015 +0300

    Fixed test expectation

commit 211f873f542504d0a0f72b6b5cb23908a1c99a2d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue Dec 8 12:28:38 2015 +0300

    Embed zend_class_constant.flags into zend_class_constants.value.u2.access_flags

commit 51deab84b2cdbf9cdb1a838cf33b2ee45c61748b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon Dec 7 11:18:55 2015 +0300

    Fixed issues found by Nikita

commit 544dbd5b47e40d38a8ccb96bc5583e9cb7fdd723
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Sat Dec 5 02:41:05 2015 +0300

    Refactored immplementation of https://wiki.php.net/rfc/class_const_visibility
    @reeze created an RFC here and I emailed internals here and didn't get any responses positive/negative.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 8 Dec 2015 02:54:01 +0000 (10:54 +0800)]
Merge branch 'PHP-7.0'

9 years agoRevert "fix typos "paramer" -> "parameters""
Xinchen Hui [Tue, 8 Dec 2015 02:52:50 +0000 (10:52 +0800)]
Revert "fix typos "paramer" -> "parameters""

ABI BC break

This reverts commit 6ac12f13379f3fc19f07abb9d1055274e5f98838.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 7 Dec 2015 21:55:24 +0000 (22:55 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server

9 years agoupdate NEWS
Anatol Belski [Mon, 7 Dec 2015 21:54:44 +0000 (22:54 +0100)]
update NEWS

9 years agoFixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same...
Anatol Belski [Mon, 7 Dec 2015 21:52:51 +0000 (22:52 +0100)]
Fixed bug #71024 Unable to use PHP 7.0 x64 side-by-side with PHP 5.6 x32 on the same server

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 7 Dec 2015 15:43:31 +0000 (07:43 -0800)]
Merge branch 'PHP-7.0'

9 years agoFixed Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of interna...
Xinchen Hui [Mon, 7 Dec 2015 15:43:09 +0000 (07:43 -0800)]
Fixed  Bug #71049 (SQLite3Stmt::execute() releases bound parameter instead of internal buffer)

9 years agoFixed potential memory leaks
Dmitry Stogov [Mon, 7 Dec 2015 15:25:25 +0000 (18:25 +0300)]
Fixed potential memory leaks

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 7 Dec 2015 06:48:32 +0000 (14:48 +0800)]
Merge branch 'PHP-7.0'

9 years agofix typos "paramer" -> "parameters"
Márcio Almada [Mon, 7 Dec 2015 05:56:21 +0000 (01:56 -0400)]
fix typos "paramer" -> "parameters"

9 years agoMerge branch 'typo/paramer' of https://github.com/marcioAlmada/php-src
Xinchen Hui [Mon, 7 Dec 2015 06:48:10 +0000 (14:48 +0800)]
Merge branch 'typo/paramer' of https://github.com/marcioAlmada/php-src

9 years agofix typos "paramer" -> "parameters"
Márcio Almada [Mon, 7 Dec 2015 05:56:21 +0000 (01:56 -0400)]
fix typos "paramer" -> "parameters"

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 7 Dec 2015 02:58:36 +0000 (10:58 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71020 (Use after free in Collator::sortWithSortKeys)
Xinchen Hui [Mon, 7 Dec 2015 02:58:26 +0000 (10:58 +0800)]
Fixed bug #71020 (Use after free in Collator::sortWithSortKeys)

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Sun, 6 Dec 2015 13:08:17 +0000 (14:08 +0100)]
Merge branch 'PHP-7.0'

9 years agostandard tsrm usage for seven
Joe Watkins [Sun, 6 Dec 2015 10:04:35 +0000 (10:04 +0000)]
standard tsrm usage for seven

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Sun, 6 Dec 2015 11:42:25 +0000 (12:42 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS with fixed bug #70831

9 years agoupdate NEWS with fixed bug #70831
Anatol Belski [Sun, 6 Dec 2015 11:41:51 +0000 (12:41 +0100)]
update NEWS with fixed bug #70831

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Sun, 6 Dec 2015 11:38:32 +0000 (12:38 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix #70831: Compile fails on system with 160 CPUs

9 years agoFix #70831: Compile fails on system with 160 CPUs
Daniel Axtens [Sun, 1 Nov 2015 23:17:10 +0000 (10:17 +1100)]
Fix #70831: Compile fails on system with 160 CPUs

This fixes the following build issue on 160-CPU POWER8 machines

ext/tokenizer/tokenizer_data.c:28:34: fatal error: zend_language_parser.h: No such file or directory
 #include <zend_language_parser.h>

It is fixed by introducing an explicit dependency on the header file.

Signed-off-by: Daniel Axtens <dja@axtens.net>
9 years agoMerge branch 'master' of https://github.com/php/php-src
Joe Watkins [Sun, 6 Dec 2015 10:04:59 +0000 (10:04 +0000)]
Merge branch 'master' of https://github.com/php/php-src

9 years agostandard tsrm usage for seven
Joe Watkins [Sun, 6 Dec 2015 10:04:35 +0000 (10:04 +0000)]
standard tsrm usage for seven

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Sun, 6 Dec 2015 01:55:55 +0000 (02:55 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix double free in formatted_print.c
Bob Weinand [Sun, 6 Dec 2015 01:54:28 +0000 (02:54 +0100)]
Fix double free in formatted_print.c

9 years agoFixed bug #71013 (Incorrect exception handler with yield from)
Bob Weinand [Sun, 6 Dec 2015 01:45:19 +0000 (02:45 +0100)]
Fixed bug #71013 (Incorrect exception handler with yield from)

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sat, 5 Dec 2015 21:48:50 +0000 (22:48 +0100)]
Merge branch 'PHP-7.0'

9 years agoDisable PEAR in Travis build
Nikita Popov [Sat, 5 Dec 2015 21:48:29 +0000 (22:48 +0100)]
Disable PEAR in Travis build

9 years agoFugbix typo
Sebastian Bergmann [Sat, 5 Dec 2015 07:25:43 +0000 (08:25 +0100)]
Fugbix typo

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 4 Dec 2015 14:51:26 +0000 (06:51 -0800)]
Merge branch 'PHP-7.0'

9 years agoMissed one place
Xinchen Hui [Fri, 4 Dec 2015 14:51:16 +0000 (06:51 -0800)]
Missed one place

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 4 Dec 2015 14:45:37 +0000 (06:45 -0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71028 (Undefined index with ArrayIterator)
Xinchen Hui [Fri, 4 Dec 2015 14:45:26 +0000 (06:45 -0800)]
Fixed bug #71028 (Undefined index with ArrayIterator)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 4 Dec 2015 03:53:48 +0000 (11:53 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71018 (ReflectionProperty::setValue() behavior changed)
Xinchen Hui [Fri, 4 Dec 2015 03:10:07 +0000 (11:10 +0800)]
Fixed bug #71018 (ReflectionProperty::setValue() behavior changed)

9 years agoSort items alphabetically
Lior Kaplan [Thu, 3 Dec 2015 16:01:22 +0000 (18:01 +0200)]
Sort items alphabetically

9 years agoAlign NEWS entries format
Lior Kaplan [Thu, 3 Dec 2015 15:58:59 +0000 (17:58 +0200)]
Align NEWS entries format

9 years agoAlign NEWS entries format
Lior Kaplan [Thu, 3 Dec 2015 15:53:48 +0000 (17:53 +0200)]
Align NEWS entries format

9 years agoAdd PDO_Firebird fix in NEWS
Popa Adrian Marius [Thu, 3 Dec 2015 15:30:35 +0000 (17:30 +0200)]
Add PDO_Firebird fix in NEWS

9 years agoAdd PDO_Firebird fix in NEWS
Popa Adrian Marius [Thu, 3 Dec 2015 15:28:51 +0000 (17:28 +0200)]
Add PDO_Firebird fix in NEWS

9 years agoMerge branch 'PHP-7.0'
Popa Adrian Marius [Thu, 3 Dec 2015 15:13:59 +0000 (17:13 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Use LL_MASK for SQL_INT64 data formatting

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Popa Adrian Marius [Thu, 3 Dec 2015 15:13:45 +0000 (17:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use LL_MASK for SQL_INT64 data formatting

9 years agoUse LL_MASK for SQL_INT64 data formatting
Popa Adrian Marius [Thu, 3 Dec 2015 15:12:02 +0000 (17:12 +0200)]
Use LL_MASK for SQL_INT64 data formatting

9 years agoMerge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
Popa Adrian Marius [Thu, 3 Dec 2015 14:24:24 +0000 (16:24 +0200)]
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0

* 'PHP-7.0' of https://git.php.net/push/php-src:
  NEWS for 8907da99b83204958cb2308ec12aa9e490372150
  Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
  remove PHP 5 NEWS entries

9 years agoMerge branch 'master' of https://git.php.net/push/php-src
Popa Adrian Marius [Thu, 3 Dec 2015 14:16:04 +0000 (16:16 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  NEWS for 8907da99b83204958cb2308ec12aa9e490372150
  Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
  remove PHP 5 NEWS entries
  remove PHP 5 NEWS entries

9 years agoMerge branch 'PHP-7.0'
Popa Adrian Marius [Thu, 3 Dec 2015 14:15:37 +0000 (16:15 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Popa Adrian Marius [Thu, 3 Dec 2015 14:15:18 +0000 (16:15 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird

9 years agoFix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
Popa Adrian Marius [Thu, 3 Dec 2015 14:14:17 +0000 (16:14 +0200)]
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird

9 years agoMerge branch 'PHP-7.0'
Andrea Faulds [Thu, 3 Dec 2015 12:16:54 +0000 (12:16 +0000)]
Merge branch 'PHP-7.0'

9 years agoNEWS for 8907da99b83204958cb2308ec12aa9e490372150
Andrea Faulds [Thu, 3 Dec 2015 12:16:15 +0000 (12:16 +0000)]
NEWS for 8907da99b83204958cb2308ec12aa9e490372150

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 3 Dec 2015 10:40:53 +0000 (13:40 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)

9 years agoFixed bug #71006 (symbol referencing errors on Sparc/Solaris)
Dmitry Stogov [Thu, 3 Dec 2015 10:28:41 +0000 (13:28 +0300)]
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 3 Dec 2015 09:56:37 +0000 (10:56 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  remove PHP 5 NEWS entries

9 years agoremove PHP 5 NEWS entries
Anatol Belski [Thu, 3 Dec 2015 09:52:04 +0000 (10:52 +0100)]
remove PHP 5 NEWS entries

9 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 3 Dec 2015 09:54:51 +0000 (10:54 +0100)]
Merge branch 'master' of git.php.net:php-src

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 3 Dec 2015 09:54:35 +0000 (10:54 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  remove PHP 5 NEWS entries

9 years agoremove PHP 5 NEWS entries
Anatol Belski [Thu, 3 Dec 2015 09:52:04 +0000 (10:52 +0100)]
remove PHP 5 NEWS entries

9 years agoMerge branch 'PHP-7.0'
Lior Kaplan [Wed, 2 Dec 2015 17:34:13 +0000 (19:34 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG

9 years agoSIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
Lior Kaplan [Mon, 23 Nov 2015 17:08:46 +0000 (19:08 +0200)]
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG

Follow up for 3689b444

9 years agoAdd a method for checking if the underlying stream is valid.
Andrey Hristov [Tue, 1 Dec 2015 11:52:36 +0000 (12:52 +0100)]
Add a method for checking if the underlying stream is valid.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 1 Dec 2015 10:35:00 +0000 (11:35 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  remove older UPGRADING entry, bug #38409 is already fixed in 5.6

9 years agoremove older UPGRADING entry, bug #38409 is already fixed in 5.6
Anatol Belski [Tue, 1 Dec 2015 10:32:52 +0000 (11:32 +0100)]
remove older UPGRADING entry, bug #38409 is already fixed in 5.6

9 years agoMerge branch 'PHP-7.0'
Adam Harvey [Tue, 1 Dec 2015 03:10:04 +0000 (03:10 +0000)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).

9 years agoFix bug #71005 (Segfault in php_cli_server_dispatch_router()).
Adam Harvey [Tue, 1 Dec 2015 03:09:36 +0000 (03:09 +0000)]
Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).

We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 1 Dec 2015 02:35:48 +0000 (10:35 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element...
Xinchen Hui [Tue, 1 Dec 2015 02:35:32 +0000 (10:35 +0800)]
Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type)

9 years agoUpdate random.c
Scott [Wed, 14 Oct 2015 19:16:59 +0000 (15:16 -0400)]
Update random.c

Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 1 Dec 2015 01:05:20 +0000 (02:05 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  arrange NEWS for final and fix one NEWS mistake

9 years agoarrange NEWS for final and fix one NEWS mistake
Anatol Belski [Tue, 1 Dec 2015 00:58:01 +0000 (01:58 +0100)]
arrange NEWS for final and fix one NEWS mistake

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)

9 years agoFixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
Dmitry Stogov [Mon, 30 Nov 2015 13:52:57 +0000 (16:52 +0300)]
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 30 Nov 2015 02:50:34 +0000 (10:50 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70993 (Array key references break argument processing)
Xinchen Hui [Mon, 30 Nov 2015 02:50:23 +0000 (10:50 +0800)]
Fixed bug #70993 (Array key references break argument processing)

9 years agoMerge branch 'PHP-7.0'
Jakub Zelenka [Sun, 29 Nov 2015 19:31:04 +0000 (19:31 +0000)]
Merge branch 'PHP-7.0'

9 years agoFix typo in php_stream_from_res_no_verify
Jakub Zelenka [Sun, 29 Nov 2015 19:28:25 +0000 (19:28 +0000)]
Fix typo in php_stream_from_res_no_verify

This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sun, 29 Nov 2015 07:48:20 +0000 (23:48 -0800)]
Merge branch 'PHP-7.0'

9 years agoOrder the NEWS
Xinchen Hui [Sun, 29 Nov 2015 07:48:12 +0000 (23:48 -0800)]
Order the NEWS

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sun, 29 Nov 2015 07:44:06 +0000 (23:44 -0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70931 (Two errors messages are in conflict)
Xinchen Hui [Sun, 29 Nov 2015 07:43:41 +0000 (23:43 -0800)]
Fixed bug #70931 (Two errors messages are in conflict)

9 years agoFixed Bug #70967 (Weird error handling for __toString when Error is thrown)
Xinchen Hui [Sun, 29 Nov 2015 07:38:19 +0000 (23:38 -0800)]
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sat, 28 Nov 2015 03:12:37 +0000 (19:12 -0800)]
Merge branch 'PHP-7.0'

9 years agoSpace
Xinchen Hui [Sat, 28 Nov 2015 03:12:26 +0000 (19:12 -0800)]
Space

9 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Fri, 27 Nov 2015 15:32:21 +0000 (07:32 -0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

9 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Fri, 27 Nov 2015 15:31:53 +0000 (07:31 -0800)]
Merge branch 'master' of git.php.net:/php-src

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 15:31:19 +0000 (07:31 -0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1)
Xinchen Hui [Fri, 27 Nov 2015 15:30:37 +0000 (07:30 -0800)]
Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1)

9 years agoMerge branch 'PHP-7.0'
Andrea Faulds [Fri, 27 Nov 2015 15:20:25 +0000 (15:20 +0000)]
Merge branch 'PHP-7.0'

9 years agoSet called_scope in Closure::call (fixes bug #70987)
Andrea Faulds [Fri, 27 Nov 2015 15:06:13 +0000 (15:06 +0000)]
Set called_scope in Closure::call (fixes bug #70987)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 07:53:19 +0000 (15:53 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
Xinchen Hui [Fri, 27 Nov 2015 07:52:55 +0000 (15:52 +0800)]
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 03:42:39 +0000 (11:42 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed test
Xinchen Hui [Fri, 27 Nov 2015 03:42:30 +0000 (11:42 +0800)]
Fixed test

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 27 Nov 2015 03:33:05 +0000 (11:33 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)
Xinchen Hui [Fri, 27 Nov 2015 03:32:38 +0000 (11:32 +0800)]
Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 26 Nov 2015 15:57:11 +0000 (16:57 +0100)]
Merge branch 'PHP-7.0'

9 years agoForbid namespace\int type hint as well
Nikita Popov [Thu, 26 Nov 2015 15:56:08 +0000 (16:56 +0100)]
Forbid namespace\int type hint as well

9 years agoFixed compilation warning
Dmitry Stogov [Thu, 26 Nov 2015 08:27:24 +0000 (11:27 +0300)]
Fixed compilation warning

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 26 Nov 2015 04:00:37 +0000 (12:00 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed test
Xinchen Hui [Thu, 26 Nov 2015 04:00:25 +0000 (12:00 +0800)]
Fixed test