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

* 'PHP-5.5' of git.php.net:php-src: Fix tests expecting specific resource IDs fixed parameter order for zend_throw_exception_ex call Fix doc (svn -> git) Updated release process
2026-04-01 05:02:27 +02:00 · 2013-12-16 13:13:29 +04:00
parent e6dbf0eeff 7cf6f012b1
commit a67c615799
17 changed files with 140 additions and 122 deletions
--- a/4
+++ b/4
@@ -59,8 +59,8 @@ Exceptions:
    you're calling.

 7.  When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<svn username here>_0". For example, #if FOO_0, where FOO is your
-    svn user foo.  This allows easier tracking of why code was commented out,
+    use "<git username here>_0". For example, #if FOO_0, where FOO is your
+    git user foo.  This allows easier tracking of why code was commented out,
    especially in bundled libraries.

 8.  Do not define functions that are not available.  For instance, if a
--- a/README.RELEASE_PROCESS
+++ b/README.RELEASE_PROCESS
@@ -8,15 +8,16 @@ General notes and tips
 1. Do not release on Fridays, Saturdays or Sundays
 because the sysadmins can not upgrade stuff then.

-2. Package the day before a release. So if the release is to be on Thursday,
-package on Wednesday.
+2. Package two days before a release. So if the release is to be on Thursday,
+package on Tuesday. Think about timezones as well.

 3. Ensure that Windows builds will work before packaging

-4. Follow all steps to the letter. When unclear ask previous RM's (Derick/Ilia)
-before proceeding. Ideally make sure that for the first releases one of the
-previous RM's is around to answer questions. For the steps related to the
-php/QA/bug websites try to have someone from the webmaster team (Bjori) on hand.
+4. Follow all steps to the letter. When unclear ask previous RM's (David/Julien/
+Johannes/Stas/Derick/Ilia) before proceeding. Ideally make sure that for the
+first releases one of the previous RM's is around to answer questions. For the
+steps related to the php/QA/bug websites try to have someone from the webmaster
+team (Bjori) on hand.

 5. Verify the tags to be extra sure everything was tagged properly.

@@ -50,37 +51,47 @@ Rolling a non stable release (alpha/beta/RC)
 2. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-3. Checkout the release branch for this release (e.g., PHP-5.4.2).
+3. Checkout the release branch for this release (e.g., PHP-5.4.2) from the main branch.

 4. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
-Do not use abbreviations for alpha and beta.
+Do not use abbreviations for alpha and beta. Do not use dashes, you should
+``#define PHP_VERSION "5.4.22RC1"`` and not ``#define PHP_VERSION "5.4.22-RC1"``

-5. Commit these changes to the branch with ``git commit -a``.
+5. Compile and make test, with and without ZTS, using the right Bison version
+(for example, for 5.5, Bison 2.4.1 is used)

-6. Tag the repository with the version, e.g.: 
+6. Check ./sapi/cli/php -v output for version matching.
+
+7. If all is right, commit the changes to the release branch with ``git commit -a``.
+
+8. Tag the repository release branch with the version, e.g.: 
 ``git tag -u YOURKEYID php-5.4.2RC2``

-7. Push the changes to the main repo:
+9. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and ``NEWS``
+in the *main* branch (PHP-5.4 for example) to prepare for the **next** version.
+F.e. if the RC is "5.4.1RC1" then the new one should be "5.4.2-dev" - regardless if we get
+a new RC or not. This is to make sure ``version_compare()`` can correctly work.
+Commit the changes to the main branch.
+
+10. Push the changes to the main repo, the tag, the main branch and the release branch :
 ``git push --tags origin HEAD``
+``git push origin {main branch}``
+``git push origin {release branch}``

-8. run: ``./makedist 5.4.2RC2``, this will export the tree, create configure
-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.
+11. run: ``PHPROOT=. ./makedist 5.4.2RC2``, this will export the tree, create configure
+and build three tarballs (gz, bz2 and xz).

-9. Copy those three tarballs to www.php.net, in your homedir there should be a
+12. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there should be a
 directory "downloads/". Copy them into there, so that the system can generate
-MD5 sums. If you do not have this directory, talk to Derick.
+MD5 sums. If you do not have this directory, talk to Derick or Dan.

