@@ -472,7 +472,7 @@ |
||
| 472 | 472 | * @param string $shortOptions the short options definition, e.g. "ab:c::" |
| 473 | 473 | * @param array $longOptions the long options definition, e.g. array("foo", "bar=") |
| 474 | 474 | * @param string $ambiguity directive to handle option names ambiguity |
| 475 | - * @param numeric $version the getopt version: 1 or 2 |
|
| 475 | + * @param integer $version the getopt version: 1 or 2 |
|
| 476 | 476 | * @return array the parsed options, their arguments and parameters |
| 477 | 477 | * @access public |
| 478 | 478 | */ |
@@ -187,10 +187,7 @@ |
||
| 187 | 187 | /** |
| 188 | 188 | * Creates the usage help text section |
| 189 | 189 | * |
| 190 | - * @param array $usages the usage descriptions |
|
| 191 | 190 | * @param string $command the command name |
| 192 | - * @param array $optionsConfig the options descriptions |
|
| 193 | - * @param array $paramsConfig the parameters descriptions |
|
| 194 | 191 | * @return array the usage help text section |
| 195 | 192 | * @access public |
| 196 | 193 | */ |
@@ -290,11 +290,11 @@ discard block |
||
| 290 | 290 | * |
| 291 | 291 | * If either is 0 it will keep the original size for that dimension |
| 292 | 292 | * |
| 293 | - * @param mixed $new_x (0, number, percentage 10% or 0.1) |
|
| 294 | - * @param mixed $new_y (0, number, percentage 10% or 0.1) |
|
| 293 | + * @param integer $new_x (0, number, percentage 10% or 0.1) |
|
| 294 | + * @param integer $new_y (0, number, percentage 10% or 0.1) |
|
| 295 | 295 | * @param array $options Options |
| 296 | 296 | * |
| 297 | - * @return mixed TRUE or PEAR_Error object on error |
|
| 297 | + * @return PEAR_Error TRUE or PEAR_Error object on error |
|
| 298 | 298 | * @access public |
| 299 | 299 | */ |
| 300 | 300 | function resize($new_x = 0, $new_y = 0, $options = null) |
@@ -653,7 +653,7 @@ discard block |
||
| 653 | 653 | /** |
| 654 | 654 | * Returns the matching IMAGETYPE_* constant for a given image type |
| 655 | 655 | * |
| 656 | - * @param mixed $type String (GIF, JPG,...) |
|
| 656 | + * @param string $type String (GIF, JPG,...) |
|
| 657 | 657 | * |
| 658 | 658 | * @return mixed string or integer or input on error |
| 659 | 659 | * @access protected |
@@ -706,10 +706,10 @@ discard block |
||
| 706 | 706 | * |
| 707 | 707 | * If either parameter is 0 it will be scaled proportionally |
| 708 | 708 | * |
| 709 | - * @param mixed $new_size (0, number, percentage 10% or 0.1) |
|
| 709 | + * @param integer $new_size (0, number, percentage 10% or 0.1) |
|
| 710 | 710 | * @param int $old_size |
| 711 | 711 | * |
| 712 | - * @return mixed Integer or PEAR_error |
|
| 712 | + * @return integer Integer or PEAR_error |
|
| 713 | 713 | * @access protected |
| 714 | 714 | */ |
| 715 | 715 | function _parse_size($new_size, $old_size) |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | * @param string $type Image type (GIF, PNG, JPEG...) |
| 1032 | 1032 | * @param string $mode 'r' for read, 'w' for write, 'rw' for both |
| 1033 | 1033 | * |
| 1034 | - * @return TRUE if type (and mode) is supported FALSE otherwise |
|
| 1034 | + * @return boolean if type (and mode) is supported FALSE otherwise |
|
| 1035 | 1035 | * @access public |
| 1036 | 1036 | */ |
| 1037 | 1037 | function supportsType($type, $mode = 'rw') |
@@ -1078,7 +1078,7 @@ discard block |
||
| 1078 | 1078 | * |
| 1079 | 1079 | * @param string $colorhex A color following the #FFFFFF format |
| 1080 | 1080 | * |
| 1081 | - * @return array 3-element array with 0-255 values |
|
| 1081 | + * @return resource 3-element array with 0-255 values |
|
| 1082 | 1082 | * @access public |
| 1083 | 1083 | * |
| 1084 | 1084 | * @see rgb2colorname |
@@ -1092,6 +1092,9 @@ discard block |
||
| 1092 | 1092 | return array($r, $g, $b, 'type' => 'RGB'); |
| 1093 | 1093 | } |
| 1094 | 1094 | |
| 1095 | + /** |
|
| 1096 | + * @param string $type |
|
| 1097 | + */ |
|
| 1095 | 1098 | function _send_display_headers($type) |
| 1096 | 1099 | { |
| 1097 | 1100 | // Find the filename of the original image: |
@@ -1106,7 +1109,7 @@ discard block |
||
| 1106 | 1109 | * |
| 1107 | 1110 | * @param array $color 3-element array with 0-255 values |
| 1108 | 1111 | * |
| 1109 | - * @return mixed A color following the #FFFFFF format or FALSE |
|
| 1112 | + * @return false|string A color following the #FFFFFF format or FALSE |
|
| 1110 | 1113 | * if the array couldn't be converted |
| 1111 | 1114 | * @access public |
| 1112 | 1115 | * |
@@ -1288,7 +1291,7 @@ discard block |
||
| 1288 | 1291 | * |
| 1289 | 1292 | * @param string $colorOf one of 'canvasColor', 'pencilColor', 'fontColor' |
| 1290 | 1293 | * @param array $options configuration options |
| 1291 | - * @param array $default default value to return if color not found |
|
| 1294 | + * @param integer[] $default default value to return if color not found |
|
| 1292 | 1295 | * |
| 1293 | 1296 | * @return array an RGB color array |
| 1294 | 1297 | * @access protected |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | /** |
| 271 | 271 | * Horizontal mirroring |
| 272 | 272 | * |
| 273 | - * @return mixed TRUE or PEAR_Error object on error |
|
| 273 | + * @return boolean TRUE or PEAR_Error object on error |
|
| 274 | 274 | * @access public |
| 275 | 275 | * @see flip() |
| 276 | 276 | **/ |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | /** |
| 290 | 290 | * Vertical mirroring |
| 291 | 291 | * |
| 292 | - * @return TRUE or PEAR Error object on error |
|
| 292 | + * @return boolean or PEAR Error object on error |
|
| 293 | 293 | * @access public |
| 294 | 294 | * @see mirror() |
| 295 | 295 | **/ |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | * Helper method to save to a file or output the image |
| 436 | 436 | * |
| 437 | 437 | * @param string $filename the name of the file to write to (blank to output) |
| 438 | - * @param string $types define the output format, default |
|
| 438 | + * @param string $type define the output format, default |
|
| 439 | 439 | * is the current used format |
| 440 | 440 | * @param int $quality output DPI, default is 75 |
| 441 | 441 | * |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * |
| 179 | 179 | * @param int angle rotation angle |
| 180 | 180 | * @param array options no option allowed |
| 181 | - * @return mixed TRUE or a PEAR error object on error |
|
| 181 | + * @return boolean TRUE or a PEAR error object on error |
|
| 182 | 182 | */ |
| 183 | 183 | function rotate($angle, $options = null) |
| 184 | 184 | { |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | * @param int x X-coordinate to crop at |
| 202 | 202 | * @param int y Y-coordinate to crop at |
| 203 | 203 | * |
| 204 | - * @return mixed TRUE or a PEAR error object on error |
|
| 204 | + * @return boolean TRUE or a PEAR error object on error |
|
| 205 | 205 | */ |
| 206 | 206 | function crop($width, $height, $x = 0, $y = 0) { |
| 207 | 207 | // Do we want a safety check - i.e. if $width+$x > $this->img_x then we |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * before drawing the text |
| 234 | 234 | * ) |
| 235 | 235 | * |
| 236 | - * @return mixed TRUE or a PEAR error object on error |
|
| 236 | + * @return boolean TRUE or a PEAR error object on error |
|
| 237 | 237 | * @see PEAR::isError() |
| 238 | 238 | */ |
| 239 | 239 | function addText($params) |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | * |
| 263 | 263 | * @access public |
| 264 | 264 | * @param float $outputgamma |
| 265 | - * @return mixed TRUE or a PEAR error object on error |
|
| 265 | + * @return boolean TRUE or a PEAR error object on error |
|
| 266 | 266 | */ |
| 267 | 267 | function gamma($outputgamma = 1.0) { |
| 268 | 268 | if ($outputgamme != 1.0) { |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | * Convert the image to greyscale |
| 276 | 276 | * |
| 277 | 277 | * @access public |
| 278 | - * @return mixed TRUE or a PEAR error object on error |
|
| 278 | + * @return boolean TRUE or a PEAR error object on error |
|
| 279 | 279 | */ |
| 280 | 280 | function greyscale() { |
| 281 | 281 | $this->command['type'] = '-type Grayscale'; |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | * Horizontal mirroring |
| 287 | 287 | * |
| 288 | 288 | * @access public |
| 289 | - * @return TRUE or PEAR Error object on error |
|
| 289 | + * @return boolean or PEAR Error object on error |
|
| 290 | 290 | */ |
| 291 | 291 | function mirror() { |
| 292 | 292 | // We can only apply "flop" once |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | * Vertical mirroring |
| 303 | 303 | * |
| 304 | 304 | * @access public |
| 305 | - * @return TRUE or PEAR Error object on error |
|
| 305 | + * @return boolean or PEAR Error object on error |
|
| 306 | 306 | */ |
| 307 | 307 | function flip() { |
| 308 | 308 | // We can only apply "flip" once |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | * @param string type (JPEG,PNG...); |
| 367 | 367 | * @param int quality 75 |
| 368 | 368 | * |
| 369 | - * @return mixed TRUE or a PEAR error object on error |
|
| 369 | + * @return boolean TRUE or a PEAR error object on error |
|
| 370 | 370 | */ |
| 371 | 371 | function display($type = '', $quality = null) |
| 372 | 372 | { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param string filename |
| 98 | 98 | * |
| 99 | - * @return mixed TRUE or a PEAR error object on error |
|
| 99 | + * @return boolean TRUE or a PEAR error object on error |
|
| 100 | 100 | * @see PEAR::isError() |
| 101 | 101 | */ |
| 102 | 102 | function load($image) |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * 'angle' A imlib direction constant |
| 131 | 131 | * ) |
| 132 | 132 | * |
| 133 | - * @return TRUE or PEAR Error object on error |
|
| 133 | + * @return boolean or PEAR Error object on error |
|
| 134 | 134 | * @see PEAR::isError() |
| 135 | 135 | */ |
| 136 | 136 | function addText($params) |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | * |
| 170 | 170 | * @param int $angle Rotation angle |
| 171 | 171 | * |
| 172 | - * @return TRUE or PEAR Error object on error |
|
| 172 | + * @return boolean or PEAR Error object on error |
|
| 173 | 173 | */ |
| 174 | 174 | function rotate($angle) |
| 175 | 175 | { |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | * Gets the image details |
| 344 | 344 | * |
| 345 | 345 | * @access private |
| 346 | - * @return TRUE on success or PEAR Error object on error |
|
| 346 | + * @return boolean on success or PEAR Error object on error |
|
| 347 | 347 | */ |
| 348 | 348 | function _get_image_details() |
| 349 | 349 | { |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | /** |
| 360 | 360 | * Horizontal mirroring |
| 361 | 361 | * |
| 362 | - * @return TRUE on success, PEAR Error object on error |
|
| 362 | + * @return boolean on success, PEAR Error object on error |
|
| 363 | 363 | */ |
| 364 | 364 | function mirror() |
| 365 | 365 | { |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | /** |
| 371 | 371 | * Vertical mirroring |
| 372 | 372 | * |
| 373 | - * @return TRUE on success, PEAR Error object on error |
|
| 373 | + * @return boolean on success, PEAR Error object on error |
|
| 374 | 374 | */ |
| 375 | 375 | function flip() |
| 376 | 376 | { |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | /** |
| 397 | 397 | * Image_Transform_Driver_NetPBM::_postProcess() |
| 398 | 398 | * |
| 399 | - * @param $type |
|
| 399 | + * @param string $type |
|
| 400 | 400 | * @param $quality |
| 401 | 401 | * @return string A chain of shell command |
| 402 | 402 | * @link http://netpbm.sourceforge.net/doc/directory.html |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | * |
| 571 | 571 | * @param string $type (jpeg,png...); |
| 572 | 572 | * @param int $quality 75 |
| 573 | - * @return TRUE or PEAR Error object on error |
|
| 573 | + * @return boolean or PEAR Error object on error |
|
| 574 | 574 | */ |
| 575 | 575 | function display($type = null, $quality = null) |
| 576 | 576 | { |
@@ -266,7 +266,7 @@ |
||
| 266 | 266 | * Use this function to register a shutdown method for static |
| 267 | 267 | * classes. |
| 268 | 268 | * |
| 269 | - * @param mixed $func The function name (or array of class/method) to call |
|
| 269 | + * @param string[] $func The function name (or array of class/method) to call |
|
| 270 | 270 | * @param mixed $args The arguments to pass to the function |
| 271 | 271 | * |
| 272 | 272 | * @return void |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * Supports multiple files and dirs and also recursive deletes |
| 204 | 204 | * |
| 205 | 205 | * @param string $args the arguments for rm |
| 206 | - * @return mixed PEAR_Error or true for success |
|
| 206 | + * @return boolean PEAR_Error or true for success |
|
| 207 | 207 | * @static |
| 208 | 208 | * @access public |
| 209 | 209 | */ |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | * c:\windows\temp or /tmp will be used. |
| 390 | 390 | * |
| 391 | 391 | * @param string $args The arguments |
| 392 | - * @return mixed the full path of the created (file|dir) or false |
|
| 392 | + * @return boolean|string the full path of the created (file|dir) or false |
|
| 393 | 393 | * @see System::tmpdir() |
| 394 | 394 | */ |
| 395 | 395 | public static function mktemp($args = null) |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | * @param string $program The command to search for |
| 490 | 490 | * @param mixed $fallback Value to return if $program is not found |
| 491 | 491 | * |
| 492 | - * @return mixed A string with the full path or false if not found |
|
| 492 | + * @return string A string with the full path or false if not found |
|
| 493 | 493 | * @author Stig Bakken <[email protected]> |
| 494 | 494 | */ |
| 495 | 495 | public static function which($program, $fallback = false) |