@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
77 | - * @return string |
|
77 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
78 | 78 | */ |
79 | 79 | public function InternallyLabelledField() { |
80 | 80 | Deprecation::notice('4.0', 'Please use ->setValue() instead'); |
@@ -52,6 +52,10 @@ discard block |
||
52 | 52 | |
53 | 53 | protected $schemaDataType = FormField::SCHEMA_DATA_TYPE_TIME; |
54 | 54 | |
55 | + /** |
|
56 | + * @param string $name |
|
57 | + * @param string $title |
|
58 | + */ |
|
55 | 59 | public function __construct($name, $title = null, $value = ""){ |
56 | 60 | if(!$this->locale) { |
57 | 61 | $this->locale = i18n::get_locale(); |
@@ -213,7 +217,7 @@ discard block |
||
213 | 217 | |
214 | 218 | /** |
215 | 219 | * @param String $name Optional, returns the whole configuration array if empty |
216 | - * @return mixed|array |
|
220 | + * @return string|null |
|
217 | 221 | */ |
218 | 222 | public function getConfig($name = null) { |
219 | 223 | if($name) { |
@@ -230,6 +234,9 @@ discard block |
||
230 | 234 | return $this->castedCopy('TimeField_Readonly'); |
231 | 235 | } |
232 | 236 | |
237 | + /** |
|
238 | + * @param string $class |
|
239 | + */ |
|
233 | 240 | public function castedCopy($class) { |
234 | 241 | $copy = parent::castedCopy($class); |
235 | 242 | if($copy->hasMethod('setConfig')) { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * |
86 | 86 | * @param string $name the field name |
87 | 87 | * @param string $title the field label |
88 | - * @param string|array $sourceObject The object-type to list in the tree. This could |
|
88 | + * @param string $sourceObject The object-type to list in the tree. This could |
|
89 | 89 | * be one of the following: |
90 | 90 | * - A DataObject class name with the {@link Hierarchy} extension. |
91 | 91 | * - An array of key/value pairs, like a {@link DropdownField} source. In |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | |
222 | 222 | /** |
223 | 223 | * @param array $properties |
224 | - * @return string |
|
224 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
225 | 225 | */ |
226 | 226 | public function Field($properties = array()) { |
227 | 227 | Requirements::add_i18n_javascript(FRAMEWORK_DIR . '/client/lang'); |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | /** |
296 | 296 | * Determine if the target folder for new uploads in is visible the field UI. |
297 | 297 | * |
298 | - * @return boolean |
|
298 | + * @return boolean|string |
|
299 | 299 | */ |
300 | 300 | public function canPreviewFolder() { |
301 | 301 | if(!$this->isActive()) return false; |
@@ -553,7 +553,7 @@ discard block |
||
553 | 553 | * Customises a file with additional details suitable for rendering in the |
554 | 554 | * UploadField.ss template |
555 | 555 | * |
556 | - * @param ViewableData|AssetContainer $file |
|
556 | + * @param AssetContainer $file |
|
557 | 557 | * @return ViewableData_Customised |
558 | 558 | */ |
559 | 559 | protected function customiseFile(AssetContainer $file) { |
@@ -653,7 +653,7 @@ discard block |
||
653 | 653 | /** |
654 | 654 | * Determine if the user has permission to upload. |
655 | 655 | * |
656 | - * @return boolean |
|
656 | + * @return boolean|string |
|
657 | 657 | */ |
658 | 658 | public function canUpload() { |
659 | 659 | if(!$this->isActive()) return false; |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | * Determine if the user has permission to attach existing files |
678 | 678 | * By default returns true if the user has the CMS_ACCESS_AssetAdmin permission |
679 | 679 | * |
680 | - * @return boolean |
|
680 | + * @return boolean|string |
|
681 | 681 | */ |
682 | 682 | public function canAttachExisting() { |
683 | 683 | if(!$this->isActive()) return false; |
@@ -2161,6 +2161,7 @@ discard block |
||
2161 | 2161 | |
2162 | 2162 | /** |
2163 | 2163 | * @param String |
2164 | + * @param string $name |
|
2164 | 2165 | * @return Zend_Translate |
2165 | 2166 | */ |
2166 | 2167 | public static function get_translator($name) { |
@@ -2200,6 +2201,7 @@ discard block |
||
2200 | 2201 | |
2201 | 2202 | /** |
2202 | 2203 | * @param String |
2204 | + * @param string $name |
|
2203 | 2205 | */ |
2204 | 2206 | public static function unregister_translator($name) { |
2205 | 2207 | foreach (self::get_translators() as $priority => $translators) { |
@@ -2302,7 +2304,7 @@ discard block |
||
2302 | 2304 | * |
2303 | 2305 | * @see get_locale_name() |
2304 | 2306 | * |
2305 | - * @param mixed $code Language code |
|
2307 | + * @param string $code Language code |
|
2306 | 2308 | * @param boolean $native If true, the native name will be returned |
2307 | 2309 | * @return string Name of the language |
2308 | 2310 | */ |
@@ -223,6 +223,7 @@ |
||
223 | 223 | * via the standard template inclusion process. |
224 | 224 | * |
225 | 225 | * @param string |
226 | + * @param string $template |
|
226 | 227 | */ |
227 | 228 | public function setTemplate($template) { |
228 | 229 | $this->template = $template; |
@@ -168,7 +168,7 @@ |
||
168 | 168 | * |
169 | 169 | * Actually only one array argument is supported. |
170 | 170 | * |
171 | - * @param $f callback to apply |
|
171 | + * @param string $f callback to apply |
|
172 | 172 | * @param $array array |
173 | 173 | * @return array |
174 | 174 | */ |
@@ -700,7 +700,7 @@ |
||
700 | 700 | /** |
701 | 701 | * Returns item stored in list with index $key |
702 | 702 | * |
703 | - * @param mixed $offset |
|
703 | + * @param integer $offset |
|
704 | 704 | * @return DataObject |
705 | 705 | */ |
706 | 706 | public function offsetGet($offset) { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | * - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full |
296 | 296 | * control over the index. |
297 | 297 | * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type |
298 | - * @param array $options Create table options (ENGINE, etc.) |
|
298 | + * @param string|null $options Create table options (ENGINE, etc.) |
|
299 | 299 | * @param array|bool $extensions List of extensions |
300 | 300 | */ |
301 | 301 | public function requireTable($table, $fieldSchema = null, $indexSchema = null, $hasAutoIncPK = true, |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | /** |
481 | 481 | * Given an index spec determines the index type |
482 | 482 | * |
483 | - * @param array|string $spec |
|
483 | + * @param string $spec |
|
484 | 484 | * @return string |
485 | 485 | */ |
486 | 486 | protected function determineIndexType($spec) { |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | * |
576 | 576 | * @param string $table The table name. |
577 | 577 | * @param string $field The field name. |
578 | - * @param array|string $spec The field specification. If passed in array syntax, the specific database |
|
578 | + * @param string $spec The field specification. If passed in array syntax, the specific database |
|
579 | 579 | * driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to |
580 | 580 | * be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll |
581 | 581 | * need to take care of database abstraction in your DBField subclass. |