Skip to content

Commit 15466ed

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: [ci skip] Fix GH-7725: Adjust README instructions on referencing issues Prepare for PHP 8.0.16
2 parents 70b02d7 + f1d7f95 commit 15466ed

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

README.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ Extension Community Library - [PECL](https://pecl.php.net).
103103

104104
## Contributing
105105

106-
Contributions are most welcome by forking the
107-
[GitHub repository](https://github.com/php/php-src) and sending a pull request.
106+
The PHP source code is located in the Git repository at
107+
[github.com/php/php-src](https://github.com/php/php-src). Contributions are most
108+
welcome by forking the repository and sending a pull request.
108109

109110
Discussions are done on GitHub, but depending on the topic can also be relayed
110111
to the official PHP developer mailing list [email protected].
@@ -114,19 +115,15 @@ New features require an RFC and must be accepted by the developers. See
114115
[Voting on PHP features](https://wiki.php.net/rfc/voting) for more information
115116
on the process.
116117

117-
Bug fixes **do not** require an RFC but require a bug tracker ticket. Open a
118-
ticket at [bugs.php.net](https://bugs.php.net) and reference the bug id using
119-
`#NNNNNN`.
118+
Bug fixes don't require an RFC. If the bug has a GitHub issue, reference it in
119+
the commit message using `GH-NNNNNN`. Use `#NNNNNN` for tickets in the old
120+
[bugs.php.net](https://bugs.php.net) bug tracker.
120121

122+
Fix GH-7815: php_uname doesn't recognise latest Windows versions
121123
Fix #55371: get_magic_quotes_gpc() throws deprecation warning
122124

123-
After removing magic quotes, the get_magic_quotes_gpc function caused a
124-
deprecated warning. get_magic_quotes_gpc can be used to detect the
125-
magic_quotes behavior and therefore should not raise a warning at any time.
126-
The patch removes this warning.
127-
128-
See [Git workflow](https://wiki.php.net/vcs/gitworkflow) for more details on the
129-
pull request workflow.
125+
See [Git workflow](https://wiki.php.net/vcs/gitworkflow) for details on how pull
126+
requests are merged.
130127

131128
### Guidelines for contributors
132129

0 commit comments

Comments
 (0)