Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/push/php-src: (266 commits)
  Fix "passing NULL to non-pointer argument" warnings in intl
  Remove support for cloning generators
  Removed deprecated check
  Fix whitespace issue in the SOAP test
  Fix SOAP test
  Forgot to fix the test on 5.4
  Exclude Travis build for 5.3 and 5.4
  Fix tests after addition of ^ (xor) operator to ini
  Fix Bug #64545:	PHP Error in ef93a93
  Attempt to fix SKIP
  This will PHP 5.3.25
  Typo fix (greater then => greater than)
  don't optimize script if it's not going to be cached
  Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
  Fixed issue php#78 (incorrect file path validation)
  Fix test on Mac (\D shows up)
  Add test for #64529
  will be 5.4.15
  fix NEWS
  ...

Author: keyurdg

.gitattributes

@@ -23,6 +23,8 @@ sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
 NEWS                            merge=NEWS
+UPGRADING                       merge=NEWS
+UPGRADING.INTERNALS             merge=NEWS
 /ext/bz2/tests/with_strings.phpt	-crlf
 /ext/dom/tests/bug40836.phpt	-crlf
 /ext/dom/tests/domelement.phpt	-crlf

.travis.yml

@@ -8,7 +8,7 @@ notifications:
     email: false
 
 env:
-    - REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=./sapi/cli/php
+    - REPORT_EXIT_STATUS=1
 
 before_script:
     # Compile PHP
@@ -21,4 +21,4 @@ before_script:
     - . ./travis/ext/pdo_pgsql/setup.sh
 
 # Run PHPs run-tests.php 
-script: ./sapi/cli/php run-tests.php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP"
+script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff

NEWS

@@ -1,14 +1,54 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20??, PHP 5.5.0 Beta 1
+?? ??? 20??, PHP 5.5.0 Beta 3
+
+
+28 Mar 2013, PHP 5.5.0 Beta 2
+
+- Core:
+  . Fixed bug #64515 (Memoryleak when using the same variablename 2times in
+    function declaration). (Laruence)
+  . Fixed bug #64503 (Compilation fails with error: conflicting types for
+    'zendparse'). (Laruence)
+  . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11).
+    (Dmitry, Laruence)
+  . Fixed bug #64523, allow XOR in php.ini. (Dejan Marjanovic, Lars)
+
+- Opcache:
+  . Fixed bug # 64490 (struct flock undefined on FreeBSD). (Joe Watkins)
+
+21 Mar 2013, PHP 5.5.0 Beta 1
 
 - Core:
+  . Added Zend Opcache extension and enable building it by default. 
+    More details here: https://wiki.php.net/rfc/optimizerplus. (Dmitry)
+  . Added array_column function which returns a column in a multidimensional
+    array. https://wiki.php.net/rfc/array_column. (Ben Ramsey)
   . Fixed bug #64354 (Unserialize array of objects whose class can't
     be autoloaded fail). (Laruence)
   . Added support for changing the process's title in CLI/CLI-Server SAPIs.
     The implementation is more robust that the proctitle PECL module. More
     details here: https://wiki.php.net/rfc/cli_process_title. (Keyur)
+  . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']).
+    (Anatol)
+  . Added support for non-scalar Iterator keys in foreach
+    (https://wiki.php.net/rfc/foreach-non-scalar-keys). (Nikita Popov)
 
+- mysqlnd
+  . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc
+    for stmt->param_bind). (Andrey)
+
+- DateTime
+  . Fixed bug #53437 (Crash when using unserialized DatePeriod instance).
+    (Gustavo, Derick, Anatol)
+  . Fixed bug #62852 (Unserialize Invalid Date causes crash). (Anatol)
+
+- SPL:
+  . Implement FR #48358 (Add SplDoublyLinkedList::add() to insert an element
+    at a given offset). (Mark Baker, David Soria Parra)
+
+- Zip:
+  . Bug #64452 (Zip crash intermittently). (Anatol)
 
 07 Mar 2013, PHP 5.5.0 Alpha 6
 
@@ -27,6 +67,10 @@ PHP                                                                        NEWS
 - DateTime:
   . Fixed bug #64359 (strftime crash with VS2012). (Anatol)
 
+- SNMP:
+  . Fixed bug #61981 (OO API, walk: $suffix_as_key is not working correctly).
+	(Boris Lytochkin)
+
 21 Feb 2013, PHP 5.5.0 Alpha 5
 
 - Core:

