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

129795 Commits

Author SHA1 Message Date
Ilija Tovilo
a5fdfc4fc0 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci ] Rename matrix-include output on old branches
  Updated to version 2022.4 (2022d)
  Updated to version 2022.4 (2022d)
2022-09-29 13:08:45 +02:00
Ilija Tovilo
a3b5861ccc Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  [skip ci ] Rename matrix-include output on old branches
2022-09-29 13:08:01 +02:00
Ilija Tovilo
f3dba7e642 [skip ci ] Rename matrix-include output on old branches
Otherwise we have a discrepancy of the output name between
master:nightly.yml and branch:nightly_matrix.php.
2022-09-29 13:06:43 +02:00
Derick Rethans
0360e62cae Updated to version 2022.4 (2022d) 2022-09-29 11:52:08 +01:00
Derick Rethans
0841b5af33 Empty merge 2022-09-29 11:52:08 +01:00
Derick Rethans
d16b5d3803 Updated to version 2022.4 (2022d) 2022-09-29 11:52:06 +01:00
Ilija Tovilo
d156b317da Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Skip Symfony preloading for PHP-8.0
2022-09-29 12:22:36 +02:00
Ilija Tovilo
98f7126cc3 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Skip Symfony preloading for PHP-8.0
2022-09-29 12:22:19 +02:00
Ilija Tovilo
f49709a544 Skip Symfony preloading for PHP-8.0 2022-09-29 12:20:53 +02:00
Christoph M. Becker
3d2d7d1000 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Revert unintended test expectation change
2022-09-28 12:14:39 +02:00
Christoph M. Becker
9caa71f94f Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Revert unintended test expectation change
2022-09-28 12:13:39 +02:00
Athos Ribeiro
e6a822d437 Revert unintended test expectation change
Commit fbe3059 included an unintended change to the test which checks if
dns_get_record populates its additional parameter. This patch reverts
such change.

The issue was not detected by the CIs because their tests run in
the --offline mode, and the test in question needs internet connection.

Closes GH-9625.
2022-09-28 12:12:21 +02:00
Derick Rethans
39c55e77f0 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-28 10:15:15 +01:00
Derick Rethans
551a0e1e51 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-28 10:15:11 +01:00
Derick Rethans
856a7ac4b7 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-28 10:15:04 +01:00
Derick Rethans
ad8d00b47b Prepare for next release 2022-09-28 10:14:50 +01:00
Derick Rethans
1d2a3e5c38 Merge branch 'PHP-8.1' into PHP-8.2 2022-09-28 10:08:04 +01:00
Derick Rethans
42fea44c13 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-28 10:08:00 +01:00
Derick Rethans
7ca5d91b70 Merge branch 'PHP-7.4' into PHP-8.0 2022-09-28 10:07:51 +01:00
Derick Rethans
0b4e153394 Prepare for 7.4.32 2022-09-28 10:07:43 +01:00
Ilija Tovilo
1ff70a5025 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Attempt to fix libmysqlclient build for >=PHP-8.2
2022-09-27 23:56:44 +02:00
Ilija Tovilo
a79e0ee57c [skip ci] Attempt to fix libmysqlclient build for >=PHP-8.2 2022-09-27 23:54:36 +02:00
Pierrick Charron
e061084bbe [ci skip] Update NEWS for PHP 8.2.0RC4 2022-09-27 17:46:45 -04:00
Ilija Tovilo
687cc0e557 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  And also update the branch ref...
2022-09-27 23:39:19 +02:00
Ilija Tovilo
85641ae05a Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  And also update the branch ref...
2022-09-27 23:39:08 +02:00
Ilija Tovilo
f518ae50aa And also update the branch ref... 2022-09-27 23:38:22 +02:00
Ilija Tovilo
83de74256e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix PHP-8.0 skipping for community steps
2022-09-27 23:36:47 +02:00
Ilija Tovilo
1d4620a6fb Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix PHP-8.0 skipping for community steps
2022-09-27 23:36:35 +02:00
Ilija Tovilo
03a48b1209 Fix PHP-8.0 skipping for community steps
github.ref refers to master here, even for other branches.
2022-09-27 23:36:09 +02:00
Ilija Tovilo
81bedb0f7d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Skip some OCI tests with repeat
2022-09-27 23:32:37 +02:00
Ilija Tovilo
93e509fd8c Skip some OCI tests with repeat 2022-09-27 23:32:15 +02:00
Ilija Tovilo
28ccf9ff73 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix PHP-8.0 skipping for some jobs
2022-09-27 23:29:29 +02:00
Ilija Tovilo
958955e62a Fix PHP-8.0 skipping for some jobs 2022-09-27 23:28:59 +02:00
Ilija Tovilo
980c2edbe2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix invalid label before }
2022-09-27 23:28:07 +02:00
Ilija Tovilo
0aa5adb143 Fix invalid label before }
Will be fixed in C23 :)

Closes GH-9624
2022-09-27 23:27:17 +02:00
Dmitry Stogov
8dc689ecfd Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Wrap JIT compiler with zend_try to recover in case of memory overflow
2022-09-27 22:29:01 +03:00
Dmitry Stogov
2568db287d Wrap JIT compiler with zend_try to recover in case of memory overflow 2022-09-27 22:28:16 +03:00
Christoph M. Becker
bad8c8efc6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:46:32 +02:00
Christoph M. Becker
d981def074 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:45:54 +02:00
Christoph M. Becker
809176dab0 Fix new bug81726.phpt for PHP 8.0
The error message has slightly changed, so we adapt our expectations.
2022-09-27 18:40:02 +02:00
Jakub Zelenka
b1d38fdbb3 Merge branch 'PHP-8.2' of github.com:php/php-src into PHP-8.2 2022-09-27 17:35:34 +01:00
Jakub Zelenka
f41eb54a5e Merge branch 'PHP-8.1' into PHP-8.2 2022-09-27 17:33:58 +01:00
Christoph M. Becker
bb34bc445e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:32:09 +02:00
Christoph M. Becker
4f79dbd745 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:31:44 +02:00
Jakub Zelenka
54cb2cdcd3 Merge branch 'PHP-8.0' into PHP-8.1 2022-09-27 17:31:08 +01:00
Christoph M. Becker
1a3c9b0542 Fix new bug81726.phpt for PHP 8.0
The error message has slightly changed, so we adapt our expectations.

Closes GH-9621.
2022-09-27 18:30:04 +02:00
Jakub Zelenka
1e8fa6607d Rework FPM tests logging for better debugging 2022-09-27 17:27:43 +01:00
Christoph M. Becker
8ba8383916 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:25:13 +02:00
Christoph M. Becker
4552f62911 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:24:07 +02:00
Christoph M. Becker
3477499d26 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix regression introduced by fixing bug 81726
2022-09-27 18:22:57 +02:00