Commit Graph

126823 Commits

Author SHA1 Message Date
Nikita Popov
ce62a98534 Merge branch 'PHP-8.1'
* PHP-8.1:
  Remove unnecessary assertion
2021-11-04 17:01:04 +01:00
Nikita Popov
e291dcd836 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Remove unnecessary assertion
2021-11-04 17:00:58 +01:00
Nikita Popov
7e67366a9b Remove unnecessary assertion
zend_class_implements_interface works fine if the "class" is an
interface, so simply drop this assertion. This avoids the need to
special case this situation.
2021-11-04 17:00:17 +01:00
Nikita Popov
aefe802e05 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix bug #81591: ignore_repeated_errors broken
2021-11-04 16:25:24 +01:00
Nikita Popov
6ebabaa50c Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix bug #81591: ignore_repeated_errors broken
2021-11-04 16:25:18 +01:00
Nikita Popov
4c171ed5eb Fix bug #81591: ignore_repeated_errors broken
We should suppress the error if the message is the same, not if
it's different. Apparently we had no test coverage for these
options.
2021-11-04 16:23:55 +01:00
Nikita Popov
52ccb4d16b Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix typo

[ci skip]
2021-11-04 15:06:21 +01:00
Nikita Popov
94cacba1ee Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix typo

[ci skip]
2021-11-04 15:05:58 +01:00
Nikita Popov
462271c7e0 Fix typo
[ci skip]
2021-11-04 15:05:43 +01:00
Nikita Popov
cacafd36a7 Merge branch 'PHP-8.1'
* PHP-8.1:
  Suppress unused label warnings in SWITCH VM
2021-11-04 14:52:53 +01:00
Nikita Popov
5d2f3d45cc Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Suppress unused label warnings in SWITCH VM
2021-11-04 14:52:45 +01:00
Nikita Popov
ee37774466 Suppress unused label warnings in SWITCH VM
While we avoid emitting labels for handlers that are not referenced
from anywhere else, we do not perform a fine-grained analysis on
used specializations, so some of the specialization labels may not
be used. Use ATTRIBUTE_UNUSED_LABEL to suppress the warning. Drop
"cold" from the definition of this attribute, as it is completely
unrelated.
2021-11-04 14:50:54 +01:00
Nikita Popov
9793b694e7 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed bug #81582
2021-11-04 11:58:59 +01:00
Nikita Popov
1d6f4db2ba Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fixed bug #81582
2021-11-04 11:58:43 +01:00
Nikita Popov
d3932682e7 Fixed bug #81582
If __toString() comes from a trait, implement Stringable during
inheritance.
2021-11-04 11:58:33 +01:00
Christoph M. Becker
2f85d79165
Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix #71316: libpng warning from imagecreatefromstring
2021-11-04 11:21:40 +01:00
Christoph M. Becker
7f2533d065
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix #71316: libpng warning from imagecreatefromstring
2021-11-04 11:21:10 +01:00
Christoph M. Becker
f22f4afd84
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #71316: libpng warning from imagecreatefromstring
2021-11-04 11:19:24 +01:00
Christoph M. Becker
1919c4b44d
Fix #71316: libpng warning from imagecreatefromstring
We backport the respective upstream fix[1] to our bundled libgd.

[1] <636100b928>

Closes GH-7615.
2021-11-04 11:16:45 +01:00
Nikita Popov
c49cb4c3a7 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix bug #81507: Adjust XCOFF asm files for AIX assembler
2021-11-04 10:54:58 +01:00
Clément Chigot
cfe8a455a6 Fix bug #81507: Adjust XCOFF asm files for AIX assembler
AIX assembler is a bit more strict than GNU assembler. Thus, adjust
the XCOFF asm files to be able to accept both assembler.

This pulls in upstream boost context changes from
https://github.com/boostorg/context/pull/191.

