1
0
mirror of https://github.com/php/php-src.git synced 2026-04-01 21:22:13 +02:00
Commit Graph

129933 Commits

Author SHA1 Message Date
Derick Rethans
472567897f Merge branch 'PHP-8.2' 2022-09-28 10:15:21 +01: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
b6bf2a9801 Merge branch 'PHP-8.2' 2022-09-28 10:08:10 +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
a1ec64af5b Merge branch 'PHP-8.2'
* PHP-8.2:
  [skip ci] Attempt to fix libmysqlclient build for >=PHP-8.2
2022-09-27 23:57:09 +02: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
Ilija Tovilo
628bcf09ba [skip ci] Fix --enable-dl-test flag being passed to PHP-8.0 MSAN build 2022-09-27 23:49:30 +02:00
Pierrick Charron
69d05fadc5 Merge branch 'PHP-8.2'
* PHP-8.2:
  [ci skip] Update NEWS for PHP 8.2.0RC4
2022-09-27 17:47:23 -04:00
Pierrick Charron
e061084bbe [ci skip] Update NEWS for PHP 8.2.0RC4 2022-09-27 17:46:45 -04:00
Ilija Tovilo
6c7c4387ba Merge branch 'PHP-8.2'
* PHP-8.2:
  And also update the branch ref...
2022-09-27 23:39:32 +02: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
24ceee88ee Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix PHP-8.0 skipping for community steps
2022-09-27 23:36:57 +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
4e747599c8 Merge branch 'PHP-8.2'
* PHP-8.2:
  Skip some OCI tests with repeat
2022-09-27 23:32:48 +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
743ab13948 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix PHP-8.0 skipping for some jobs
2022-09-27 23:29:38 +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
518f108b01 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix invalid label before }
2022-09-27 23:28:22 +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
c649c5f562 Merge branch 'PHP-8.2'
* PHP-8.2:
  Wrap JIT compiler with zend_try to recover in case of memory overflow
2022-09-27 22:29:13 +03: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
660cf59272 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:46:48 +02: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
12a0cc7906 Merge branch 'PHP-8.2' 2022-09-27 17:36:23 +01: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
d6306e7600 Merge branch 'PHP-8.2' 2022-09-27 17:34:32 +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
96a46ed3f6 Merge branch 'PHP-8.2'
* PHP-8.2:
  Fix new bug81726.phpt for PHP 8.0
2022-09-27 18:32:25 +02: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