-10. Now the RC can be found on http://downloads.php.net/yourname,
+13. Now the RC can be found on http://downloads.php.net/yourname,
 f.e. http://downloads.php.net/derick/

-11. Once the release has been tagged, contact the PHP Windows development team
+14. 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
 those are made, they should be placed into the same directory as the source snapshots.

-12. Notify the documentation team if documentations for new features are
-not yet available but a stable release is imminent.
-
 Getting the non stable release (alpha/beta/RC) announced
 --------------------------------------------------------

@@ -109,9 +120,9 @@ Derick) run the following commands for you:

   Note: Remember to update the MD5 checksum information.

-4. Update ``php.git/include/version.inc`` (x=major version number)
+4. Update ``web/php.git/include/version.inc`` (x=major version number)

- a. ``$PHP_x_RC`` = "5.4.0RC1"
+ a. ``$PHP_x_RC`` = "5.4.0RC1"  (should be set to "false" before)

 b. ``$PHP_x_RC_DATE`` = "06 September 2007"

@@ -122,70 +133,61 @@ Derick) run the following commands for you:
 6. For the first RC, write the doc team (phpdoc@lists.php.net) about updating the
 INSTALL and win32/install.txt files which are generated from the PHP manual sources.

-7. Publish the announce on www.php.net as well (for all releases, alpha, RCs or other)
-
 Rolling a stable release
 ------------------------

