svn: /phpdoc/en/trunk/ appendices/migration70/new-features.xml language/operators.xml
| From: | Andrea Faulds | Date: | Mon, 07 Dec 2015 14:49:18 +0000 |
| Subject: | svn: /phpdoc/en/trunk/ appendices/migration70/new-features.xml language/operators.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-13876@lists.php.net to get a copy of this message | ||
ajf Mon, 07 Dec 2015 14:49:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=338220
Log:
Correct "null coalesce" to "null coalescing"
When I originally named the "Null Coalesce Operator" RFC, I made this mistake. But the
manual doesn't need to repeat it.
Changed paths:
U phpdoc/en/trunk/appendices/migration70/new-features.xml
U phpdoc/en/trunk/language/operators.xml
Modified: phpdoc/en/trunk/appendices/migration70/new-features.xml
===================================================================
--- phpdoc/en/trunk/appendices/migration70/new-features.xml 2015-12-07 09:52:39 UTC (rev 338219)
+++ phpdoc/en/trunk/appendices/migration70/new-features.xml 2015-12-07 14:49:18 UTC (rev 338220)
@@ -109,10 +109,10 @@
</sect2>
<sect2 xml:id="migration70.new-features.null-coalesce-op">
- <title>Null coalesce operator</title>
+ <title>Null coalescing operator</title>
<para>
- The null coalesce operator (<literal>??</literal>) has been added as
+ The null coalescing operator (<literal>??</literal>) has been added as
syntactic sugar for the common case of needing to use a ternary in
conjunction with <function>isset</function>. It returns its first operand
if it exists and is not &null;; otherwise it returns its second operand.
@@ -128,7 +128,7 @@
// This is equivalent to:
$username = isset($_GET['user']) ? $_GET['user'] : 'nobody';
-// Coalesces can be chained: this will return the first
+// Coalescing can be chained: this will return the first
// defined value out of $_GET['user'], $_POST['user'], and
// 'nobody'.
$username = $_GET['user'] ?? $_POST['user'] ?? 'nobody';
Modified: phpdoc/en/trunk/language/operators.xml
===================================================================
--- phpdoc/en/trunk/language/operators.xml 2015-12-07 09:52:39 UTC (rev 338219)
+++ phpdoc/en/trunk/language/operators.xml 2015-12-07 14:49:18 UTC (rev 338220)
@@ -1300,7 +1300,7 @@
</row>
<row>
<entry>$a ?? $b ?? $c</entry>
- <entry>Null coalesce</entry>
+ <entry>Null coalescing</entry>
<entry>
The first operand from left to right that exists and is not &null;.
&null; if no values are defined and not &null;. Available as of PHP 7.