1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

108802 Commits

Author SHA1 Message Date
Anatol Belski c571005bd9 Merge branch 'PHP-7.3'
* PHP-7.3:
  Sync version for vc++ 15.9
2018-09-13 19:28:02 +02:00
Anatol Belski 6bd6265845 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Sync version for vc++ 15.9
2018-09-13 19:27:29 +02:00
Anatol Belski 83685b5258 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Sync version for vc++ 15.9
2018-09-13 19:26:49 +02:00
Anatol Belski d77ac7b3dc Sync version for vc++ 15.9 2018-09-13 19:25:23 +02:00
Dmitry Stogov 49b92446d7 Remove zend_check_private() 2018-09-13 13:47:06 +03:00
Dmitry Stogov 50b515f1a2 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix a typo in a class catch in Phar
2018-09-13 13:38:27 +03:00
Dmitry Stogov bc288c4723 Simplify __clone() visibility check (magic methods still don't respect ZEND_ACC_CHANGED). 2018-09-13 13:36:09 +03:00
Tyson Andre 26f952b175 Fix a typo in a class catch in Phar 2018-09-13 11:48:42 +02:00
Dmitry Stogov 72bf2def6b Make visibilty check in is_callable() to be consistent with zend_std_get_method() 2018-09-13 12:24:59 +03:00
Anatol Belski 67a75a79ae Merge branch 'PHP-7.3'
* PHP-7.3:
  Backport changes for OpenSSL 1.1.1 CI integration
2018-09-13 11:07:09 +02:00
Anatol Belski b9bcca0080 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Backport changes for OpenSSL 1.1.1 CI integration
2018-09-13 11:06:47 +02:00
Anatol Belski 922f1a0dcf Backport changes for OpenSSL 1.1.1 CI integration
Add debug message for failing test parts

(cherry picked from commit a45169a6ba)

Show all unmatched errors when test failed

(cherry picked from commit 7015965254)

More possibly colliding libs to remove from the test image

(cherry picked from commit 3008ad1a49)

Remove colliding file from CI image

(cherry picked from commit 6220d21c34)

Fix typo

(cherry picked from commit 24517d82cf)
2018-09-13 11:03:42 +02:00
Anatol Belski 24517d82cf Fix typo 2018-09-13 10:06:49 +02:00
Anatol Belski 6220d21c34 Remove colliding file from CI image 2018-09-13 10:05:27 +02:00
Dmitry Stogov a12cd1c5e0 Split error code into "cold" functions and cleanup. 2018-09-13 10:31:49 +03:00
Dmitry Stogov e1ef054be5 Micro-optimization (condition reordering) 2018-09-13 09:31:38 +03:00
Dmitry Stogov eb4148e02d typo 2018-09-13 08:49:21 +03:00
Anatol Belski 3008ad1a49 More possibly colliding libs to remove from the test image 2018-09-13 00:49:54 +02:00
Dmitry Stogov f79270d876 Micro-optimization 2018-09-13 01:41:19 +03:00
Dmitry Stogov cdeebfd4af Avoid unnecesury iterations over parent classes, in case of no overriden private properties. 2018-09-12 23:47:52 +03:00
Anatol Belski 7015965254 Show all unmatched errors when test failed 2018-09-12 22:27:30 +02:00
Anatol Belski a45169a6ba Add debug message for failing test parts 2018-09-12 19:59:20 +02:00
Dmitry Stogov 5293dd9d8b Optimize method/property visibility checks 2018-09-12 18:59:12 +03:00
Anatol Belski 8a8edac8a5 Merge branch 'PHP-7.3'
* PHP-7.3:
  Improve error code matching
2018-09-12 16:26:26 +02:00
Anatol Belski ed5262b589 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Improve error code matching
2018-09-12 16:25:39 +02:00
Anatol Belski 05a4fec761 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Improve error code matching
2018-09-12 16:24:38 +02:00
Anatol Belski 19ab91781e Improve error code matching 2018-09-12 16:22:22 +02:00
Anatol Belski 385ffea3ab Merge branch 'PHP-7.3'
* PHP-7.3:
  Update binary SDK version for AppVeyor
2018-09-12 12:12:38 +02:00
Anatol Belski a14b69e114 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update binary SDK version for AppVeyor
2018-09-12 12:11:47 +02:00
Anatol Belski aed32f2a03 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update binary SDK version for AppVeyor
2018-09-12 12:11:07 +02:00
Anatol Belski 49511a5132 Update binary SDK version for AppVeyor 2018-09-12 12:09:32 +02:00
Dmitry Stogov 3444c260a2 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed bug #76869 (Incorrect bypassing protected method accessibilty check).
2018-09-12 12:27:48 +03:00
Dmitry Stogov 655a99d131 Fixed bug #76869 (Incorrect bypassing protected method accessibilty check). 2018-09-12 12:16:50 +03:00
Dmitry Stogov beb3594eb8 Better ZEND_ACC_CHANGED handling 2018-09-12 11:43:15 +03:00
Dmitry Stogov aee4b145ef Optimisation: Check for private property in parent class makes sense only if we already found a property info. Check for property started with "\\0" makes sense only if we didn't find property info. 2018-09-12 09:57:36 +03:00
Dmitry Stogov 73efd1b651 Simplify method visibility checks 2018-09-12 08:31:01 +03:00
Ferenc Kovacs 34f4ecee25 Merge branch 'PHP-7.3' 2018-09-12 00:08:34 +02:00
Ferenc Kovacs 58735c59b1 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-12 00:06:33 +02:00
Ferenc Kovacs f56eeb1779 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-12 00:04:40 +02:00
Ferenc Kovacs 68a77fe3d8 Merge branch 'PHP-7.0' into PHP-7.1 2018-09-12 00:02:18 +02:00
Ferenc Kovacs cba6055cac Merge branch 'PHP-5.6' into PHP-7.0 2018-09-12 00:00:46 +02:00
Ferenc Kovacs 81f23057dc 5.6.39 will be the next 2018-09-11 23:58:17 +02:00
Dmitry Stogov 83fe1f1cc8 Use Zend API helper functions 2018-09-11 23:50:43 +03:00
Dmitry Stogov 1cc0d78c9b This increment is not necessary anymore. 2018-09-11 22:56:31 +03:00
Dmitry Stogov 06f056a760 Additional fix for bug #76860. 2018-09-11 18:29:27 +03:00
Christoph M. Becker 3f41ce75bb Merge branch 'PHP-7.3'
* PHP-7.3:
  [ci skip] Update NEWS wrt. php-7.3.RC1 tagging
2018-09-11 16:30:52 +02:00
Christoph M. Becker e6585a472e [ci skip] Update NEWS wrt. php-7.3.RC1 tagging 2018-09-11 16:28:36 +02:00
Dmitry Stogov 0fbd2e6a16 Renumber ZEND_ACC_... flags 2018-09-11 17:21:17 +03:00
Dmitry Stogov 1570fe180f Removed weird test, trait can't be "static" or "final". 2018-09-11 17:07:06 +03:00
Nikita Popov e1123e3e4e Drop unused variable 2018-09-11 15:16:11 +02:00