@@ -232,7 +232,7 @@ |
||
| 232 | 232 | * |
| 233 | 233 | * @param array $request Request data (same form as {@see request_multiple}) |
| 234 | 234 | * @param boolean $merge_options Should we merge options as well? |
| 235 | - * @return array Request data |
|
| 235 | + * @return string Request data |
|
| 236 | 236 | */ |
| 237 | 237 | protected function merge_request($request, $merge_options = true) { |
| 238 | 238 | if ($this->url !== null) { |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $context['files'] = ''; |
| 36 | 36 | $path = realpath(dirname(__FILE__).'/../library/Requests'); |
| 37 | 37 | foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::LEAVES_ONLY) as $file) { |
| 38 | - if (preg_match('/\.php$/', $file)) { |
|
| 38 | + if (preg_match('/\.php$/', $file)) { |
|
| 39 | 39 | $name = str_replace($path . DIRECTORY_SEPARATOR, '', $file); |
| 40 | 40 | $name = str_replace(DIRECTORY_SEPARATOR, '/', $name); |
| 41 | 41 | $context['files'][] = "\t\t\t\t\t" . '<file install-as="Requests/' . $name . '" name="' . $name . '" role="php" />'; |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * |
| 251 | 251 | * Returns false if $base is not absolute, otherwise an IRI. |
| 252 | 252 | * |
| 253 | - * @param Requests_IRI|string $base (Absolute) Base IRI |
|
| 253 | + * @param string $base (Absolute) Base IRI |
|
| 254 | 254 | * @param Requests_IRI|string $relative Relative IRI |
| 255 | 255 | * @return Requests_IRI|false |
| 256 | 256 | */ |
@@ -985,6 +985,7 @@ discard block |
||
| 985 | 985 | * Convert an IRI to a URI (or parts thereof) |
| 986 | 986 | * |
| 987 | 987 | * @param string|bool IRI to convert (or false from {@see get_iri}) |
| 988 | + * @param false|string $string |
|
| 988 | 989 | * @return string|false URI if IRI is valid, false otherwise. |
| 989 | 990 | */ |
| 990 | 991 | protected function to_uri($string) { |
@@ -353,7 +353,7 @@ |
||
| 353 | 353 | * @param int $delta |
| 354 | 354 | * @param int $numpoints |
| 355 | 355 | * @param bool $firsttime |
| 356 | - * @return int New bias |
|
| 356 | + * @return double New bias |
|
| 357 | 357 | * |
| 358 | 358 | * function adapt(delta,numpoints,firsttime): |
| 359 | 359 | */ |