1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Commit Graph

109061 Commits

Author SHA1 Message Date
Nikita Popov
784579d99a Merge branch 'PHP-7.3' 2018-10-02 18:20:30 +02:00
Nikita Popov
a42801abe3 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-02 18:20:25 +02:00
Nikita Popov
f0647edd88 Fixed bug #66430 2018-10-02 18:19:53 +02:00
Nikita Popov
c8188fdd3b Merge branch 'PHP-7.3' 2018-10-02 17:49:08 +02:00
Nikita Popov
b8392803f9 Merge branch 'PHP-7.2' into PHP-7.3 2018-10-02 17:48:56 +02:00
Nikita Popov
d2477b284b Fixed bug #76936 2018-10-02 17:47:07 +02:00
Nikita Popov
aec6421409 Merge branch 'PHP-7.3' 2018-10-02 16:14:36 +02:00
Nikita Popov
26f82a7706 Fixed bug #76958 2018-10-02 16:13:51 +02:00
Nikita Popov
9cfd8f43c2 Don't fall back to vtbl_pass if no matching vtbl found
If we don't know how to convert between two encodings, make sure
we error instead of ignoring the issue.

Explicitly use vtbl_pass if we are round-tripping wchar->wchar or
8bit->8bit. Fingers crossed that nothing else relies on the
vtbl_pass fallback...
2018-10-02 16:07:22 +02:00
Dmitry Stogov
9bfb972413 typo 2018-10-02 15:38:55 +03:00
Dmitry Stogov
f521586814 Make ZEND_ACC_IMMUTABLE and ZEND_ACC_HAS_TYPE_HINTS to be common (for functions and classes) 2018-10-02 09:51:06 +03:00
Dmitry Stogov
2606566269 Rename ZEND_ACC_NO_RT_ARENA into ZEND_ACC_HEAP_RT_CACHE and use it for pseudo-main op_arrays. 2018-10-02 09:10:04 +03:00
Dmitry Stogov
a2e8334613 Allocate only necessary space for static properties of internal classes in ZTS mode. 2018-10-01 19:05:31 +03:00
Dmitry Stogov
250b577258 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Bump phpdbg version to PHP_VERSION
2018-10-01 14:11:31 +03:00
Dmitry Stogov
34a491d1ed Turn accel_activate into module callback. 2018-10-01 14:10:54 +03:00
Peter Kokot
a3760badbe Bump phpdbg version to PHP_VERSION
The phpdbg sapi module is distributed with the release cycle of PHP.
This patch simplifes phpdbg versioning and bumps it to the PHP_VERSION.
2018-10-01 13:01:58 +02:00
Dmitry Stogov
c25e7439ae Get rid of accel_deactivate() calback 2018-10-01 13:53:15 +03:00
Dmitry Stogov
2d87b51ae9 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (29 commits)
  Fix the deplister rule to not ignore the .c file (Anatol)
  Update .gitignore to include the Windows deplister program (win32/build/deplister.c)
  Bug > Feature Request
  NEWS and UPGRADING
  Fixed bug #75479
  Fix test
  Fix some tests and improve coverage for Windows in SPL
  Use already set variable
  Fix reflection arguments for sodium_memzero function
  Deprecate unbinding of $this of non-static methods
  Generalize compile_typename
  Fixed bug #76737
  Fixed bug #72635
  Remove and refactor ext/spl/examples
  Remove outdated soap examples
  Remove unused ext/bz2/php_bz2.def
  Remove redundant ce from reflection property_reference
  Only store zend_type inside reflection type_reference
  Fixed bug #76946
  Bump versions for 7.1.24-dev
  ...
2018-10-01 11:19:36 +03:00
Kalle Sommer Nielsen
4fc5833b3e Fix the deplister rule to not ignore the .c file (Anatol) 2018-10-01 08:31:49 +02:00
Kalle Sommer Nielsen
a698dcd24a Update .gitignore to include the Windows deplister program (win32/build/deplister.c) 2018-10-01 07:54:52 +02:00
Kalle Sommer Nielsen
e23a9d6a5c Bug > Feature Request 2018-10-01 07:52:22 +02:00
Remi Collet
3d5fe90e7e NEWS and UPGRADING 2018-10-01 07:24:04 +02:00
Remi Collet
959e640e6d Fixed bug #76908 PDO_OCI getColumnMeta() not implemented
* Letargie-feature-getcolumnmeta:
  Removing last unused
  Last few changes : 	. force the nls_date_format 	. add the scale to the return of the function 	. add tests on some function return 	. removing unused variables
  cs
  Changes : . Add the distinction between NUMBER and FLOAT types . Changing BFLOAT text to be BINARY_FLOAT . Changing BDOUBLE text to be BINARY_DOUBLE . Add the data types names for NCHAR, NVARCHAR and NCLOB . Few changes in the tests
  fixing comments
  Update oci_statement.c
  Add the PDOStatement::getColumnMeta() function to the pdo_oci driver
2018-10-01 07:18:20 +02:00
Remi Collet
0ae5f82135 Fixed bug #76908 PDO_OCI getColumnMeta() not implemented
Merge branch 'feature-getcolumnmeta' of https://github.com/Letargie/php-src into Letargie-feature-getcolumnmeta

