@@ -17,7 +17,7 @@ |
||
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * @param string $name |
| 20 | - * @param DataOject $object The object that this is primary key for (should have a relation with $name) |
|
| 20 | + * @param DataObject $object The object that this is primary key for (should have a relation with $name) |
|
| 21 | 21 | */ |
| 22 | 22 | public function __construct($name = null, $object) { |
| 23 | 23 | $this->object = $object; |
@@ -71,8 +71,8 @@ |
||
| 71 | 71 | /** |
| 72 | 72 | * resizeRatio |
| 73 | 73 | * |
| 74 | - * @param int $width |
|
| 75 | - * @param int $height |
|
| 74 | + * @param integer $maxWidth |
|
| 75 | + * @param integer $maxHeight |
|
| 76 | 76 | * @return Image_Backend |
| 77 | 77 | */ |
| 78 | 78 | public function resizeRatio($maxWidth, $maxHeight, $useAsMinimum = false); |
@@ -33,6 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * @deprecated since version 4.0 |
| 36 | + * @param boolean $value |
|
| 36 | 37 | */ |
| 37 | 38 | public function setDelete($value) { |
| 38 | 39 | Deprecation::notice('4.0', 'SQLQuery::setDelete is deprecated. Use toDelete instead'); |
@@ -47,6 +48,9 @@ discard block |
||
| 47 | 48 | return $this->isDelete; |
| 48 | 49 | } |
| 49 | 50 | |
| 51 | + /** |
|
| 52 | + * @return string |
|
| 53 | + */ |
|
| 50 | 54 | public function sql(&$parameters = array()) { |
| 51 | 55 | return $this->toAppropriateExpression()->sql($parameters); |
| 52 | 56 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * column. Can contain a relation name in dot notation, which will automatically join |
| 48 | 48 | * the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and |
| 49 | 49 | * search the "Name" column when applying this filter to a SiteTree class). |
| 50 | - * @param mixed $value |
|
| 50 | + * @param boolean|string $value |
|
| 51 | 51 | * @param array $modifiers |
| 52 | 52 | */ |
| 53 | 53 | public function __construct($fullName, $value = false, array $modifiers = array()) { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | /** |
| 288 | 288 | * Determines case sensitivity based on {@link getModifiers()}. |
| 289 | 289 | * |
| 290 | - * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 290 | + * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 291 | 291 | */ |
| 292 | 292 | protected function getCaseSensitive() { |
| 293 | 293 | $modifiers = $this->getModifiers(); |
@@ -304,6 +304,10 @@ |
||
| 304 | 304 | // Delete files in the default uploads directory that match the name pattern. |
| 305 | 305 | // @param String $namePattern A regular expression applied to files in the directory. If the name matches |
| 306 | 306 | // the pattern, it is deleted. Directories, . and .. are excluded. |
| 307 | + |
|
| 308 | + /** |
|
| 309 | + * @param string $namePattern |
|
| 310 | + */ |
|
| 307 | 311 | public function deleteTestUploadFiles($namePattern) { |
| 308 | 312 | $tmpFolder = ASSETS_PATH . "/" . Config::inst()->get('Upload', 'uploads_folder'); |
| 309 | 313 | $files = scandir($tmpFolder); |
@@ -105,6 +105,9 @@ discard block |
||
| 105 | 105 | return $matches; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | + /** |
|
| 109 | + * @param string $string |
|
| 110 | + */ |
|
| 108 | 111 | function _unhtmlentities($string) {
|
| 109 | 112 | $string = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $string);
|
| 110 | 113 | $string = preg_replace('~&#([0-9]+);~e', 'chr(\\1)', $string);
|
@@ -118,6 +121,10 @@ discard block |
||
| 118 | 121 | |
| 119 | 122 | // Patch in multibyte support |
| 120 | 123 | if (!function_exists('mb_substr')) {
|
| 124 | + |
|
| 125 | + /** |
|
| 126 | + * @param string $str |
|
| 127 | + */ |
|
| 121 | 128 | function mb_substr($str, $start, $len = '', $encoding="UTF-8"){
|
| 122 | 129 | $limit = strlen($str); |
| 123 | 130 | |
@@ -45,6 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * Opens a link for pspell. |
| 48 | + * @return string |
|
| 48 | 49 | */ |
| 49 | 50 | function &_getPLink($lang) {
|
| 50 | 51 | // Check for native PSpell support |
@@ -160,7 +160,6 @@ discard block |
||
| 160 | 160 | /** |
| 161 | 161 | * Construct a writer object based on a configuration array |
| 162 | 162 | * |
| 163 | - * @param array $spec config array with writer spec |
|
| 164 | 163 | * @return Zend_Log_Writer_Abstract |
| 165 | 164 | * @throws Zend_Log_Exception |
| 166 | 165 | */ |
@@ -457,7 +456,7 @@ discard block |
||
| 457 | 456 | * Before a message will be received by any of the writers, it |
| 458 | 457 | * must be accepted by all filters added with this method. |
| 459 | 458 | * |
| 460 | - * @param int|Zend_Config|array|Zend_Log_Filter_Interface $filter |
|
| 459 | + * @param Zend_Log_Filter_Priority $filter |
|
| 461 | 460 | * @return Zend_Log |
| 462 | 461 | * @throws Zend_Log_Exception |
| 463 | 462 | */ |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | * |
| 49 | 49 | * @param array|string|resource $streamOrUrl Stream or URL to open as a stream |
| 50 | 50 | * @param string|null $mode Mode, only applicable if a URL is given |
| 51 | - * @return void |
|
| 51 | + * @return null|Zend_Log_Writer_Abstract |
|
| 52 | 52 | * @throws Zend_Log_Exception |
| 53 | 53 | */ |
| 54 | 54 | public function __construct($streamOrUrl, $mode = null) |