Commit Graph

115359 Commits

Author SHA1 Message Date
Nikita Popov
f61f122b9a Merge branch 'PHP-7.4' 2019-09-12 16:41:45 +02:00
Nikita Popov
4b9ebd837b Allow throwing exception while loading parent class
This is a fix for symfony/symfony#32995.

The behavior is:

* Throwing exception when loading parent/interface is allowed
  (and we will also throw one if the class is simply not found).
* If this happens, the bucket key for the class is reset, so
  it's possibly to try registering the same class again.
* However, if the class has already been used due to a variance
  obligation, the exception is upgraded to a fatal error, as we
  cannot safely unregister the class stub anymore.
2019-09-12 16:41:18 +02:00
Christoph M. Becker
b59f6e4fb1 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix exif build
  NEWS
2019-09-12 09:14:27 +02:00
Christoph M. Becker
679cbee870 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix exif build
  NEWS
2019-09-12 09:14:08 +02:00
Christoph M. Becker
31f617d9bc Fix exif build
As of PHP 7.3.0 the `model` field is removed.
2019-09-12 09:13:27 +02:00
Kalle Sommer Nielsen
f6f981c13c Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  NEWS
2019-09-12 06:52:24 +03:00
Kalle Sommer Nielsen
716518373f NEWS 2019-09-12 06:50:53 +03:00
Kalle Sommer Nielsen
c2d661c2e1 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:34:35 +03:00
Kalle Sommer Nielsen
89227fba99 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:33:40 +03:00
Kalle Sommer Nielsen
6f0e5a45ff Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:31:52 +03:00
Kalle Sommer Nielsen
2823e938d4 Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7) 2019-09-12 06:21:39 +03:00
Nikita Popov
a09da43888 Merge branch 'PHP-7.4' 2019-09-11 17:05:07 +02:00
Nikita Popov
d88b212ea6 Improve "already declared" error message
If this error is missing because the rtd_key was renamed to lcname,
fetch the class based on lcname and use the class type and cased
name from there.
2019-09-11 17:04:13 +02:00
Nikita Popov
a97645eb0a Merge branch 'PHP-7.4' 2019-09-11 16:51:30 +02:00
Nikita Popov
fbe287a677 Fix typo in unlinked_instanceof assertion 2019-09-11 16:50:16 +02:00
Nikita Popov
403396e42c Merge branch 'PHP-7.4' 2019-09-11 16:30:59 +02:00
Nikita Popov
270e5e3c5b Only allow "nearly linked" classes for parent/interface
The requirements for parent/interface are difference than for the
variance checks in type declarations. The latter can work on fully
unlinked classes, but the former need inheritance to be essentially
finished, only variance checks may still be outstanding.

Adding a new flag for this because we have lots of space, but we
could also represent these "inheritance states" more compactly in
the future.
2019-09-11 16:27:28 +02:00
Nikita Popov
7992a712a9 Merge branch 'PHP-7.4' 2019-09-11 12:02:39 +02:00
Nikita Popov
b7c353c8d0 Specify -fsanitize-no-recover
To make it more obvious when there are ubsan failures.
2019-09-11 11:59:33 +02:00
Nicolas Grekas
aee31dd7e4 Improve Symfony test setup
Perform PHPUnit installation under php7.3 -- which will also make
it work on master.

