From 41e67a136823f3436fabce4d0553b4234c11f7bd Mon Sep 17 00:00:00 2001 From: Louis-Arnaud Date: Tue, 30 Jun 2026 12:02:44 +0200 Subject: [PATCH 1/2] Remove $ sigil from names A should hold the parameter name without the $ sigil. $this, superglobals ($_GET/$_POST) and in-text example variables are left untouched. --- appendices/migration83/deprecated.xml | 8 ++--- appendices/migration83/incompatible.xml | 20 ++++++------- appendices/migration83/new-features.xml | 2 +- appendices/migration83/other-changes.xml | 30 +++++++++---------- appendices/migration85/deprecated.xml | 4 +-- appendices/migration85/incompatible.xml | 14 ++++----- appendices/migration85/new-features.xml | 6 ++-- appendices/migration85/other-changes.xml | 12 ++++---- appendices/migration85/windows-support.xml | 6 ++-- reference/com/functions/variant-cat.xml | 2 +- reference/datetime/datetime/construct.xml | 10 +++---- .../datetime/datetimeimmutable/construct.xml | 10 +++---- reference/mongodb/tutorial/apm.xml | 2 +- reference/pcre/functions/preg-match-all.xml | 2 +- reference/pcre/functions/preg-match.xml | 2 +- reference/session/examples.xml | 2 +- .../session/functions/session-decode.xml | 2 +- reference/session/sessionhandler/destroy.xml | 2 +- reference/session/sessionhandler/read.xml | 2 +- reference/session/sessionhandler/write.xml | 2 +- reference/stream/constants.xml | 4 +-- reference/yac/yac/dump.xml | 2 +- 22 files changed, 73 insertions(+), 73 deletions(-) diff --git a/appendices/migration83/deprecated.xml b/appendices/migration83/deprecated.xml index ab65272d82a8..c941df1682b0 100644 --- a/appendices/migration83/deprecated.xml +++ b/appendices/migration83/deprecated.xml @@ -39,7 +39,7 @@ DBA - Calling dba_fetch with $dba as + Calling dba_fetch with dba as the 3rd argument is now deprecated. @@ -72,7 +72,7 @@ Calling ldap_connect with separate - $hostname and $port is + hostname and port is deprecated. @@ -82,7 +82,7 @@ MBString - Passing a negative $width to + Passing a negative width to mb_strimwidth is now deprecated. @@ -92,7 +92,7 @@ Calling Phar::setStub with a - resource and a $length + resource and a length is now deprecated. Such calls should be replaced by: $phar->setStub(stream_get_contents($resource)); diff --git a/appendices/migration83/incompatible.xml b/appendices/migration83/incompatible.xml index f735b9a99526..d18eb5f9afb6 100644 --- a/appendices/migration83/incompatible.xml +++ b/appendices/migration83/incompatible.xml @@ -175,25 +175,25 @@ A TypeError is now thrown when passing objects, resources, or arrays as the boundary inputs. A more descriptive ValueError is thrown when - passing 0 for $step. + passing 0 for step. A ValueError is now thrown when using a - negative $step for increasing ranges. - If $step is a float that can be interpreted + negative step for increasing ranges. + If step is a float that can be interpreted as an int, it is now done so. A ValueError is now thrown if any argument is infinity or NAN. An E_WARNING is now emitted if - $start or $end is the empty + start or end is the empty string. The value continues to be cast to the value 0. An E_WARNING is now emitted if - $start or $end has more than + start or end has more than one byte, only if it is a non-numeric string. An E_WARNING is now emitted if - $start or $end is cast to an + start or end is cast to an integer because the other boundary input is a number. (e.g. range(5, 'z');). An E_WARNING is now emitted if - $step is a float when trying to generate a range of + step is a float when trying to generate a range of characters, except if both boundary inputs are numeric strings (e.g. range('5', '9', 0.5); does not produce a warning). range now produce a list of characters if one @@ -215,9 +215,9 @@ range('9', 'A'); // [9, 8, 7, 6, 5, 4, 3, 2, 1, 0], prior to PHP 8.3.0 number_format now handles negative - $decimals values by rounding - $num to abs($decimals) digits before the - decimal point. Previously, negative $decimals values + decimals values by rounding + num to abs($decimals) digits before the + decimal point. Previously, negative decimals values were ignored. diff --git a/appendices/migration83/new-features.xml b/appendices/migration83/new-features.xml index 27b765b64dfa..507a8636c1d4 100644 --- a/appendices/migration83/new-features.xml +++ b/appendices/migration83/new-features.xml @@ -155,7 +155,7 @@ echo $user_ini['listen']; // localhost:9000 posix_getrlimit now takes an optional - $resource parameter to allow fetching a single resource limit. + resource parameter to allow fetching a single resource limit. diff --git a/appendices/migration83/other-changes.xml b/appendices/migration83/other-changes.xml index 487e36be0724..ceeb556745c1 100644 --- a/appendices/migration83/other-changes.xml +++ b/appendices/migration83/other-changes.xml @@ -178,7 +178,7 @@ The signature of imagerotate has changed. - The $ignore_transparent parameter has been removed, + The ignore_transparent parameter has been removed, as it was ignored since PHP 5.5.0. @@ -265,14 +265,14 @@ mysqli_fetch_object now raises a ValueError instead of an Exception - when the $constructor_args argument is non empty with + when the constructor_args argument is non empty with the class not having constructor. mysqli_poll now raises a ValueError - when neither the $read - nor the $error arguments are passed. + when neither the read + nor the error arguments are passed. @@ -287,7 +287,7 @@ odbc_autocommit now accepts &null; for the - $enable parameter. + enable parameter. Passing &null; has the same behaviour as passing only 1 parameter, namely indicating if the autocommit feature is enabled or not. @@ -299,7 +299,7 @@ pg_fetch_object now raises a ValueError instead of an Exception - when the $constructor_args argument is non empty with + when the constructor_args argument is non empty with the class not having constructor. @@ -316,7 +316,7 @@ - The $row parameter of + The row parameter of pg_fetch_result, pg_field_prtlen, and pg_field_is_null is now nullable. @@ -374,19 +374,19 @@ password_hash will now chain the underlying Random\RandomException - as the ValueError's $previous + as the ValueError's previous Exception when salt generation fails. - If using an array as the $command + If using an array as the command for proc_open, it must now have at least one non empty element. Otherwise a ValueError is thrown. - proc_open returns &false; if $command + proc_open returns &false; if command array is invalid command instead of resource object that produces warning later. This was already the case for Windows but it is now also the case if a posix_spawn implementation is in use (most Linux, BSD and MacOS platforms). There are still @@ -404,17 +404,17 @@ - The $decimals of number_format + The decimals of number_format now properly handles negative integers. - Rounding with a negative value for $decimals means - that $num is rounded to $decimals + Rounding with a negative value for decimals means + that num is rounded to decimals significant digits before the decimal point. - Previously negative $decimals were silently + Previously negative decimals were silently ignored and the number got rounded to zero decimal places. - A new $before_needle argument has been added to + A new before_needle argument has been added to strrchr. It behaves like its counterpart in the strstr or stristr functions. diff --git a/appendices/migration85/deprecated.xml b/appendices/migration85/deprecated.xml index e875a0ae2d6e..864b92a4d077 100644 --- a/appendices/migration85/deprecated.xml +++ b/appendices/migration85/deprecated.xml @@ -204,7 +204,7 @@ - The $context parameter of the + The context parameter of the finfo_buffer function has been deprecated as it is ignored. @@ -285,7 +285,7 @@ OpenSSL - The $key_length parameter for + The key_length parameter for openssl_pkey_derive has been deprecated. This is because it is either ignored, or truncates the key, which can be a security vulnerability. diff --git a/appendices/migration85/incompatible.xml b/appendices/migration85/incompatible.xml index fde91fe519ff..b81692aaf87b 100644 --- a/appendices/migration85/incompatible.xml +++ b/appendices/migration85/incompatible.xml @@ -155,12 +155,12 @@ bzcompress now throws a ValueError - when $block_size is not between 1 and 9. + when block_size is not between 1 and 9. bzcompress now throws a ValueError - when $work_factor is not between 0 and 250. + when work_factor is not between 0 and 250. @@ -184,7 +184,7 @@ finfo_file and finfo::file now throws a ValueError instead of a - TypeError when $filename + TypeError when filename contains nul bytes. This aligns the type of Error thrown to be consistent with the rest of the language. @@ -293,12 +293,12 @@ pcntl_exec now throws ValueError - when entries of the $args parameter contain null bytes. + when entries of the args parameter contain null bytes. pcntl_exec now throws ValueError - when entries or keys of the $env_vars parameter + when entries or keys of the env_vars parameter contain null bytes. @@ -485,7 +485,7 @@ SoapClient::__doRequest now accepts a new, - optional $uriParserClass parameter accepting + optional uriParserClass parameter accepting string or &null; arguments. &null; represents the original (parse_url) based method, while the new backends will be used when passing either @@ -538,7 +538,7 @@ SplFileObject::fwrite's parameter - $length is now nullable. + length is now nullable. The default value changed from 0 to &null;. diff --git a/appendices/migration85/new-features.xml b/appendices/migration85/new-features.xml index 9acd268ef54b..685ecc02bcf5 100644 --- a/appendices/migration85/new-features.xml +++ b/appendices/migration85/new-features.xml @@ -394,7 +394,7 @@ print T1 . PHP_EOL; // Prints "0" The signature of SoapFault::__construct and SoapServer::fault therefore - now have an optional $lang parameter. + now have an optional lang parameter. This support solves compatibility with .NET SOAP clients. @@ -453,11 +453,11 @@ print T1 . PHP_EOL; // Prints "0" XSL - The $namespace argument of XSLTProcessor::getParameter, + The namespace argument of XSLTProcessor::getParameter, XSLTProcessor::setParameter and XSLTProcessor::removeParameter now actually works instead of being treated as empty. - This only works if the $name argument does not use Clark notation and is not a + This only works if the name argument does not use Clark notation and is not a QName because in those cases the namespace is taken from the namespace href or prefix respectively. diff --git a/appendices/migration85/other-changes.xml b/appendices/migration85/other-changes.xml index 715b1440d86e..e61eafd8fc8a 100644 --- a/appendices/migration85/other-changes.xml +++ b/appendices/migration85/other-changes.xml @@ -88,7 +88,7 @@ grapheme_extract properly assigns - $next value when skipping over invalid starting bytes. + next value when skipping over invalid starting bytes. Previously there were cases where it would point to the start of the grapheme boundary instead of the end. @@ -103,7 +103,7 @@ - The following functions now support a $locale argument: + The following functions now support a locale argument: grapheme_strpos, grapheme_stripos, grapheme_strrpos, @@ -143,18 +143,18 @@ openssl_public_encrypt and openssl_private_decrypt have a new parameter - $digest_algo that allows specifying the hash + digest_algo that allows specifying the hash digest algorithm for OAEP padding. openssl_sign and openssl_verify - have a new parameter $padding to allow using more + have a new parameter padding to allow using more secure RSA PSS padding. - openssl_cms_encrypt $cipher_algo + openssl_cms_encrypt cipher_algo parameter can be a string with the cipher name. That allows to use more algorithms including AES GCM cipher algorithms for auth enveloped data. @@ -270,7 +270,7 @@ Zlib - The $use_include_path argument for the + The use_include_path argument for the gzfile, gzopen and readgzfile functions has been changed from int to bool. diff --git a/appendices/migration85/windows-support.xml b/appendices/migration85/windows-support.xml index b84f24312c7f..f33d5b040a15 100644 --- a/appendices/migration85/windows-support.xml +++ b/appendices/migration85/windows-support.xml @@ -58,9 +58,9 @@ Streams - If only pipe streams are contained in the $read - array, and the $write and - $except arrays are empty, + If only pipe streams are contained in the read + array, and the write and + except arrays are empty, stream_select now behaves similar to POSIX systems, i.e. the function only returns if at least one pipe is ready to be read, or after the timeout expires. diff --git a/reference/com/functions/variant-cat.xml b/reference/com/functions/variant-cat.xml index 88be694fe9c2..6622e3eed67f 100644 --- a/reference/com/functions/variant-cat.xml +++ b/reference/com/functions/variant-cat.xml @@ -18,7 +18,7 @@ This function is notionally equivalent to - $left . $right. + left . right. diff --git a/reference/datetime/datetime/construct.xml b/reference/datetime/datetime/construct.xml index 11d3f90e06d3..d16bd4ef832c 100644 --- a/reference/datetime/datetime/construct.xml +++ b/reference/datetime/datetime/construct.xml @@ -32,7 +32,7 @@ &date.formats.parameter; Enter "now" here to obtain the current time when using - the $timezone parameter. + the timezone parameter. @@ -41,17 +41,17 @@ A DateTimeZone object representing the - timezone of $datetime. + timezone of datetime. - If $timezone is omitted or &null;, + If timezone is omitted or &null;, the current timezone will be used. - The $timezone parameter + The timezone parameter and the current timezone are ignored when the - $datetime parameter either + datetime parameter either is a UNIX timestamp (e.g. @946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00). diff --git a/reference/datetime/datetimeimmutable/construct.xml b/reference/datetime/datetimeimmutable/construct.xml index 943fa828f2a8..a89a9b94fb65 100644 --- a/reference/datetime/datetimeimmutable/construct.xml +++ b/reference/datetime/datetimeimmutable/construct.xml @@ -35,7 +35,7 @@ &date.formats.parameter; Enter "now" here to obtain the current time when using - the $timezone parameter. + the timezone parameter. @@ -44,17 +44,17 @@ A DateTimeZone object representing the - timezone of $datetime. + timezone of datetime. - If $timezone is omitted or &null;, + If timezone is omitted or &null;, the current timezone will be used. - The $timezone parameter + The timezone parameter and the current timezone are ignored when the - $datetime parameter either + datetime parameter either is a UNIX timestamp (e.g. @946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00, or diff --git a/reference/mongodb/tutorial/apm.xml b/reference/mongodb/tutorial/apm.xml index 2984c705c36d..60a3acdad501 100644 --- a/reference/mongodb/tutorial/apm.xml +++ b/reference/mongodb/tutorial/apm.xml @@ -18,7 +18,7 @@ commandSucceeded, and commandFailed. Each of these three methods accept a single event argument of a specific class for the respective event. For example, the - commandSucceeded's $event argument + commandSucceeded's event argument is a MongoDB\Driver\Monitoring\CommandSucceededEvent object. diff --git a/reference/pcre/functions/preg-match-all.xml b/reference/pcre/functions/preg-match-all.xml index d5387b6952f1..04a3611cc9ee 100644 --- a/reference/pcre/functions/preg-match-all.xml +++ b/reference/pcre/functions/preg-match-all.xml @@ -305,7 +305,7 @@ Array 7.2.0 The PREG_UNMATCHED_AS_NULL is now supported for the - $flags parameter. + flags parameter. diff --git a/reference/pcre/functions/preg-match.xml b/reference/pcre/functions/preg-match.xml index 11587ac3144e..8e2224c59f97 100644 --- a/reference/pcre/functions/preg-match.xml +++ b/reference/pcre/functions/preg-match.xml @@ -274,7 +274,7 @@ Array 7.2.0 The PREG_UNMATCHED_AS_NULL is now supported for the - $flags parameter. + flags parameter. diff --git a/reference/session/examples.xml b/reference/session/examples.xml index efe6177a6ec4..40227986eb37 100644 --- a/reference/session/examples.xml +++ b/reference/session/examples.xml @@ -237,7 +237,7 @@ here. PHP will call the gc callback from time to time to expire any session records according to the set max lifetime of a session. This routine should delete all records from persistent storage which were - last accessed longer than the $lifetime. + last accessed longer than the lifetime. diff --git a/reference/session/functions/session-decode.xml b/reference/session/functions/session-decode.xml index 42bc10c1b240..6c9c56be91d1 100644 --- a/reference/session/functions/session-decode.xml +++ b/reference/session/functions/session-decode.xml @@ -14,7 +14,7 @@ session_decode decodes the serialized session data provided in - $data, and populates the $_SESSION superglobal + data, and populates the $_SESSION superglobal with the result. diff --git a/reference/session/sessionhandler/destroy.xml b/reference/session/sessionhandler/destroy.xml index 5b77110274ea..19cd434c1f2c 100644 --- a/reference/session/sessionhandler/destroy.xml +++ b/reference/session/sessionhandler/destroy.xml @@ -14,7 +14,7 @@ Destroys a session. Called internally by PHP with session_regenerate_id (assuming - the $destroy is set to &true;, by session_destroy or when + the destroy is set to &true;, by session_destroy or when session_decode fails. diff --git a/reference/session/sessionhandler/read.xml b/reference/session/sessionhandler/read.xml index 8a8d0e5d790e..ca8e2cb1a0a0 100644 --- a/reference/session/sessionhandler/read.xml +++ b/reference/session/sessionhandler/read.xml @@ -26,7 +26,7 @@ If this class is extended by inheritance, calling the parent read method will invoke the wrapper for this method and therefore invoke the associated internal callback. This allows the method to be - overridden and or intercepted and filtered (for example, decrypting the $data value + overridden and or intercepted and filtered (for example, decrypting the data value returned by the parent read method). diff --git a/reference/session/sessionhandler/write.xml b/reference/session/sessionhandler/write.xml index 3f6bfbb3885a..8657ed23d44c 100644 --- a/reference/session/sessionhandler/write.xml +++ b/reference/session/sessionhandler/write.xml @@ -26,7 +26,7 @@ If this class is extended by inheritance, calling the parent write method will invoke the wrapper for this method and therefore invoke the associated internal callback. This allows this method to be - overridden and or intercepted and filtered (for example, encrypting the $data value + overridden and or intercepted and filtered (for example, encrypting the data value before sending it to the parent write method). diff --git a/reference/stream/constants.xml b/reference/stream/constants.xml index d937365f456a..2668da3c31d5 100644 --- a/reference/stream/constants.xml +++ b/reference/stream/constants.xml @@ -1203,7 +1203,7 @@ Return value indicating that the userspace filter - returned buckets in $out. + returned buckets in out. @@ -1215,7 +1215,7 @@ Return value indicating that the userspace filter - did not return buckets in $out. + did not return buckets in out. (i.e. No data available.) diff --git a/reference/yac/yac/dump.xml b/reference/yac/yac/dump.xml index b49e265ebdf1..8a8a4fc73a3a 100644 --- a/reference/yac/yac/dump.xml +++ b/reference/yac/yac/dump.xml @@ -11,7 +11,7 @@ &reftitle.description; public mixedYac::dump - int$num + intnum Dump values stored in cache From a03bd5b7dbef8b2a8c584a04db6376243518f1d8 Mon Sep 17 00:00:00 2001 From: Louis-Arnaud Date: Tue, 30 Jun 2026 13:05:51 +0200 Subject: [PATCH 2/2] Convert touched inline-only to and exception to Required by the DocBook style check on the paragraphs modified by this PR. Within those blocks, neighbouring exception names in the same list/paragraph are also converted to for local consistency. --- appendices/migration83/deprecated.xml | 12 ++--- appendices/migration83/incompatible.xml | 8 +-- appendices/migration83/new-features.xml | 4 +- appendices/migration83/other-changes.xml | 50 +++++++++---------- reference/com/functions/variant-cat.xml | 4 +- reference/datetime/datetime/construct.xml | 16 +++--- .../datetime/datetimeimmutable/construct.xml | 16 +++--- reference/session/examples.xml | 4 +- .../session/functions/session-decode.xml | 4 +- reference/session/sessionhandler/destroy.xml | 4 +- reference/session/sessionhandler/read.xml | 4 +- reference/session/sessionhandler/write.xml | 4 +- 12 files changed, 65 insertions(+), 65 deletions(-) diff --git a/appendices/migration83/deprecated.xml b/appendices/migration83/deprecated.xml index c941df1682b0..c70d6628b481 100644 --- a/appendices/migration83/deprecated.xml +++ b/appendices/migration83/deprecated.xml @@ -38,10 +38,10 @@ DBA - + Calling dba_fetch with dba as the 3rd argument is now deprecated. - + @@ -70,21 +70,21 @@ LDAP - + Calling ldap_connect with separate hostname and port is deprecated. - + MBString - + Passing a negative width to mb_strimwidth is now deprecated. - + diff --git a/appendices/migration83/incompatible.xml b/appendices/migration83/incompatible.xml index d18eb5f9afb6..e17d6b966bda 100644 --- a/appendices/migration83/incompatible.xml +++ b/appendices/migration83/incompatible.xml @@ -172,15 +172,15 @@ The range function has had various changes: - A TypeError is now thrown when passing objects, + A TypeError is now thrown when passing objects, resources, or arrays as the boundary inputs. - A more descriptive ValueError is thrown when + A more descriptive ValueError is thrown when passing 0 for step. - A ValueError is now thrown when using a + A ValueError is now thrown when using a negative step for increasing ranges. If step is a float that can be interpreted as an int, it is now done so. - A ValueError is now thrown if any argument + A ValueError is now thrown if any argument is infinity or NAN. An E_WARNING is now emitted if start or end is the empty diff --git a/appendices/migration83/new-features.xml b/appendices/migration83/new-features.xml index 507a8636c1d4..c67fab39dd63 100644 --- a/appendices/migration83/new-features.xml +++ b/appendices/migration83/new-features.xml @@ -153,10 +153,10 @@ echo $user_ini['listen']; // localhost:9000 POSIX - + posix_getrlimit now takes an optional resource parameter to allow fetching a single resource limit. - + posix_isatty now raises type warnings for integers diff --git a/appendices/migration83/other-changes.xml b/appendices/migration83/other-changes.xml index ceeb556745c1..b1d288e9d454 100644 --- a/appendices/migration83/other-changes.xml +++ b/appendices/migration83/other-changes.xml @@ -176,11 +176,11 @@ Gd - + The signature of imagerotate has changed. The ignore_transparent parameter has been removed, as it was ignored since PHP 5.5.0. - + @@ -262,18 +262,18 @@ mysqli - + mysqli_fetch_object now raises a ValueError instead of an Exception when the constructor_args argument is non empty with the class not having constructor. - + - + mysqli_poll now raises a ValueError when neither the read nor the error arguments are passed. - + mysqli_field_seek and @@ -285,23 +285,23 @@ ODBC - + odbc_autocommit now accepts &null; for the enable parameter. Passing &null; has the same behaviour as passing only 1 parameter, namely indicating if the autocommit feature is enabled or not. - + PGSQL - + pg_fetch_object now raises a ValueError instead of an Exception when the constructor_args argument is non empty with the class not having constructor. - + pg_insert now raises a ValueError @@ -315,12 +315,12 @@ does not match properly with a PostgreSQL's type. - + The row parameter of pg_fetch_result, pg_field_prtlen, and pg_field_is_null is now nullable. - + @@ -371,28 +371,28 @@ case token is not provided when starting tokenization. - + password_hash will now chain the underlying - Random\RandomException - as the ValueError's previous - Exception when salt generation fails. - + Random\RandomException + as the ValueError's previous + Exception when salt generation fails. + - + If using an array as the command for proc_open, it must now have at least one non empty element. Otherwise a ValueError is thrown. - + - + proc_open returns &false; if command array is invalid command instead of resource object that produces warning later. This was already the case for Windows but it is now also the case if a posix_spawn implementation is in use (most Linux, BSD and MacOS platforms). There are still some old platforms where this behavior is not changed as posix_spawn is not supported there. - + array_sum and array_product now @@ -403,7 +403,7 @@ - + The decimals of number_format now properly handles negative integers. Rounding with a negative value for decimals means @@ -411,13 +411,13 @@ significant digits before the decimal point. Previously negative decimals were silently ignored and the number got rounded to zero decimal places. - + - + A new before_needle argument has been added to strrchr. It behaves like its counterpart in the strstr or stristr functions. - + str_getcsv and fgetcsv now return diff --git a/reference/com/functions/variant-cat.xml b/reference/com/functions/variant-cat.xml index 6622e3eed67f..cb2bd4d5e793 100644 --- a/reference/com/functions/variant-cat.xml +++ b/reference/com/functions/variant-cat.xml @@ -16,10 +16,10 @@ Concatenates left with right and returns the result. - + This function is notionally equivalent to left . right. - + &reftitle.parameters; diff --git a/reference/datetime/datetime/construct.xml b/reference/datetime/datetime/construct.xml index d16bd4ef832c..4589d28986f1 100644 --- a/reference/datetime/datetime/construct.xml +++ b/reference/datetime/datetime/construct.xml @@ -30,32 +30,32 @@ datetime &date.formats.parameter; - + Enter "now" here to obtain the current time when using the timezone parameter. - + timezone - + A DateTimeZone object representing the timezone of datetime. - - + + If timezone is omitted or &null;, the current timezone will be used. - + - + The timezone parameter and the current timezone are ignored when the datetime parameter either is a UNIX timestamp (e.g. @946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00). - + diff --git a/reference/datetime/datetimeimmutable/construct.xml b/reference/datetime/datetimeimmutable/construct.xml index a89a9b94fb65..7825d8e8657e 100644 --- a/reference/datetime/datetimeimmutable/construct.xml +++ b/reference/datetime/datetimeimmutable/construct.xml @@ -33,25 +33,25 @@ datetime &date.formats.parameter; - + Enter "now" here to obtain the current time when using the timezone parameter. - + timezone - + A DateTimeZone object representing the timezone of datetime. - - + + If timezone is omitted or &null;, the current timezone will be used. - + - + The timezone parameter and the current timezone are ignored when the datetime parameter either @@ -59,7 +59,7 @@ or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00, or 2010-07-05T06:00:00Z). - + diff --git a/reference/session/examples.xml b/reference/session/examples.xml index 40227986eb37..2e0554e0b72d 100644 --- a/reference/session/examples.xml +++ b/reference/session/examples.xml @@ -233,12 +233,12 @@ here. When a session is specifically destroyed, PHP will call the destroy handler with the session ID. - + PHP will call the gc callback from time to time to expire any session records according to the set max lifetime of a session. This routine should delete all records from persistent storage which were last accessed longer than the lifetime. - + diff --git a/reference/session/functions/session-decode.xml b/reference/session/functions/session-decode.xml index 6c9c56be91d1..a3044ad5f461 100644 --- a/reference/session/functions/session-decode.xml +++ b/reference/session/functions/session-decode.xml @@ -12,11 +12,11 @@ boolsession_decode stringdata - + session_decode decodes the serialized session data provided in data, and populates the $_SESSION superglobal with the result. - + By default, the unserialization method used is internal to PHP, and is not the same as unserialize. The serialization method can be set using session.serialize_handler. diff --git a/reference/session/sessionhandler/destroy.xml b/reference/session/sessionhandler/destroy.xml index 19cd434c1f2c..68ff98a64067 100644 --- a/reference/session/sessionhandler/destroy.xml +++ b/reference/session/sessionhandler/destroy.xml @@ -12,11 +12,11 @@ public boolSessionHandler::destroy stringid - + Destroys a session. Called internally by PHP with session_regenerate_id (assuming the destroy is set to &true;, by session_destroy or when session_decode fails. - + This method wraps the internal PHP save handler defined in the session.save_handler ini setting that was set diff --git a/reference/session/sessionhandler/read.xml b/reference/session/sessionhandler/read.xml index ca8e2cb1a0a0..e466519148cb 100644 --- a/reference/session/sessionhandler/read.xml +++ b/reference/session/sessionhandler/read.xml @@ -23,12 +23,12 @@ session.save_handler ini setting that was set before this handler was set by session_set_save_handler. - + If this class is extended by inheritance, calling the parent read method will invoke the wrapper for this method and therefore invoke the associated internal callback. This allows the method to be overridden and or intercepted and filtered (for example, decrypting the data value returned by the parent read method). - + For more information on what this method is expected to do, please refer to the documentation at SessionHandlerInterface::read. diff --git a/reference/session/sessionhandler/write.xml b/reference/session/sessionhandler/write.xml index 8657ed23d44c..50918af8abd5 100644 --- a/reference/session/sessionhandler/write.xml +++ b/reference/session/sessionhandler/write.xml @@ -23,12 +23,12 @@ session.save_handler ini setting that was set before this handler was set by session_set_save_handler. - + If this class is extended by inheritance, calling the parent write method will invoke the wrapper for this method and therefore invoke the associated internal callback. This allows this method to be overridden and or intercepted and filtered (for example, encrypting the data value before sending it to the parent write method). - + For more information on what this method is expected to do, please refer to the documentation at SessionHandlerInterface::write.