php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
112,357 Commits 549 Branches 1,486 Tags
39caedac3e855fad2f1803bfbfaf82a31cd0aedf
Commit Graph

2219 Commits

Author SHA1 Message Date
Gabriel Caruso f13ad7836c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix typo in comments
 2019-04-19 13:12:21 -03:00
Fabien Villepinte baa9669392 Fix typo in comments 2019-04-19 13:11:50 -03:00
Nikita Popov 772a158d7a Merge branch 'PHP-7.4' 2019-04-16 10:40:01 +02:00
Nikita Popov 32fb2d9343 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-16 10:39:48 +02:00
Nikita Popov 9a9eed472b Fix second part of bug #77903 
When a HT iterator is one past the end and we rehash, we need to make
sure that it is move to the new one past the end position, to make
sure that newly inserted elements are picked up.
 2019-04-16 10:38:20 +02:00
Nikita Popov e1b4cabbd6 Partial fix for bug #77903 
In the hash position APIs, make sure we always advance to the next
non-undef element and not just when the position is 0 (similar to
what foreach does). This can happen when the position of an
ArrayIterator is one past its current end and a new element is
inserted not directly at that position because the array is packed.

There is still a bug here (as shown in the tests), but this is a
separate issue that also affects plain array iteration in foreach.
 2019-04-16 10:23:11 +02:00
Nikita Popov b8e5c07183 Merge branch 'PHP-7.4' 2019-04-15 13:22:00 +02:00
Nikita Popov 5fc71c7dba Correctly destroy reference in ArrayObject sort 
The reference may be captured in an exception backtrace, in which
case the refcount may be more than one.
 2019-04-15 13:21:45 +02:00
Gabriel Caruso 12446aafce Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove HAVE_* for always available extensions
 2019-04-14 11:51:39 -03:00
Gabriel Caruso 656db96eb9 Remove HAVE_* for always available extensions 2019-04-14 11:44:12 -03:00
Nikita Popov 771c64edcc Merge branch 'PHP-7.4' 2019-04-11 15:23:29 +02:00
Nikita Popov 2d823cb681 Fix error message in spl_autoload test 2019-04-11 15:22:59 +02:00
Nikita Popov dc17ca6044 Remove redundant $this args in SplObjectStorage implementation 
If we pass intern we can get the object from &intern->std, no need
to pass around an extra argument everywhere.
 2019-04-10 09:44:06 +02:00
Nikita Popov 03783bb55d Merge branch 'PHP-7.4' 2019-04-10 09:40:06 +02:00
Nikita Popov e2ea0f105c Fix bug #77866: Port Serializable SPL classes to use __unserialize() 
Payloads created using Serializable are still supported.
 2019-04-10 09:36:39 +02:00
Peter Kokot 1522a12974 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Clean ext/spl/tests/bug42364.phpt files after tests
 2019-04-02 23:24:27 +02:00
Peter Kokot bb8ea4d64d Clean ext/spl/tests/bug42364.phpt files after tests 2019-04-02 23:24:21 +02:00
Nikita Popov d7348cd2b4 Merge branch 'PHP-7.4' 2019-03-22 10:30:15 +01:00
Nikita Popov e7e2056d1a Remove HAVE_PCRE/HAVE_BUNDLED_PCRE checks 
PCRE is always available.
 2019-03-22 10:29:18 +01:00
Peter Kokot 61d9e53ed9 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove extension readmes
 2019-03-19 20:26:07 +01:00
Peter Kokot 38b22448f8 Remove extension readmes 
This patch removes several extension readmes in favor of the PHP manual
and where possible.
 2019-03-19 20:25:32 +01:00
