Completed
Pull Request — 3.2 (#5154)
by Jono
10:39
created
forms/Tab.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,6 @@  discard block
 block discarded – undo
23 23
 	 * @uses FormField::name_to_label()
24 24
 	 *
25 25
 	 * @param string $name Identifier of the tab, without characters like dots or spaces
26
-	 * @param string $title Natural language title of the tab. If its left out,
27
-	 *  the class uses {@link FormField::name_to_label()} to produce a title from the {@link $name} parameter.
28 26
 	 * @param FormField All following parameters are inserted as children to this tab
29 27
 	 */
30 28
 	public function __construct($name) {
@@ -54,6 +52,9 @@  discard block
 block discarded – undo
54 52
 		return $this->children;
55 53
 	}
56 54
 
55
+	/**
56
+	 * @param TabSet $val
57
+	 */
57 58
 	public function setTabSet($val) {
58 59
 		$this->tabSet = $val;
59 60
 		return $this;
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.
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.
model/connect/Database.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -406,6 +406,7 @@  discard block
 block discarded – undo
406 406
 	 * - minutes
407 407
 	 * - seconds
408 408
 	 * This includes the singular forms as well
409
+	 * @param string $date
409 410
 	 * @return string SQL datetime expression to query for a datetime (YYYY-MM-DD hh:mm:ss) which is the result of
410 411
 	 *                the addition
411 412
 	 */
@@ -419,6 +420,7 @@  discard block
 block discarded – undo
419 420
 	 *                       e.g. '"SiteTree"."Created"'
420 421
 	 * @param string $date2 to be substracted of $date1, can be either 'now', literal datetime
421 422
 	 *                      like '1973-10-14 10:30:00' or field name, e.g. '"SiteTree"."Created"'
423
+	 * @param string $date1
422 424
 	 * @return string SQL datetime expression to query for the interval between $date1 and $date2 in seconds which
423 425
 	 *                is the result of the substraction
424 426
 	 */
@@ -646,7 +648,7 @@  discard block
 block discarded – undo
646 648
 	 * @param boolean $create Flag indicating whether the database should be created
647 649
 	 * if it doesn't exist. If $create is false and the database doesn't exist
648 650
 	 * then an error will be raised
649
-	 * @param int|boolean $errorLevel The level of error reporting to enable for the query, or false if no error
651
+	 * @param boolean $errorLevel The level of error reporting to enable for the query, or false if no error
650 652
 	 * should be raised
651 653
 	 * @return boolean Flag indicating success
652 654
 	 */
@@ -681,7 +683,7 @@  discard block
 block discarded – undo
681 683
 	/**
682 684
 	 * Returns the name of the currently selected database
683 685
 	 *
684
-	 * @return string|null Name of the selected database, or null if none selected
686
+	 * @return string Name of the selected database, or null if none selected
685 687
 	 */
686 688
 	public function getSelectedDatabase() {
687 689
 		return $this->connector->getSelectedDatabase();
@@ -806,6 +808,7 @@  discard block
 block discarded – undo
806 808
 
807 809
 	/**
808 810
 	 * @deprecated since version 4.0 Use DB::field_list instead
811
+	 * @param string $table
809 812
 	 */
810 813
 	public function fieldList($table) {
811 814
 		Deprecation::notice('4.0', 'Use DB::field_list instead');
Please login to merge, or discard this patch.
model/connect/DBSchemaManager.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,6 @@  discard block
 block discarded – undo
38 38
 	/**
39 39
 	 * Injector injection point for database controller
40 40
 	 *
41
-	 * @param SS_Database $connector
42 41
 	 */
43 42
 	public function setDatabase(SS_Database $database) {
44 43
 		$this->database = $database;
@@ -104,6 +103,7 @@  discard block
 block discarded – undo
104 103
 	 *
105 104
 	 * @var callable $callback
106 105
 	 * @throws Exception
106
+	 * @param Closure $callback
107 107
 	 */
108 108
 	public function schemaUpdate($callback) {
109 109
 		// Begin schema update
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 	/**
477 477
 	 * Given an index spec determines the index type
478 478
 	 *
479
-	 * @param array|string $spec
479
+	 * @param string $spec
480 480
 	 * @return string
481 481
 	 */
482 482
 	protected function determineIndexType($spec) {
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 	/**
545 545
 	 * Returns true if the given table is exists in the current database
546 546
 	 *
547
-	 * @param string $table Name of table to check
547
+	 * @param string $tableName Name of table to check
548 548
 	 * @return boolean Flag indicating existence of table
549 549
 	 */
550 550
 	abstract public function hasTable($tableName);
Please login to merge, or discard this patch.