Completed
Pull Request — 3.1 (#5200)
by Daniel
12:18
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.
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/fieldtypes/Currency.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -23,6 +23,9 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	private static $currency_symbol = '$';
25 25
 
26
+	/**
27
+	 * @param string $name
28
+	 */
26 29
 	public function __construct($name = null, $wholeSize = 9, $decimalSize = 2, $defaultValue = 0) {
27 30
 		parent::__construct($name, $wholeSize, $decimalSize, $defaultValue);
28 31
 	}
@@ -46,6 +49,9 @@  discard block
 block discarded – undo
46 49
 		else return $val;
47 50
 	}
48 51
 
52
+	/**
53
+	 * @param string $value
54
+	 */
49 55
 	public function setValue($value, $record = null, $markChanged = true) {
50 56
 		$matches = null;
51 57
 		if(is_numeric($value)) {
Please login to merge, or discard this patch.
model/fieldtypes/Date.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,6 +20,9 @@  discard block
 block discarded – undo
20 20
  */
21 21
 class Date extends DBField {
22 22
 
23
+	/**
24
+	 * @param string|null $value
25
+	 */
23 26
 	public function setValue($value, $record = null, $markChanged = true) {
24 27
 		if($value === false || $value === null || (is_string($value) && !strlen($value))) {
25 28
 			// don't try to evaluate empty values with strtotime() below, as it returns "1970-01-01" when it should be
@@ -102,7 +105,7 @@  discard block
 block discarded – undo
102 105
 
103 106
 	/**
104 107
 	 * Returns the day of the month.
105
-	 * @param boolean $includeOrdinals Include ordinal suffix to day, e.g. "th" or "rd"
108
+	 * @param boolean $includeOrdinal Include ordinal suffix to day, e.g. "th" or "rd"
106 109
 	 * @return string
107 110
 	 */
108 111
 	public function DayOfMonth($includeOrdinal = false) {
@@ -156,7 +159,7 @@  discard block
 block discarded – undo
156 159
 	 * Return a date formatted as per a CMS user's settings.
157 160
 	 *
158 161
 	 * @param Member $member
159
-	 * @return boolean | string A date formatted as per user-defined settings.
162
+	 * @return false|string | string A date formatted as per user-defined settings.
160 163
 	 */
161 164
 	public function FormatFromSettings($member = null) {
162 165
 		require_once 'Zend/Date.php';
Please login to merge, or discard this patch.
model/fieldtypes/Datetime.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 * Return a date and time formatted as per a CMS user's settings.
98 98
 	 *
99 99
 	 * @param Member $member
100
-	 * @return boolean | string A time and date pair formatted as per user-defined settings.
100
+	 * @return false|string | string A time and date pair formatted as per user-defined settings.
101 101
 	 */
102 102
 	public function FormatFromSettings($member = null) {
103 103
 		require_once 'Zend/Date.php';
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 * Use {@link clear_mock_now()} to revert to the current system date.
177 177
 	 * Caution: This sets a fixed date that doesn't increment with time.
178 178
 	 *
179
-	 * @param SS_Datetime|string $datetime Either in object format, or as a SS_Datetime compatible string.
179
+	 * @param string $datetime Either in object format, or as a SS_Datetime compatible string.
180 180
 	 */
181 181
 	public static function set_mock_now($datetime) {
182 182
 		if($datetime instanceof SS_Datetime) {
Please login to merge, or discard this patch.
model/fieldtypes/HTMLText.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -36,6 +36,9 @@
 block discarded – undo
36 36
 
37 37
 	protected $whitelist = false;
38 38
 
39
+	/**
40
+	 * @param string $name
41
+	 */
39 42
 	public function __construct($name = null, $options = array()) {
40 43
 		if(is_string($options)) {
41 44
 			$options = array('whitelist' => $options);
Please login to merge, or discard this patch.