Nikita Popov e67d872e3e Merge branch 'PHP-7.4' 2019-03-18 12:33:12 +01:00
Nikita Popov 275fa53564 Accept zend_string* instead of char* in php_pcre_match_impl() 2019-03-18 12:32:06 +01:00
Nikita Popov 3bbabc1f61 Merge branch 'PHP-7.4' 2019-03-18 11:07:43 +01:00
Nikita Popov 4eb9e93728 Merge branch 'PHP-7.3' into PHP-7.4 2019-03-18 11:07:36 +01:00
Nikita Popov 82fbaab53c Merge branch 'PHP-7.2' into PHP-7.3 2019-03-18 11:07:27 +01:00
Nikita Popov 4f03401628 Partial fix for bug #77751 
This avoids the segfault, but it will not make writing to the
SplFileObject during output shutdown work.
 2019-03-18 11:06:23 +01:00
Peter Kokot 6426420f61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests
 2019-03-15 23:36:47 +01:00
Fabien Villepinte 26dfce7f36 Replace dirname(__FILE__) by __DIR__ in tests 2019-03-15 22:55:30 +01:00
Nikita Popov 852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Nikita Popov 6bfb119e18 Remove some unnecessary error handler setting 
A few non-standard exceptions thrown on zpp failures will change to
TypeError due to this.
 2019-03-11 11:32:20 +01:00
Nikita Popov 17fb7241e4 Merge branch 'PHP-7.4' 2019-03-06 13:45:13 +01:00
Nikita Popov 8c62c69265 More zpp error/variation test removals 
Some of these tests also check non-zpp conditions -- however, there is
always some other test that also checks those error conditions.
 2019-03-06 13:40:22 +01:00
Christoph M. Becker ae1fad5bb7 Fix #77431 SplFileInfo::__construct() accepts NUL bytes 
`SplFileInfo::__construct()` has to expect a path instead of a string,
analogous to `SplFileObject::__construct()`.
 2019-03-03 23:34:00 -08:00
Stanislav Malyshev 534a18c08f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 22:20:49 -08:00
Stanislav Malyshev e3f7c352dc Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 22:20:42 -08:00
Stanislav Malyshev 8363df3703 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 22:20:35 -08:00
Christoph M. Becker 254a5914ad Fix #77431 SplFileInfo::__construct() accepts NUL bytes 
`SplFileInfo::__construct()` has to expect a path instead of a string,
analogous to `SplFileObject::__construct()`.
 2019-03-03 18:23:46 -08:00
Nikita Popov 57561bd129 Merge branch 'PHP-7.4' 2019-03-01 15:35:18 +01:00
Nikita Popov 51dacafc64 Use separate files for SplFileObject::setCsvControl() tests 2019-03-01 15:32:02 +01:00
Nikita Popov c8e2b333cb Merge branch 'PHP-7.4' 2019-02-20 11:22:31 +01:00
Nikita Popov f5872614d8 Make ext/spl/tests/bug42364.phpt more robust 
If tests are run in parallel, files may be created and deleted in
the directory. Create a separate directory just for this test to
avoid this dependence.
 2019-02-20 11:19:55 +01:00
Dmitry Stogov 832d683334 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Use ZEND_ACC_REUSE_GET_ITERATOR flag instead of run-time class modification
 2019-02-20 02:33:11 +03:00
Dmitry Stogov f2e515e9eb Use ZEND_ACC_REUSE_GET_ITERATOR flag instead of run-time class modification 2019-02-20 02:32:29 +03:00
Nikita Popov e517cffd92 Merge branch 'PHP-7.4' 2019-02-18 13:58:40 +01:00
Dmitry Stogov c9ffae1bec Fixed bug #77633 
Add a new class flag to inherit get_iterator() when implementing
the Iterator/IteratorAggregate interfaces and use it for
ArrayIterator.
 2019-02-18 13:47:44 +01:00
Peter Kokot 9dc8cd5cc2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  SplDoublyLinkedList Iterating a DLL by reference shouldn't be permitted
 2019-02-17 19:36:13 +01:00
MarkBaker a84227650a SplDoublyLinkedList Iterating a DLL by reference shouldn't be permitted 2019-02-17 19:35:13 +01:00
Fabien Villepinte ce7552af38 Fixed bug #77619 
Fix MultipleIterator::__construct() arginfo
 2019-02-14 17:03:52 +01:00
Nikita Popov a302d11610 Don't silence fatal errors with @ 2019-02-11 16:17:55 +01:00