We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>'; |
| 218 | 218 | |
| 219 | - while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)){ |
|
| 219 | + while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)) { |
|
| 220 | 220 | |
| 221 | 221 | $mails[] = $row; |
| 222 | 222 | |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>'; |
| 263 | 263 | |
| 264 | - while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)){ |
|
| 264 | + while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)) { |
|
| 265 | 265 | |
| 266 | 266 | $printers[] = $row; |
| 267 | 267 | |
@@ -9,7 +9,9 @@ discard block |
||
| 9 | 9 | * LICENSE.txt file that was distributed with this source code. |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | -if (!defined ('TYPO3_MODE')) die ('Access denied.'); |
|
| 12 | +if (!defined ('TYPO3_MODE')) { |
|
| 13 | + die ('Access denied.'); |
|
| 14 | +} |
|
| 13 | 15 | |
| 14 | 16 | // Register static typoscript. |
| 15 | 17 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript/', 'Basic Configuration'); |
@@ -163,16 +165,16 @@ discard block |
||
| 163 | 165 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($_EXTKEY.'_validator', 'FILE:EXT:'.$_EXTKEY.'/plugins/validator/flexform.xml'); |
| 164 | 166 | |
| 165 | 167 | // Register modules. |
| 166 | -if (TYPO3_MODE == 'BE') { |
|
| 168 | +if (TYPO3_MODE == 'BE') { |
|
| 167 | 169 | |
| 168 | 170 | // Add modules after "web". |
| 169 | - if (!isset($TBE_MODULES['txdlfmodules'])) { |
|
| 171 | + if (!isset($TBE_MODULES['txdlfmodules'])) { |
|
| 170 | 172 | |
| 171 | 173 | $modules = array(); |
| 172 | 174 | |
| 173 | - foreach($TBE_MODULES as $key => $val) { |
|
| 175 | + foreach($TBE_MODULES as $key => $val) { |
|
| 174 | 176 | |
| 175 | - if ($key == 'web') { |
|
| 177 | + if ($key == 'web') { |
|
| 176 | 178 | |
| 177 | 179 | $modules[$key] = $val; |
| 178 | 180 | |
@@ -36,8 +36,7 @@ |
||
| 36 | 36 | * @author Donovan Jimenez <[email protected]> |
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | -class Apache_Solr_Exception extends Exception |
|
| 40 | -{ |
|
| 39 | +class Apache_Solr_Exception extends Exception { |
|
| 41 | 40 | /** |
| 42 | 41 | * SVN Revision meta data for this class |
| 43 | 42 | */ |
@@ -55,8 +55,7 @@ discard block |
||
| 55 | 55 | * } |
| 56 | 56 | * </code> |
| 57 | 57 | */ |
| 58 | -class Apache_Solr_Document implements IteratorAggregate |
|
| 59 | -{ |
|
| 58 | +class Apache_Solr_Document implements IteratorAggregate { |
|
| 60 | 59 | /** |
| 61 | 60 | * SVN Revision meta data for this class |
| 62 | 61 | */ |
@@ -91,8 +90,7 @@ discard block |
||
| 91 | 90 | /** |
| 92 | 91 | * Clear all boosts and fields from this document |
| 93 | 92 | */ |
| 94 | - public function clear() |
|
| 95 | - { |
|
| 93 | + public function clear() { |
|
| 96 | 94 | $this->_documentBoost = false; |
| 97 | 95 | |
| 98 | 96 | $this->_fields = array(); |
@@ -104,8 +102,7 @@ discard block |
||
| 104 | 102 | * |
| 105 | 103 | * @return mixed will be false for default, or else a float |
| 106 | 104 | */ |
| 107 | - public function getBoost() |
|
| 108 | - { |
|
| 105 | + public function getBoost() { |
|
| 109 | 106 | return $this->_documentBoost; |
| 110 | 107 | } |
| 111 | 108 | |
@@ -114,16 +111,12 @@ discard block |
||
| 114 | 111 | * |
| 115 | 112 | * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false |
| 116 | 113 | */ |
| 117 | - public function setBoost($boost) |
|
| 118 | - { |
|
| 114 | + public function setBoost($boost) { |
|
| 119 | 115 | $boost = (float) $boost; |
| 120 | 116 | |
| 121 | - if ($boost > 0.0) |
|
| 122 | - { |
|
| 117 | + if ($boost > 0.0) { |
|
| 123 | 118 | $this->_documentBoost = $boost; |
| 124 | - } |
|
| 125 | - else |
|
| 126 | - { |
|
| 119 | + } else { |
|
| 127 | 120 | $this->_documentBoost = false; |
| 128 | 121 | } |
| 129 | 122 | } |
@@ -151,26 +144,19 @@ discard block |
||
| 151 | 144 | * @param mixed $value |
| 152 | 145 | * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false |
| 153 | 146 | */ |
| 154 | - public function addField($key, $value, $boost = false) |
|
| 155 | - { |
|
| 156 | - if (!isset($this->_fields[$key])) |
|
| 157 | - { |
|
| 147 | + public function addField($key, $value, $boost = false) { |
|
| 148 | + if (!isset($this->_fields[$key])) { |
|
| 158 | 149 | // create holding array if this is the first value |
| 159 | 150 | $this->_fields[$key] = array(); |
| 160 | - } |
|
| 161 | - else if (!is_array($this->_fields[$key])) |
|
| 162 | - { |
|
| 151 | + } else if (!is_array($this->_fields[$key])) { |
|
| 163 | 152 | // move existing value into array if it is not already an array |
| 164 | 153 | $this->_fields[$key] = array($this->_fields[$key]); |
| 165 | 154 | } |
| 166 | 155 | |
| 167 | - if ($this->getFieldBoost($key) === false) |
|
| 168 | - { |
|
| 156 | + if ($this->getFieldBoost($key) === false) { |
|
| 169 | 157 | // boost not already set, set it now |
| 170 | 158 | $this->setFieldBoost($key, $boost); |
| 171 | - } |
|
| 172 | - else if ((float) $boost > 0.0) |
|
| 173 | - { |
|
| 159 | + } else if ((float) $boost > 0.0) { |
|
| 174 | 160 | // multiply passed boost with current field boost - similar to SolrJ implementation |
| 175 | 161 | $this->_fieldBoosts[$key] *= (float) $boost; |
| 176 | 162 | } |
@@ -188,8 +174,7 @@ discard block |
||
| 188 | 174 | * |
| 189 | 175 | * @deprecated Use addField(...) instead |
| 190 | 176 | */ |
| 191 | - public function setMultiValue($key, $value, $boost = false) |
|
| 192 | - { |
|
| 177 | + public function setMultiValue($key, $value, $boost = false) { |
|
| 193 | 178 | $this->addField($key, $value, $boost); |
| 194 | 179 | } |
| 195 | 180 | |
@@ -199,10 +184,8 @@ discard block |
||
| 199 | 184 | * @param string $key |
| 200 | 185 | * @return mixed associative array of info if field exists, false otherwise |
| 201 | 186 | */ |
| 202 | - public function getField($key) |
|
| 203 | - { |
|
| 204 | - if (isset($this->_fields[$key])) |
|
| 205 | - { |
|
| 187 | + public function getField($key) { |
|
| 188 | + if (isset($this->_fields[$key])) { |
|
| 206 | 189 | return array( |
| 207 | 190 | 'name' => $key, |
| 208 | 191 | 'value' => $this->_fields[$key], |
@@ -222,8 +205,7 @@ discard block |
||
| 222 | 205 | * @param mixed $value |
| 223 | 206 | * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false |
| 224 | 207 | */ |
| 225 | - public function setField($key, $value, $boost = false) |
|
| 226 | - { |
|
| 208 | + public function setField($key, $value, $boost = false) { |
|
| 227 | 209 | $this->_fields[$key] = $value; |
| 228 | 210 | $this->setFieldBoost($key, $boost); |
| 229 | 211 | } |
@@ -234,8 +216,7 @@ discard block |
||
| 234 | 216 | * @param string $key |
| 235 | 217 | * @return float currently set field boost, false if one is not set |
| 236 | 218 | */ |
| 237 | - public function getFieldBoost($key) |
|
| 238 | - { |
|
| 219 | + public function getFieldBoost($key) { |
|
| 239 | 220 | return isset($this->_fieldBoosts[$key]) ? $this->_fieldBoosts[$key] : false; |
| 240 | 221 | } |
| 241 | 222 | |
@@ -245,16 +226,12 @@ discard block |
||
| 245 | 226 | * @param string $key field name for the boost |
| 246 | 227 | * @param mixed $boost Use false for default boost, else cast to float that should be > 0 or will be treated as false |
| 247 | 228 | */ |
| 248 | - public function setFieldBoost($key, $boost) |
|
| 249 | - { |
|
| 229 | + public function setFieldBoost($key, $boost) { |
|
| 250 | 230 | $boost = (float) $boost; |
| 251 | 231 | |
| 252 | - if ($boost > 0.0) |
|
| 253 | - { |
|
| 232 | + if ($boost > 0.0) { |
|
| 254 | 233 | $this->_fieldBoosts[$key] = $boost; |
| 255 | - } |
|
| 256 | - else |
|
| 257 | - { |
|
| 234 | + } else { |
|
| 258 | 235 | $this->_fieldBoosts[$key] = false; |
| 259 | 236 | } |
| 260 | 237 | } |
@@ -264,8 +241,7 @@ discard block |
||
| 264 | 241 | * |
| 265 | 242 | * @return array |
| 266 | 243 | */ |
| 267 | - public function getFieldBoosts() |
|
| 268 | - { |
|
| 244 | + public function getFieldBoosts() { |
|
| 269 | 245 | return $this->_fieldBoosts; |
| 270 | 246 | } |
| 271 | 247 | |
@@ -274,8 +250,7 @@ discard block |
||
| 274 | 250 | * |
| 275 | 251 | * @return array |
| 276 | 252 | */ |
| 277 | - public function getFieldNames() |
|
| 278 | - { |
|
| 253 | + public function getFieldNames() { |
|
| 279 | 254 | return array_keys($this->_fields); |
| 280 | 255 | } |
| 281 | 256 | |
@@ -284,8 +259,7 @@ discard block |
||
| 284 | 259 | * |
| 285 | 260 | * @return array |
| 286 | 261 | */ |
| 287 | - public function getFieldValues() |
|
| 288 | - { |
|
| 262 | + public function getFieldValues() { |
|
| 289 | 263 | return array_values($this->_fields); |
| 290 | 264 | } |
| 291 | 265 | |
@@ -299,8 +273,7 @@ discard block |
||
| 299 | 273 | * } |
| 300 | 274 | * </code> |
| 301 | 275 | */ |
| 302 | - public function getIterator() |
|
| 303 | - { |
|
| 276 | + public function getIterator() { |
|
| 304 | 277 | $arrayObject = new ArrayObject($this->_fields); |
| 305 | 278 | |
| 306 | 279 | return $arrayObject->getIterator(); |
@@ -312,10 +285,8 @@ discard block |
||
| 312 | 285 | * @param string $key |
| 313 | 286 | * @return mixed |
| 314 | 287 | */ |
| 315 | - public function __get($key) |
|
| 316 | - { |
|
| 317 | - if (isset($this->_fields[$key])) |
|
| 318 | - { |
|
| 288 | + public function __get($key) { |
|
| 289 | + if (isset($this->_fields[$key])) { |
|
| 319 | 290 | return $this->_fields[$key]; |
| 320 | 291 | } |
| 321 | 292 | |
@@ -330,8 +301,7 @@ discard block |
||
| 330 | 301 | * @param string $key |
| 331 | 302 | * @param mixed $value |
| 332 | 303 | */ |
| 333 | - public function __set($key, $value) |
|
| 334 | - { |
|
| 304 | + public function __set($key, $value) { |
|
| 335 | 305 | $this->setField($key, $value); |
| 336 | 306 | } |
| 337 | 307 | |
@@ -345,8 +315,7 @@ discard block |
||
| 345 | 315 | * @param string $key |
| 346 | 316 | * @return boolean |
| 347 | 317 | */ |
| 348 | - public function __isset($key) |
|
| 349 | - { |
|
| 318 | + public function __isset($key) { |
|
| 350 | 319 | return isset($this->_fields[$key]); |
| 351 | 320 | } |
| 352 | 321 | |
@@ -359,8 +328,7 @@ discard block |
||
| 359 | 328 | * |
| 360 | 329 | * @param string $key |
| 361 | 330 | */ |
| 362 | - public function __unset($key) |
|
| 363 | - { |
|
| 331 | + public function __unset($key) { |
|
| 364 | 332 | unset($this->_fields[$key]); |
| 365 | 333 | unset($this->_fieldBoosts[$key]); |
| 366 | 334 | } |
@@ -36,8 +36,7 @@ |
||
| 36 | 36 | * @author Donovan Jimenez <[email protected]> |
| 37 | 37 | */ |
| 38 | 38 | |
| 39 | -class Apache_Solr_InvalidArgumentException extends Apache_Solr_Exception |
|
| 40 | -{ |
|
| 39 | +class Apache_Solr_InvalidArgumentException extends Apache_Solr_Exception { |
|
| 41 | 40 | /** |
| 42 | 41 | * SVN Revision meta data for this class |
| 43 | 42 | */ |
@@ -42,8 +42,7 @@ discard block |
||
| 42 | 42 | /** |
| 43 | 43 | * HTTP Transport implemenation that uses the builtin http URL wrappers and file_get_contents |
| 44 | 44 | */ |
| 45 | -class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract |
|
| 46 | -{ |
|
| 45 | +class Apache_Solr_HttpTransport_FileGetContents extends Apache_Solr_HttpTransport_Abstract { |
|
| 47 | 46 | /** |
| 48 | 47 | * SVN Revision meta data for this class |
| 49 | 48 | */ |
@@ -64,26 +63,21 @@ discard block |
||
| 64 | 63 | /** |
| 65 | 64 | * Initializes our reuseable get and post stream contexts |
| 66 | 65 | */ |
| 67 | - public function __construct() |
|
| 68 | - { |
|
| 66 | + public function __construct() { |
|
| 69 | 67 | $this->_getContext = stream_context_create(); |
| 70 | 68 | $this->_headContext = stream_context_create(); |
| 71 | 69 | $this->_postContext = stream_context_create(); |
| 72 | 70 | } |
| 73 | 71 | |
| 74 | - public function performGetRequest($url, $timeout = false) |
|
| 75 | - { |
|
| 72 | + public function performGetRequest($url, $timeout = false) { |
|
| 76 | 73 | // set the timeout if specified |
| 77 | - if ($timeout !== FALSE && $timeout > 0.0) |
|
| 78 | - { |
|
| 74 | + if ($timeout !== FALSE && $timeout > 0.0) { |
|
| 79 | 75 | // timeouts with file_get_contents seem to need |
| 80 | 76 | // to be halved to work as expected |
| 81 | 77 | $timeout = (float) $timeout / 2; |
| 82 | 78 | |
| 83 | 79 | stream_context_set_option($this->_getContext, 'http', 'timeout', $timeout); |
| 84 | - } |
|
| 85 | - else |
|
| 86 | - { |
|
| 80 | + } else { |
|
| 87 | 81 | // use the default timeout pulled from default_socket_timeout otherwise |
| 88 | 82 | stream_context_set_option($this->_getContext, 'http', 'timeout', $this->getDefaultTimeout()); |
| 89 | 83 | } |
@@ -97,8 +91,7 @@ discard block |
||
| 97 | 91 | return $this->_getResponseFromParts($responseBody, $http_response_header); |
| 98 | 92 | } |
| 99 | 93 | |
| 100 | - public function performHeadRequest($url, $timeout = false) |
|
| 101 | - { |
|
| 94 | + public function performHeadRequest($url, $timeout = false) { |
|
| 102 | 95 | stream_context_set_option($this->_headContext, array( |
| 103 | 96 | 'http' => array( |
| 104 | 97 | // set HTTP method |
@@ -111,8 +104,7 @@ discard block |
||
| 111 | 104 | ); |
| 112 | 105 | |
| 113 | 106 | // set the timeout if specified |
| 114 | - if ($timeout !== FALSE && $timeout > 0.0) |
|
| 115 | - { |
|
| 107 | + if ($timeout !== FALSE && $timeout > 0.0) { |
|
| 116 | 108 | // timeouts with file_get_contents seem to need |
| 117 | 109 | // to be halved to work as expected |
| 118 | 110 | $timeout = (float) $timeout / 2; |
@@ -129,8 +121,7 @@ discard block |
||
| 129 | 121 | return $this->_getResponseFromParts($responseBody, $http_response_header); |
| 130 | 122 | } |
| 131 | 123 | |
| 132 | - public function performPostRequest($url, $rawPost, $contentType, $timeout = false) |
|
| 133 | - { |
|
| 124 | + public function performPostRequest($url, $rawPost, $contentType, $timeout = false) { |
|
| 134 | 125 | stream_context_set_option($this->_postContext, array( |
| 135 | 126 | 'http' => array( |
| 136 | 127 | // set HTTP method |
@@ -149,8 +140,7 @@ discard block |
||
| 149 | 140 | ); |
| 150 | 141 | |
| 151 | 142 | // set the timeout if specified |
| 152 | - if ($timeout !== FALSE && $timeout > 0.0) |
|
| 153 | - { |
|
| 143 | + if ($timeout !== FALSE && $timeout > 0.0) { |
|
| 154 | 144 | // timeouts with file_get_contents seem to need |
| 155 | 145 | // to be halved to work as expected |
| 156 | 146 | $timeout = (float) $timeout / 2; |
@@ -170,15 +160,13 @@ discard block |
||
| 170 | 160 | return $this->_getResponseFromParts($responseBody, $http_response_header); |
| 171 | 161 | } |
| 172 | 162 | |
| 173 | - private function _getResponseFromParts($rawResponse, $httpHeaders) |
|
| 174 | - { |
|
| 163 | + private function _getResponseFromParts($rawResponse, $httpHeaders) { |
|
| 175 | 164 | //Assume 0, false as defaults |
| 176 | 165 | $status = 0; |
| 177 | 166 | $contentType = false; |
| 178 | 167 | |
| 179 | 168 | //iterate through headers for real status, type, and encoding |
| 180 | - if (is_array($httpHeaders) && count($httpHeaders) > 0) |
|
| 181 | - { |
|
| 169 | + if (is_array($httpHeaders) && count($httpHeaders) > 0) { |
|
| 182 | 170 | //look at the first headers for the HTTP status code |
| 183 | 171 | //and message (errors are usually returned this way) |
| 184 | 172 | // |
@@ -189,8 +177,7 @@ discard block |
||
| 189 | 177 | //the spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.1 |
| 190 | 178 | // |
| 191 | 179 | //Thanks to Daniel Andersson for pointing out this oversight |
| 192 | - while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP') |
|
| 193 | - { |
|
| 180 | + while (isset($httpHeaders[0]) && substr($httpHeaders[0], 0, 4) == 'HTTP') { |
|
| 194 | 181 | // we can do a intval on status line without the "HTTP/1.X " to get the code |
| 195 | 182 | $status = intval(substr($httpHeaders[0], 9)); |
| 196 | 183 | |
@@ -200,11 +187,9 @@ discard block |
||
| 200 | 187 | |
| 201 | 188 | //Look for the Content-Type response header and determine type |
| 202 | 189 | //and encoding from it (if possible - such as 'Content-Type: text/plain; charset=UTF-8') |
| 203 | - foreach ($httpHeaders as $header) |
|
| 204 | - { |
|
| 190 | + foreach ($httpHeaders as $header) { |
|
| 205 | 191 | // look for the header that starts appropriately |
| 206 | - if (strncasecmp($header, 'Content-Type:', 13) == 0) |
|
| 207 | - { |
|
| 192 | + if (strncasecmp($header, 'Content-Type:', 13) == 0) { |
|
| 208 | 193 | $contentType = substr($header, 13); |
| 209 | 194 | break; |
| 210 | 195 | } |
@@ -42,8 +42,7 @@ discard block |
||
| 42 | 42 | /** |
| 43 | 43 | * A Curl based HTTP transport. Uses a single curl session for all requests. |
| 44 | 44 | */ |
| 45 | -class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract |
|
| 46 | -{ |
|
| 45 | +class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract { |
|
| 47 | 46 | /** |
| 48 | 47 | * SVN Revision meta data for this class |
| 49 | 48 | */ |
@@ -64,8 +63,7 @@ discard block |
||
| 64 | 63 | /** |
| 65 | 64 | * Initializes a curl session |
| 66 | 65 | */ |
| 67 | - public function __construct() |
|
| 68 | - { |
|
| 66 | + public function __construct() { |
|
| 69 | 67 | // initialize a CURL session |
| 70 | 68 | $this->_curl = curl_init(); |
| 71 | 69 | |
@@ -85,17 +83,14 @@ discard block |
||
| 85 | 83 | /** |
| 86 | 84 | * Closes a curl session |
| 87 | 85 | */ |
| 88 | - function __destruct() |
|
| 89 | - { |
|
| 86 | + function __destruct() { |
|
| 90 | 87 | // close our curl session |
| 91 | 88 | curl_close($this->_curl); |
| 92 | 89 | } |
| 93 | 90 | |
| 94 | - public function performGetRequest($url, $timeout = false) |
|
| 95 | - { |
|
| 91 | + public function performGetRequest($url, $timeout = false) { |
|
| 96 | 92 | // check the timeout value |
| 97 | - if ($timeout === false || $timeout <= 0.0) |
|
| 98 | - { |
|
| 93 | + if ($timeout === false || $timeout <= 0.0) { |
|
| 99 | 94 | // use the default timeout |
| 100 | 95 | $timeout = $this->getDefaultTimeout(); |
| 101 | 96 | } |
@@ -125,11 +120,9 @@ discard block |
||
| 125 | 120 | return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody); |
| 126 | 121 | } |
| 127 | 122 | |
| 128 | - public function performHeadRequest($url, $timeout = false) |
|
| 129 | - { |
|
| 123 | + public function performHeadRequest($url, $timeout = false) { |
|
| 130 | 124 | // check the timeout value |
| 131 | - if ($timeout === false || $timeout <= 0.0) |
|
| 132 | - { |
|
| 125 | + if ($timeout === false || $timeout <= 0.0) { |
|
| 133 | 126 | // use the default timeout |
| 134 | 127 | $timeout = $this->getDefaultTimeout(); |
| 135 | 128 | } |
@@ -156,11 +149,9 @@ discard block |
||
| 156 | 149 | return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody); |
| 157 | 150 | } |
| 158 | 151 | |
| 159 | - public function performPostRequest($url, $postData, $contentType, $timeout = false) |
|
| 160 | - { |
|
| 152 | + public function performPostRequest($url, $postData, $contentType, $timeout = false) { |
|
| 161 | 153 | // check the timeout value |
| 162 | - if ($timeout === false || $timeout <= 0.0) |
|
| 163 | - { |
|
| 154 | + if ($timeout === false || $timeout <= 0.0) { |
|
| 164 | 155 | // use the default timeout |
| 165 | 156 | $timeout = $this->getDefaultTimeout(); |
| 166 | 157 | } |
@@ -41,8 +41,7 @@ discard block |
||
| 41 | 41 | * implementations and then consumed by the Apache_Solr_Response class which provides |
| 42 | 42 | * decoding |
| 43 | 43 | */ |
| 44 | -class Apache_Solr_HttpTransport_Response |
|
| 45 | -{ |
|
| 44 | +class Apache_Solr_HttpTransport_Response { |
|
| 46 | 45 | /** |
| 47 | 46 | * Status Messages indexed by Status Code |
| 48 | 47 | * Obtained from: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html |
@@ -109,12 +108,10 @@ discard block |
||
| 109 | 108 | * |
| 110 | 109 | * @return string |
| 111 | 110 | */ |
| 112 | - public static function getDefaultStatusMessage($statusCode) |
|
| 113 | - { |
|
| 111 | + public static function getDefaultStatusMessage($statusCode) { |
|
| 114 | 112 | $statusCode = (int) $statusCode; |
| 115 | 113 | |
| 116 | - if (isset(self::$_defaultStatusMessages[$statusCode])) |
|
| 117 | - { |
|
| 114 | + if (isset(self::$_defaultStatusMessages[$statusCode])) { |
|
| 118 | 115 | return self::$_defaultStatusMessages[$statusCode]; |
| 119 | 116 | } |
| 120 | 117 | |
@@ -163,8 +160,7 @@ discard block |
||
| 163 | 160 | * @param string $contentType The VALUE of the Content-Type HTTP header |
| 164 | 161 | * @param string $responseBody The body of the HTTP response |
| 165 | 162 | */ |
| 166 | - public function __construct($statusCode, $contentType, $responseBody) |
|
| 167 | - { |
|
| 163 | + public function __construct($statusCode, $contentType, $responseBody) { |
|
| 168 | 164 | // set the status code, make sure its an integer |
| 169 | 165 | $this->_statusCode = (int) $statusCode; |
| 170 | 166 | |
@@ -180,23 +176,19 @@ discard block |
||
| 180 | 176 | $this->_mimeType = "text/plain"; |
| 181 | 177 | $this->_encoding = "UTF-8"; |
| 182 | 178 | |
| 183 | - if ($contentType) |
|
| 184 | - { |
|
| 179 | + if ($contentType) { |
|
| 185 | 180 | // now break apart the header to see if there's character encoding |
| 186 | 181 | $contentTypeParts = explode(';', $contentType, 2); |
| 187 | 182 | |
| 188 | - if (isset($contentTypeParts[0])) |
|
| 189 | - { |
|
| 183 | + if (isset($contentTypeParts[0])) { |
|
| 190 | 184 | $this->_mimeType = trim($contentTypeParts[0]); |
| 191 | 185 | } |
| 192 | 186 | |
| 193 | - if (isset($contentTypeParts[1])) |
|
| 194 | - { |
|
| 187 | + if (isset($contentTypeParts[1])) { |
|
| 195 | 188 | // we have a second part, split it further |
| 196 | 189 | $contentTypeParts = explode('=', $contentTypeParts[1]); |
| 197 | 190 | |
| 198 | - if (isset($contentTypeParts[1])) |
|
| 199 | - { |
|
| 191 | + if (isset($contentTypeParts[1])) { |
|
| 200 | 192 | $this->_encoding = trim($contentTypeParts[1]); |
| 201 | 193 | } |
| 202 | 194 | } |
@@ -208,8 +200,7 @@ discard block |
||
| 208 | 200 | * |
| 209 | 201 | * @return integer |
| 210 | 202 | */ |
| 211 | - public function getStatusCode() |
|
| 212 | - { |
|
| 203 | + public function getStatusCode() { |
|
| 213 | 204 | return $this->_statusCode; |
| 214 | 205 | } |
| 215 | 206 | |
@@ -218,8 +209,7 @@ discard block |
||
| 218 | 209 | * |
| 219 | 210 | * @return string |
| 220 | 211 | */ |
| 221 | - public function getStatusMessage() |
|
| 222 | - { |
|
| 212 | + public function getStatusMessage() { |
|
| 223 | 213 | return $this->_statusMessage; |
| 224 | 214 | } |
| 225 | 215 | |
@@ -228,8 +218,7 @@ discard block |
||
| 228 | 218 | * |
| 229 | 219 | * @return string |
| 230 | 220 | */ |
| 231 | - public function getMimeType() |
|
| 232 | - { |
|
| 221 | + public function getMimeType() { |
|
| 233 | 222 | return $this->_mimeType; |
| 234 | 223 | } |
| 235 | 224 | |
@@ -238,8 +227,7 @@ discard block |
||
| 238 | 227 | * |
| 239 | 228 | * @return string |
| 240 | 229 | */ |
| 241 | - public function getEncoding() |
|
| 242 | - { |
|
| 230 | + public function getEncoding() { |
|
| 243 | 231 | return $this->_encoding; |
| 244 | 232 | } |
| 245 | 233 | |
@@ -248,8 +236,7 @@ discard block |
||
| 248 | 236 | * |
| 249 | 237 | * @return string |
| 250 | 238 | */ |
| 251 | - public function getBody() |
|
| 252 | - { |
|
| 239 | + public function getBody() { |
|
| 253 | 240 | return $this->_responseBody; |
| 254 | 241 | } |
| 255 | 242 | } |
@@ -44,8 +44,7 @@ discard block |
||
| 44 | 44 | * every request. This isn't the recommended way to use curl, but some version of |
| 45 | 45 | * PHP have memory issues. |
| 46 | 46 | */ |
| 47 | -class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract |
|
| 48 | -{ |
|
| 47 | +class Apache_Solr_HttpTransport_CurlNoReuse extends Apache_Solr_HttpTransport_Abstract { |
|
| 49 | 48 | /** |
| 50 | 49 | * SVN Revision meta data for this class |
| 51 | 50 | */ |
@@ -56,11 +55,9 @@ discard block |
||
| 56 | 55 | */ |
| 57 | 56 | const SVN_ID = '$Id:$'; |
| 58 | 57 | |
| 59 | - public function performGetRequest($url, $timeout = false) |
|
| 60 | - { |
|
| 58 | + public function performGetRequest($url, $timeout = false) { |
|
| 61 | 59 | // check the timeout value |
| 62 | - if ($timeout === false || $timeout <= 0.0) |
|
| 63 | - { |
|
| 60 | + if ($timeout === false || $timeout <= 0.0) { |
|
| 64 | 61 | // use the default timeout |
| 65 | 62 | $timeout = $this->getDefaultTimeout(); |
| 66 | 63 | } |
@@ -98,11 +95,9 @@ discard block |
||
| 98 | 95 | return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody); |
| 99 | 96 | } |
| 100 | 97 | |
| 101 | - public function performHeadRequest($url, $timeout = false) |
|
| 102 | - { |
|
| 98 | + public function performHeadRequest($url, $timeout = false) { |
|
| 103 | 99 | // check the timeout value |
| 104 | - if ($timeout === false || $timeout <= 0.0) |
|
| 105 | - { |
|
| 100 | + if ($timeout === false || $timeout <= 0.0) { |
|
| 106 | 101 | // use the default timeout |
| 107 | 102 | $timeout = $this->getDefaultTimeout(); |
| 108 | 103 | } |
@@ -143,11 +138,9 @@ discard block |
||
| 143 | 138 | return new Apache_Solr_HttpTransport_Response($statusCode, $contentType, $responseBody); |
| 144 | 139 | } |
| 145 | 140 | |
| 146 | - public function performPostRequest($url, $postData, $contentType, $timeout = false) |
|
| 147 | - { |
|
| 141 | + public function performPostRequest($url, $postData, $contentType, $timeout = false) { |
|
| 148 | 142 | // check the timeout value |
| 149 | - if ($timeout === false || $timeout <= 0.0) |
|
| 150 | - { |
|
| 143 | + if ($timeout === false || $timeout <= 0.0) { |
|
| 151 | 144 | // use the default timeout |
| 152 | 145 | $timeout = $this->getDefaultTimeout(); |
| 153 | 146 | } |