* 'feature-getcolumnmeta' of https://github.com/Letargie/php-src:
  Removing last unused
  Last few changes : 	. force the nls_date_format 	. add the scale to the return of the function 	. add tests on some function return 	. removing unused variables
  cs
  Changes : . Add the distinction between NUMBER and FLOAT types . Changing BFLOAT text to be BINARY_FLOAT . Changing BDOUBLE text to be BINARY_DOUBLE . Add the data types names for NCHAR, NVARCHAR and NCLOB . Few changes in the tests
  fixing comments
  Update oci_statement.c
  Add the PDOStatement::getColumnMeta() function to the pdo_oci driver
2018-10-01 07:16:48 +02:00
Nikita Popov
eab939e1e3 Merge branch 'PHP-7.3' 2018-09-30 20:08:10 +02:00
Nikita Popov
d7e96c1b95 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-30 20:07:58 +02:00
Nikita Popov
56d1578515 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-30 20:07:44 +02:00
Nikita Popov
db80e0e2ad Fixed bug #75479
Wrap the zend_signal_init() call, so the hook arguments line up.
2018-09-30 20:07:15 +02:00
Nikita Popov
ab2120e4e5 Fix test 2018-09-30 19:56:28 +02:00
Kalle Sommer Nielsen
8595dc8fa9 Fix some tests and improve coverage for Windows in SPL 2018-09-30 10:41:34 +02:00
Gabriel Caruso
257bec33f8 Use already set variable 2018-09-30 02:01:10 -03:00
Nikita Popov
03ba053af0 Merge branch 'PHP-7.3' 2018-09-29 21:20:08 +02:00
Nikita Popov
b617a5b2ea Merge branch 'PHP-7.2' into PHP-7.3 2018-09-29 21:20:01 +02:00
James Titcumb
950c338f80 Fix reflection arguments for sodium_memzero function 2018-09-29 21:19:42 +02:00
Nikita Popov
fc18f44213 Deprecate unbinding of $this of non-static methods
Static calls to non-static methods have been fully deprecated in
PHP 7.0 as part of https://wiki.php.net/rfc/reclassify_e_strict.

A combination of ReflectionMethod::getClosure() ("fake closures")
and Closure::bindTo() etc can be used to achieve the same behavior.
This commit ensures that a deprecation notice will be thrown also
in this case.
2018-09-29 21:01:27 +02:00
Nikita Popov
c4cb3250ca Generalize compile_typename
Return zend_type instead of assigning to arg_info. Also move
nullable handling into the function.
2018-09-29 18:53:48 +02:00
Nikita Popov
96da1fe8a9 Fixed bug #76737
Explicitly prohibit serialization and unserialization of reflection
objects.
2018-09-29 14:47:57 +02:00
Nikita Popov
2ae2e820be Merge branch 'PHP-7.3' 2018-09-29 14:23:13 +02:00
Nikita Popov
8b8b625d08 Fixed bug #72635
This seems to be a simple oversight, where we did not enable
exceptions. Other constexpr conditions already throw, so there is
no particular reason to stick to a fatal error here.
2018-09-29 14:21:08 +02:00
Peter Kokot
80c6ba26e3 Remove and refactor ext/spl/examples
- Test file from ext/spl/examples has been moved to ext/spl/tests
- Other custom SPL examples and implementations were removed in favor of
the PHP manual.
2018-09-29 09:29:32 +02:00
Peter Kokot
ab60b79912 Remove outdated soap examples
This patch removes PHP soap extension examples in favor of the PHP
manual.
2018-09-29 09:26:29 +02:00
Peter Kokot
61536b9d64 Remove unused ext/bz2/php_bz2.def
Exporting symbols has been added via
a7ba08a0bd and then removed via
d5c6825241
2018-09-29 09:23:31 +02:00
Nikita Popov
36a4f58ab9 Remove redundant ce from reflection property_reference
The ce is already stored in the main reflection object, no need to
store it twice.
2018-09-28 23:16:10 +02:00
Nikita Popov
570f9f6281 Only store zend_type inside reflection type_reference
We don't need the full arg_info and the baggage associated with it.
Storing the type should be safe, as it's part of structures which
are never released during a request (arg_info and in the future
prop_info).
2018-09-28 22:27:14 +02:00
Nikita Popov
7ef42ec359 Merge branch 'PHP-7.3' 2018-09-28 19:18:01 +02:00
Nikita Popov
7189e0b70f Merge branch 'PHP-7.2' into PHP-7.3 2018-09-28 19:17:53 +02:00
Nikita Popov
8e7dfc6ddf Merge branch 'PHP-7.1' into PHP-7.2 2018-09-28 19:17:29 +02:00
Nikita Popov
83e2b9e220 Fixed bug #76946 2018-09-28 19:15:19 +02:00
Sara Golemon
8371159790 Merge branch 'PHP-7.3'
* PHP-7.3:
  Bump versions for 7.1.24-dev
2018-09-28 11:33:12 -04:00
Sara Golemon
0470d21ef3 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Bump versions for 7.1.24-dev
2018-09-28 11:32:56 -04:00