Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appendices/migration80/deprecated.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function test($a, $b) {} // After
</para>
<para>
One exception to this rule are parameters of the form <code>Type $param = null</code>, where
the null default makes the type implicitly nullable. This usage remains allowed, but it is
the &null; default makes the type implicitly nullable. This usage remains allowed, but it is
recommended to use an explicit nullable type instead:
</para>
<para>
Expand Down
4 changes: 2 additions & 2 deletions appendices/migration80/incompatible.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function test(int $arg = null) {}
<simplelist>
<member>
Attempting to write to a property of a non-object. Previously this
implicitly created an stdClass object for null, false and empty strings.
implicitly created an stdClass object for &null;, &false; and empty strings.
</member>
<member>
Attempting to append an element to an array for which the PHP_INT_MAX key
Expand Down Expand Up @@ -1257,7 +1257,7 @@ $array["key"];
<methodname>ReflectionMethod::isDestructor</methodname> now also return &true; for
<link linkend="object.construct">__construct()</link> and
<link linkend="object.destruct">__destruct()</link> methods of interfaces.
Previously, this would only be true for methods of classes and traits.
Previously, this would only be &true; for methods of classes and traits.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think that was mean to be the word "true", not the constant TRUE.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Disagree. Here is the same text without confusing markup:

... now also return &true; for __construct() and __destruct() methods of interfaces. Previously, this would only be &true; for methods of classes and traits.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Maybe "Previously, this would only be the case for methods of classes and traits." would be better.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I have a "more notes" file where I am tracking this specific suggestion.

I hope that the merging of the improvements in these 300 changes I am proposing can continue without requiring the further incremental changes proposed here and below.

We agree that your note is good. We agreed it should be done. I'm noting it. I'll do it. But I don't see anything here which says that that this PR should be considered broken or blocked.

