Completed
Pull Request — master (#6776)
by Nic
09:32
created
thirdparty/php-peg/Parser.php 1 patch
Doc Comments   +28 added lines patch added patch discarded remove patch
@@ -9,6 +9,10 @@  discard block
 block discarded – undo
9 9
  *  the bracket if a failed match + restore has moved the current position backwards - so we have to check that too.
10 10
  */
11 11
 class ParserRegexp {
12
+
13
+	/**
14
+	 * @param Parser $parser
15
+	 */
12 16
 	function __construct( $parser, $rx ) {
13 17
 		$this->parser = $parser ;
14 18
 		$this->rx = $rx . 'Sx' ;
@@ -83,6 +87,9 @@  discard block
 block discarded – undo
83 87
 		return FALSE ;
84 88
 	}
85 89
 
90
+ 	/**
91
+ 	 * @param string $token
92
+ 	 */
86 93
  	function literal( $token ) {
87 94
  		/* Debugging: * / print( "Looking for token '$token' @ '" . substr( $this->string, $this->pos ) . "'\n" ) ; /* */
88 95
  		$toklen = strlen( $token ) ;
@@ -94,11 +101,17 @@  discard block
 block discarded – undo
94 101
 		return FALSE ;
95 102
 	}
96 103
 
104
+	/**
105
+	 * @param string $rx
106
+	 */
97 107
 	function rx( $rx ) {
98 108
 		if ( !isset( $this->regexps[$rx] ) ) $this->regexps[$rx] = new ParserRegexp( $this, $rx ) ;
99 109
 		return $this->regexps[$rx]->match() ;
100 110
 	}
101 111
 
112
+	/**
113
+	 * @param string $value
114
+	 */
102 115
 	function expression( $result, $stack, $value ) {
103 116
 		$stack[] = $result; $rv = false;
104 117
 		
@@ -120,14 +133,26 @@  discard block
 block discarded – undo
120 133
 		return is_array($rv) ? $rv['text'] : ($rv ? $rv : '');
121 134
 	}
122 135
 	
136
+	/**
137
+	 * @param string $key
138
+	 * @param integer $pos
139
+	 */
123 140
 	function packhas( $key, $pos ) {
124 141
 		return false ;
125 142
 	}
126 143
 
144
+	/**
145
+	 * @param string $key
146
+	 * @param integer $pos
147
+	 */
127 148
 	function packread( $key, $pos ) {
128 149
 		throw new \Exception('PackRead after PackHas=>false in Parser.php');
129 150
 	}
130 151
 
152
+	/**
153
+	 * @param string $key
154
+	 * @param integer $pos
155
+	 */
131 156
 	function packwrite( $key, $pos, $res ) {
132 157
 		return $res ;
133 158
 	}
@@ -164,6 +189,9 @@  discard block
 block discarded – undo
164 189
 		return $result ;
165 190
 	}
166 191
 
192
+	/**
193
+	 * @param string $storetag
194
+	 */
167 195
 	function store ( &$result, $subres, $storetag = NULL ) {
168 196
 		$result['text'] .= $subres['text'] ;
169 197
 
Please login to merge, or discard this patch.
src/Core/Core.php 1 patch
Doc Comments   +4 added lines, -7 removed lines patch added patch discarded remove patch
@@ -136,6 +136,9 @@  discard block
 block discarded – undo
136 136
     return Injector::inst()->get($className);
137 137
 }
138 138
 
139
+/**
140
+ * @return string
141
+ */
139 142
 function project()
140 143
 {
141 144
     global $project;
@@ -152,12 +155,6 @@  discard block
 block discarded – undo
152 155
      * @param string $entity Entity that identifies the string. It must be in the form
153 156
      * "Namespace.Entity" where Namespace will be usually the class name where this
154 157
      * string is used and Entity identifies the string inside the namespace.
155
-     * @param mixed $arg,... Additional arguments are parsed as such:
156
-     *  - Next string argument is a default. Pass in a `|` pipe-delimeted value with `{count}`
157
-     *    to do pluralisation.
158
-     *  - Any other string argument after default is context for i18nTextCollector
159
-     *  - Any array argument in any order is an injection parameter list. Pass in a `count`
160
-     *    injection parameter to pluralise.
161 158
      * @return string
162 159
      */
163 160
 function _t($entity, $arg = null)
@@ -171,7 +168,7 @@  discard block
 block discarded – undo
171 168
  * Only increases up to the maximum defined in {@link set_increase_memory_limit_max()},
172 169
  * and defaults to the 'memory_limit' setting in the PHP configuration.
173 170
  *
174
- * @param string|int $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
171
+ * @param integer $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
175 172
  * @return Boolean TRUE indicates a successful change, FALSE a denied change.
176 173
  */
177 174
 function increase_memory_limit_to($memoryLimit = -1)
Please login to merge, or discard this patch.
src/Forms/FieldList.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,6 +89,9 @@  discard block
 block discarded – undo
89 89
         $this->sequentialSaveableSet = null;
90 90
     }
91 91
 
92
+    /**
93
+     * @param FormField[] $list
94
+     */
92 95
     protected function collateDataFields(&$list, $saveableOnly = false)
93 96
     {
94 97
         if (!isset($list)) {
@@ -198,7 +201,7 @@  discard block
 block discarded – undo
198 201
      * Removes a number of fields from a Tab/TabSet within this FieldList.
199 202
      *
200 203
      * @param string $tabName The name of the Tab or TabSet field
201
-     * @param array $fields A list of fields, e.g. array('Name', 'Email')
204
+     * @param string[] $fields A list of fields, e.g. array('Name', 'Email')
202 205
      */
203 206
     public function removeFieldsFromTab($tabName, $fields)
204 207
     {
@@ -625,7 +628,7 @@  discard block
 block discarded – undo
625 628
     }
626 629
 
627 630
     /**
628
-     * @param $field
631
+     * @param CompositeField $field
629 632
      * @return $this
630 633
      */
631 634
     public function setContainerField($field)
@@ -707,6 +710,7 @@  discard block
 block discarded – undo
707 710
      * the children collection. Doesn't work recursively.
708 711
      *
709 712
      * @param string|FormField
713
+     * @param string $field
710 714
      * @return int Position in children collection (first position starts with 0).
711 715
      * Returns FALSE if the field can't be found.
712 716
      */
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldPrintButton.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
      *
78 78
      * @param GridField
79 79
      *
80
-     * @return array
80
+     * @return string[]
81 81
      */
82 82
     public function getActions($gridField)
83 83
     {
Please login to merge, or discard this patch.
src/ORM/DataObjectSchema.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -701,7 +701,7 @@
 block discarded – undo
701 701
      * @param string $parentClass Parent class name
702 702
      * @param string $component ManyMany name
703 703
      * @param string|array $specification Declaration of many_many relation type
704
-     * @return array
704
+     * @return string[]
705 705
      */
706 706
     protected function parseManyManyComponent($parentClass, $component, $specification)
707 707
     {
Please login to merge, or discard this patch.
src/Security/CMSSecurity.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -41,6 +41,9 @@  discard block
 block discarded – undo
41 41
         Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/vendor.js');
42 42
     }
43 43
 
44
+    /**
45
+     * @param string $action
46
+     */
44 47
     public function Link($action = null)
45 48
     {
46 49
         /** @skipUpgrade */
@@ -60,6 +63,9 @@  discard block
 block discarded – undo
60 63
         return null;
61 64
     }
62 65
 
66
+    /**
67
+     * @param string $title
68
+     */
63 69
     public function getResponseController($title)
64 70
     {
65 71
         // Use $this to prevent use of Page to render underlying templates
Please login to merge, or discard this patch.
src/Forms/DatetimeField.php 1 patch
Doc Comments   +17 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,6 +54,10 @@  discard block
 block discarded – undo
54 54
      */
55 55
     protected $dateTimeOrder = '{date} {time}';
56 56
 
57
+    /**
58
+     * @param string $name
59
+     * @param string $title
60
+     */
57 61
     public function __construct($name, $title = null, $value = "")
58 62
     {
59 63
         $this->timeField = TimeField::create($name . '[time]', false);
@@ -61,6 +65,9 @@  discard block
 block discarded – undo
61 65
         parent::__construct($name, $title, $value);
62 66
     }
63 67
 
68
+    /**
69
+     * @param Form $form
70
+     */
64 71
     public function setForm($form)
65 72
     {
66 73
         parent::setForm($form);
@@ -69,6 +76,9 @@  discard block
 block discarded – undo
69 76
         return $this;
70 77
     }
71 78
 
79
+    /**
80
+     * @param string $name
81
+     */
72 82
     public function setName($name)
73 83
     {
74 84
         parent::setName($name);
@@ -152,7 +162,7 @@  discard block
 block discarded – undo
152 162
     /**
153 163
      * Assign value from iso8601 string
154 164
      *
155
-     * @param mixed $value
165
+     * @param string $value
156 166
      * @param mixed $data
157 167
      * @return $this
158 168
      */
@@ -260,6 +270,9 @@  discard block
 block discarded – undo
260 270
         return $this;
261 271
     }
262 272
 
273
+    /**
274
+     * @param boolean $bool
275
+     */
263 276
     public function setReadonly($bool)
264 277
     {
265 278
         parent::setReadonly($bool);
@@ -345,6 +358,9 @@  discard block
 block discarded – undo
345 358
         return $this->dateField->getLocale();
346 359
     }
347 360
 
361
+    /**
362
+     * @param RequiredFields $validator
363
+     */
348 364
     public function validate($validator)
349 365
     {
350 366
         $dateValid = $this->dateField->validate($validator);
Please login to merge, or discard this patch.
src/Forms/FormField.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1222,7 +1222,7 @@  discard block
 block discarded – undo
1222 1222
     /**
1223 1223
      * @param FormTransformation $transformation
1224 1224
      *
1225
-     * @return mixed
1225
+     * @return FormField
1226 1226
      */
1227 1227
     public function transform(FormTransformation $transformation)
1228 1228
     {
@@ -1333,7 +1333,7 @@  discard block
 block discarded – undo
1333 1333
      * This function is used by the template processor. If you refer to a field as a $ variable, it
1334 1334
      * will return the $Field value.
1335 1335
      *
1336
-     * @return string
1336
+     * @return DBHTMLText
1337 1337
      */
1338 1338
     public function forTemplate()
1339 1339
     {
Please login to merge, or discard this patch.
src/Forms/HTMLEditor/HTMLEditorField.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     /**
80 80
      * Assign a new configuration instance or identifier
81 81
      *
82
-     * @param string|HTMLEditorConfig $config
82
+     * @param string $config
83 83
      * @return $this
84 84
      */
85 85
     public function setEditorConfig($config)
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
      *
95 95
      * @param string $name The internal field name, passed to forms.
96 96
      * @param string $title The human-readable field label.
97
-     * @param mixed $value The value of the field.
97
+     * @param integer $value The value of the field.
98 98
      * @param string $config HTMLEditorConfig identifier to be used. Default to the active one.
99 99
      */
100 100
     public function __construct($name, $title = null, $value = '', $config = null)
@@ -142,6 +142,9 @@  discard block
 block discarded – undo
142 142
         $record->{$this->name} = $htmlValue->getContent();
143 143
     }
144 144
 
145
+    /**
146
+     * @param string|null $value
147
+     */
145 148
     public function setValue($value, $data = null)
146 149
     {
147 150
         // Regenerate links prior to preview, so that the editor can see them.
Please login to merge, or discard this patch.