1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

129649 Commits

Author SHA1 Message Date
Derick Rethans 2480d9cc2e Merge branch 'PHP-8.1' into PHP-8.2 2022-09-14 16:27:05 +01:00
Derick Rethans 0dcd098dfa Merge remote-tracking branch 'derickr/timelib-2021-17-integration' into PHP-8.1 2022-09-14 16:25:43 +01:00
Bruce Dou 9f7e27a86b Fix: sockets constants
Closes GH-9533.
2022-09-14 15:27:29 +02:00
Derick Rethans dd365b044a Add 'const' to match actual API 2022-09-14 11:02:26 +01:00
Derick Rethans e5b4624b8b Fixed #9165: strtotime translates a date-time with DST/non-DST hour differently based on default timezone 2022-09-14 10:42:42 +01:00
Derick Rethans 4a5202293b Merge timelib 2021.17 2022-09-14 10:40:59 +01:00
Bob Weinand d1fc0017c9 Revert "Fix compilation on MacOS"
This reverts commit 800c6672e5.

Reverted along with a01dd9feda.
2022-09-14 11:28:06 +02:00
Bob Weinand 5a0b68bed7 Revert "Store default object handlers alongside the class entry"
This reverts commit 9e6eab3c13.

Reverted along a01dd9feda.
2022-09-14 11:18:14 +02:00
Bob Weinand a01dd9feda Revert "Port all internally used classes to use default_object_handlers"
This reverts commit 94ee4f9834.

The commit was a bit too late to be included in PHP 8.2 RC1. Given it's a massive ABI break, we decide to postpone the change to PHP 8.3.
2022-09-14 11:13:23 +02:00
Sara Golemon d228651a71 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Bump for 8.0.25
2022-09-13 23:48:24 +00:00
Sara Golemon 50dc7a8634 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Bump for 8.0.25
2022-09-13 23:47:32 +00:00
Sara Golemon 559da529a0 Bump for 8.0.25 2022-09-13 23:46:26 +00:00
Patrick Allaert 5c63f36b9d Merge branch 'PHP-8.1' into PHP-8.2 2022-09-13 23:19:59 +02:00
Patrick Allaert 0f575aa698 PHP-8.1 is now for PHP 8.1.12-dev 2022-09-13 23:09:47 +02:00
Sergey Panteleev 450d28d315 [ci skip] Update NEWS for PHP 8.2.0RC3 2022-09-13 18:25:42 +03:00
Christoph M. Becker fee4bdb595 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix oci_success_with_info.phpt test random failures
2022-09-13 17:17:28 +02:00
Michael Voříšek 7fd14eb08b Fix oci_success_with_info.phpt test random failures
Closes GH-9525.
2022-09-13 17:15:36 +02:00
George Peter Banyard 951bd74038 Do early returns in xml.c
This reduces nesting clarying what preconditions are needed in each of the handler functions
2022-09-13 13:56:52 +01:00
George Peter Banyard 6aef13402e Mark _xml_decode_tag() as taking a const XML_Char*
As this is always the case and this removes unnecessary pointer casts
2022-09-13 13:56:52 +01:00
George Peter Banyard 0b8ad94b91 Refactor _xml_add_to_info()
Mark char* as const, and compute it's length once to save an expensive strlen() call
2022-09-13 13:56:52 +01:00
Christoph M. Becker 5b8f379fb6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Always skip randomly failing OCI8 extauth tests
2022-09-13 14:26:45 +02:00
Christoph M. Becker cd927ef634 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Always skip randomly failing OCI8 extauth tests
2022-09-13 14:25:11 +02:00
Michael Voříšek 9a73ec0367 Always skip randomly failing OCI8 extauth tests
This might be caused by an issue with the Oracle Instant Client
libraries[1]; we skip the tests for the time being.

[1] <https://github.com/php/php-src/pull/9524#issuecomment-1244409815>

