Skip to content

Commit

Permalink
Prepare for PHP 8.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@ramsey
ramsey committed Apr 27, 2022
1 parent 97ffd75 commit fb819fa
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
5 changes: 4 additions & 1 deletion NEWS
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.1.6
?? ??? ????, PHP 8.1.7


12 May 2022, PHP 8.1.6

- Core:
. Fixed bug GH-8310 (Registry settings are no longer recognized). (cmb)
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef ZEND_H
#define ZEND_H

#define ZEND_VERSION "4.1.6-dev"
#define ZEND_VERSION "4.1.7-dev"

#define ZEND_ENGINE_3

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
dnl ----------------------------------------------------------------------------

AC_PREREQ([2.68])
AC_INIT([PHP],[8.1.6-dev],[https://bugs.php.net],[php],[https://www.php.net])
AC_INIT([PHP],[8.1.7-dev],[https://bugs.php.net],[php],[https://www.php.net])
AC_CONFIG_SRCDIR([main/php_version.h])
AC_CONFIG_AUX_DIR([build])
AC_PRESERVE_HELP_ORDER
Expand Down
6 changes: 3 additions & 3 deletions main/php_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* edit configure.ac to change version number */
#define PHP_MAJOR_VERSION 8
#define PHP_MINOR_VERSION 1
#define PHP_RELEASE_VERSION 6
#define PHP_RELEASE_VERSION 7
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "8.1.6-dev"
#define PHP_VERSION_ID 80106
#define PHP_VERSION "8.1.7-dev"
#define PHP_VERSION_ID 80107

6 comments on commit fb819fa

@bukka
Copy link
Member

@bukka bukka commented on fb819fa Apr 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ramsey please merge always changes on lower branches up (in this case to master) otherwise others will need to resolve the conflicts as I just had to do... :)

@ramsey
Copy link
Member Author

@ramsey ramsey commented on fb819fa Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦🏻‍♂️ I thought I committed this to the PHP-8.1 branch. Committing directly to master was unintentional.

@ramsey
Copy link
Member Author

@ramsey ramsey commented on fb819fa Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I just checked, and I did commit this to the PHP-8.1 branch. Does your comment mean that I should have merged PHP-8.1 directly to master after I committed it to PHP-8.1?

@bwoebi
Copy link
Member

@bwoebi bwoebi commented on fb819fa Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ramsey yes.

@bukka
Copy link
Member

@bukka bukka commented on fb819fa Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, you can see our gitflow here: https://wiki.php.net/vcs/gitworkflow

@ramsey
Copy link
Member Author

@ramsey ramsey commented on fb819fa Apr 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. That was my bad. I know better, and I’ll do it the right way next time.

Please sign in to comment.