@@ -219,6 +219,7 @@ discard block |
||
| 219 | 219 | |
| 220 | 220 | /** |
| 221 | 221 | * Returns true if the given class implements the given interface |
| 222 | + * @param string $interfaceName |
|
| 222 | 223 | */ |
| 223 | 224 | public static function classImplements($className, $interfaceName) { |
| 224 | 225 | return in_array($className, self::implementorsOf($interfaceName)); |
@@ -269,6 +270,9 @@ discard block |
||
| 269 | 270 | |
| 270 | 271 | private static $method_from_cache = array(); |
| 271 | 272 | |
| 273 | + /** |
|
| 274 | + * @param string $method |
|
| 275 | + */ |
|
| 272 | 276 | public static function has_method_from($class, $method, $compclass) { |
| 273 | 277 | $lClass = strtolower($class); |
| 274 | 278 | $lMethod = strtolower($method); |
@@ -83,6 +83,7 @@ |
||
| 83 | 83 | * Returns the path for a class or interface in the currently active manifest, |
| 84 | 84 | * or any previous ones if later manifests aren't set to "exclusive". |
| 85 | 85 | * |
| 86 | + * @param string $class |
|
| 86 | 87 | * @return String |
| 87 | 88 | */ |
| 88 | 89 | public function getItemPath($class) { |
@@ -214,6 +214,12 @@ discard block |
||
| 214 | 214 | set_exception_handler('exceptionHandler'); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | + /** |
|
| 218 | + * @param integer $errno |
|
| 219 | + * @param string $errstr |
|
| 220 | + * @param string $errfile |
|
| 221 | + * @param integer $errline |
|
| 222 | + */ |
|
| 217 | 223 | public static function noticeHandler($errno, $errstr, $errfile, $errline, $errcontext) { |
| 218 | 224 | if(error_reporting() == 0) return; |
| 219 | 225 | ini_set('display_errors', 0); |
@@ -240,10 +246,10 @@ discard block |
||
| 240 | 246 | /** |
| 241 | 247 | * Handle a non-fatal warning error thrown by PHP interpreter. |
| 242 | 248 | * |
| 243 | - * @param unknown_type $errno |
|
| 244 | - * @param unknown_type $errstr |
|
| 245 | - * @param unknown_type $errfile |
|
| 246 | - * @param unknown_type $errline |
|
| 249 | + * @param integer $errno |
|
| 250 | + * @param string $errstr |
|
| 251 | + * @param string $errfile |
|
| 252 | + * @param integer $errline |
|
| 247 | 253 | * @param unknown_type $errcontext |
| 248 | 254 | */ |
| 249 | 255 | public static function warningHandler($errno, $errstr, $errfile, $errline, $errcontext) { |
@@ -274,8 +280,8 @@ discard block |
||
| 274 | 280 | * |
| 275 | 281 | * Runtime execution dies immediately once the error is generated. |
| 276 | 282 | * |
| 277 | - * @param unknown_type $errno |
|
| 278 | - * @param unknown_type $errstr |
|
| 283 | + * @param integer $errno |
|
| 284 | + * @param string $errstr |
|
| 279 | 285 | * @param unknown_type $errfile |
| 280 | 286 | * @param unknown_type $errline |
| 281 | 287 | * @param unknown_type $errcontext |
@@ -315,7 +321,7 @@ discard block |
||
| 315 | 321 | * or "tech-speak". Used in the HTTP Header and ajax responses. |
| 316 | 322 | * @param string $friendlyErrorDetail Detailed user-focused message. Is just used if no {@link ErrorPage} is found |
| 317 | 323 | * for this specific status code. |
| 318 | - * @return string HTML error message for non-ajax requests, plaintext for ajax-request. |
|
| 324 | + * @return boolean HTML error message for non-ajax requests, plaintext for ajax-request. |
|
| 319 | 325 | */ |
| 320 | 326 | public static function friendlyError($statusCode=500, $friendlyErrorMessage=null, $friendlyErrorDetail=null) { |
| 321 | 327 | if(!$friendlyErrorMessage) { |
@@ -388,6 +394,7 @@ discard block |
||
| 388 | 394 | * @param unknown_type $errfile |
| 389 | 395 | * @param unknown_type $errline |
| 390 | 396 | * @param unknown_type $errcontext |
| 397 | + * @param string $errtype |
|
| 391 | 398 | */ |
| 392 | 399 | public static function showError($errno, $errstr, $errfile, $errline, $errcontext, $errtype) { |
| 393 | 400 | if(!headers_sent()) { |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | * greater than or equal to this version, a message will be raised |
| 73 | 73 | * |
| 74 | 74 | * @static |
| 75 | - * @param $ver string - |
|
| 75 | + * @param string|null $ver string - |
|
| 76 | 76 | * A php standard version string, see http://php.net/manual/en/function.version-compare.php for details. |
| 77 | 77 | * @param null $forModule string - |
| 78 | 78 | * The name of a module. The passed version will be used as the check value for |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * Find a File object by the given filename. |
| 235 | 235 | * |
| 236 | 236 | * @param String $filename Matched against the "Name" property. |
| 237 | - * @return mixed null if not found, File object of found file |
|
| 237 | + * @return null|DataObject null if not found, File object of found file |
|
| 238 | 238 | */ |
| 239 | 239 | public static function find($filename) { |
| 240 | 240 | // Get the base file if $filename points to a resampled file |
@@ -449,6 +449,7 @@ discard block |
||
| 449 | 449 | * showing icons on filelinks, etc. |
| 450 | 450 | * Possible group values are: "audio", "mov", "zip", "image". |
| 451 | 451 | * |
| 452 | + * @param string $ext |
|
| 452 | 453 | * @return String |
| 453 | 454 | */ |
| 454 | 455 | public static function get_app_category($ext) { |
@@ -872,7 +873,6 @@ discard block |
||
| 872 | 873 | /** |
| 873 | 874 | * Convert a php.ini value (eg: 512M) to bytes |
| 874 | 875 | * |
| 875 | - * @param string $phpIniValue |
|
| 876 | 876 | * @return int |
| 877 | 877 | */ |
| 878 | 878 | public static function ini2bytes($PHPiniValue) { |
@@ -150,6 +150,7 @@ discard block |
||
| 150 | 150 | * successfully, the manipulation's cache key is removed. |
| 151 | 151 | * |
| 152 | 152 | * @param string $filename |
| 153 | + * @param string $manipulation |
|
| 153 | 154 | * @return boolean |
| 154 | 155 | */ |
| 155 | 156 | public function failedResample($filename, $manipulation) { |
@@ -417,6 +418,10 @@ discard block |
||
| 417 | 418 | return $useAsMinimum ? $this->resizeByWidth( $maxWidth ) : $this->resizeByHeight( $maxHeight ); |
| 418 | 419 | } |
| 419 | 420 | |
| 421 | + /** |
|
| 422 | + * @param resource $image |
|
| 423 | + * @param string $webColor |
|
| 424 | + */ |
|
| 420 | 425 | public static function color_web2gd($image, $webColor) { |
| 421 | 426 | if(substr($webColor,0,1) == "#") $webColor = substr($webColor,1); |
| 422 | 427 | $r = hexdec(substr($webColor,0,2)); |
@@ -521,6 +526,9 @@ discard block |
||
| 521 | 526 | return $output; |
| 522 | 527 | } |
| 523 | 528 | |
| 529 | + /** |
|
| 530 | + * @param string $dirname |
|
| 531 | + */ |
|
| 524 | 532 | public function makeDir($dirname) { |
| 525 | 533 | if(!file_exists(dirname($dirname))) $this->makeDir(dirname($dirname)); |
| 526 | 534 | if(!file_exists($dirname)) mkdir($dirname, Config::inst()->get('Filesystem', 'folder_create_mask')); |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * |
| 81 | 81 | * Get the backend-specific resource handling the manipulations. Replaces Image::getGD() |
| 82 | 82 | * |
| 83 | - * @return mixed |
|
| 83 | + * @return ImagickBackend |
|
| 84 | 84 | */ |
| 85 | 85 | public function getImageResource() { |
| 86 | 86 | return $this; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * |
| 112 | 112 | * @param int $width |
| 113 | 113 | * @param int $height |
| 114 | - * @return Image_Backend |
|
| 114 | + * @return null|ImagickBackend |
|
| 115 | 115 | */ |
| 116 | 116 | public function resize($width, $height) { |
| 117 | 117 | if(!$this->valid()) return; |
@@ -141,9 +141,9 @@ discard block |
||
| 141 | 141 | /** |
| 142 | 142 | * resizeRatio |
| 143 | 143 | * |
| 144 | - * @param int $width |
|
| 145 | - * @param int $height |
|
| 146 | - * @return Image_Backend |
|
| 144 | + * @param integer $maxWidth |
|
| 145 | + * @param integer $maxHeight |
|
| 146 | + * @return null|ImagickBackend |
|
| 147 | 147 | */ |
| 148 | 148 | public function resizeRatio($maxWidth, $maxHeight, $useAsMinimum = false) { |
| 149 | 149 | if(!$this->valid()) return; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * resizeByWidth |
| 164 | 164 | * |
| 165 | 165 | * @param int $width |
| 166 | - * @return Image_Backend |
|
| 166 | + * @return null|ImagickBackend |
|
| 167 | 167 | */ |
| 168 | 168 | public function resizeByWidth($width) { |
| 169 | 169 | if(!$this->valid()) return; |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * resizeByHeight |
| 179 | 179 | * |
| 180 | 180 | * @param int $height |
| 181 | - * @return Image_Backend |
|
| 181 | + * @return null|ImagickBackend |
|
| 182 | 182 | */ |
| 183 | 183 | public function resizeByHeight($height) { |
| 184 | 184 | if(!$this->valid()) return; |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | * |
| 195 | 195 | * @param int $width |
| 196 | 196 | * @param int $height |
| 197 | - * @return Image_Backend |
|
| 197 | + * @return null|ImagickBackend |
|
| 198 | 198 | */ |
| 199 | 199 | public function paddedResize($width, $height, $backgroundColor = "FFFFFF") { |
| 200 | 200 | $new = $this->resizeRatio($width, $height); |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | * |
| 212 | 212 | * @param int $width |
| 213 | 213 | * @param int $height |
| 214 | - * @return Image_Backend |
|
| 214 | + * @return null|ImagickBackend |
|
| 215 | 215 | */ |
| 216 | 216 | public function croppedResize($width, $height) { |
| 217 | 217 | if(!$this->valid()) return; |
@@ -90,6 +90,10 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | protected $valueObj = null; |
| 92 | 92 | |
| 93 | + /** |
|
| 94 | + * @param string $name |
|
| 95 | + * @param string $title |
|
| 96 | + */ |
|
| 93 | 97 | public function __construct($name, $title = null, $value = null) { |
| 94 | 98 | if(!$this->locale) { |
| 95 | 99 | $this->locale = i18n::get_locale(); |
@@ -288,6 +292,9 @@ discard block |
||
| 288 | 292 | return $field; |
| 289 | 293 | } |
| 290 | 294 | |
| 295 | + /** |
|
| 296 | + * @param string $class |
|
| 297 | + */ |
|
| 291 | 298 | public function castedCopy($class) { |
| 292 | 299 | $copy = new $class($this->name); |
| 293 | 300 | if($copy->hasMethod('setConfig')) { |
@@ -326,7 +333,7 @@ discard block |
||
| 326 | 333 | * @deprecated 4.0 Use the "DateField.default_config" config setting instead |
| 327 | 334 | * @param String $k |
| 328 | 335 | * @param mixed $v |
| 329 | - * @return boolean |
|
| 336 | + * @return boolean|null |
|
| 330 | 337 | */ |
| 331 | 338 | public static function set_default_config($k, $v) { |
| 332 | 339 | Deprecation::notice('4.0', 'Use the "DateField.default_config" config setting instead'); |
@@ -56,6 +56,10 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | protected $config; |
| 58 | 58 | |
| 59 | + /** |
|
| 60 | + * @param string $name |
|
| 61 | + * @param string $title |
|
| 62 | + */ |
|
| 59 | 63 | public function __construct($name, $title = null, $value = ""){ |
| 60 | 64 | $this->config = $this->config()->default_config; |
| 61 | 65 | |
@@ -68,6 +72,9 @@ discard block |
||
| 68 | 72 | parent::__construct($name, $title, $value); |
| 69 | 73 | } |
| 70 | 74 | |
| 75 | + /** |
|
| 76 | + * @param Form $form |
|
| 77 | + */ |
|
| 71 | 78 | public function setForm($form) { |
| 72 | 79 | parent::setForm($form); |
| 73 | 80 | |
@@ -78,6 +85,9 @@ discard block |
||
| 78 | 85 | return $this; |
| 79 | 86 | } |
| 80 | 87 | |
| 88 | + /** |
|
| 89 | + * @param string $name |
|
| 90 | + */ |
|
| 81 | 91 | public function setName($name) { |
| 82 | 92 | parent::setName($name); |
| 83 | 93 | |
@@ -90,7 +100,7 @@ discard block |
||
| 90 | 100 | |
| 91 | 101 | /** |
| 92 | 102 | * @param array $properties |
| 93 | - * @return HTMLText |
|
| 103 | + * @return string |
|
| 94 | 104 | */ |
| 95 | 105 | public function FieldHolder($properties = array()) { |
| 96 | 106 | $config = array( |
@@ -240,6 +250,7 @@ discard block |
||
| 240 | 250 | |
| 241 | 251 | /** |
| 242 | 252 | * @param FormField |
| 253 | + * @param DateField $field |
|
| 243 | 254 | */ |
| 244 | 255 | public function setDateField($field) { |
| 245 | 256 | $expected = $this->getName() . '[date]'; |
@@ -265,6 +276,7 @@ discard block |
||
| 265 | 276 | |
| 266 | 277 | /** |
| 267 | 278 | * @param FormField |
| 279 | + * @param TimeField $field |
|
| 268 | 280 | */ |
| 269 | 281 | public function setTimeField($field) { |
| 270 | 282 | $expected = $this->getName() . '[time]'; |
@@ -303,7 +315,7 @@ discard block |
||
| 303 | 315 | * to set field-specific config options. |
| 304 | 316 | * |
| 305 | 317 | * @param string $name |
| 306 | - * @param mixed $val |
|
| 318 | + * @param string $val |
|
| 307 | 319 | */ |
| 308 | 320 | public function setConfig($name, $val) { |
| 309 | 321 | $this->config[$name] = $val; |
@@ -321,7 +333,7 @@ discard block |
||
| 321 | 333 | * to get field-specific config options. |
| 322 | 334 | * |
| 323 | 335 | * @param String $name Optional, returns the whole configuration array if empty |
| 324 | - * @return mixed |
|
| 336 | + * @return string |
|
| 325 | 337 | */ |
| 326 | 338 | public function getConfig($name = null) { |
| 327 | 339 | if($name) { |
@@ -331,6 +343,9 @@ discard block |
||
| 331 | 343 | } |
| 332 | 344 | } |
| 333 | 345 | |
| 346 | + /** |
|
| 347 | + * @param RequiredFields $validator |
|
| 348 | + */ |
|
| 334 | 349 | public function validate($validator) { |
| 335 | 350 | $dateValid = $this->dateField->validate($validator); |
| 336 | 351 | $timeValid = $this->timeField->validate($validator); |