Completed
Pull Request — master (#5886)
by Damian
11:53
created
core/Injectable.php 1 patch
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,6 @@
 block discarded – undo
23 23
 	 *    $list = DataList::create('SiteTree');
24 24
 	 *	  $list = SiteTree::get();
25 25
 	 *
26
-	 * @param string $class the class name
27
-	 * @param mixed $arguments,... arguments to pass to the constructor
28 26
 	 * @return static
29 27
 	 */
30 28
 	public static function create() {
Please login to merge, or discard this patch.
view/Requirements.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,6 +65,7 @@  discard block
 block discarded – undo
65 65
 	 * while automatically busting this cache every time the file is changed.
66 66
 	 *
67 67
 	 * @param bool
68
+	 * @param boolean $var
68 69
 	 */
69 70
 	public static function set_suffix_requirements($var) {
70 71
 		self::backend()->setSuffixRequirements($var);
@@ -336,7 +337,7 @@  discard block
 block discarded – undo
336 337
 	 * </code>
337 338
 	 *
338 339
 	 * @param string $combinedFileName Filename of the combined file relative to docroot
339
-	 * @param array  $files            Array of filenames relative to docroot
340
+	 * @param string[]  $files            Array of filenames relative to docroot
340 341
 	 * @param string $media
341 342
 	 *
342 343
 	 * @return bool|void
@@ -761,6 +762,7 @@  discard block
 block discarded – undo
761 762
 	 * Forces the JavaScript requirements to the end of the body, right before the closing tag
762 763
 	 *
763 764
 	 * @param bool
765
+	 * @param boolean $var
764 766
 	 * @return $this
765 767
 	 */
766 768
 	public function setForceJSToBottom($var) {
Please login to merge, or discard this patch.
admin/code/ModelAdmin.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -117,6 +117,9 @@
 block discarded – undo
117 117
 		Requirements::javascript(FRAMEWORK_ADMIN_DIR . '/client/dist/js/ModelAdmin.js');
118 118
 	}
119 119
 
120
+	/**
121
+	 * @param string $action
122
+	 */
120 123
 	public function Link($action = null) {
121 124
 		if(!$action) $action = $this->sanitiseClassName($this->modelClass);
122 125
 		return parent::Link($action);
Please login to merge, or discard this patch.
forms/htmleditor/HTMLEditorConfig.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
 	 * Get the current value of an option
139 139
      *
140 140
 	 * @param string $key The key of the option to get
141
-	 * @return mixed The value of the specified option
141
+	 * @return string The value of the specified option
142 142
 	 */
143 143
 	abstract public function getOption($key);
144 144
 
Please login to merge, or discard this patch.
forms/HTMLEditorSanitiser.php 1 patch
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	/**
40 40
 	 * Given a TinyMCE pattern (close to unix glob style), create a regex that does the match
41 41
 	 *
42
-	 * @param $str - The TinyMCE pattern
42
+	 * @param string|null $str - The TinyMCE pattern
43 43
 	 * @return string - The equivalent regex
44 44
 	 */
45 45
 	protected function patternToRegex($str) {
@@ -180,6 +180,7 @@  discard block
 block discarded – undo
180 180
 	/**
181 181
 	 * Given an attribute name, return the rule structure for that attribute
182 182
 	 * @param string $name - The attribute name
183
+	 * @param stdClass $elementRule
183 184
 	 * @return stdClass - The attribute rule
184 185
 	 */
185 186
 	protected function getRuleForAttribute($elementRule, $name) {
Please login to merge, or discard this patch.
view/SSTemplateParser.php.inc 1 patch
Doc Comments   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -111,6 +111,8 @@  discard block
 block discarded – undo
111 111
 
112 112
 	/**
113 113
 	 * Override the function that constructs the result arrays to also prepare a 'php' item in the array
114
+	 * @param string $matchrule
115
+	 * @param string $name
114 116
 	 */
115 117
 	function construct($matchrule, $name, $arguments = null) {
116 118
 		$res = parent::construct($matchrule, $name, $arguments);
@@ -172,9 +174,9 @@  discard block
 block discarded – undo
172 174
 
173 175
 	/**
174 176
 	 * Ensures that the arguments to addOpenBlock and addClosedBlock are valid
175
-	 * @param $name
176
-	 * @param $callable
177
-	 * @param $type
177
+	 * @param string $name
178
+	 * @param callable $callable
179
+	 * @param string $type
178 180
 	 * @throws InvalidArgumentException
179 181
 	 */
180 182
 	protected function validateExtensionBlock($name, $callable, $type) {
@@ -737,6 +739,7 @@  discard block
 block discarded – undo
737 739
 	 * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to
738 740
 	 * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj)
739 741
 	 * depending on the context the lookup is used in.
742
+	 * @param string $method
740 743
 	 */
741 744
 	function Lookup_AddLookupStep(&$res, $sub, $method) {
742 745
 		$res['LookupSteps'][] = $sub;
@@ -4691,8 +4694,8 @@  discard block
 block discarded – undo
4691 4694
 	 * Compiles some passed template source code into the php code that will execute as per the template source.
4692 4695
 	 *
4693 4696
 	 * @throws SSTemplateParseException
4694
-	 * @param  $string The source of the template
4695
-	 * @param string $templateName The name of the template, normally the filename the template source was loaded from
4697
+	 * @param  string $string The source of the template
4698
+	 * @param string string The name of the template, normally the filename the template source was loaded from
4696 4699
 	 * @param bool $includeDebuggingComments True is debugging comments should be included in the output
4697 4700
 	 * @param bool $topTemplate True if this is a top template, false if it's just a template
4698 4701
 	 * @return mixed|string The php that, when executed (via include or exec) will behave as per the template source
@@ -4732,6 +4735,7 @@  discard block
 block discarded – undo
4732 4735
 
4733 4736
 	/**
4734 4737
 	 * @param string $code
4738
+	 * @param string $templateName
4735 4739
 	 * @return string $code
4736 4740
 	 */
4737 4741
 	protected function includeDebuggingComments($code, $templateName) {
Please login to merge, or discard this patch.
core/startup/ErrorControlChain.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	/**
101 101
 	 * Get value of display_errors ini value
102 102
 	 *
103
-	 * @return mixed
103
+	 * @return string
104 104
 	 */
105 105
 	protected function getDisplayErrors() {
106 106
 		return ini_get('display_errors');
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 * Add this callback to the chain of callbacks to call along with the state
111 111
 	 * that $error must be in this point in the chain for the callback to be called
112 112
 	 *
113
-	 * @param $callback - The callback to call
113
+	 * @param callable $callback - The callback to call
114 114
 	 * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either
115 115
 	 * @return $this
116 116
 	 */
Please login to merge, or discard this patch.
tests/core/startup/ErrorControlChainTest.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	/**
25 25
 	 * Modify method visibility to public for testing
26 26
 	 *
27
-	 * @param mixed $errors
27
+	 * @param string $errors
28 28
 	 */
29 29
 	public function setDisplayErrors($errors)
30 30
 	{
@@ -33,6 +33,10 @@  discard block
 block discarded – undo
33 33
 	}
34 34
 
35 35
 	// Change function visibility to be testable directly
36
+
37
+	/**
38
+	 * @param string $memstring
39
+	 */
36 40
 	public function translateMemstring($memstring) {
37 41
 		return parent::translateMemstring($memstring);
38 42
 	}
Please login to merge, or discard this patch.
forms/htmleditor/EmbedShortcodeProvider.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 	/**
23 23
 	 * Gets the list of shortcodes provided by this handler
24 24
 	 *
25
-	 * @return mixed
25
+	 * @return string[]
26 26
 	 */
27 27
 	public static function get_shortcodes()
28 28
 	{
Please login to merge, or discard this patch.