clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
102,684 Commits 491 Branches 1,363 Tags 837 MiB
f00d1c72b4
Commit Graph

102684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
f00d1c72b4 Added ZEND_GET_CLASS, ZEMD_GET_CALLED_CLASS, ZEND_GET_TYPE instructions, to implement corresponding builtin functions. 2017-05-25 18:41:28 +03:00
Derick Rethans
546dd2af96 Merge branch 'PHP-7.1' 2017-05-25 10:57:15 -04:00
Derick Rethans
fc87715950 Added a test case for (docs) bug #74652 2017-05-25 10:57:09 -04:00
Dmitry Stogov
34be1cf2aa Fixed test (backtrace was changed) 2017-05-25 16:02:16 +03:00
Dmitry Stogov
cd953269d3 Added ZEND_COUNT instruction, to implement corresponding builtin. 2017-05-25 12:52:34 +03:00
Dmitry Stogov
27e7aea412 "Countable" interface is moved from SPL to Core 2017-05-25 12:47:43 +03:00
Dmitry Stogov
44ec732752 Fixed ZEND_IN_ARRAY related issues 2017-05-25 10:26:42 +03:00
Dmitry Stogov
13ee8fd626 Improved UTF-8 validation in JSON 2017-05-25 01:16:17 +03:00
Dmitry Stogov
fa828dbe84 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Remove `user=foo` from FPM test config
  Skip FPM tests when running as root (unless requested)
 2017-05-25 01:16:06 +03:00
Sara Golemon
d316ba2d65 Remove user=foo from FPM test config 
This setting has nothing to do with what's being tested,
and on any system without a "foo" user we'll get a spurious error.
 2017-05-24 15:07:24 -07:00
Sara Golemon
d8d1c78ed0 Skip FPM tests when running as root (unless requested) 
FPM must be configured as a user.
Normally it defaults to the current user,
but if that's root it'll fail to startup
unless the --run-as-root option is provided.

Extend that logic into the test runner so that
we don't fail for stupid reasons.

If you're running `make test` as root and you want
FPM tests to run anyway, set TEST_FPM_RUN_AS_ROOT=1
in your environment.
 2017-05-24 13:58:18 -07:00
Dmitry Stogov
89b3c9f647 Optimizer support for ZEND_IN_ARRAY 2017-05-24 23:37:35 +03:00
Dmitry Stogov
7c7383067f Added ZEND_IN_ARRAY instruction, implementing optimized in_array() builtin function, through hash lookup in flipped array 2017-05-24 23:00:48 +03:00
Nikita Popov
5c3d14d43f Merge branch 'PHP-7.1' 2017-05-24 18:02:22 +02:00
Nikita Popov
e7a7065024 Merge branch 'PHP-7.0' into PHP-7.1 2017-05-24 18:02:13 +02:00
jhdxr
872e43d6e5 Fixed bug #74478 2017-05-24 18:01:41 +02:00
Pedro Magalhães
a5eb57c96e Allow overriding abstract methods 
RFC: https://wiki.php.net/rfc/allow-abstract-function-override
 2017-05-24 17:42:01 +02:00
Sara Golemon
5dc43b4c9d Run scripts/dev/credits 2017-05-23 16:35:36 -07:00
Sara Golemon
92056aee85 Merge branch 'PHP-7.1' 
7.1.x release shouldn't have been pn mainline PHP-7.1 branch
Fix the merge history to keep master in place.

* PHP-7.1:
  bump versions
 2017-05-23 16:29:11 -07:00
Joe Watkins
e535b80257
bump versions 2017-05-23 22:04:01 +01:00
Dmitry Stogov
dd4a78b631 Don't separate output arguments 2017-05-23 17:18:05 +03:00
Dmitry Stogov
490960d861 Avoid useless string duplication 2017-05-23 15:25:21 +03:00
Anatol Belski
e8294cd50d Merge branch 'PHP-7.1' 
* PHP-7.1:
  time to move next
 2017-05-23 12:34:07 +02:00
Anatol Belski
056cb8c256 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  time to move next
 2017-05-23 12:33:23 +02:00
Anatol Belski
fff1cab367 time to move next 2017-05-23 12:31:03 +02:00
Dmitry Stogov
293d99052d Optimized parse_url() by using "known" strings 2017-05-22 23:23:12 +03:00
Xinchen Hui
26a6d20ab5 Fixed segfult in JIT (emalloc may trigger memory limitation) 
Zend/tests/bug68412.phpt
 2017-05-21 20:48:07 +08:00
Anatol Belski
5d3027d759 Merge branch 'PHP-7.1' 
* PHP-7.1:
  move to the next sdk version for AppVeyor
 2017-05-20 13:52:35 +02:00
Anatol Belski
65bf0364b6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move to the next sdk version for AppVeyor
 2017-05-20 13:51:18 +02:00
Anatol Belski
c4ae856912 move to the next sdk version for AppVeyor 2017-05-20 13:48:35 +02:00
Xinchen Hui
dd0795ac33 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update news
  Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters
 2017-05-20 00:03:17 +08:00
Xinchen Hui
11b4f105bf Merge branch '74595-reflection-parameters' of https://github.com/andrewnester/php-src into PHP-7.1 
* '74595-reflection-parameters' of https://github.com/andrewnester/php-src:
  Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters
 2017-05-19 23:59:43 +08:00
Xinchen Hui
08293a960b Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  follow up fix on bug #74022
  Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators)
 2017-05-19 23:56:31 +08:00
Xinchen Hui
459c382df5 Update news 2017-05-19 23:56:10 +08:00
Dmitry Stogov
372397f518 Updated func info 2017-05-18 19:24:30 +03:00
Dmitry Stogov
a08723d3d3 Use interned empty and "one char" strings. 2017-05-18 17:59:59 +03:00
Dmitry Stogov
b1a07d430b Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  follow up fix on bug #74022
 2017-05-18 13:18:47 +03:00
Dmitry Stogov
8203a175b1 Remove unused opcode handlers 2017-05-18 13:18:08 +03:00
Anatol Belski
f8f8f24024 Merge branch 'PHP-7.1' 
* PHP-7.1:
  follow up fix on bug #74022
 2017-05-18 12:10:17 +02:00
Anatol Belski
26f217bf40 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  follow up fix on bug #74022
 2017-05-18 12:07:09 +02:00
Anatol Belski
464c1639ae follow up fix on bug #74022 2017-05-18 12:03:13 +02:00
Sara Golemon
b627e33a8d Bugfix 63790 - Don't try to use Spoofchecker when unavailable 
ICUSpoofChecker was introduced with 4.2 and may be
unavailable in some cases.
Skip this test when its not present.
 2017-05-17 17:25:23 -07:00
Dmitry Stogov
2649a9e1a9 Removed useless dereferences 2017-05-17 21:01:08 +03:00
Bob Weinand
ccb5591728 Merge branch 'PHP-7.1' 2017-05-17 19:59:36 +02:00
Bob Weinand
649494c0ee Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators) 
Thanks to Nikita for pointing out the error source.
 2017-05-17 19:58:51 +02:00
Xinchen Hui
23ea38d8f7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added cleanup
 2017-05-17 23:25:34 +08:00
Xinchen Hui
78b10dd9d6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added cleanup
 2017-05-17 23:25:17 +08:00
Xinchen Hui
0954ea8d6d Added cleanup 2017-05-17 23:24:58 +08:00
Xinchen Hui
af0c443dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added test for bug #74600
 2017-05-17 23:21:42 +08:00
Xinchen Hui
f38487a0e0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added test for bug #74600
 2017-05-17 23:21:38 +08:00