php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
113,214 Commits 549 Branches 1,485 Tags
3820296c42e146cc080bc24314ccdfdd700e743e
Commit Graph

113214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov 3820296c42 Merge branch 'PHP-7.4' 2019-06-06 11:48:54 +02:00
Nikita Popov 3372f2cf2c php_zip_pcre: Match pattern before stating for directories 
For two reasons: First, it's generally cheaper to match a regex than
perform a stat (especially on Windows). Second, it will not fail on
concurrent modification of a directory in parts that are not matched
by the pattern, such as the spurious failure in ext/zip/tests/bug72660.phpt.
 2019-06-06 11:46:23 +02:00
Nikita Popov 8b2741c1c3 Fix accidentially dropped type 
I only meant to drop the MAY_BE_FALSE here, not the MAY_BE_ARRAY...
 2019-06-06 10:07:59 +02:00
Christoph M. Becker ac8c4a4853 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78114: segfault when calling sodium_* functions from eval
 2019-06-06 10:01:44 +02:00
Christoph M. Becker b2b528b973 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78114: segfault when calling sodium_* functions from eval
 2019-06-06 10:01:12 +02:00
Christoph M. Becker 22a3fa0b2e Fix #78114: segfault when calling sodium_* functions from eval 
We must not follow the NULL pointer.
 2019-06-06 10:00:15 +02:00
Nikita Popov 252216b2de Remove possible false return value from get_object_vars() 
I'm not sure this one ever happens in practice (and we might want
to forbid NULL return from get_properties), but if it does, return
an empty array instead of false.
 2019-06-06 09:49:25 +02:00
Dmitry Stogov a8ac6e6604 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Update release-process.md
 2019-06-06 02:24:00 +03:00
Dmitry Stogov e029cc4dd4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Cheaper checks for exceptions thrown from __toString()
 2019-06-06 02:23:17 +03:00
Sara Golemon 642b8d00e0 Update release-process.md 2019-06-05 19:05:38 -04:00
Dmitry Stogov 457392fa64 Cheaper checks for exceptions thrown from __toString() 2019-06-06 01:47:22 +03:00
Dmitry Stogov b4d21310cb Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed reference-counting
 2019-06-06 01:40:59 +03:00
Dmitry Stogov 90a2e4ba66 Fixed reference-counting 2019-06-06 01:40:40 +03:00
Joe Watkins d6f93ca753 fix test 2019-06-05 20:23:31 +02:00
Joe Watkins 69f6458849 Revert "this test is flaky on azure, and can't see why from current output" 
This reverts commit 6f9a06cb74.
 2019-06-05 20:22:44 +02:00
Joe Watkins 120d383020 Merge branch 'PHP-7.4' 
* PHP-7.4:
  junit testcase classname is used as filename on azure
 2019-06-05 19:28:41 +02:00
Joe Watkins bed8ae1d0f junit testcase classname is used as filename on azure 2019-06-05 19:27:50 +02:00
Joe Watkins 9e49a545aa Merge branch 'PHP-7.4' 
* PHP-7.4:
  this test is flaky on azure, and can't see why from current output so refactored, and restored an accidentally removed check (resource)
 2019-06-05 19:26:33 +02:00
Joe Watkins 6f9a06cb74 this test is flaky on azure, and can't see why from current output 
so refactored, and restored an accidentally removed check (resource)
 2019-06-05 19:24:41 +02:00
Dmitry Stogov 5f3ee3afe7 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Prevent generation of specialized ZEND_ASSIGN_OP_..._STATIC_PROP handlers, that call unspecialized helper, anyway.
 2019-06-05 17:38:36 +03:00
Dmitry Stogov 3f4dfe1877 Prevent generation of specialized ZEND_ASSIGN_OP_..._STATIC_PROP handlers, that call unspecialized helper, anyway. 2019-06-05 17:38:13 +03:00
Joe Watkins f47bd9f17a Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix flaky posix test
 2019-06-05 16:36:41 +02:00
Joe Watkins 829d046241 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix flaky posix test
 2019-06-05 16:35:55 +02:00
Joe Watkins 249c20023d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix flaky posix test
 2019-06-05 16:35:43 +02:00
