@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper_Boundaries |
| 85 | 85 | { |
| 86 | - if(empty($contentType)) |
|
| 86 | + if (empty($contentType)) |
|
| 87 | 87 | { |
| 88 | 88 | $contentType = (string)FileHelper::detectMimeType($fileName); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - if(empty($encoding)) |
|
| 91 | + if (empty($encoding)) |
|
| 92 | 92 | { |
| 93 | 93 | $encoding = RequestHelper::ENCODING_UTF8; |
| 94 | 94 | $content = ConvertHelper::string2utf8($content); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function render() : string |
| 155 | 155 | { |
| 156 | - if(empty($this->boundaries)) |
|
| 156 | + if (empty($this->boundaries)) |
|
| 157 | 157 | { |
| 158 | 158 | throw new RequestHelper_Exception( |
| 159 | 159 | 'No mime boundaries added', |
@@ -164,13 +164,13 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | $result = ''; |
| 166 | 166 | |
| 167 | - foreach($this->boundaries as $boundary) |
|
| 167 | + foreach ($this->boundaries as $boundary) |
|
| 168 | 168 | { |
| 169 | 169 | $result .= $boundary->render(); |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - $result .= "--" . $this->getMimeBoundary() . "--" . |
|
| 173 | - $this->getEOL() . $this->getEOL(); // always finish with two eol's!! |
|
| 172 | + $result .= "--".$this->getMimeBoundary()."--". |
|
| 173 | + $this->getEOL().$this->getEOL(); // always finish with two eol's!! |
|
| 174 | 174 | |
| 175 | 175 | return $result; |
| 176 | 176 | } |
@@ -22,19 +22,19 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | public const ERROR_NO_BOUNDARIES_SPECIFIED = 44401; |
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * @var RequestHelper |
|
| 27 | - */ |
|
| 25 | + /** |
|
| 26 | + * @var RequestHelper |
|
| 27 | + */ |
|
| 28 | 28 | protected $helper; |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @var RequestHelper_Boundaries_Boundary[] |
|
| 32 | - */ |
|
| 30 | + /** |
|
| 31 | + * @var RequestHelper_Boundaries_Boundary[] |
|
| 32 | + */ |
|
| 33 | 33 | protected $boundaries = array(); |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var integer |
|
| 37 | - */ |
|
| 35 | + /** |
|
| 36 | + * @var integer |
|
| 37 | + */ |
|
| 38 | 38 | protected $contentLength = 0; |
| 39 | 39 | |
| 40 | 40 | public function __construct(RequestHelper $helper) |
@@ -42,31 +42,31 @@ discard block |
||
| 42 | 42 | $this->helper = $helper; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Retrieves the string that is used to separate mime boundaries in the body. |
|
| 47 | - * |
|
| 48 | - * @return string |
|
| 49 | - */ |
|
| 45 | + /** |
|
| 46 | + * Retrieves the string that is used to separate mime boundaries in the body. |
|
| 47 | + * |
|
| 48 | + * @return string |
|
| 49 | + */ |
|
| 50 | 50 | public function getMimeBoundary() : string |
| 51 | 51 | { |
| 52 | 52 | return $this->helper->getMimeBoundary(); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - /** |
|
| 56 | - * Retrieves the end of line character(s) used in the body. |
|
| 57 | - * |
|
| 58 | - * @return string |
|
| 59 | - */ |
|
| 55 | + /** |
|
| 56 | + * Retrieves the end of line character(s) used in the body. |
|
| 57 | + * |
|
| 58 | + * @return string |
|
| 59 | + */ |
|
| 60 | 60 | public function getEOL() : string |
| 61 | 61 | { |
| 62 | 62 | return $this->helper->getEOL(); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * Retrieves the total content length of all boundary contents. |
|
| 67 | - * |
|
| 68 | - * @return int |
|
| 69 | - */ |
|
| 65 | + /** |
|
| 66 | + * Retrieves the total content length of all boundary contents. |
|
| 67 | + * |
|
| 68 | + * @return int |
|
| 69 | + */ |
|
| 70 | 70 | public function getContentLength() : int |
| 71 | 71 | { |
| 72 | 72 | // this must use strlen, and not mb_strlen: the content length |
@@ -75,15 +75,15 @@ discard block |
||
| 75 | 75 | return strlen($this->render()); |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - /** |
|
| 79 | - * Adds a file to be sent with the request. |
|
| 80 | - * |
|
| 81 | - * @param string $varName The variable name to send the file in |
|
| 82 | - * @param string $fileName The name of the file as it should be received at the destination |
|
| 83 | - * @param string $content The raw content of the file |
|
| 84 | - * @param string $contentType The content type, use the constants to specify this |
|
| 85 | - * @param string $encoding The encoding of the file, use the constants to specify this |
|
| 86 | - */ |
|
| 78 | + /** |
|
| 79 | + * Adds a file to be sent with the request. |
|
| 80 | + * |
|
| 81 | + * @param string $varName The variable name to send the file in |
|
| 82 | + * @param string $fileName The name of the file as it should be received at the destination |
|
| 83 | + * @param string $content The raw content of the file |
|
| 84 | + * @param string $contentType The content type, use the constants to specify this |
|
| 85 | + * @param string $encoding The encoding of the file, use the constants to specify this |
|
| 86 | + */ |
|
| 87 | 87 | public function addFile(string $varName, string $fileName, string $content, string $contentType = '', string $encoding = '') : RequestHelper_Boundaries |
| 88 | 88 | { |
| 89 | 89 | if(empty($contentType)) |
@@ -107,13 +107,13 @@ discard block |
||
| 107 | 107 | return $this->addBoundary($boundary); |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - /** |
|
| 111 | - * Adds arbitrary content. |
|
| 112 | - * |
|
| 113 | - * @param string $varName |
|
| 114 | - * @param string $content |
|
| 115 | - * @param string $contentType |
|
| 116 | - */ |
|
| 110 | + /** |
|
| 111 | + * Adds arbitrary content. |
|
| 112 | + * |
|
| 113 | + * @param string $varName |
|
| 114 | + * @param string $content |
|
| 115 | + * @param string $contentType |
|
| 116 | + */ |
|
| 117 | 117 | public function addContent(string $varName, string $content, string $contentType) : RequestHelper_Boundaries |
| 118 | 118 | { |
| 119 | 119 | $content = ConvertHelper::string2utf8($content); |
@@ -127,13 +127,13 @@ discard block |
||
| 127 | 127 | return $this->addBoundary($boundary); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - /** |
|
| 131 | - * Adds a variable to be sent with the request. If it |
|
| 132 | - * already exists, its value is overwritten. |
|
| 133 | - * |
|
| 134 | - * @param string $name |
|
| 135 | - * @param string $value |
|
| 136 | - */ |
|
| 130 | + /** |
|
| 131 | + * Adds a variable to be sent with the request. If it |
|
| 132 | + * already exists, its value is overwritten. |
|
| 133 | + * |
|
| 134 | + * @param string $name |
|
| 135 | + * @param string $value |
|
| 136 | + */ |
|
| 137 | 137 | public function addVariable(string $name, string $value) : RequestHelper_Boundaries |
| 138 | 138 | { |
| 139 | 139 | $boundary = $this->createBoundary($value) |
@@ -149,11 +149,11 @@ discard block |
||
| 149 | 149 | return $this; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - /** |
|
| 153 | - * Renders the response body with all mime boundaries. |
|
| 154 | - * |
|
| 155 | - * @return string |
|
| 156 | - */ |
|
| 152 | + /** |
|
| 153 | + * Renders the response body with all mime boundaries. |
|
| 154 | + * |
|
| 155 | + * @return string |
|
| 156 | + */ |
|
| 157 | 157 | public function render() : string |
| 158 | 158 | { |
| 159 | 159 | if(empty($this->boundaries)) |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | $result = array(); |
| 48 | 48 | |
| 49 | - foreach($parts as $part) |
|
| 49 | + foreach ($parts as $part) |
|
| 50 | 50 | { |
| 51 | 51 | $tokens = explode('=', $part); |
| 52 | 52 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | $trimmed = trim($name); |
| 57 | 57 | |
| 58 | - if(empty($trimmed)) |
|
| 58 | + if (empty($trimmed)) |
|
| 59 | 59 | { |
| 60 | 60 | continue; |
| 61 | 61 | } |
@@ -27,16 +27,16 @@ |
||
| 27 | 27 | |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * We parse the query string ourselves, because the PHP implementation |
|
| 32 | - * of parse_str has limitations that do not apply to query strings. This |
|
| 33 | - * is due to the fact that parse_str has to create PHP-compatible variable |
|
| 34 | - * names from the parameters. URL parameters simply allow way more things |
|
| 35 | - * than PHP variable names. |
|
| 36 | - * |
|
| 37 | - * @param string $queryString |
|
| 38 | - * @return array<string,string> |
|
| 39 | - */ |
|
| 30 | + /** |
|
| 31 | + * We parse the query string ourselves, because the PHP implementation |
|
| 32 | + * of parse_str has limitations that do not apply to query strings. This |
|
| 33 | + * is due to the fact that parse_str has to create PHP-compatible variable |
|
| 34 | + * names from the parameters. URL parameters simply allow way more things |
|
| 35 | + * than PHP variable names. |
|
| 36 | + * |
|
| 37 | + * @param string $queryString |
|
| 38 | + * @return array<string,string> |
|
| 39 | + */ |
|
| 40 | 40 | public function parse(string $queryString) : array |
| 41 | 41 | { |
| 42 | 42 | // allow HTML entities notation |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | /** |
| 26 | 26 | * @var string[] |
| 27 | 27 | */ |
| 28 | - protected static $controlChars = array( |
|
| 28 | + protected static $controlChars = array( |
|
| 29 | 29 | '0000-0008', // control chars |
| 30 | 30 | '000E-000F', // control chars |
| 31 | 31 | '0010-001F', // control chars |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | public function __construct() |
| 51 | 51 | { |
| 52 | 52 | // create the regex from the unicode characters list |
| 53 | - if(!isset(self::$controlCharsRegex)) |
|
| 53 | + if (!isset(self::$controlCharsRegex)) |
|
| 54 | 54 | { |
| 55 | 55 | $chars = $this->getCharsAsHex(); |
| 56 | 56 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | // in the regular expression. |
| 59 | 59 | $stack = array(); |
| 60 | 60 | |
| 61 | - foreach($chars as $char) |
|
| 61 | + foreach ($chars as $char) |
|
| 62 | 62 | { |
| 63 | 63 | $stack[] = '\x{'.$char.'}'; |
| 64 | 64 | } |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $stack = array(); |
| 85 | 85 | |
| 86 | - foreach(self::$controlChars as $char) |
|
| 86 | + foreach (self::$controlChars as $char) |
|
| 87 | 87 | { |
| 88 | 88 | $tokens = explode('-', $char); |
| 89 | 89 | $start = $tokens[0]; |
@@ -92,24 +92,24 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | $range = array(); |
| 94 | 94 | |
| 95 | - foreach(self::$hexAlphabet as $number) |
|
| 95 | + foreach (self::$hexAlphabet as $number) |
|
| 96 | 96 | { |
| 97 | 97 | $range[] = $prefix.$number; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | $use = false; |
| 101 | 101 | |
| 102 | - foreach($range as $number) |
|
| 102 | + foreach ($range as $number) |
|
| 103 | 103 | { |
| 104 | - if($number == $start) { |
|
| 104 | + if ($number == $start) { |
|
| 105 | 105 | $use = true; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - if($use) { |
|
| 108 | + if ($use) { |
|
| 109 | 109 | $stack[] = $number; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - if($number == $end) { |
|
| 112 | + if ($number == $end) { |
|
| 113 | 113 | break; |
| 114 | 114 | } |
| 115 | 115 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $chars = $this->getCharsAsHex(); |
| 133 | 133 | |
| 134 | 134 | $result = array(); |
| 135 | - foreach($chars as $char) { |
|
| 135 | + foreach ($chars as $char) { |
|
| 136 | 136 | $result[] = hex2bin($char); |
| 137 | 137 | } |
| 138 | 138 | |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | $chars = $this->getCharsAsHex(); |
| 151 | 151 | |
| 152 | 152 | $result = array(); |
| 153 | - foreach($chars as $char) { |
|
| 153 | + foreach ($chars as $char) { |
|
| 154 | 154 | $result[] = '\u'.strtolower($char); |
| 155 | 155 | } |
| 156 | 156 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | public function stripControlCharacters(string $string) : string |
| 172 | 172 | { |
| 173 | - if(empty($string)) |
|
| 173 | + if (empty($string)) |
|
| 174 | 174 | { |
| 175 | 175 | return $string; |
| 176 | 176 | } |
@@ -178,13 +178,13 @@ discard block |
||
| 178 | 178 | $result = preg_replace(self::$controlCharsRegex, '', $string); |
| 179 | 179 | |
| 180 | 180 | // can happen if the text contains invalid UTF8 |
| 181 | - if($result === null) |
|
| 181 | + if ($result === null) |
|
| 182 | 182 | { |
| 183 | 183 | $string = ConvertHelper::string2utf8($string); |
| 184 | 184 | |
| 185 | 185 | $result = preg_replace(self::$controlCharsRegex, '', $string); |
| 186 | 186 | |
| 187 | - if($result === null) |
|
| 187 | + if ($result === null) |
|
| 188 | 188 | { |
| 189 | 189 | throw new ConvertHelper_Exception( |
| 190 | 190 | 'Cannot strip control characters: malformatted string encountered.', |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | public const ERROR_MALFORMATTED_STRING = 53801; |
| 24 | 24 | |
| 25 | - /** |
|
| 26 | - * @var string[] |
|
| 27 | - */ |
|
| 25 | + /** |
|
| 26 | + * @var string[] |
|
| 27 | + */ |
|
| 28 | 28 | protected static $controlChars = array( |
| 29 | 29 | '0000-0008', // control chars |
| 30 | 30 | '000E-000F', // control chars |
@@ -32,19 +32,19 @@ discard block |
||
| 32 | 32 | '2000-200F', // non-breaking space and co |
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var string|NULL |
|
| 37 | - */ |
|
| 35 | + /** |
|
| 36 | + * @var string|NULL |
|
| 37 | + */ |
|
| 38 | 38 | protected static $controlCharsRegex; |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @var string[] |
|
| 42 | - */ |
|
| 40 | + /** |
|
| 41 | + * @var string[] |
|
| 42 | + */ |
|
| 43 | 43 | protected static $hexAlphabet = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); |
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var string[]|NULL |
|
| 47 | - */ |
|
| 45 | + /** |
|
| 46 | + * @var string[]|NULL |
|
| 47 | + */ |
|
| 48 | 48 | protected static $charsAsHex; |
| 49 | 49 | |
| 50 | 50 | public function __construct() |
@@ -67,13 +67,13 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * Retrieves the HEX character codes for all control |
|
| 72 | - * characters that the {@link stripControlCharacters()} |
|
| 73 | - * method will remove. |
|
| 74 | - * |
|
| 75 | - * @return string[] |
|
| 76 | - */ |
|
| 70 | + /** |
|
| 71 | + * Retrieves the HEX character codes for all control |
|
| 72 | + * characters that the {@link stripControlCharacters()} |
|
| 73 | + * method will remove. |
|
| 74 | + * |
|
| 75 | + * @return string[] |
|
| 76 | + */ |
|
| 77 | 77 | public function getCharsAsHex() : array |
| 78 | 78 | { |
| 79 | 79 | if (isset(self::$charsAsHex)) |
@@ -120,13 +120,13 @@ discard block |
||
| 120 | 120 | return $stack; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - /** |
|
| 124 | - * Retrieves an array of all control characters that |
|
| 125 | - * the {@link stripControlCharacters()} method will |
|
| 126 | - * remove, as the actual UTF-8 characters. |
|
| 127 | - * |
|
| 128 | - * @return string[] |
|
| 129 | - */ |
|
| 123 | + /** |
|
| 124 | + * Retrieves an array of all control characters that |
|
| 125 | + * the {@link stripControlCharacters()} method will |
|
| 126 | + * remove, as the actual UTF-8 characters. |
|
| 127 | + * |
|
| 128 | + * @return string[] |
|
| 129 | + */ |
|
| 130 | 130 | public function getCharsAsUTF8() : array |
| 131 | 131 | { |
| 132 | 132 | $chars = $this->getCharsAsHex(); |
@@ -139,12 +139,12 @@ discard block |
||
| 139 | 139 | return $result; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - /** |
|
| 143 | - * Retrieves all control characters as JSON encoded |
|
| 144 | - * characters, e.g. "\u200b". |
|
| 145 | - * |
|
| 146 | - * @return string[] |
|
| 147 | - */ |
|
| 142 | + /** |
|
| 143 | + * Retrieves all control characters as JSON encoded |
|
| 144 | + * characters, e.g. "\u200b". |
|
| 145 | + * |
|
| 146 | + * @return string[] |
|
| 147 | + */ |
|
| 148 | 148 | public function getCharsAsJSON() : array |
| 149 | 149 | { |
| 150 | 150 | $chars = $this->getCharsAsHex(); |
@@ -157,17 +157,17 @@ discard block |
||
| 157 | 157 | return $result; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - /** |
|
| 161 | - * Removes all control characters from the specified string |
|
| 162 | - * that can cause problems in some cases, like creating |
|
| 163 | - * valid XML documents. This includes invisible non-breaking |
|
| 164 | - * spaces. |
|
| 165 | - * |
|
| 166 | - * @param string $string |
|
| 167 | - * @return string |
|
| 168 | - * @see https://stackoverflow.com/a/8171868/2298192 |
|
| 169 | - * @see https://unicode-table.com/en |
|
| 170 | - */ |
|
| 160 | + /** |
|
| 161 | + * Removes all control characters from the specified string |
|
| 162 | + * that can cause problems in some cases, like creating |
|
| 163 | + * valid XML documents. This includes invisible non-breaking |
|
| 164 | + * spaces. |
|
| 165 | + * |
|
| 166 | + * @param string $string |
|
| 167 | + * @return string |
|
| 168 | + * @see https://stackoverflow.com/a/8171868/2298192 |
|
| 169 | + * @see https://unicode-table.com/en |
|
| 170 | + */ |
|
| 171 | 171 | public function stripControlCharacters(string $string) : string |
| 172 | 172 | { |
| 173 | 173 | if(empty($string)) |
@@ -22,14 +22,14 @@ |
||
| 22 | 22 | */ |
| 23 | 23 | class Value_Bool_False extends Value_Bool |
| 24 | 24 | { |
| 25 | - public function __construct(bool $value=true) |
|
| 25 | + public function __construct(bool $value = true) |
|
| 26 | 26 | { |
| 27 | 27 | parent::__construct($value); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function set(bool $value) : Value_Bool |
| 31 | 31 | { |
| 32 | - if($value === false) |
|
| 32 | + if ($value === false) |
|
| 33 | 33 | { |
| 34 | 34 | parent::set($value); |
| 35 | 35 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | { |
| 25 | 25 | public function set(bool $value) : Value_Bool |
| 26 | 26 | { |
| 27 | - if($value === true) |
|
| 27 | + if ($value === true) |
|
| 28 | 28 | { |
| 29 | 29 | parent::set($value); |
| 30 | 30 | } |
@@ -22,8 +22,7 @@ |
||
| 22 | 22 | if(is_array($val)) |
| 23 | 23 | { |
| 24 | 24 | $result[$key] = $this->traverseArray($val, ($level+1)); |
| 25 | - } |
|
| 26 | - else |
|
| 25 | + } else |
|
| 27 | 26 | { |
| 28 | 27 | $result[$key] = parseVariable($val)->toString(); |
| 29 | 28 | } |
@@ -18,15 +18,15 @@ |
||
| 18 | 18 | * @param int $level |
| 19 | 19 | * @return array<mixed> |
| 20 | 20 | */ |
| 21 | - protected function traverseArray(array $array, int $level=0) : array |
|
| 21 | + protected function traverseArray(array $array, int $level = 0) : array |
|
| 22 | 22 | { |
| 23 | 23 | $result = array(); |
| 24 | 24 | |
| 25 | - foreach($array as $key => $val) |
|
| 25 | + foreach ($array as $key => $val) |
|
| 26 | 26 | { |
| 27 | - if(is_array($val)) |
|
| 27 | + if (is_array($val)) |
|
| 28 | 28 | { |
| 29 | - $result[$key] = $this->traverseArray($val, ($level+1)); |
|
| 29 | + $result[$key] = $this->traverseArray($val, ($level + 1)); |
|
| 30 | 30 | } |
| 31 | 31 | else |
| 32 | 32 | { |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | private static function checkFragment(string $fragment) : void |
| 109 | 109 | { |
| 110 | - if(!stristr($fragment, '<body') && !stristr($fragment, 'doctype')) |
|
| 110 | + if (!stristr($fragment, '<body') && !stristr($fragment, 'doctype')) |
|
| 111 | 111 | { |
| 112 | 112 | return; |
| 113 | 113 | } |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | |
| 208 | 208 | // capture all elements except the body tag itself |
| 209 | 209 | $xml = ''; |
| 210 | - foreach($nodes as $child) |
|
| 210 | + foreach ($nodes as $child) |
|
| 211 | 211 | { |
| 212 | 212 | $xml .= $this->dom->saveXML($child); |
| 213 | 213 | } |
@@ -39,19 +39,19 @@ discard block |
||
| 39 | 39 | { |
| 40 | 40 | public const ERROR_STRING_ALREADY_HAS_BODY_TAG = 57001; |
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @var \DOMElement |
|
| 44 | - */ |
|
| 42 | + /** |
|
| 43 | + * @var \DOMElement |
|
| 44 | + */ |
|
| 45 | 45 | private $bodyNode; |
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @var XMLHelper_DOMErrors |
|
| 49 | - */ |
|
| 47 | + /** |
|
| 48 | + * @var XMLHelper_DOMErrors |
|
| 49 | + */ |
|
| 50 | 50 | private $errors; |
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * @var string |
|
| 54 | - */ |
|
| 52 | + /** |
|
| 53 | + * @var string |
|
| 54 | + */ |
|
| 55 | 55 | private static $htmlTemplate = |
| 56 | 56 | '<!DOCTYPE html>'. |
| 57 | 57 | '<html>'. |
@@ -63,9 +63,9 @@ discard block |
||
| 63 | 63 | '</body>'. |
| 64 | 64 | '</html>'; |
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * @var \DOMDocument |
|
| 68 | - */ |
|
| 66 | + /** |
|
| 67 | + * @var \DOMDocument |
|
| 68 | + */ |
|
| 69 | 69 | private $dom; |
| 70 | 70 | |
| 71 | 71 | private function __construct(string $html) |
@@ -73,13 +73,13 @@ discard block |
||
| 73 | 73 | $this->load($html); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - /** |
|
| 77 | - * Creates an HTML loader from an HTML fragment (without |
|
| 78 | - * doctype, head and body elements). |
|
| 79 | - * |
|
| 80 | - * @param string $fragment |
|
| 81 | - * @return XMLHelper_HTMLLoader |
|
| 82 | - */ |
|
| 76 | + /** |
|
| 77 | + * Creates an HTML loader from an HTML fragment (without |
|
| 78 | + * doctype, head and body elements). |
|
| 79 | + * |
|
| 80 | + * @param string $fragment |
|
| 81 | + * @return XMLHelper_HTMLLoader |
|
| 82 | + */ |
|
| 83 | 83 | public static function loadFragment(string $fragment) : XMLHelper_HTMLLoader |
| 84 | 84 | { |
| 85 | 85 | self::checkFragment($fragment); |
@@ -90,24 +90,24 @@ discard block |
||
| 90 | 90 | return new XMLHelper_HTMLLoader($pseudoHTML); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - /** |
|
| 94 | - * Creates an HTML loader from a full HTML document (including |
|
| 95 | - * doctype, head and body elements). |
|
| 96 | - * |
|
| 97 | - * @param string $html |
|
| 98 | - * @return XMLHelper_HTMLLoader |
|
| 99 | - */ |
|
| 93 | + /** |
|
| 94 | + * Creates an HTML loader from a full HTML document (including |
|
| 95 | + * doctype, head and body elements). |
|
| 96 | + * |
|
| 97 | + * @param string $html |
|
| 98 | + * @return XMLHelper_HTMLLoader |
|
| 99 | + */ |
|
| 100 | 100 | public static function loadHTML(string $html) : XMLHelper_HTMLLoader |
| 101 | 101 | { |
| 102 | 102 | return new XMLHelper_HTMLLoader($html); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - /** |
|
| 106 | - * Verifies that the fragment does not already contain a body element or doctype. |
|
| 107 | - * |
|
| 108 | - * @param string $fragment |
|
| 109 | - * @throws XMLHelper_Exception |
|
| 110 | - */ |
|
| 105 | + /** |
|
| 106 | + * Verifies that the fragment does not already contain a body element or doctype. |
|
| 107 | + * |
|
| 108 | + * @param string $fragment |
|
| 109 | + * @throws XMLHelper_Exception |
|
| 110 | + */ |
|
| 111 | 111 | private static function checkFragment(string $fragment) : void |
| 112 | 112 | { |
| 113 | 113 | if(!stristr($fragment, '<body') && !stristr($fragment, 'doctype')) |
@@ -145,65 +145,65 @@ discard block |
||
| 145 | 145 | return $this->bodyNode; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - /** |
|
| 149 | - * Retrieves the document's `<body>` tag node. |
|
| 150 | - * |
|
| 151 | - * @return \DOMDocument |
|
| 152 | - */ |
|
| 148 | + /** |
|
| 149 | + * Retrieves the document's `<body>` tag node. |
|
| 150 | + * |
|
| 151 | + * @return \DOMDocument |
|
| 152 | + */ |
|
| 153 | 153 | public function getDOM() : \DOMDocument |
| 154 | 154 | { |
| 155 | 155 | return $this->dom; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - /** |
|
| 159 | - * Retrieves all nodes from the HTML fragment (= child nodes |
|
| 160 | - * of the `<body>` element). |
|
| 161 | - * |
|
| 162 | - * @return DOMNodeList<DOMNode> |
|
| 163 | - */ |
|
| 158 | + /** |
|
| 159 | + * Retrieves all nodes from the HTML fragment (= child nodes |
|
| 160 | + * of the `<body>` element). |
|
| 161 | + * |
|
| 162 | + * @return DOMNodeList<DOMNode> |
|
| 163 | + */ |
|
| 164 | 164 | public function getFragmentNodes() : DOMNodeList |
| 165 | 165 | { |
| 166 | 166 | return $this->bodyNode->childNodes; |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | - /** |
|
| 170 | - * Retrieves the LibXML HTML parsing errors collection, which |
|
| 171 | - * can be used to review any errors that occurred while loading |
|
| 172 | - * the HTML document. |
|
| 173 | - * |
|
| 174 | - * @return XMLHelper_DOMErrors |
|
| 175 | - */ |
|
| 169 | + /** |
|
| 170 | + * Retrieves the LibXML HTML parsing errors collection, which |
|
| 171 | + * can be used to review any errors that occurred while loading |
|
| 172 | + * the HTML document. |
|
| 173 | + * |
|
| 174 | + * @return XMLHelper_DOMErrors |
|
| 175 | + */ |
|
| 176 | 176 | public function getErrors() : XMLHelper_DOMErrors |
| 177 | 177 | { |
| 178 | 178 | return $this->errors; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - /** |
|
| 182 | - * Returns a valid HTML string. |
|
| 183 | - * |
|
| 184 | - * @return string |
|
| 185 | - */ |
|
| 181 | + /** |
|
| 182 | + * Returns a valid HTML string. |
|
| 183 | + * |
|
| 184 | + * @return string |
|
| 185 | + */ |
|
| 186 | 186 | public function toHTML() : string |
| 187 | 187 | { |
| 188 | 188 | return $this->dom->saveHTML(); |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - /** |
|
| 192 | - * Returns a valid XML string. |
|
| 193 | - * |
|
| 194 | - * @return string |
|
| 195 | - */ |
|
| 191 | + /** |
|
| 192 | + * Returns a valid XML string. |
|
| 193 | + * |
|
| 194 | + * @return string |
|
| 195 | + */ |
|
| 196 | 196 | public function toXML() : string |
| 197 | 197 | { |
| 198 | 198 | return $this->dom->saveXML(); |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - /** |
|
| 202 | - * Converts the HTML fragment to valid XML (= all |
|
| 203 | - * child nodes of the `<body>` element). |
|
| 204 | - * |
|
| 205 | - * @return string |
|
| 206 | - */ |
|
| 201 | + /** |
|
| 202 | + * Converts the HTML fragment to valid XML (= all |
|
| 203 | + * child nodes of the `<body>` element). |
|
| 204 | + * |
|
| 205 | + * @return string |
|
| 206 | + */ |
|
| 207 | 207 | public function fragmentToXML() : string |
| 208 | 208 | { |
| 209 | 209 | $nodes = $this->getFragmentNodes(); |
@@ -14,9 +14,9 @@ |
||
| 14 | 14 | * @see http://www.xmlsoft.org/html/libxml-xmlerror.html |
| 15 | 15 | */ |
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @var string $list |
|
| 19 | - */ |
|
| 17 | + /** |
|
| 18 | + * @var string $list |
|
| 19 | + */ |
|
| 20 | 20 | $list = file_get_contents('libxmlerrors.txt'); |
| 21 | 21 | $outputFile = 'LibXML.php'; |
| 22 | 22 | $lines = explode("\n", $list); |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | $lines = explode("\n", $list); |
| 23 | 23 | $reverseArray = array(); |
| 24 | 24 | |
| 25 | - foreach($lines as $line) |
|
| 25 | + foreach ($lines as $line) |
|
| 26 | 26 | { |
| 27 | 27 | $parts = explode('=', $line); |
| 28 | 28 | $name = trim(str_replace('XML_ERR_', '', $parts[0])); |
@@ -19,9 +19,9 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | class Request_RefreshParams_Exclude_Name extends Request_RefreshParams_Exclude |
| 21 | 21 | { |
| 22 | - /** |
|
| 23 | - * @var string |
|
| 24 | - */ |
|
| 22 | + /** |
|
| 23 | + * @var string |
|
| 24 | + */ |
|
| 25 | 25 | private $name; |
| 26 | 26 | |
| 27 | 27 | public function __construct(string $paramName) |