-1. Check windows snapshot builder logs (http://snaps.php.net/win32/snapshot-STABLE.log f.e.)
+1. Checkout your release branch, you should have created when releasing previous RC
+and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.

-2. Bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
+2. If a CVE commit needs to be merged to the release, then have it commited to
+the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
+merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
+Don't forget to update NEWS manually in an extra commit then.

-3. **Merge** all related sections in NEWS (f.e. merge the 5.4.1RC1 and 5.4.0 sections)
+3. Commit those changes

-4. Commit those changes
-
-5. run the "scripts/dev/credits" script in php-src and commit the changes in the
+4. run the "scripts/dev/credits" script in php-src and commit the changes in the
 credits files in ext/standard.

-6. tag the repository with the version f.e. "``git tag -s php-5.4.1``"
-(of course, you need to change that to the version you're rolling an RC for).
-When making 5.X release, you need to tag the Zend directory separately!!
+5. Compile and make test, with and without ZTS, using the right Bison version
+(for example, for 5.5, Bison 2.4.1 is used)

-7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and
-possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate
-was "5.4.1RC1" then the new one should be "5.4.1RC2-dev" - regardless if we get
-a new RC or not. This is to make sure ``version_compare()`` can correctly work.
+6. Check ./sapi/cli/php -v output for version matching.

-8. Commit those changes
+7. tag the repository with the version f.e. "``git tag -s php-5.4.1``"

-9. Log in onto the snaps box and go into the correct tree (f.e. the PHP-5.4
-branch if you're rolling 5.5.x releases).
+8. Push the tag f.e. "``git push origin php-5.4.1``"

-10. You do not have to update the tree, but of course you can with "``git pull
-origin <branch>``".
+9. run: ``PHPROOT=. ./makedist php 5.4.1``, this will export the tag, create configure
+and build three tarballs (gz, bz2 and xz).
+Check if the pear files are updated (phar).

-11. run: ``./makedist php 5.4.1``, this will export the tree, create configure
-and build two tarballs (one gz and one bz2).
+10. Generate the GPG signature files for the archives.
+  ``gpg -u YOUREMAIL --armor --detach-sign php-X.Y.Z.tar.xxx``

-12. Commit those two tarballs to web/php-distributions.git, then update the git
-    submodule reference in web/php.git: 
-    git submodule init;
+11. Commit and push all the tarballs and signature files 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;
+    git push;``
+This is to fetch the last commit id from php-distributions.git and commit this
+last commit id to web/php.git, then, mirrors will now sync

-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
-those are made, they should be committed to SVN too.
-
-14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
-
-15. When making a final release, also remind the PHP Windows development team
-(internals-win@lists.php.net) to prepare the installer packages for Win32.
-
-16. Make sure proper documentation exists for all new features/changes.
-Coordinate the release with the PHP Documentation team.
+12. Once the release has been tagged, contact the PHP Windows development team
+(internals-win@lists.php.net) so that Windows binaries can be created.

 Getting the stable release announced
 ------------------------------------

 1. Run the bumpRelease script for phpweb on your local checkout

- a. ``php bin/bumpRelease 5`` (or ``php bin/bumpRelease 4`` for PHP4)
+ a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
+    The release announcement file should list in detail security fixes and
+    changes in behavior (whether due to a bug fix or not).

 b. In case multiple PHP minor versions are in active development you have
    to manually copy the old information to include/releases.inc
@@ -205,7 +207,13 @@ Getting the stable release announced

 f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")

-3. Update the ChangeLog file for the given major version
+3. Update phpweb/include/releases.php with the old release info
+  (updates the download archives)
+
+4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
+   (prepare for next RC)
+
+5. Update the ChangeLog file for the given major version
 f.e. ``ChangeLog-5.php`` from the NEWS file

 a. go over the list and put every element on one line
@@ -225,19 +233,10 @@ f.e. ``ChangeLog-5.php`` from the NEWS file
  IV. ``s/Fixed PECL bug #\([0-9]\+\)/<?php peclbugfix(\1); ?>/``

  V. ``s/FR #\([0-9]\+\)/FR <?php bugl(\1); ?>/``
+  
+  e. You may want to try php-web/bin/news2html to automate this task

-4. ``cp releases/5_4_0.php releases/5_4_1.php``
-
-5. ``git add releases/5_4_1.php``
-
-6. Update the ``releases/*.php`` file with relevant data. The release
-announcement file should list in detail:
-
- a. security fixes,
-
- b. changes in behavior (whether due to a bug fix or not)
-
-7. Add a short notice to phpweb stating that there is a new release, and
+6. Add a short notice to phpweb stating that there is a new release, and
 highlight the major important things (security fixes) and when it is important
 to upgrade.

@@ -245,7 +244,11 @@ to upgrade.

 b. Add the content for the news entry

-8. Commit all the changes.
+7. **Check mirrors have been synced before announcing or pushing news**
+  Try, f.e. http://www.php.net/get/php-5.5.1.tar.bz2/from/a/mirror
+  Try several mirrors, mirrors may update slowly (may take an hour)
+
+8. Commit all the changes to their respective git repos

 9. Wait an hour or two, then send a mail to php-announce@lists.php.net,
 php-general@lists.php.net and internals@lists.php.net with a text similar to
--- a/Zend/tests/bug41421.phpt
+++ b/Zend/tests/bug41421.phpt
@@ -24,6 +24,6 @@ Warning: feof(): wrapper::stream_eof is not implemented! Assuming EOF in %s on l
 Fatal error: Uncaught exception 'Exception' in %s:%d
 Stack trace:
 #0 [internal function]: wrapper->stream_eof()
-#1 %s(%d): feof(Resource id #6)
+#1 %s(%d): feof(Resource id #%d)
 #2 {main}
  thrown in %s on line %d
--- a/ext/session/tests/session_name_error.phpt
+++ b/ext/session/tests/session_name_error.phpt
@@ -231,6 +231,6 @@ string(12) "Hello World!"
 -- Iteration 24 --

 Warning: session_name() expects parameter 1 to be string, resource given in %s on line %d
-resource(5) of type (stream)
+resource(%d) of type (stream)
 NULL
 Done
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -533,7 +533,7 @@ static void php_snmp_error(zval *object, const char *docref TSRMLS_DC, int type,
 	}

 	if (object && (snmp_object->exceptions_enabled & type)) {
-		zend_throw_exception_ex(php_snmp_exception_ce, type, snmp_object->snmp_errstr TSRMLS_CC);
+		zend_throw_exception_ex(php_snmp_exception_ce, type TSRMLS_CC, snmp_object->snmp_errstr);
 	} else {
 		va_start(args, format);
 		php_verror(docref, "", E_WARNING, format, args TSRMLS_CC);
--- a/ext/standard/tests/array/each.phpt
+++ b/ext/standard/tests/array/each.phpt
--- a/ext/standard/tests/file/007_error.phpt
+++ b/ext/standard/tests/file/007_error.phpt
@@ -76,7 +76,7 @@ bool(false)
 Warning: fopen() expects at least 2 parameters, 0 given in %s on line %d
 bool(false)

-Warning: fclose(): 5 is not a valid stream resource in %s on line %d
+Warning: fclose(): %d is not a valid stream resource in %s on line %d
 bool(false)

 Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d
@@ -85,7 +85,7 @@ bool(false)
 Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d
 bool(false)

-Warning: feof(): 5 is not a valid stream resource in %s on line %d
+Warning: feof(): %d is not a valid stream resource in %s on line %d
 bool(false)

 Warning: feof() expects parameter 1 to be resource, string given in %s on line %d
--- a/ext/standard/tests/file/fgetss_error.phpt
+++ b/ext/standard/tests/file/fgetss_error.phpt
@@ -98,7 +98,7 @@ bool(false)
 Warning: fgetss() expects parameter 1 to be resource, object given in %s on line %d
 bool(false)
 -- Testing fgetss() with closed/unset file handle --
-Warning: fgetss(): 5 is not a valid stream resource in %s on line %d
+Warning: fgetss(): %d is not a valid stream resource in %s on line %d
 bool(false)

 Warning: fgetss() expects parameter 1 to be resource, null given in %s on line %d
--- a/ext/standard/tests/file/ftruncate_error.phpt
+++ b/ext/standard/tests/file/ftruncate_error.phpt
@@ -114,7 +114,7 @@ Warning: ftruncate() expects parameter 1 to be resource, object given in %s on l
 bool(false)
 -- Testing ftruncate() with closed/unset file handle --

-Warning: ftruncate(): 5 is not a valid stream resource in %s on line %d
+Warning: ftruncate(): %d is not a valid stream resource in %s on line %d
 bool(false)
 int(36)

--- a/ext/standard/tests/general_functions/floatval.phpt
+++ b/ext/standard/tests/general_functions/floatval.phpt
@@ -157,8 +157,8 @@ float(-5000000)
 *** Testing floatval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-float(5)
-float(6)
+float(%d)
+float(%d)
 float(0)
 float(1)
 float(-1300)
@@ -175,8 +175,8 @@ float(0)
 *** Testing doubleval() on non floating types ***
 float(-2147483648)
 float(2147483648)
-float(5)
-float(6)
+float(%d)
+float(%d)
 float(0)
 float(1)
 float(-1300)
--- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt
+++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt
@@ -232,11 +232,11 @@ int(0)
 string(7) "integer"
 -- Iteration 12 --
 bool(true)
-int(5)
+int(%d)
 string(7) "integer"
 -- Iteration 13 --
 bool(true)
-int(6)
+int(%d)
 string(7) "integer"
 -- Iteration 14 --
 8: Object of class point could not be converted to int
@@ -291,11 +291,11 @@ int(0)
 string(7) "integer"
 -- Iteration 12 --
 bool(true)
-int(5)
+int(%d)
 string(7) "integer"
 -- Iteration 13 --
 bool(true)
-int(6)
+int(%d)
 string(7) "integer"
 -- Iteration 14 --
 8: Object of class point could not be converted to int
@@ -350,11 +350,11 @@ float(0)
 string(6) "double"
 -- Iteration 12 --
 bool(true)
-float(5)
+float(%d)
 string(6) "double"
 -- Iteration 13 --
 bool(true)
-float(6)
+float(%d)
 string(6) "double"
 -- Iteration 14 --
 8: Object of class point could not be converted to double
@@ -409,11 +409,11 @@ float(0)
 string(6) "double"
 -- Iteration 12 --
 bool(true)
-float(5)
+float(%d)
 string(6) "double"
 -- Iteration 13 --
 bool(true)
-float(6)
+float(%d)
 string(6) "double"
 -- Iteration 14 --
 8: Object of class point could not be converted to double
@@ -610,12 +610,12 @@ string(6) "string"
 -- Iteration 12 --
 2: settype(): Cannot convert to resource type
 bool(false)
-resource(5) of type (stream)
+resource(%d) of type (stream)
 string(8) "resource"
 -- Iteration 13 --
 2: settype(): Cannot convert to resource type
 bool(false)
-resource(6) of type (stream)
+resource(%d) of type (stream)
 string(8) "resource"
 -- Iteration 14 --
 2: settype(): Cannot convert to resource type
@@ -716,14 +716,14 @@ string(5) "array"
 bool(true)
 array(1) {
  [0]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
 }
 string(5) "array"
 -- Iteration 13 --
 bool(true)
 array(1) {
  [0]=>
-  resource(6) of type (stream)
+  resource(%d) of type (stream)
 }
 string(5) "array"
 -- Iteration 14 --
@@ -824,14 +824,14 @@ string(6) "object"
 bool(true)
 object(stdClass)#2 (1) {
  ["scalar"]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
 }
 string(6) "object"
 -- Iteration 13 --
 bool(true)
 object(stdClass)#2 (1) {
  ["scalar"]=>
-  resource(6) of type (stream)
+  resource(%d) of type (stream)
 }
 string(6) "object"
 -- Iteration 14 --
@@ -893,11 +893,11 @@ string(6) "string"
 string(6) "string"
 -- Iteration 12 --
 bool(true)
-string(14) "Resource id #5"
+string(14) "Resource id #%d"
 string(6) "string"
 -- Iteration 13 --
 bool(true)
-string(14) "Resource id #6"
+string(14) "Resource id #%d"
 string(6) "string"
 -- Iteration 14 --
 bool(true)
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -1484,13 +1484,13 @@ object_class Object

 )

-*** Testing print_r() on resources ***
-
-- Iteration 1 --
+*** Testing print_r() on resources ***
+
+-- Iteration 1 --
 Resource id #%d
-Resource id #5
-Resource id #5
-- Iteration 2 --
+Resource id #%d
+Resource id #%d
+-- Iteration 2 --
 Resource id #%d
 Resource id #%d
 Resource id #%d
--- a/ext/standard/tests/general_functions/strval.phpt
+++ b/ext/standard/tests/general_functions/strval.phpt
@@ -279,9 +279,9 @@ string(0) ""
 -- Iteration 1 --
 string(6) "Object"
 -- Iteration 2 --
-string(14) "Resource id #5"
+string(14) "Resource id #%d"
 -- Iteration 3 --
-string(14) "Resource id #6"
+string(14) "Resource id #%d"
 -- Iteration 4 --

 Notice: Array to string conversion in %sstrval.php on line %d
--- a/ext/standard/tests/general_functions/type.phpt
+++ b/ext/standard/tests/general_functions/type.phpt
@@ -105,9 +105,9 @@ int(0)
 bool(true)
 int(0)
 bool(true)
-int(5)
+int(%d)
 bool(true)
-int(6)
+int(%d)
 string(54) "Object of class stdClass could not be converted to int"
 bool(true)
 int(%d)
@@ -128,9 +128,9 @@ float(0)
 bool(true)
 float(0)
 bool(true)
-float(5)
+float(%d)
 bool(true)
-float(6)
+float(%d)
 string(57) "Object of class stdClass could not be converted to double"
 bool(true)
 float(%d)
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -844,9 +844,9 @@ object(object_class)#13 (8) {
 }

 *** Testing var_dump() on resources ***
-- Iteration 1 --
+-- Iteration 1 --
 resource(%d) of type (stream)
-- Iteration 2 --
+-- Iteration 2 --
 resource(%d) of type (stream)

 *** Testing var_dump() on different combinations of scalar 
@@ -1227,9 +1227,9 @@ array(4) {
  [3]=>
  bool(false)
 }
-array(2) {
+array(2) {
  [0]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
  [1]=>
  resource(%d) of type (stream)
 }
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt
--- a/tests/strings/001.phpt
+++ b/tests/strings/001.phpt
@@ -177,9 +177,23 @@ if ($ss == "\$'") {
 }


-echo "Testing uniqid: ";
+echo "Testing uniqid(true): ";
+$str = "prefix";
+$ui1 = uniqid($str, true);
+$ui2 = uniqid($str, true);
+
+$len = 29;
+
+if (strlen($ui1) == strlen($ui2) && strlen($ui1) == $len && $ui1 != $ui2) {
+	echo("passed\n");
+} else {
+	echo("failed!\n");
+}
+
+echo "Testing uniqid(false): ";
 $str = "prefix";
 $ui1 = uniqid($str);
+usleep( 1 );
 $ui2 = uniqid($str);

 $len = strncasecmp(PHP_OS, 'CYGWIN', 6) ? 19 : 29;
@@ -207,4 +221,5 @@ Testing ufirst: passed
 Testing strtr: passed
 Testing addslashes: passed
 Testing stripslashes: passed
-Testing uniqid: passed
+Testing uniqid(true): passed
+Testing uniqid(false): passed