Completed
Pull Request — master (#5986)
by Sam
12:37
created
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.
View/SSViewer.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 	 * @param mixed $data Data context
623 623
 	 * @param array $arguments Additional arguments
624 624
 	 * @param Object $scope
625
-	 * @return string Evaluated result
625
+	 * @return DBHTMLText Evaluated result
626 626
 	 */
627 627
 	public static function execute_template($template, $data, $arguments = null, $scope = null) {
628 628
 		$v = new SSViewer($template);
@@ -648,6 +648,9 @@  discard block
 block discarded – undo
648 648
 		return $v->process($data, $arguments);
649 649
 	}
650 650
 
651
+	/**
652
+	 * @param string $content
653
+	 */
651 654
 	public function parseTemplateContent($content, $template="") {
652 655
 		return $this->getParser()->compileString(
653 656
 			$content,
Please login to merge, or discard this patch.
View/SSViewer_DataPresenter.php 1 patch
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -33,6 +33,10 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	protected $underlay;
35 35
 
36
+	/**
37
+	 * @param ViewableData $item
38
+	 * @param ViewableData $inheritedScope
39
+	 */
36 40
 	public function __construct($item, $overlay = null, $underlay = null, $inheritedScope = null)
37 41
 	{
38 42
 		parent::__construct($item, $inheritedScope);
@@ -58,6 +62,10 @@  discard block
 block discarded – undo
58 62
 		$this->underlay = $underlay ? $underlay : array();
59 63
 	}
60 64
 
65
+	/**
66
+	 * @param string $interfaceToQuery
67
+	 * @param string $variableMethod
68
+	 */
61 69
 	protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false)
62 70
 	{
63 71
 		$implementers = ClassInfo::implementorsOf($interfaceToQuery);
Please login to merge, or discard this patch.
View/SSViewer_FromString.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -30,6 +30,9 @@
 block discarded – undo
30 30
 	 */
31 31
 	protected $cacheTemplate;
32 32
 
33
+	/**
34
+	 * @param string $content
35
+	 */
33 36
 	public function __construct($content, TemplateParser $parser = null)
34 37
 	{
35 38
 		if ($parser) {
Please login to merge, or discard this patch.
View/ThemeResourceLoader.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -30,6 +30,9 @@
 block discarded – undo
30 30
 		self::$instance = $instance;
31 31
 	}
32 32
 
33
+	/**
34
+	 * @param string $base
35
+	 */
33 36
 	public function __construct($base = null) {
34 37
 		$this->base = $base ? $base : BASE_PATH;
35 38
 	}
Please login to merge, or discard this patch.
Assets/Folder.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
 	 * Find the given folder or create it as a database record
57 57
 	 *
58 58
 	 * @param string $folderPath Directory path relative to assets root
59
-	 * @return Folder|null
59
+	 * @return null|\SilverStripe\ORM\DataObject
60 60
 	 */
61 61
 	public static function find_or_make($folderPath) {
62 62
 		// replace leading and trailing slashes
Please login to merge, or discard this patch.
Dev/BulkLoader_Result.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
 	/**
135 135
 	 * @param $obj DataObject
136
-	 * @param $message string
136
+	 * @param string $message string
137 137
 	 */
138 138
 	public function addCreated($obj, $message = null)
139 139
 	{
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 
148 148
 	/**
149 149
 	 * @param $obj DataObject
150
-	 * @param $message string
150
+	 * @param string $message string
151 151
 	 */
152 152
 	public function addUpdated($obj, $message = null)
153 153
 	{
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	 * @param $obj DataObject
164
-	 * @param $message string
163
+	 * @param DataObject|null $obj DataObject
164
+	 * @param string $message string
165 165
 	 */
166 166
 	public function addDeleted($obj, $message = null)
167 167
 	{
Please login to merge, or discard this patch.
Forms/HiddenField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 	}
75 75
 
76 76
 	/**
77
-	 * @return string
77
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
78 78
 	 */
79 79
 	public function InternallyLabelledField() {
80 80
 		Deprecation::notice('4.0', 'Please use ->setValue() instead');
Please login to merge, or discard this patch.
Forms/HTMLEditor/HTMLEditorField_Toolbar.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,6 +67,10 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	protected $name;
69 69
 
70
+	/**
71
+	 * @param Controller|null $controller
72
+	 * @param string $name
73
+	 */
70 74
 	public function __construct($controller, $name)
71 75
 	{
72 76
 		parent::__construct();
@@ -487,7 +491,7 @@  discard block
 block discarded – undo
487 491
 	/**
488 492
 	 * Find all anchors available on the given page.
489 493
 	 *
490
-	 * @return array
494
+	 * @return string
491 495
 	 * @throws SS_HTTPResponse_Exception
492 496
 	 */
493 497
 	public function getanchors()
Please login to merge, or discard this patch.