Also properly resolve the tty issue by specifying excluded groups
during the test run.
2019-09-11 11:15:23 +02:00
Nikita Popov
9ca21b9d0a Merge branch 'PHP-7.4' 2019-09-11 11:13:33 +02:00
Nikita Popov
f945c82ec6 Free history_get_history_state() result
It's not documented, but per https://bugs.python.org/issue8065
the result is freshly malloc'd and needs to be freed.
2019-09-11 10:59:04 +02:00
Nikita Popov
f10eb9f756 Merge branch 'PHP-7.4' 2019-09-11 10:32:27 +02:00
Nikita Popov
1ce830a4aa Fix another pointer indexing UB in http_fopen_wrapper
Only compute the gep after checking whether the pointer is NULL.
2019-09-11 10:31:03 +02:00
Nikita Popov
11f3e24190 Fixed bug #78506 2019-09-11 10:27:32 +02:00
Nikita Popov
c70bab7b24 Merge branch 'PHP-7.4' 2019-09-11 09:53:18 +02:00
Nikita Popov
0a24cd4e7c Preloading: Fix handling of static vars in inherited methods
Part of bug #78512.
2019-09-11 09:53:10 +02:00
Dmitry Stogov
e5af673e45 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bad format string
2019-09-11 00:53:30 +03:00
Dmitry Stogov
5f555fb19e Fixed bad format string 2019-09-11 00:52:54 +03:00
Sara Golemon
76fa2111e0 Merge branch 'PHP-7.4'
* PHP-7.4:
  Bump for 7.2.24
2019-09-10 13:05:56 -04:00
Sara Golemon
e9cb68d4f3 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Bump for 7.2.24
2019-09-10 13:05:38 -04:00
Sara Golemon
e2bdd7b4ab Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Bump for 7.2.24
2019-09-10 13:05:17 -04:00
Sara Golemon
a270eb1911 Bump for 7.2.24 2019-09-10 13:04:01 -04:00
Remi Collet
3d7cd00e97 Merge branch 'PHP-7.4'
* PHP-7.4:
  Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
2019-09-10 16:30:39 +02:00
Remi Collet
d78ffd54ef Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
2019-09-10 16:29:44 +02:00
Remi Collet
664b1a3f57 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
2019-09-10 16:29:30 +02:00
Remi Collet
c43fc204b1 Raise minimal GCC version,
Test with 4.8 is OK
With 4.4: error: #pragma GCC diagnostic not allowed inside functions
2019-09-10 16:28:35 +02:00
Christoph M. Becker
bd57fc747f Merge branch 'PHP-7.4'
* PHP-7.4:
  PHP 7.3.10RC1 has been tagged
2019-09-10 15:13:52 +02:00
Christoph M. Becker
abc564462f Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  PHP 7.3.10RC1 has been tagged
2019-09-10 15:13:11 +02:00
Christoph M. Becker
cf31210f29 PHP 7.3.10RC1 has been tagged 2019-09-10 15:11:54 +02:00
Peter Cowburn
4253811c42 upgrading notes for ValueError/zend_value_error() 2019-09-10 13:19:24 +01:00
Dmitry Stogov
02c83b809a ceanup 2019-09-10 15:12:42 +03:00
Christoph M. Becker
4f4074328c Prefer ValueError over Error in GD
Cf. <https://github.com/php/php-src/pull/4682>.
2019-09-10 12:37:42 +02:00
Florian Weimer
aeaab8ee3e Port various autoconf bits to C99 compilers
C99 no longer has implicit function declarations and implicit ints.
Current GCC versions enable them as an extension, but this will
change in a future GCC version.
2019-09-10 12:32:14 +02:00
Dmitry Stogov
0128f6eb84 Merge branch 'PHP-7.4'
* PHP-7.4:
  NEWS entry, test and minor cleanup for FFI::isNull()
  add FFI::isNull() to check whether a FFI\CData is a null pointer
2019-09-10 11:34:08 +03:00
Dmitry Stogov
989959fb16 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Drop regression test
2019-09-10 11:23:53 +03:00
Dmitry Stogov
21c3cdf668 NEWS entry, test and minor cleanup for FFI::isNull() 2019-09-10 11:23:12 +03:00
Dmitry Stogov
825dac1445 Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src:
  Drop regression test
2019-09-10 11:22:05 +03:00
Christoph M. Becker
2bb77e6367 Merge branch 'PHP-7.4'
* PHP-7.4:
  Drop regression test
2019-09-10 10:09:02 +02:00
Christoph M. Becker
280e40fadd Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Drop regression test
2019-09-10 10:08:42 +02:00