1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Commit Graph

62770 Commits

Author SHA1 Message Date
Christoph M. Becker b75542a8c8 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix: sockets constants
2022-09-14 15:27:55 +02:00
Bruce Dou 9f7e27a86b Fix: sockets constants
Closes GH-9533.
2022-09-14 15:27:29 +02: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
Christoph M. Becker 80063a5a90 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix oci_success_with_info.phpt test random failures
2022-09-13 17:17:59 +02: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 189159bfcd Merge branch 'PHP-8.2' 2022-09-13 13:57:18 +01: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 9d46d53d29 Merge branch 'PHP-8.2'
* PHP-8.2:
  Always skip randomly failing OCI8 extauth tests
2022-09-13 14:27:26 +02: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 18b7e43106 Merge branch 'PHP-8.2' 2022-09-13 12:51:19 +01: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 408f1cc2a7 Merge branch 'PHP-8.2' 2022-09-13 11:35:59 +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
Nikita Popov 9f9042fd43 Fix always non-null warning
ZSTR_VAL can not be null.
2022-09-11 22:13:01 +02:00
Jakub Zelenka 93b537599e Merge branch 'PHP-8.2' 2022-09-11 15:41:37 +01:00
Jakub Zelenka f126769a29 Fix bug GH-9517: Compilation error in openssl extension 2022-09-11 15:40:57 +01:00
Ilija Tovilo 128dddcdc5 Merge branch 'PHP-8.2'
* PHP-8.2:
  Mark gh9259_003.phpt as xfail with ASAN
2022-09-11 12:47:43 +02: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
Christoph M. Becker 27bde17a43 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix GH-9518: Disabling IPv6 support disables unrelated constants
2022-09-10 18:12:47 +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
Arnaud Le Blanc 0a9a8a90ae Fix GH-9139: Allow FFI in opcache.preload when opcache.preload_user=root (#9473) 2022-09-09 11:00:57 +02:00
Arnaud Le Blanc 1020b74c03 Merge branch 'PHP-8.2'
* PHP-8.2:
  Check return value of zend_jit_trace_get_exit_addr() (#9097)
2022-09-09 10:51:26 +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 53cefd4beb Merge branch 'PHP-8.2' 2022-09-09 09:16:29 +01:00
Derick Rethans 49c029858b Fixed error updating once more 2022-09-09 09:16:24 +01:00
Derick Rethans 47447891f7 Merge branch 'PHP-8.2' 2022-09-09 00:27:56 +01:00
Derick Rethans f799bc4eca Don't return existing error_container/NULL, but use by-ref instead 2022-09-09 00:25:30 +01:00
Derick Rethans 8cdfffb753 Fixed MemorySanitizer: use-of-uninitialized-value warning introduced by 932586c426 2022-09-09 00:25:30 +01:00
Ilija Tovilo 5f526c1e18 Merge branch 'PHP-8.2'
* PHP-8.2:
  Skip oci tests that leak under asan
  Fix undefined left shift in oci
2022-09-08 15:58:28 +02:00
Ilija Tovilo 6af3f5d514 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Skip oci tests that leak under asan
  Fix undefined left shift in oci
2022-09-08 15:58:11 +02:00
Ilija Tovilo f8d62b4c4b Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Skip oci tests that leak under asan
  Fix undefined left shift in oci
2022-09-08 15:57:53 +02:00
Ilija Tovilo 4a8cca241f Skip oci tests that leak under asan 2022-09-08 15:56:13 +02:00
Ilija Tovilo aa7f4497bf Fix undefined left shift in oci
The bit is shifted into the signed bit which is undefined. Make the
integer explicitly unsigned before shifting.
2022-09-08 15:56:10 +02:00
Máté Kocsis 340b94e9ad Merge branch 'PHP-8.2'
* PHP-8.2:
  Declare ext/standard constants in stubs - part 7 (#9505)
2022-09-08 13:59:46 +02:00
Máté Kocsis 3227d04fa9 Declare ext/standard constants in stubs - part 7 (#9505) 2022-09-08 13:57:07 +02:00
Ilija Tovilo c200623f28 Merge branch 'PHP-8.2'
* PHP-8.2:
  Private method incorrectly marked as "overwrites" in reflection
2022-09-08 10:44:50 +02:00
Ilija Tovilo a85c757dcb Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Private method incorrectly marked as "overwrites" in reflection
2022-09-08 10:44:32 +02:00
Ilija Tovilo a795f3ebc6 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Private method incorrectly marked as "overwrites" in reflection
2022-09-08 10:44:13 +02:00