Closes GH-9524.
2022-09-13 14:21:23 +02:00
George Peter Banyard bacbfb81ab Merge branch 'PHP-8.1' into PHP-8.2 2022-09-13 12:50:38 +01:00
George Peter Banyard 71e198be25 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 12:45:42 +01:00
George Peter Banyard 47500f3300 Fix GH-9421 Incorrect argument number for ValueError in NumberFormatter
Closes GH-9489
2022-09-13 12:42:58 +01:00
George Peter Banyard 79b011bdd9 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-13 11:35:12 +01:00
George Peter Banyard 3d5df064ca Merge branch 'PHP-8.0' into PHP-8.1 2022-09-13 11:33:09 +01:00
George Peter Banyard 293e69179d Fix GH-9308 GMP throws the wrong error when a GMP object is passed to gmp_init()
Closes GH-9490
2022-09-13 11:24:19 +01:00
George Peter Banyard 3675041d03 Update NEWS with DNF type check bug fix 2022-09-13 11:12:18 +01:00
George Peter Banyard 5bfceae770 Only check classes in intersection type if the type might be valid
Closes GH-9522
2022-09-13 11:10:32 +01:00
Ilija Tovilo 09aa27cc09 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix ZEND_RC_MOD_CHECK() for thread local ini parser strings
2022-09-12 23:33:03 +02:00
Ilija Tovilo 9af98cd465 Fix ZEND_RC_MOD_CHECK() for thread local ini parser strings 2022-09-12 23:31:26 +02:00
Dmitry Stogov d64aa6f646 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Reset FG(user_stream_current_filename) at the end of request
2022-09-12 11:39:27 +03:00
Dmitry Stogov f4afa9adc6 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Reset FG(user_stream_current_filename) at the end of request
2022-09-12 11:39:18 +03:00
Dmitry Stogov d0b3096ff0 Reset FG(user_stream_current_filename) at the end of request
Attempt to fix oss-fuzz #51047
2022-09-12 11:38:31 +03:00
Jakub Zelenka f126769a29 Fix bug GH-9517: Compilation error in openssl extension 2022-09-11 15:40:57 +01:00
Ilija Tovilo e9a0d21a06 Mark gh9259_003.phpt as xfail with ASAN
The tests reports memory leaks.
2022-09-11 12:37:06 +02:00
Ilija Tovilo 08b7539583 Fix syntax error when dnf type in parens after readonly
Fixes GH-9500
Closes GH-9512
2022-09-11 12:29:29 +02:00
Máté Kocsis 8b632749d7 Use PHP 7.4 syntax in gen_stub.php 2022-09-11 07:51:28 +02:00
Máté Kocsis 4af695e908 Require PHP 7.4 at least for running the build system (#9519) 2022-09-10 18:31:43 +02:00
Christoph M. Becker 76dccd8207 Fix GH-9518: Disabling IPv6 support disables unrelated constants
We need to properly terminate the "conditional compilation" in stub
files.

Closes GH-9520.
2022-09-10 18:12:22 +02:00
George Peter Banyard 6c4d24e4f0 Update cache slot size calculation in compact_literals.c 2022-09-10 13:20:59 +01:00
George Peter Banyard c70a8281e3 Use DNF intersection type check also for simple intersection types 2022-09-10 11:39:22 +01:00
George Peter Banyard 9286101da4 Fix GH-9516: (A&B)|D as a param should allow AB or D. Not just A.
The issue was that we didn't compute enough cache slots for DNF types.
Nor progressed throught the CE's in the cache slot, meaning we were only checking if the value passed
satisfied the first type of the nested intersection type.
2022-09-10 11:34:32 +01:00
George Peter Banyard 80315edd58 Introduce PROGRESS_CACHE_SLOT() macro 2022-09-10 11:34:11 +01:00
Máté Kocsis e0422979f6 Validate if the refpurpose and the description is in sync (#9510) 2022-09-09 11:54:38 +02:00
Arnaud Le Blanc 3c852cf43f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Check return value of zend_jit_trace_get_exit_addr() (#9097)
2022-09-09 10:51:10 +02:00
Arnaud Le Blanc 466e4dc2a2 Check return value of zend_jit_trace_get_exit_addr() (#9097) 2022-09-09 10:50:03 +02:00
Derick Rethans 49c029858b Fixed error updating once more 2022-09-09 09:16:24 +01:00