Joe Watkins f4474e5724 fix flaky posix test 2019-06-05 16:34:50 +02:00
Nikita Popov cc286e5bd5 Merge branch 'PHP-7.4' 2019-06-05 15:34:56 +02:00
Nikita Popov b964298c19 Deprecate ReflectionType::__toString() 
We weren't able to do this in 7.1 because the deprecation notice
may be converted to an exception and __toString() can't throw,
which means that it ultimately become a fatal error. This issue
is resolved now, so we can mark the method as deprecated.
 2019-06-05 15:33:52 +02:00
Nikita Popov d3ed9d8192 Make sure array_splice() always returns an array 
Return an array even if the return value isn't used. This allows us
to add the arginfo return type.
 2019-06-05 14:56:32 +02:00
Nikita Popov 7686b0b889 Merge branch 'PHP-7.4' 2019-06-05 14:53:50 +02:00
Nikita Popov a31f46421d Allow exceptions in __toString() 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
 2019-06-05 14:25:07 +02:00
Nikita Popov 03a9c2df7b Merge branch 'PHP-7.4' 2019-06-05 11:58:20 +02:00
Nikita Popov 528aa7932a Use zero port in socket_(export|import)_stream-5.phpt 
These regularly fail due to port clashes, though we don't seem to
use those ports in any other tests.

As we don't care about the specific port that is used here, pass
zero so that a random ephemeral port is used.
 2019-06-05 11:58:11 +02:00
Remi Collet cd687a4953 Merge branch 'PHP-7.4' 
* PHP-7.4:
  ignore first gets time which is usually a few ms only
 2019-06-05 11:50:20 +02:00
Remi Collet a0ce1df024 ignore first gets time which is usually a few ms only 
in previous version, max_ms was "1" and "10" in travis/appveyor
having 10 by default make it fails on fast computer
 2019-06-05 11:48:48 +02:00
Nikita Popov 21947e37a2 Merge branch 'PHP-7.4' 2019-06-05 11:30:20 +02:00
Nikita Popov 9cf6a5413a Make mysqli_connect arguments explicitly nullable 
It should be possible to skip any of these (and use the ini configured
defaults) by passing null, independently of strict_types settings.

Noticed while working on GH-4227.
 2019-06-05 11:30:13 +02:00
Remi Collet 6a0a091333 Merge branch 'PHP-7.4' 
* PHP-7.4:
  keep DIR option to --with-unixODBC for old versions without libodbc.pc
 2019-06-05 10:56:25 +02:00
Remi Collet 8f854c1099 keep DIR option to --with-unixODBC for old versions without libodbc.pc 2019-06-05 10:56:10 +02:00
Nikita Popov 401e5ebf24 Merge branch 'PHP-7.4' 2019-06-05 10:06:04 +02:00
Peter Kokot ac9ce0f895 Fixed bug #78102 2019-06-05 10:04:57 +02:00
Nikita Popov 46d5a9bef9 Avoid concurrent directory writes in FilesystemIterator test 
The test directory is often used for temporary files, let's use
the source directory, which should be more stable. If that doesn't
work we need to create a temporary directory.
 2019-06-05 09:58:59 +02:00
Gabriel Caruso 192170a39a Add return type to some array_* functions 2019-06-05 00:13:52 -03:00
Joe Watkins 2cfb525096 Merge branch 'PHP-7.4' 
* PHP-7.4:
  add azure pipelines badge to readme [ci skip]
 2019-06-04 17:12:10 +02:00
Joe Watkins cb9bb146d9 add azure pipelines badge to readme [ci skip] 2019-06-04 17:11:16 +02:00
Nikita Popov 6f31f03fd7 Merge branch 'PHP-7.4' 2019-06-04 16:28:14 +02:00
Nikita Popov 524dbee15b Merge branch 'PHP-7.3' into PHP-7.4 2019-06-04 16:28:08 +02:00
Nikita Popov d154301866 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-04 16:27:57 +02:00
Nikita Popov a3e6b50442 Fixed bug #78050 
This is a backport of a982125561.
 2019-06-04 16:26:34 +02:00
Nikita Popov 623eedbbd5 Merge branch 'PHP-7.4' 2019-06-04 16:14:46 +02:00
Nikita Popov f4bac9a438 Actually load opcache on Azure 2019-06-04 16:14:34 +02:00