1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Commit Graph

129634 Commits

Author SHA1 Message Date
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
Derick Rethans 2d2a1e39ac Merge remote-tracking branch 'derickr/fix-error-container-uninitialised-variable' into PHP-8.2 2022-09-09 00:27:46 +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 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 3227d04fa9 Declare ext/standard constants in stubs - part 7 (#9505) 2022-09-08 13:57:07 +02:00
Ilija Tovilo 580c29e1a2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix lsp error in eval'd code referring to incorrect class for static type
2022-09-08 10:54:02 +02:00
Ilija Tovilo 15ee9d2686 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix lsp error in eval'd code referring to incorrect class for static type
2022-09-08 10:53:45 +02:00
Ilija Tovilo d5373eac46 Fix lsp error in eval'd code referring to incorrect class for static type
Fixes GH-9407
Closes GH-9471
2022-09-08 10:52:27 +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
Ilija Tovilo 1435fc6262 Private method incorrectly marked as "overwrites" in reflection
Fix GH-9409
Closes GH-9469
2022-09-08 10:43:25 +02:00
David CARLIER 4f2759525c Fix GH-9493: fix ancillary data build for FreeBSD prior to the 13 release. (#9496)
the legacy sockcred struct does not hold the process id, thus sockcred2
 had been added from FreeBSD 13 in conjunction with LOCAL_CREDS_PERSISTENT
 to address this thus we disable the feature for earlier releases.
2022-09-08 09:10:16 +01:00