Completed
Pull Request — master (#6266)
by Sam
13:07
created
src/Security/Security.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
 	 * Combine the given forms into a formset with a tabbed interface
508 508
 	 *
509 509
 	 * @param array $forms List of LoginForm instances
510
-	 * @return string
510
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
511 511
 	 */
512 512
 	protected function generateLoginFormSet($forms) {
513 513
 		$viewData = new ArrayData(array(
@@ -1082,7 +1082,7 @@  discard block
 block discarded – undo
1082 1082
 	/**
1083 1083
 	 * Set to true to ignore access to disallowed actions, rather than returning permission failure
1084 1084
 	 * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions()
1085
-	 * @param $flag True or false
1085
+	 * @param boolean $flag True or false
1086 1086
 	 */
1087 1087
 	public static function set_ignore_disallowed_actions($flag) {
1088 1088
 		self::$ignore_disallowed_actions = $flag;
Please login to merge, or discard this patch.
src/View/Parsers/Diff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	 * @param string|array $content If passed as an array, values will be concatenated with a comma.
163
+	 * @param string $content If passed as an array, values will be concatenated with a comma.
164 164
 	 * @return array
165 165
 	 */
166 166
 	public static function getHTMLChunks($content) {
Please login to merge, or discard this patch.
src/View/Parsers/HTMLValue.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -139,6 +139,7 @@
 block discarded – undo
139 139
 	/**
140 140
 	 * Get the body element, or false if there isn't one (we haven't loaded any content
141 141
 	 * or this instance is in an invalid state)
142
+	 * @return \DOMElement
142 143
 	 */
143 144
 	public function getBody() {
144 145
 		$doc = $this->getDocument();
Please login to merge, or discard this patch.
src/View/Parsers/ShortcodeParser.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -168,6 +168,9 @@
 block discarded – undo
168 168
 
169 169
 	// --------------------------------------------------------------------------------------------------------------
170 170
 
171
+	/**
172
+	 * @param DOMElement $node
173
+	 */
171 174
 	protected function removeNode($node) {
172 175
 		$node->parentNode->removeChild($node);
173 176
 	}
Please login to merge, or discard this patch.
src/View/Parsers/URLSegmentFilter.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -89,6 +89,7 @@
 block discarded – undo
89 89
 	 * Determines if the field should render open or closed by default.
90 90
 	 * 
91 91
 	 * @param boolean
92
+	 * @param boolean $bool
92 93
 	 */
93 94
 	public function startClosed($bool) {
94 95
 		($bool) ? $this->addExtraClass('startClosed') : $this->removeExtraClass('startClosed');
Please login to merge, or discard this patch.
src/View/Requirements.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -321,6 +321,7 @@
 block discarded – undo
321 321
 	 * Forces the JavaScript requirements to the end of the body, right before the closing tag
322 322
 	 *
323 323
 	 * @param bool
324
+	 * @param boolean $var
324 325
 	 * @return $this
325 326
 	 */
326 327
 	public function setForceJSToBottom($var)
Please login to merge, or discard this patch.
src/View/Requirements_Backend.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -321,6 +321,7 @@
 block discarded – undo
321 321
 	 * Forces the JavaScript requirements to the end of the body, right before the closing tag
322 322
 	 *
323 323
 	 * @param bool
324
+	 * @param boolean $var
324 325
 	 * @return $this
325 326
 	 */
326 327
 	public function setForceJSToBottom($var)
Please login to merge, or discard this patch.
src/View/SSTemplateParser.php 1 patch
Doc Comments   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -114,6 +114,8 @@  discard block
 block discarded – undo
114 114
 
115 115
 	/**
116 116
 	 * Override the function that constructs the result arrays to also prepare a 'php' item in the array
117
+	 * @param string $matchrule
118
+	 * @param string $name
117 119
 	 */
118 120
 	function construct($matchrule, $name, $arguments = null) {
119 121
 		$res = parent::construct($matchrule, $name, $arguments);
@@ -175,9 +177,9 @@  discard block
 block discarded – undo
175 177
 
176 178
 	/**
177 179
 	 * Ensures that the arguments to addOpenBlock and addClosedBlock are valid
178
-	 * @param $name
179
-	 * @param $callable
180
-	 * @param $type
180
+	 * @param string $name
181
+	 * @param callable $callable
182
+	 * @param string $type
181 183
 	 * @throws InvalidArgumentException
182 184
 	 */
183 185
 	protected function validateExtensionBlock($name, $callable, $type) {
@@ -262,6 +264,7 @@  discard block
 block discarded – undo
262 264
 	 * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to
263 265
 	 * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj)
264 266
 	 * depending on the context the lookup is used in.
267
+	 * @param string $method
265 268
 	 */
266 269
 	function Lookup_AddLookupStep(&$res, $sub, $method) {
267 270
 		$res['LookupSteps'][] = $sub;
@@ -1174,6 +1177,7 @@  discard block
 block discarded – undo
1174 1177
 
1175 1178
 	/**
1176 1179
 	 * @param string $code
1180
+	 * @param string $templateName
1177 1181
 	 * @return string $code
1178 1182
 	 */
1179 1183
 	protected function includeDebuggingComments($code, $templateName) {
Please login to merge, or discard this patch.
src/View/SSTemplateParser.php.inc 1 patch
Doc Comments   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -114,6 +114,8 @@  discard block
 block discarded – undo
114 114
 
115 115
 	/**
116 116
 	 * Override the function that constructs the result arrays to also prepare a 'php' item in the array
117
+	 * @param string $matchrule
118
+	 * @param string $name
117 119
 	 */
118 120
 	function construct($matchrule, $name, $arguments = null) {
119 121
 		$res = parent::construct($matchrule, $name, $arguments);
@@ -175,9 +177,9 @@  discard block
 block discarded – undo
175 177
 
176 178
 	/**
177 179
 	 * Ensures that the arguments to addOpenBlock and addClosedBlock are valid
178
-	 * @param $name
179
-	 * @param $callable
180
-	 * @param $type
180
+	 * @param string $name
181
+	 * @param callable $callable
182
+	 * @param string $type
181 183
 	 * @throws InvalidArgumentException
182 184
 	 */
183 185
 	protected function validateExtensionBlock($name, $callable, $type) {
@@ -262,6 +264,7 @@  discard block
 block discarded – undo
262 264
 	 * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to
263 265
 	 * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj)
264 266
 	 * depending on the context the lookup is used in.
267
+	 * @param string $method
265 268
 	 */
266 269
 	function Lookup_AddLookupStep(&$res, $sub, $method) {
267 270
 		$res['LookupSteps'][] = $sub;
@@ -1174,6 +1177,7 @@  discard block
 block discarded – undo
1174 1177
 
1175 1178
 	/**
1176 1179
 	 * @param string $code
1180
+	 * @param string $templateName
1177 1181
 	 * @return string $code
1178 1182
 	 */
1179 1183
 	protected function includeDebuggingComments($code, $templateName) {
Please login to merge, or discard this patch.