</para>
</listitem>
<listitem>
Expand Down
2 changes: 1 addition & 1 deletion language/generators.xml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ foreach (input_parser($input) as $id => $fields) {
</sect3>

<sect3 xml:id="control-structures.yield.null">
<title>Yielding null values</title>
<title>Yielding &null; values</title>

<para>
Yield can be called without an argument to yield a &null; value with an
Expand Down
2 changes: 1 addition & 1 deletion reference/apcu/functions/apcu-add.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns TRUE if something has effectively been added into the cache, FALSE otherwise.
Returns &true; if something has effectively been added into the cache, &false; otherwise.
Second syntax returns array with error keys.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/componere/componere/definition/isregistered.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Shall return true if this Definition is registered
Shall return &true; if this Definition is registered

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is "shall" the right word here? What is "Definition"? Shouldn't this be the reference to the class name?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I have a "more notes" file where I am tracking this specific suggestion.

I hope that the merging of the improvements in these 300 changes I am proposing can continue without requiring the further incremental changes proposed here and below.

We agree that your note is good. We agreed it should be done. I'm noting it. I'll do it. But I don't see anything here which says that that this PR should be considered broken or blocked.

</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-errno.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<para>
The <function>cubrid_errno</function> function is used to get the
error code of the error that occurred during the API execution. Usually,
it gets the error code when API returns false as its return value.
it gets the error code when API returns &false;.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit (consistency): as its return value is removed here, but not from the several other places where the same occurs. Your preference is to not include this kind of change in this PR, so I suggest reverting the removal of "as its return value" here.

</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-fetch-assoc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<para>
This function returns the associative array, that corresponds to the
fetched row, and then moves the internal data pointer ahead, or returns
FALSE when the end is reached.
&false; when the end is reached.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-fetch-lengths.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</methodsynopsis>
<para>
This function returns an numeric array with the lengths of the values of
each field from the current row of the result set or it returns FALSE on
each field from the current row of the result set or it returns &false; on
failure.
</para>
<note>
Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-field-len.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
</methodsynopsis>
<para>
This function returns the maximum length of the specified field on success, or it returns FALSE on failure.
This function returns the maximum length of the specified field on success, or it returns &false; on failure.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-field-name.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</methodsynopsis>
<para>
This function returns the name of the specified field index on success or
it returns FALSE on failure.
it returns &false; on failure.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-field-seek.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<para>
This function moves the result set cursor to the specified field offset.
This offset is used by <function>cubrid_fetch_field</function> if it
doesn't include a field offset. It returns TRUE on success or FALSE on
doesn't include a field offset. It returns &true; on success or &false; on
failure.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/cubridmysql/cubrid-num-fields.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</methodsynopsis>
<para>
This function returns the number of columns in the result set, on success,
or it returns FALSE on failure.
or it returns &false; on failure.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/functions/cubrid-error-code-facility.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
The <function>cubrid_error_code_facility</function> function is used to
get the facility code (level in which the error occurred) from the error
code of the error that occurred during the API execution. Usually, you can
get the error code when API returns false as its return value.
get the error code when API returns &false; as its return value.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/functions/cubrid-error-code.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<para>
The <function>cubrid_error_code</function> function is used to get the
error code of the error that occurred during the API execution. Usually,
it gets the error code when API returns false as its return value.
it gets the error code when API returns &false; as its return value.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/cubrid/functions/cubrid-insert-id.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
The <function>cubrid_insert_id</function> function retrieves the ID
generated for the AUTO_INCREMENT column which is updated by the previous
INSERT query. It returns 0 if the previous query does not generate new
rows, or FALSE on failure.
rows, or &false; on failure.
</para>

<note>
Expand Down
2 changes: 1 addition & 1 deletion reference/dom/domdocumenttype.xml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<term><varname>internalSubset</varname></term>
<listitem>
<para>
The internal subset as a string, or null if there is none. This
The internal subset as a string, or &null; if there is none. This
does not contain the delimiting square brackets.
</para>
</listitem>
Expand Down
2 changes: 1 addition & 1 deletion reference/filter/constants.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
</term>
<listitem>
<simpara>
Use NULL instead of FALSE on failure.
Use NULL instead of &false; on failure.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
Use NULL instead of &false; on failure.
Use &null; instead of &false; on failure.

</simpara>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/gmp/functions/gmp-setbit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<term><parameter>value</parameter></term>
<listitem>
<para>
True to set the bit (set it to 1/on); false to clear the bit (set it to 0/off).
&true; to set the bit (set it to 1/on); &false; to clear the bit (set it to 0/off).
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/hash/functions/hash-file.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
&reftitle.returnvalues;
<para>
Returns a string containing the calculated message digest as lowercase hexits
unless <parameter>binary</parameter> is set to true in which case the raw
unless <parameter>binary</parameter> is set to &true; in which case the raw
binary representation of the message digest is returned.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/hash/functions/hash-final.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
&reftitle.returnvalues;
<para>
Returns a string containing the calculated message digest as lowercase hexits
unless <parameter>binary</parameter> is set to true in which case the raw
unless <parameter>binary</parameter> is set to &true; in which case the raw
binary representation of the message digest is returned.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/hash/functions/hash-hmac-file.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
&reftitle.returnvalues;
<para>
Returns a string containing the calculated message digest as lowercase hexits
unless <parameter>binary</parameter> is set to true in which case the raw
unless <parameter>binary</parameter> is set to &true; in which case the raw
binary representation of the message digest is returned.
Returns &false; when <parameter>algo</parameter> is unknown or is a
non-cryptographic hash function, or if the file
Expand Down
2 changes: 1 addition & 1 deletion reference/hash/functions/hash-hmac.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
&reftitle.returnvalues;
<para>
Returns a string containing the calculated message digest as lowercase hexits
unless <parameter>binary</parameter> is set to true in which case the raw
unless <parameter>binary</parameter> is set to &true; in which case the raw
binary representation of the message digest is returned.
Returns &false; when <parameter>algo</parameter> is unknown or is a
non-cryptographic hash function.
Expand Down
2 changes: 1 addition & 1 deletion reference/hash/functions/hash.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
&reftitle.returnvalues;
<para>
Returns a string containing the calculated message digest as lowercase hexits
unless <parameter>binary</parameter> is set to true in which case the raw
unless <parameter>binary</parameter> is set to &true; in which case the raw
binary representation of the message digest is returned.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ibm_db2/ini.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
is only for simple DB2 based websites that never require profile switching
and therefore can avoid all overhead of server mode additional QSQSRVR jobs.
This is a convenience override of db2_(p)connect to set the userid and password
values to null without PHP source code changes. This override can be used in
values to &null; without PHP source code changes. This override can be used in
combination with <parameter>ibm_db2.i5_all_pconnect</parameter> = 1.
<itemizedlist>
<listitem>
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagick/getimageproperty.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns a string containing the image property, false if a
Returns a string containing the image property, &false; if a
property with the given name does not exist.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagick/getregistry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<methodparam><type>string</type><parameter>key</parameter></methodparam>
</methodsynopsis>
<para>
Get the StringRegistry entry for the named key or false if not set.
Get the StringRegistry entry for the named key or &false; if not set.
</para>

</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagick/setimagematte.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<term><parameter>matte</parameter></term>
<listitem>
<para>
True activates the matte channel and false disables it.
&true; activates the matte channel and &false; disables it.
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagick/setprogressmonitor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<term><parameter>callback</parameter></term>
<listitem>
<para>
The progress function to call. It should return true if image processing should continue, or false if it should be cancelled. The offset parameter indicates the progress and the span parameter indicates the total amount of work needed to be done.
The progress function to call. It should return &true; if image processing should continue, or &false; if it should be cancelled. The offset parameter indicates the progress and the span parameter indicates the total amount of work needed to be done.
</para>

<methodsynopsis xmlns="http://docbook.org/ns/docbook">
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagick/sigmoidalcontrastimage.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<term><parameter>sharpen</parameter></term>
<listitem>
<para>
If true increase the contrast, if false decrease the contrast.
If &true; increase the contrast, if &false; decrease the contrast.
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagickdraw/getclippath.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns a string containing the clip path ID or false if no clip path exists.
Returns a string containing the clip path ID or &false; if no clip path exists.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagickdraw/getfont.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns a string on success and false if no font is set.
Returns a string on success and &false; if no font is set.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagickdraw/getfontfamily.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns the font family currently selected or false if font family is not set.
Returns the font family currently selected or &false; if font family is not set.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagickdraw/gettextencoding.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
&reftitle.returnvalues;
<para>
Returns a string specifying the code set
or false if text encoding is not set.
or &false; if text encoding is not set.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagickkernel/frommatrix.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<term><parameter>array</parameter></term>
<listitem>
<para>
A matrix (i.e. 2d array) of values that define the kernel. Each element should be either a float value, or FALSE if that element shouldn't be used by the kernel.
A matrix (i.e. 2d array) of values that define the kernel. Each element should be either a float value, or &false; if that element shouldn't be used by the kernel.
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/imagick/imagickpixel/ispixelsimilarquantum.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<methodparam choice="opt"><type>string</type><parameter>fuzz</parameter></methodparam>
</methodsynopsis>
<para>
Returns true if the distance between two colors is less than the specified distance.
Returns &true; if the distance between two colors is less than the specified distance.
The fuzz value should be in the range 0-QuantumRange.
The maximum value represents the longest possible distance in the colorspace.
e.g. from RGB(0, 0, 0) to RGB(255, 255, 255) for the RGB colorspace
Expand Down
2 changes: 1 addition & 1 deletion reference/info/functions/getenv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<term><parameter>local_only</parameter></term>
<listitem>
<para>
Set to true to only return local environment variables (set by the operating system or putenv).
Set to &true; to only return local environment variables (set by the operating system or putenv).
</para>
</listitem>
</varlistentry>
Expand Down
2 changes: 1 addition & 1 deletion reference/intl/intlcalendar/equals.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<methodparam><type>IntlCalendar</type><parameter>other</parameter></methodparam>
</methodsynopsis>
<para>
Returns true if this calendar and the given calendar have the same time.
Returns &true; if this calendar and the given calendar have the same time.
The settings, calendar types and field states do not have to be the same.
</para>
</refsect1>
Expand Down
2 changes: 1 addition & 1 deletion reference/ldap/functions/ldap-control-paged-result.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink">
<listitem>
<para>
Indicates whether the pagination is critical or not.
If true and if the server doesn't support pagination, the search
If &true; and if the server doesn't support pagination, the search
will return no result.
</para>
</listitem>
Expand Down
2 changes: 1 addition & 1 deletion reference/luasandbox/luasandbox/callfunction.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
recursive table accesses, as if the name were a Lua expression.
</para>
<para>
If the variable does not exist, or is not a function, false will be
If the variable does not exist, or is not a function, &false; will be
returned and a warning issued.
</para>
<para>
Expand Down
2 changes: 1 addition & 1 deletion reference/memcached/callbacks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ array(3) {
Read-through cache callbacks are invoked when an item cannot be retrieved
from the server. The callback is passed the Memcached object, the requested
key, and the by-reference value variable. The callback is responsible for
setting the value and returning true or false. If the callback returns true,
setting the value and returning &true; or false. If the callback returns true,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
setting the value and returning &true; or false. If the callback returns true,
setting the value and returning &true; or &false;. If the callback returns &true;,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
setting the value and returning &true; or false. If the callback returns true,
setting the value and returning &true; or &false;. If the callback returns &true;,

Memcached will store the populated value on the server and return it to the
original calling function. Only <methodname>Memcached::get</methodname> and
<methodname>Memcached::getByKey</methodname> support these callbacks,
Expand Down
2 changes: 1 addition & 1 deletion reference/memcached/memcached/ispersistent.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns true if Memcache instance uses a persistent connection, false otherwise.
Returns &true; if Memcache instance uses a persistent connection, &false; otherwise.
</para>
</refsect1>

Expand Down
2 changes: 1 addition & 1 deletion reference/memcached/memcached/ispristine.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
Returns the true if instance is recently created, false otherwise.
Returns the &true; if instance is recently created, &false; otherwise.
</para>
</refsect1>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</listitem>
<listitem>
<para>
<code>required</code>: bool, (optional) true if the field is required to exist in the document.
<code>required</code>: bool, (optional) &true; if the field is required to exist in the document.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
<code>required</code>: bool, (optional) &true; if the field is required to exist in the document.
<code>required</code>: &boolean;, (optional) &true; if the field is required to exist in the document.

Defaults to &false;, except for <literal>GEOJSON</literal> where it defaults to &true;.
</para>
</listitem>
Expand Down
Loading