README.RELEASE_PROCESS

@@ -64,7 +64,8 @@ Do not use abbreviations for alpha and beta.
 ``git push --tags origin HEAD``
 
 8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
-and build three tarballs (gz,bz2 and xz).
+and build three tarballs (gz,bz2 and xz). Make sure you use the same GNU Bison
+version as snaps. Recent bison version are known to break ZTS.
 
 9. Copy those three tarballs to www.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
@@ -154,7 +155,15 @@ origin <branch>``".
 11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
 and build two tarballs (one gz and one bz2).
 
-12. Commit those two tarballs to Git (php-distributions.git)
+12. Commit those two tarballs to web/php-distributions.git, then update the git
+    submodule reference in web/php.git: 
+    git submodule init;
+    git submodule update;
+    cd distributions;
+    git pull origin master;
+    cd ..;
+    git commit distributions;
+    git push;
 
 13. Once the release has been tagged, contact the PHP Windows development team
 (internals-win@lists.php.net) so that Windows binaries can be created. Once

UPGRADING

@@ -30,38 +30,6 @@ PHP 5.5 UPGRADE NOTES
   zend_logo_guid() have been removed
 - Removal of Logo GUIDs
 
-- extensions can't override zend_execute() any more, they should override
-  zend_execute_ex() instead. The EG(current_execute_data) is already
-  initialized in zend_execute_ex(), so for compatibility extensions
-  may need to use EG(current_execute_data)->prev_execute_data instead.
-- removed EG(arg_types_stack), EX(fbc), EX(called_scope), EX(current_object)
-- added op_array->nested_calls. It's calculated at compile time.
-- added EX(call_slots). It is an array to store information about syntaticaly
-  nested calls (e.g. foo(bar())). It's preallocated together with execute_data.
-- added EX(call) - pointer to a current calling function. Actually an
-  element of EX(call_slots)
-- opcodes INIT_METHOD_CALL, ZEND_INIT_STATIC_METHOD_CALL,
-  ZEND_INIT_FCALL_BY_NAME, ZEND_INIT_NS_FCALL_BY_NAME use result.num as
-  an index in EX(call_slots)
-- opcode ZEND_NEW uses extended_vallue as an index in EX(call_slots)
-- opcoes ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME use op2.num as
-  an index in EX(call_slots)
-- added op_array->used_stack. It's calculated at compile time and the
-  corresponding stack space is preallocated together with execute_data.
-  ZEND_SEND* and ZEND_DO_FCALL* don't need to check for stack overflow
-  anymore.
-- Removed execute_data->Ts field. The VM temporary variables always allocated
-  immediately before execute_data structure. Now they are accessed by offset
-  from the execute_data base pointer (instead of execute_data->Ts). Compiler
-  stores new offsets in op_array->opcodes[*].op?.num. You can use macros
-  EX_TMP_VAR() and EX_TMP_VAR_NUM() to access temp_variable by offset or
-  number. You can convert number to offset using EX_TMP_VAR_NUM(0, num) or
-  offset to number (EX_TMP_VAR_NUM(0,0)-EX_TMP_VAR(0,offset)).
-- Removed execute_data->CVs field. The VM compiled variables always allocated
-  immediately after execute_data structure. Now they are accessed by offset
-  from the execute_data base pointer (instead of execute_data->CVs). You can
-  use macros EX_CV_NUM() to access compiled variables by number.
-
 ========================================
 2. New Features
 ========================================