Closes GH-7579.
2021-11-04 10:54:42 +01:00
Nikita Popov
d5b97362bb Always initialize iterator_funcs_ptr
The behavior here depending on the order in which the class entry
was initialized: If get_iterator was set first and Iterator or
IteratorAggregate implemented later, we would not initialize
iterator_funcs_ptr. If Iterator/IteratorAggregate were implemented
first, we would initialize it. After the migration to stub-based
class declarations, we always follow the latter order, but 3rd-party
extension may not. To ensure that behavior is order-independent,
always initialize iterator_funcs_ptr, as we have code (at least the
MultipleIterator implementation) that depends on it being
initialized for iterators with custom get_iterator as well.
2021-11-04 10:46:43 +01:00
Nikita Popov
8a7f9a5c38 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed bug #81587
2021-11-04 10:38:59 +01:00
Nikita Popov
d7ad32649a Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fixed bug #81587
2021-11-04 10:38:08 +01:00
Nikita Popov
4b9fbc6627 Fixed bug #81587
iterator_funcs_ptr may be null for Iterators with custom
get_iterator. Ideally MultipleIterator would make use of get_iterator,
but this would require a large implementation change.
2021-11-04 10:34:52 +01:00
David CARLIER
1de405907d
fpm allow process tracing/core dump on solaris systems. (#7548) 2021-11-03 22:26:43 +00:00
George Peter Banyard
3f9331a83a
Enable more DBA drivers in CI (#7622)
This now tests for the following drivers:
 - flatfile
 - inifile
 - in-built cdb
 - lmdb
 - TokyoCabinet
 - qdbm
2021-11-03 20:49:37 +00:00
Dmitry Stogov
aa9600cfc6 Merge branch 'PHP-8.1'
* PHP-8.1:
  Tracing JIT: Fixed incorrect guard elimination
2021-11-03 23:46:02 +03:00
George Peter Banyard
f6616846e1
Revert "Refactor php_com_cache_typelib()"
As php_com_typelibraries is a persistent HashTable we need to insert
a persistent string, therefore initialising a new one.

This reverts commit 0497b2bf4b.
2021-11-03 20:44:12 +00:00
Dmitry Stogov
5e39ed08e1 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Tracing JIT: Fixed incorrect guard elimination
2021-11-03 23:37:29 +03:00
Dmitry Stogov
34d22acc7e Tracing JIT: Fixed incorrect guard elimination 2021-11-03 23:37:00 +03:00
DmitryMaksimov
2b32cafd88
Use neutral language instead of default on Windows
Most notably, this affects some Windows specific error messages, which
are no longer in the default language of the system, to better match
error messages provided by PHP which are not localized anyway.

This also affects the com_dotnet extension, where it could fix some
DCOM related issues.  Furthermore, the constant `LOCALE_NEUTRAL` is
added, which can be used for `variant_cmp()`.

Closes GH-7613.
2021-11-03 19:39:20 +01:00
George Peter Banyard
0497b2bf4b
Refactor php_com_cache_typelib() 2021-11-03 17:58:18 +00:00
Dmitry Stogov
e465218e35 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fixed type inference for FETCH_DIM_W without use
2021-11-03 19:45:42 +03:00
Dmitry Stogov
22a171a0b5 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fixed type inference for FETCH_DIM_W without use
2021-11-03 19:45:30 +03:00
Dmitry Stogov
66d93c63ff Fixed type inference for FETCH_DIM_W without use 2021-11-03 19:44:38 +03:00
Derick Rethans
2b5007dcd2 Merge branch 'PHP-8.1' 2021-11-03 16:13:59 +00:00
Derick Rethans
dfb039203b Merge branch 'PHP-8.0' into PHP-8.1 2021-11-03 16:13:49 +00:00
Derick Rethans
5751536dec Merge branch 'PHP-7.4' into PHP-8.0 2021-11-03 16:13:35 +00:00
Derick Rethans
905a1d5011 Merge branch 'PHP-7.3' into PHP-7.4 2021-11-03 16:13:22 +00:00
Derick Rethans
88f99c9c1d Revert "Updated to version 2021.5 (2021e)"
This reverts commit a93ff1df20.
2021-11-03 16:13:05 +00:00
Derick Rethans
64bd602b6a Updated to version 2021.5 (2021e) 2021-11-03 15:49:27 +00:00
Derick Rethans
456bfc7e9e Updated to version 2021.5 (2021e) 2021-11-03 15:49:27 +00:00
Derick Rethans
177225865a Empty merge 2021-11-03 15:49:27 +00:00
Derick Rethans
4d4ec676c4 Empty merge 2021-11-03 15:49:26 +00:00
Derick Rethans
4ec9d07cc3 Updated to version 2021.5 (2021e) 2021-11-03 15:49:25 +00:00
Derick Rethans
b085f79cce Empty merge 2021-11-03 15:49:25 +00:00
Derick Rethans
7c9c722b53 Updated to version 2021.5 (2021e) 2021-11-03 15:49:24 +00:00
Derick Rethans
5715a5e570 Empty merge 2021-11-03 15:49:24 +00:00
Derick Rethans
a93ff1df20 Updated to version 2021.5 (2021e) 2021-11-03 15:49:23 +00:00