From 72a7277ae6c9edd85979bd3e219f430c00b1a404 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Thu, 5 Dec 2024 11:43:51 +0000 Subject: [PATCH 1/3] Fix local development setup And fix HTML to be readable --- manual/en/book.var.php | 82 ++++--- manual/en/class.exception.php | 97 ++------ manual/en/context.http.php | 2 +- manual/en/funcref.php | 380 ++++++++++++++++++++++++++---- manual/en/function.strpos.php | 6 +- manual/en/index.php | 214 +++++++++++++++-- manual/en/language.exceptions.php | 2 +- manual/en/refs.basic.vartype.php | 195 ++++++++------- 8 files changed, 702 insertions(+), 276 deletions(-) diff --git a/manual/en/book.var.php b/manual/en/book.var.php index 2374a91242..d5ee10a55f 100644 --- a/manual/en/book.var.php +++ b/manual/en/book.var.php @@ -53,31 +53,57 @@

Variable handling

- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/manual/en/class.exception.php b/manual/en/class.exception.php index ef158b0960..8fdf15bf3d 100644 --- a/manual/en/class.exception.php +++ b/manual/en/class.exception.php @@ -205,87 +205,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Table of Contents

+

Table of Contents

+ - + diff --git a/manual/en/context.http.php b/manual/en/context.http.php index 9b5ea29a3c..23a8238226 100644 --- a/manual/en/context.http.php +++ b/manual/en/context.http.php @@ -438,4 +438,4 @@ - + diff --git a/manual/en/funcref.php b/manual/en/funcref.php index 4696ada96b..41c4146795 100644 --- a/manual/en/funcref.php +++ b/manual/en/funcref.php @@ -63,55 +63,331 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/manual/en/function.strpos.php b/manual/en/function.strpos.php index 5bf4f0cd70..89faf76e07 100644 --- a/manual/en/function.strpos.php +++ b/manual/en/function.strpos.php @@ -26,8 +26,8 @@ ), 'prev' => array ( - 0 => 'function.strpbrk.php', - 1 => 'strpbrk', + 0 => 'ref.strings.php', + 1 => 'String Functions', ), 'next' => array ( @@ -197,4 +197,4 @@ function.

- + diff --git a/manual/en/index.php b/manual/en/index.php index a750b9580d..74d7e4ba57 100644 --- a/manual/en/index.php +++ b/manual/en/index.php @@ -143,29 +143,191 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/manual/en/language.exceptions.php b/manual/en/language.exceptions.php index e98d8e30a5..114194b952 100644 --- a/manual/en/language.exceptions.php +++ b/manual/en/language.exceptions.php @@ -161,4 +161,4 @@ class or a subclass of Exception - + diff --git a/manual/en/refs.basic.vartype.php b/manual/en/refs.basic.vartype.php index 7c5dd22801..9617220eae 100644 --- a/manual/en/refs.basic.vartype.php +++ b/manual/en/refs.basic.vartype.php @@ -50,85 +50,116 @@ ?>
-

Variable and Type Related Extensions

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+

Variable and Type Related Extensions

+ + From 58419246e0e77da35b89f8f9c4194c41ba1c788a Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Thu, 5 Dec 2024 11:47:37 +0000 Subject: [PATCH 2/3] Add a new documentation page for rtrim() This page has examples with output to test the interactive code runner --- manual/en/function.rtrim.php | 190 ++++++++++++++++++++++++++++++++++ manual/en/function.strpos.php | 4 +- 2 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 manual/en/function.rtrim.php diff --git a/manual/en/function.rtrim.php b/manual/en/function.rtrim.php new file mode 100644 index 0000000000..a6fae9449d --- /dev/null +++ b/manual/en/function.rtrim.php @@ -0,0 +1,190 @@ + + array ( + 0 => 'index.php', + 1 => 'PHP Manual', + ), + 'head' => + array ( + 0 => 'UTF-8', + 1 => 'en', + ), + 'this' => + array ( + 0 => 'function.rtrim.php', + 1 => 'rtrim', + ), + 'up' => + array ( + 0 => 'ref.strings.php', + 1 => 'String Functions', + ), + 'prev' => + array ( + 0 => 'function.strpos.php', + 1 => 'strpos', + ), + 'alternatives' => + array ( + ), +); +$setup["toc"] = $TOC; +$setup["parents"] = $PARENTS; +manual_setup($setup); + +?> +
+
+

rtrim

+

(PHP 4, PHP 5, PHP 7, PHP 8)

rtrim — Strip whitespace (or other characters) from the end of a string

+ +
+ +
+

Description

+
+ rtrim(string $string, string $characters = " \n\r\t\v\x00"): string
+ +

+ This function returns a string with whitespace (or other characters) stripped from the + end of string. +

+

+ Without the second parameter, + rtrim() will strip these characters: +

