Completed
Pull Request — master (#4748)
by Michael
10:35
created
forms/TabSet.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,6 @@
 block discarded – undo
29 29
 
30 30
 	/**
31 31
 	 * @param string $name Identifier
32
-	 * @param string $title (Optional) Natural language title of the tabset
33
-	 * @param Tab|TabSet $unknown All further parameters are inserted as children into the TabSet
34 32
 	 */
35 33
 	public function __construct($name) {
36 34
 		$args = func_get_args();
Please login to merge, or discard this patch.
forms/TextField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	/**
48
-	 * @return null|int
48
+	 * @return integer
49 49
 	 */
50 50
 	public function getMaxLength() {
51 51
 		return $this->maxLength;
Please login to merge, or discard this patch.
forms/TimeField.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -50,6 +50,10 @@  discard block
 block discarded – undo
50 50
 	 */
51 51
 	protected $valueObj = null;
52 52
 
53
+	/**
54
+	 * @param string $name
55
+	 * @param string $title
56
+	 */
53 57
 	public function __construct($name, $title = null, $value = ""){
54 58
 		if(!$this->locale) {
55 59
 			$this->locale = i18n::get_locale();
@@ -228,6 +232,9 @@  discard block
 block discarded – undo
228 232
 		return $this->castedCopy('TimeField_Readonly');
229 233
 	}
230 234
 
235
+	/**
236
+	 * @param string $class
237
+	 */
231 238
 	public function castedCopy($class) {
232 239
 		$copy = parent::castedCopy($class);
233 240
 		if($copy->hasMethod('setConfig')) {
Please login to merge, or discard this patch.
forms/TreeDropdownField.php 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 *
77 77
 	 * @param string $name the field name
78 78
 	 * @param string $title the field label
79
-	 * @param string|array $sourceObject The object-type to list in the tree. This could
79
+	 * @param string $sourceObject The object-type to list in the tree. This could
80 80
 	 * be one of the following:
81 81
 	 * - A DataObject class name with the {@link Hierarchy} extension.
82 82
 	 * - An array of key/value pairs, like a {@link DropdownField} source. In
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
 	 * If a filter function has been set, that will be called. And if search text is set,
386 386
 	 * filter on that too. Return true if all applicable conditions are true, false otherwise.
387 387
 	 * @param $node
388
-	 * @return unknown_type
388
+	 * @return boolean
389 389
 	 */
390 390
 	public function filterMarking($node) {
391 391
 		if ($this->filterCallback && !call_user_func($this->filterCallback, $node)) return false;
@@ -436,7 +436,6 @@  discard block
 block discarded – undo
436 436
 	}
437 437
 
438 438
 	/**
439
-	 * @param String $field
440 439
 	 */
441 440
 	public function setSourceObject($class) {
442 441
 		$this->sourceObject = $class;
Please login to merge, or discard this patch.
forms/UploadField.php 1 patch
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -211,7 +211,6 @@  discard block
 block discarded – undo
211 211
 	 * @param string $title The field label.
212 212
 	 * @param SS_List $items If no items are defined, the field will try to auto-detect an existing relation on
213 213
 	 *                       @link $record}, with the same name as the field name.
214
-	 * @param Form $form Reference to the container form
215 214
 	 */
216 215
 	public function __construct($name, $title = null, SS_List $items = null) {
217 216
 
@@ -1078,7 +1077,7 @@  discard block
 block discarded – undo
1078 1077
 
1079 1078
 	/**
1080 1079
 	 * @param SS_HTTPRequest $request
1081
-	 * @return UploadField_ItemHandler
1080
+	 * @return UploadField_SelectHandler
1082 1081
 	 */
1083 1082
 	public function handleSelect(SS_HTTPRequest $request) {
1084 1083
 		if(!$this->canAttachExisting()) return $this->httpError(403);
@@ -1434,7 +1433,7 @@  discard block
 block discarded – undo
1434 1433
 	 * Action to handle editing of a single file
1435 1434
 	 *
1436 1435
 	 * @param SS_HTTPRequest $request
1437
-	 * @return ViewableData_Customised
1436
+	 * @return HTMLText
1438 1437
 	 */
1439 1438
 	public function edit(SS_HTTPRequest $request) {
1440 1439
 		// Check form field state
Please login to merge, or discard this patch.
forms/Validator.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	/**
38 38
 	 * Returns any errors there may be.
39 39
 	 *
40
-	 * @return null|array
40
+	 * @return string
41 41
 	 */
42 42
 	public function validate() {
43 43
 		$this->errors = null;
Please login to merge, or discard this patch.
i18n/i18n.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
 	/**
120 120
 	 * Return an instance of the cache used for i18n data.
121
-	 * @return Zend_Cache
121
+	 * @return Zend_Cache_Core
122 122
 	 */
123 123
 	public static function get_cache() {
124 124
 		return SS_Cache::factory('i18n', 'Output', array('lifetime' => null, 'automatic_serialization' => true));
@@ -2156,6 +2156,7 @@  discard block
 block discarded – undo
2156 2156
 
2157 2157
 	/**
2158 2158
 	 * @param String
2159
+	 * @param string $name
2159 2160
 	 * @return Zend_Translate
2160 2161
 	 */
2161 2162
 	public static function get_translator($name) {
@@ -2169,6 +2170,7 @@  discard block
 block discarded – undo
2169 2170
 	 * @param Zend_Translate Needs to implement {@link i18nTranslateAdapterInterface}
2170 2171
 	 * @param String If left blank will override the default translator.
2171 2172
 	 * @param Int
2173
+	 * @param string $name
2172 2174
 	 */
2173 2175
 	public static function register_translator($translator, $name, $priority = 10) {
2174 2176
 		if (!is_int($priority)) throw new InvalidArgumentException("register_translator expects an int priority");
@@ -2298,7 +2300,7 @@  discard block
 block discarded – undo
2298 2300
 	 *
2299 2301
 	 * @see get_locale_name()
2300 2302
 	 *
2301
-	 * @param mixed $code Language code
2303
+	 * @param string $code Language code
2302 2304
 	 * @param boolean $native If true, the native name will be returned
2303 2305
 	 * @return Name of the language
2304 2306
 	 */
@@ -2455,6 +2457,7 @@  discard block
 block discarded – undo
2455 2457
 	 *
2456 2458
 	 * Note: Does not check for {@link $allowed_locales}.
2457 2459
 	 *
2460
+	 * @param string $locale
2458 2461
 	 * @return boolean
2459 2462
 	 */
2460 2463
 	public static function validate_locale($locale) {
Please login to merge, or discard this patch.
i18n/i18nTextCollector.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -712,7 +712,8 @@  discard block
 block discarded – undo
712 712
 	 * Input for langArrayCodeForEntitySpec() should be suitable for insertion
713 713
 	 * into single-quoted strings, so needs to be escaped already.
714 714
 	 *
715
-	 * @param string $entity The entity name, e.g. CMSMain.BUTTONSAVE
715
+	 * @param string $entitySpec The entity name, e.g. CMSMain.BUTTONSAVE
716
+	 * @param string $locale
716 717
 	 */
717 718
 	public function langArrayCodeForEntitySpec($entityFullName, $entitySpec, $locale) {
718 719
 		$php = '';
@@ -775,6 +776,9 @@  discard block
 block discarded – undo
775 776
 		return true;
776 777
 	}
777 778
 
779
+	/**
780
+	 * @param string $locale
781
+	 */
778 782
 	public function getYaml($entities, $locale) {
779 783
 		// Unflatten array
780 784
 		$entitiesNested = array();
@@ -843,6 +847,7 @@  discard block
 block discarded – undo
843 847
 
844 848
 	/**
845 849
 	 * Parses a template and returns any translatable entities
850
+	 * @param string $template
846 851
 	 */
847 852
 	public static function GetTranslatables($template) {
848 853
 		self::$entities = array();
Please login to merge, or discard this patch.
model/ArrayList.php 1 patch
Doc Comments   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 	 *
388 388
 	 * Note that columns may be double quoted as per ANSI sql standard
389 389
 	 *
390
-	 * @return DataList
390
+	 * @return ArrayList
391 391
 	 * @see SS_List::sort()
392 392
 	 * @example $list->sort('Name'); // default ASC sorting
393 393
 	 * @example $list->sort('Name DESC'); // DESC sorting
@@ -523,6 +523,9 @@  discard block
 block discarded – undo
523 523
 		return $list;
524 524
 	}
525 525
 
526
+	/**
527
+	 * @param integer $id
528
+	 */
526 529
 	public function byID($id) {
527 530
 		$firstElement = $this->filter("ID", $id)->first();
528 531
 
@@ -624,7 +627,6 @@  discard block
 block discarded – undo
624 627
 	/**
625 628
 	 * Returns whether an item with $key exists
626 629
 	 *
627
-	 * @param mixed $key
628 630
 	 * @return bool
629 631
 	 */
630 632
 	public function offsetExists($offset) {
@@ -634,7 +636,6 @@  discard block
 block discarded – undo
634 636
 	/**
635 637
 	 * Returns item stored in list with index $key
636 638
 	 *
637
-	 * @param mixed $key
638 639
 	 * @return DataObject
639 640
 	 */
640 641
 	public function offsetGet($offset) {
@@ -644,7 +645,6 @@  discard block
 block discarded – undo
644 645
 	/**
645 646
 	 * Set an item with the key in $key
646 647
 	 *
647
-	 * @param mixed $key
648 648
 	 * @param mixed $value
649 649
 	 */
650 650
 	public function offsetSet($offset, $value) {
@@ -658,7 +658,6 @@  discard block
 block discarded – undo
658 658
 	/**
659 659
 	 * Unset an item with the key in $key
660 660
 	 *
661
-	 * @param mixed $key
662 661
 	 */
663 662
 	public function offsetUnset($offset) {
664 663
 		unset($this->items[$offset]);
Please login to merge, or discard this patch.