Completed
Pull Request — master (#4975)
by Peter
12:14 queued 14s
created
forms/MoneyField.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -32,6 +32,10 @@  discard block
 block discarded – undo
32 32
 	 */
33 33
 	protected $fieldCurrency = null;
34 34
 
35
+	/**
36
+	 * @param string $name
37
+	 * @param string $title
38
+	 */
35 39
 	public function __construct($name, $title = null, $value = "") {
36 40
 		// naming with underscores to prevent values from actually being saved somewhere
37 41
 		$this->fieldAmount = new NumericField("{$name}[Amount]", _t('MoneyField.FIELDLABELAMOUNT', 'Amount'));
@@ -135,6 +139,7 @@  discard block
 block discarded – undo
135 139
 	/**
136 140
 	 * @todo Implement removal of readonly state with $bool=false
137 141
 	 * @todo Set readonly state whenever field is recreated, e.g. in setAllowedCurrencies()
142
+	 * @param boolean $bool
138 143
 	 */
139 144
 	public function setReadonly($bool) {
140 145
 		parent::setReadonly($bool);
Please login to merge, or discard this patch.
model/DataObject.php 1 patch
Doc Comments   +7 added lines, -4 removed lines patch added patch discarded remove patch
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
 	 * The destinationObject must be written to the database already and have an ID. Writing is performed
546 546
 	 * automatically when adding the new relations.
547 547
 	 *
548
-	 * @param $sourceObject the source object to duplicate from
548
+	 * @param DataObject $sourceObject the source object to duplicate from
549 549
 	 * @param $destinationObject the destination object to populate with the duplicated relations
550 550
 	 * @return DataObject with the new many_many relations copied in
551 551
 	 */
@@ -953,6 +953,7 @@  discard block
 block discarded – undo
953 953
 	 * @param $includeRelations Boolean Merge any existing relations (optional)
954 954
 	 * @param $overwriteWithEmpty Boolean Overwrite existing left values with empty right values.
955 955
 	 *                            Only applicable with $priority='right'. (optional)
956
+	 * @param DataObject|null $rightObj
956 957
 	 * @return Boolean
957 958
 	 */
958 959
 	public function merge($rightObj, $priority = 'right', $includeRelations = true, $overwriteWithEmpty = false) {
@@ -1640,7 +1641,7 @@  discard block
 block discarded – undo
1640 1641
 	/**
1641 1642
 	 * Find the foreign class of a relation on this DataObject, regardless of the relation type.
1642 1643
 	 *
1643
-	 * @param $relationName Relation name.
1644
+	 * @param string $relationName Relation name.
1644 1645
 	 * @return string Class name, or null if not found.
1645 1646
 	 */
1646 1647
 	public function getRelationClass($relationName) {
@@ -2216,6 +2217,7 @@  discard block
 block discarded – undo
2216 2217
 	 *
2217 2218
 	 * This is experimental, and is currently only a Postgres-specific enhancement.
2218 2219
 	 *
2220
+	 * @param string $class
2219 2221
 	 * @return array or false
2220 2222
 	 */
2221 2223
 	public function database_extensions($class){
@@ -3019,7 +3021,7 @@  discard block
 block discarded – undo
3019 3021
 	 * Traverses to a field referenced by relationships between data objects, returning the value
3020 3022
 	 * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName)
3021 3023
 	 *
3022
-	 * @param $fieldName string
3024
+	 * @param string $fieldName string
3023 3025
 	 * @return string | null - will return null on a missing value
3024 3026
 	 */
3025 3027
 	public function relField($fieldName) {
@@ -3088,7 +3090,7 @@  discard block
 block discarded – undo
3088 3090
 	 * @param string $callerClass The class of objects to be returned
3089 3091
 	 * @param string|array $filter A filter to be inserted into the WHERE clause.
3090 3092
 	 * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples.
3091
-	 * @param string|array $sort A sort expression to be inserted into the ORDER
3093
+	 * @param string $sort A sort expression to be inserted into the ORDER
3092 3094
 	 * BY clause.  If omitted, self::$default_sort will be used.
3093 3095
 	 * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead.
3094 3096
 	 * @param string|array $limit A limit expression to be inserted into the LIMIT clause.
@@ -3294,6 +3296,7 @@  discard block
 block discarded – undo
3294 3296
 
3295 3297
 	/**
3296 3298
 	 * @see $sourceQueryParams
3299
+	 * @param string $key
3297 3300
 	 * @return Mixed
3298 3301
 	 */
3299 3302
 	public function getSourceQueryParam($key) {
Please login to merge, or discard this patch.
model/Versioned.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
 	 * Extend permissions to include additional security for objects that are not published to live.
746 746
 	 *
747 747
 	 * @param Member $member
748
-	 * @return bool|null
748
+	 * @return false|null
749 749
 	 */
750 750
 	public function canView($member = null) {
751 751
 		// Invoke default version-gnostic canView
@@ -814,7 +814,7 @@  discard block
 block discarded – undo
814 814
 	 *
815 815
 	 * @param string $stage
816 816
 	 * @param Member $member
817
-	 * @return bool
817
+	 * @return boolean|string
818 818
 	 */
819 819
 	public function canViewStage($stage = 'Live', $member = null) {
820 820
 		$oldMode = Versioned::get_reading_mode();
@@ -879,7 +879,7 @@  discard block
 block discarded – undo
879 879
 	/**
880 880
 	 * Get the latest published DataObject.
881 881
 	 *
882
-	 * @return DataObject
882
+	 * @return string
883 883
 	 */
884 884
 	public function latestPublished() {
885 885
 		// Get the root data object class - this will have the version field
@@ -1073,6 +1073,7 @@  discard block
 block discarded – undo
1073 1073
 	/**
1074 1074
 	 * Return the base table - the class that directly extends DataObject.
1075 1075
 	 *
1076
+	 * @param string $stage
1076 1077
 	 * @return string
1077 1078
 	 */
1078 1079
 	public function baseTable($stage = null) {
@@ -1239,7 +1240,6 @@  discard block
 block discarded – undo
1239 1240
 	 * @param string $stage The name of the stage.
1240 1241
 	 * @param string $filter A filter to be inserted into the WHERE clause.
1241 1242
 	 * @param boolean $cache Use caching.
1242
-	 * @param string $orderby A sort expression to be inserted into the ORDER BY clause.
1243 1243
 	 *
1244 1244
 	 * @return DataObject
1245 1245
 	 */
Please login to merge, or discard this patch.
view/ViewableData.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	/**
142 142
 	 * Get the current failover object if set
143 143
 	 *
144
-	 * @return ViewableData|null
144
+	 * @return ViewableData
145 145
 	 */
146 146
 	public function getFailover() {
147 147
 		return $this->failover;
@@ -208,8 +208,6 @@  discard block
 block discarded – undo
208 208
 	/**
209 209
 	 * Method to facilitate deprecation of underscore-prefixed methods automatically being cached.
210 210
 	 * 
211
-	 * @param string $field
212
-	 * @param array $arguments
213 211
 	 * @param string $identifier an optional custom cache identifier
214 212
 	 * @return unknown
215 213
 	 */
@@ -270,7 +268,7 @@  discard block
 block discarded – undo
270 268
 	 *  - castingHelper: the casting helper for casting the field (e.g. "return new Varchar($fieldName)")
271 269
 	 *
272 270
 	 * @param string $field
273
-	 * @return array
271
+	 * @return string
274 272
 	 */
275 273
 	public function castingHelperPair($field) {
276 274
 		Deprecation::notice('2.5', 'use castingHelper() instead');
@@ -520,6 +518,7 @@  discard block
 block discarded – undo
520 518
 	
521 519
 	/**
522 520
 	 * Return the value of a field in an SQL-safe format.
521
+	 * @param string $field
523 522
 	 */
524 523
 	public function SQL_val($field, $arguments = null, $cache = true) {
525 524
 		return Convert::raw2sql($this->RAW_val($field, $arguments, $cache));
@@ -527,6 +526,7 @@  discard block
 block discarded – undo
527 526
 	
528 527
 	/**
529 528
 	 * Return the value of a field in a JavaScript-save format.
529
+	 * @param string $field
530 530
 	 */
531 531
 	public function JS_val($field, $arguments = null, $cache = true) {
532 532
 		return Convert::raw2js($this->RAW_val($field, $arguments, $cache));
@@ -534,6 +534,7 @@  discard block
 block discarded – undo
534 534
 	
535 535
 	/**
536 536
 	 * Return the value of a field escaped suitable to be inserted into an XML node attribute.
537
+	 * @param string $field
537 538
 	 */
538 539
 	public function ATT_val($field, $arguments = null, $cache = true) {
539 540
 		return Convert::raw2att($this->RAW_val($field, $arguments, $cache));
@@ -544,7 +545,6 @@  discard block
 block discarded – undo
544 545
 	/**
545 546
 	 * Get an array of XML-escaped values by field name
546 547
 	 *
547
-	 * @param array $elements an array of field names
548 548
 	 * @return array
549 549
 	 */
550 550
 	public function getXMLValues($fields) {
Please login to merge, or discard this patch.