@@ -79,13 +47,17 @@ PHP 5.5 UPGRADE NOTES
   (https://wiki.php.net/rfc/generators)
 - ClassName::class syntax returning full class name for a class as 
   a string constant. (https://wiki.php.net/rfc/class_name_scalars)
-- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur)
-  (https://wiki.php.net/rfc/cli_process_title)
+- Added support for non-scalar Iterator keys in foreach.
+  (https://wiki.php.net/rfc/foreach-non-scalar-keys).
+- Bundled Zend OPcache extension
+ (https://wiki.php.net/rfc/optimizerplus)
 
 ========================================
 2. Changes in SAPI modules
 ========================================
 
+- Support for changing the process's title in CLI/CLI-Server SAPIs. (Keyur)
+  (https://wiki.php.net/rfc/cli_process_title)
 
 ========================================
 3. Deprecated Functionality
@@ -167,6 +139,7 @@ PHP 5.5 UPGRADE NOTES
 ========================================
 
 - Core:
+  - array_column()
   - boolval()
   - password_get_info()
   - password_hash()
@@ -180,6 +153,11 @@ PHP 5.5 UPGRADE NOTES
   - imageflip
   - imagecrop
   - imagecropauto
+  - imagesetinterpolation
+  - imageaffine
+  - imageaffinematrixget
+  - imageaffinematrixconcat
+  - imagescale
 
 - Hash:
   - hash_pbkdf2()
@@ -273,6 +251,12 @@ PHP 5.5 UPGRADE NOTES
 
 - SPL:
   - SplFixedArray::__wakeup()
+  - SplDoublyLinkedList::add()
+
+- Zend OPcache
+ - opcache_get_configuration()
+ - opcache_get_status()
+ - opcache_reset()
 
 ========================================
 6. New Classes and Interfaces
@@ -324,13 +308,42 @@ PHP 5.5 UPGRADE NOTES
     . IMG_CROP_WHITE
     . IMG_CROP_SIDES
     . IMG_CROP_THRESHOLD
+  - Added constants for imagesetinterpolation, used by imagescale
+    imagerotate and imageaffine:
+    . IMG_BELL
+    . IMG_BESSEL
+    . IMG_BILINEAR_FIXED
+    . IMG_BICUBIC
+    . IMG_BICUBIC_FIXED
+    . IMG_BLACKMAN
+    . IMG_BOX
+    . IMG_BSPLINE
+    . IMG_CATMULLROM
+    . IMG_GAUSSIAN
+    . IMG_GENERALIZED_CUBIC
+    . IMG_HERMITE
+    . IMG_HAMMING
+    . IMG_HANNING
+    . IMG_MITCHELL
+    . IMG_POWER
+    . IMG_QUADRATIC
+    . IMG_SINC
+    . IMG_NEAREST_NEIGHBOUR
+    . IMG_WEIGHTED4
+    . IMG_TRIANGLE
+  - Added constants for imageaffinematrixget
+    . IMG_AFFINE_TRANSLATE
+    . IMG_AFFINE_SCALE
+    . IMG_AFFINE_ROTATE
+    . IMG_AFFINE_SHEAR_HORIZONTAL
+    . IMG_AFFINE_SHEAR_VERTICAL
 
 ========================================
 10. Changes to INI File Handling
 ========================================
 
 - Core:
-  - Added sys_temp_dir INI directive, for specifying temp firectory.
+  - Added sys_temp_dir INI directive, for specifying temp directory.
 
 - Intl:
   - Added intl.use_exceptions INI directive, which controls what happens when
@@ -341,6 +354,33 @@ PHP 5.5 UPGRADE NOTES
     APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
 	with the new auth protocol, although at coarser level.
 
+- Zend OPcache (See ext/opcache/README for more details)
+  - Added the following directives:
+    - opcache.enable (default "1")
+    - opcache.memory_consumption (default "64")
+    - opcache.interned_strings_buffer (default "4")
+    - opcache.max_accelerated_files (default "2000")
+    - opcache.max_wasted_percentage (default "5")
+    - opcache.use_cwd (default "1")
+    - opcache.validate_timestamps (default "1")
+    - opcache.revalidate_freq (default "2")
+    - opcache.revalidate_path (default "0")
+    - opcache.save_comments (default "1")
+    - opcache.load_comments (default "1")
+    - opcache.fast_shutdown (default "0")
+    - opcache.enable_file_override (default "0")
+    - opcache.optimization_level (default "0xffffffff")
+    - opcache.inherited_hack (default "1")
+    - opcache.blacklist_filename (default "")
+    - opcache.max_file_size (default "0")
+    - opcache.consistency_checks (default "0")
+    - opcache.force_restart_timeout (default "180")
+    - opcache.error_log (default "" which means stderr)
+    - opcache.log_verbosity_level (default "1")
+    - opcache.preferred_memory_model (default "")
+    - opcache.protect_memory (default "0")
+    - opcache.mmap_base (Windows-only)
+
 ========================================
 11. Windows Support
 ========================================

UPGRADING.INTERNALS

@@ -3,9 +3,11 @@ $Id$
 UPGRADE NOTES - PHP X.Y
 
 1. Internal API changes
-  a. Streams pooling API
-  b. Lowercasing and locales
-  c. zend_qsort_r
+  a. Executor changes
+  b. Streams pooling API
+  c. Lowercasing and locales
+  d. zend_qsort_r
+  e. get_current_key
 
 2. Build system changes
   a. Unix build system changes
@@ -16,7 +18,41 @@ UPGRADE NOTES - PHP X.Y
 1. Internal API changes
 ========================
 
-	a. Streams pooling API
+	a. Executor changes
+
+ * extensions can't override zend_execute() any more, they should override
+   zend_execute_ex() instead. The EG(current_execute_data) is already
+   initialized in zend_execute_ex(), so for compatibility extensions
+   may need to use EG(current_execute_data)->prev_execute_data instead.
+ * removed EG(arg_types_stack), EX(fbc), EX(called_scope), EX(current_object)
+ * added op_array->nested_calls. It's calculated at compile time.
+ * added EX(call_slots). It is an array to store information about syntaticaly
+   nested calls (e.g. foo(bar())). It's preallocated together with execute_data.
+ * added EX(call) - pointer to a current calling function. Actually an
+   element of EX(call_slots)
+ * opcodes INIT_METHOD_CALL, ZEND_INIT_STATIC_METHOD_CALL,
+   ZEND_INIT_FCALL_BY_NAME, ZEND_INIT_NS_FCALL_BY_NAME use result.num as
+   an index in EX(call_slots)
+ * opcode ZEND_NEW uses extended_vallue as an index in EX(call_slots)
+ * opcoes ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME use op2.num as
+   an index in EX(call_slots)
+ * added op_array->used_stack. It's calculated at compile time and the
+   corresponding stack space is preallocated together with execute_data.
+   ZEND_SEND* and ZEND_DO_FCALL* don't need to check for stack overflow
+   anymore.
+ * Removed execute_data->Ts field. The VM temporary variables always allocated
+   immediately before execute_data structure. Now they are accessed by offset
+   from the execute_data base pointer (instead of execute_data->Ts). Compiler
+   stores new offsets in op_array->opcodes[*].op?.num. You can use macros
+   EX_TMP_VAR() and EX_TMP_VAR_NUM() to access temp_variable by offset or
+   number. You can convert number to offset using EX_TMP_VAR_NUM(0, num) or
+   offset to number (EX_TMP_VAR_NUM(0,0)-EX_TMP_VAR(0,offset)).
+ * Removed execute_data->CVs field. The VM compiled variables always allocated
+   immediately after execute_data structure. Now they are accessed by offset
+   from the execute_data base pointer (instead of execute_data->CVs). You can
+   use macros EX_CV_NUM() to access compiled variables by number.
+
+	b. Streams pooling API
 
 The streams pooling API has been removed. The following functions no longer
 exist:
@@ -28,7 +64,7 @@ PHPAPI int php_stream_context_set_link(php_stream_context *context,
 PHPAPI int php_stream_context_del_link(php_stream_context *context,
 		php_stream *stream);
 
-	b. Lowercasing and locales
+	c. Lowercasing and locales
 
 The lowercasing functions in zend_operators.c were split into those that do 
 lowercasing according to locale rules and those that do ASCII lowercasing.
@@ -54,7 +90,7 @@ such as strcasecmp, will be using locale rules.
 Two new functions - zend_binary_strncasecmp_l and zend_binary_strcasecmp_l - added as 
 locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
 
-	c. zend_qsort_r
+	d. zend_qsort_r
 
 Added the function zend_qsort_r():
 
@@ -64,6 +100,14 @@ void zend_qsort_r(void *base, size_t nmemb, size_t siz, compare_r_func_t compare
 The extra argument it has (relatively to zend_qsort()) is passed to the
 comparison function.
 
+	e. get_current_key
+
+The signature of the get_current_key iteration handler has been changed to:
+
+void (*get_current_key)(zend_object_iterator *iter, zval *key TSRMLS_DC);
+
+The key should be written into the zval* using the ZVAL_* macros.
+
 ========================
 2. Build system changes
 ========================

Zend/tests/bug55156.phpt

@@ -1,5 +1,8 @@
 --TEST--
 Bug #55156 (ReflectionClass::getDocComment() returns comment even though the class has none)
+--INI--
+opcache.save_comments=1
+opcache.load_comments=1
 --FILE--
 <?php