1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Commit Graph

73732 Commits

Author SHA1 Message Date
David Soria Parra
ec26c93eff Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for array_column
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:14:33 +01:00
David Soria Parra
66b4e5cdec NEWS for array_column 2013-03-20 13:14:20 +01:00
David Soria Parra
0173c4bab0 Merge branch 'pull-request/257' into PHP-5.5
* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Pierre Joye
fa161e9a67 Merge branch 'PHP-5.5'
* PHP-5.5:
  - ws

Conflicts:
	UPGRADING
2013-03-20 12:38:22 +01:00
Pierre Joye
15ecea7602 - ws 2013-03-20 12:37:13 +01:00
Pierre Joye
09854f1fb9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING
2013-03-20 12:34:51 +01:00
Pierre Joye
ff7d7bb290 - add gd changes 2013-03-20 12:34:01 +01:00
Pierre Joye
83e81c40ae Merge branch 'PHP-5.5'
* PHP-5.5:
  - update the comment to match the code/features
2013-03-20 12:29:56 +01:00
Pierre Joye
f0078897c7 - update the comment to match the code/features 2013-03-20 12:29:47 +01:00
Pierre Joye
2799534296 Merge branch 'master' of git.php.net:php-src 2013-03-20 12:20:32 +01:00
Pierre Joye
bc7b287a61 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add imageaffinematrixget and imagematrixconcat
  - add affine matrix helper for translate, scale, rotate and shear
  - fix unix build
  - add new files for interpolation
  - config.m4 sync with .w32
  - add new interpolation method   . imagescale   . imageaffine   . replace imagerotate with new generic and optimized new implementations   . imagesetinterpolationmethod, to set the default interpolation to be     used with the new functions   . add imagepalettetotruecolor
2013-03-20 12:19:46 +01:00
Pierre Joye
1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00
Pierre Joye
780c6e0a9c - add affine matrix helper for translate, scale, rotate and shear 2013-03-20 11:01:37 +01:00
Pierre Joye
a46065ef71 - fix unix build 2013-03-20 09:24:54 +01:00
Anatol Belski
7daabc42a2 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:15:46 +01:00
Anatol Belski
bf8026aacf updated NEWS 2013-03-20 09:15:16 +01:00
Anatol Belski
0125ec77d2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:14:13 +01:00
Anatol Belski
0881ff0466 updated NEWS 2013-03-20 09:13:13 +01:00
Anatol Belski
06a526be3e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Pierre Joye
a7a53d369b - add new files for interpolation 2013-03-20 08:10:54 +01:00
Pierre Joye
00a53ca817 - config.m4 sync with .w32 2013-03-20 07:52:23 +01:00
Pierre Joye
22159fb7b7 - add new interpolation method
. imagescale
  . imageaffine
  . replace imagerotate with new generic and optimized new implementations
  . imagesetinterpolationmethod, to set the default interpolation to be
    used with the new functions
  . add imagepalettetotruecolor
2013-03-20 07:46:59 +01:00
Stanislav Malyshev
b5a7675836 Merge branch 'PHP-5.5'
* PHP-5.5:
  clarify NEWS
2013-03-19 23:26:42 -07:00
Stanislav Malyshev
5aaff8d634 clarify NEWS 2013-03-19 22:32:50 -07:00
Ben Ramsey
f5bf1ba88f array_column: Fix compile-time warnings 2013-03-19 20:44:19 -05:00
Anatol Belski
1cdf2c49ba Merge branch 'PHP-5.5'
* PHP-5.5:
  Backported fix for bug #62852
2013-03-19 21:23:08 +01:00
Anatol Belski
cb76420fe0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Backported fix for bug #62852
2013-03-19 21:22:49 +01:00
Anatol Belski
cfd096fd7c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported fix for bug #62852
2013-03-19 21:22:09 +01:00
Anatol Belski
8d199c7c4f Backported fix for bug #62852 2013-03-19 21:19:55 +01:00
David Soria Parra
d9f5056dba Merge branch 'PHP-5.5'
* PHP-5.5:
  Refer to Zend Optimizer as Zend Opcache from now on
2013-03-19 16:21:14 +01:00
David Soria Parra
5e55c6d9fd Refer to Zend Optimizer as Zend Opcache from now on 2013-03-19 16:20:37 +01:00
David Soria Parra
12877372ac Merge branch 'PHP-5.5'
* PHP-5.5:
  ZO+ NEWS
2013-03-19 15:55:36 +01:00
David Soria Parra
60b36a6819 ZO+ NEWS 2013-03-19 15:54:57 +01:00
Anatol Belski
da1aa323fe Merge branch 'master' of git.php.net:php-src 2013-03-19 15:16:16 +01:00
Anatol Belski
25b84546a8 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-19 15:15:31 +01:00
Anatol Belski
5cea998c5d Merge branch 'PHP-5.5'
* PHP-5.5:
  fix C89 compat
2013-03-19 15:14:03 +01:00
Anatol Belski
b3d82845db fix C89 compat 2013-03-19 15:13:27 +01:00
David Soria Parra
d90a85c3bd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix typos
2013-03-19 15:11:56 +01:00
David Soria Parra
c542e969f2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix typos
2013-03-19 15:11:48 +01:00
Carson McDonald
c6f6bf88d8 Fix typos 2013-03-19 15:11:34 +01:00
Anatol Belski
ce04268bb9 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-19 14:50:05 +01:00
Anatol Belski
11567299d5 Merge branch 'master' of git.php.net:php-src 2013-03-19 14:49:41 +01:00
David Soria Parra
7b876167cf Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:48:05 +01:00
Mark Baker
4257469079 Fix #48358 add() method for SplDoublyLinkedLis 2013-03-19 14:46:21 +01:00
Anatol Belski
3b922794ab Merge branch 'PHP-5.5'
* PHP-5.5:
  fix C90 compat
2013-03-19 14:45:57 +01:00
Anatol Belski
6f0f5d5281 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix C90 compat
2013-03-19 14:44:20 +01:00
Anatol Belski
7687b8b81c fix C90 compat 2013-03-19 14:42:18 +01:00
Dmitry Stogov
b8ab827e4f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 17:05:36 +04:00
Dmitry Stogov
4837bdb910 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)

Conflicts:
	NEWS
2013-03-19 17:04:35 +04:00