+ +
    +
  • + + " ": ASCII SP character + 0x20, an ordinary space. + +
    • +
  • + + "\t": ASCII HT character + 0x09, a tab. + +
    • +
  • + + "\n": ASCII LF character + 0x0A, a new line (line feed). + +
    • +
  • + + "\r": ASCII CR character + 0x0D, a carriage return. + +
    • +
  • + + "\0": ASCII NUL character + 0x00, the NUL-byte. + +
    • +
  • + + "\v": ASCII VT + character 0x0B, a vertical tab. + +
    • +
+ +
+ + +
+

Parameters

+
+ +
string
+
+ + The input string. + +
+ + +
characters
+
+ + + Optionally, the stripped characters can also be specified using + the characters parameter. + Simply list all characters that need to be stripped. + With .. it is possible to specify an incrementing range of characters. + + +
+ +
+
+ + +
+

Return Values

+

+ Returns the modified string. +

+
+ + +
+

Examples

+
+

Example #1 Usage example of rtrim()

+
+
<?php

$text = "\t\tThese are a few words :) ... ";
$binary = "\x09Example string\x0A";
$hello = "Hello World";
var_dump($text, $binary, $hello);

print "\n";

$trimmed = rtrim($text);
var_dump($trimmed);

$trimmed = rtrim($text, " \t.");
var_dump($trimmed);

$trimmed = rtrim($hello, "Hdle");
var_dump($trimmed);

// trim the ASCII control characters at the end of $binary
// (from 0 to 31 inclusive)
$clean = rtrim($binary, "\x00..\x1F");
var_dump($clean);

?>
+
+ +

The above example will output:

+
+ 
string(32) "        These are a few words :) ...  "
+string(16) "    Example string
+"
+string(11) "Hello World"
+
+string(30) "        These are a few words :) ..."
+string(26) "        These are a few words :)"
+string(9) "Hello Wor"
+string(15) "    Example string"
+
+
+
+
+

Example #1 similar_text() argument swapping example

+

+ This example shows that swapping the string1 and + string2 argument may yield different results. +

+
+
<?php
$sim = similar_text('bafoobar', 'barfoo', $perc);
echo "similarity: $sim ($perc %)\n";
$sim = similar_text('barfoo', 'bafoobar', $perc);
echo "similarity: $sim ($perc %)\n";
+
+ +

The above example will output + something similar to:

+
+ 
similarity: 5 (71.428571428571 %)
+similarity: 3 (42.857142857143 %)
+
+
+
+
+ + +
+

See Also

+
    +
  • trim() - Strip whitespace (or other characters) from the beginning and end of a string
    • +
  • ltrim() - Strip whitespace (or other characters) from the beginning of a string
    • +
+
+
diff --git a/manual/en/function.strpos.php b/manual/en/function.strpos.php index 89faf76e07..00b1ebdbb8 100644 --- a/manual/en/function.strpos.php +++ b/manual/en/function.strpos.php @@ -31,8 +31,8 @@ ), 'next' => array ( - 0 => 'function.strrchr.php', - 1 => 'strrchr', + 0 => 'function.rtrim.php', + 1 => 'rtrim', ), 'alternatives' => array ( From c001e99b63a3123c6bc0dc8ba171c1017df63b7f Mon Sep 17 00:00:00 2001 From: Sergey Panteleev Date: Wed, 11 Dec 2024 09:44:05 +0300 Subject: [PATCH 3/3] Update snapshots --- ...-screenshots-manual-index-php-chromium.png | Bin 393171 -> 419892 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/Visual/SmokeTest.spec.ts-snapshots/tests-screenshots-manual-index-php-chromium.png b/tests/Visual/SmokeTest.spec.ts-snapshots/tests-screenshots-manual-index-php-chromium.png index c693f3c826f242c8c311a362b477c4b8c34d72bf..998960b9d297a793bbd71597fcd3945bbd39ec98 100644 GIT binary patch delta 36655 zcmcG$2RNK-_dY7I6Hq#AV~CXM}i=T-bK!1=0>(7*QQvxP-l&Ht-TdNvN$OJQ=W#eLW@CSP>N+guS#-_$ z8KS5AMts@qs8d%$+MDgDFm(qAQ#JQ51TUJ6+`mwg;B@5lRn$pRPgN z7_;6sJ@8of{ltZ5SPnBfTuRqsie~c_Qd8e2M0^ZL4|d-e{CFxN$lhKor*H8*YjIVP zSL1m2H)Xe!9IuyESJ)W}OA7TiM+7A~V=m8{S`cwA?w*)O`k#!ve1U9*74p_yYV*Pm~<84<5Y z)}nRUXrhCg-tV1}(L4a?lI>fMRI2B7pl ztIr*Z9Y=TkfL2&o7-nQdRaMo{bMfx9+p}k!k*B57Wlk~5b3i>y&U+e~ng#PwN