Completed
Pull Request — 3.6 (#7850)
by Daniel
12:54 queued 03:35
created
forms/gridfield/GridField.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -200,7 +200,7 @@
 block discarded – undo
200 200
 	 *
201 201
 	 * @todo refactor this into GridFieldComponent
202 202
 	 *
203
-	 * @param mixed $value
203
+	 * @param string $value
204 204
 	 * @param string|array $castingDefinition
205 205
 	 *
206 206
 	 * @return mixed
Please login to merge, or discard this patch.
dev/BulkLoader.php 1 patch
Doc Comments   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 *
212 212
 	 * @todo Mix in custom column mappings
213 213
 	 *
214
-	 * @return array
214
+	 * @return string
215 215
 	 **/
216 216
 	public function getImportSpec() {
217 217
 		$spec = array();
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 * so this is mainly a customization method.
238 238
 	 *
239 239
 	 * @param mixed $val
240
-	 * @param string $field Name of the field as specified in the array-values for {@link self::$columnMap}.
240
+	 * @param string $fieldName Name of the field as specified in the array-values for {@link self::$columnMap}.
241 241
 	 * @return boolean
242 242
 	 */
243 243
 	protected function isNullValue($val, $fieldName = null) {
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 
362 362
 	/**
363 363
 	 * @param $obj DataObject
364
-	 * @param $message string
364
+	 * @param string $message string
365 365
 	 */
366 366
 	public function addCreated($obj, $message = null) {
367 367
 		$this->created[] = $this->lastChange = array(
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 
375 375
 	/**
376 376
 	 * @param $obj DataObject
377
-	 * @param $message string
377
+	 * @param string $message string
378 378
 	 */
379 379
 	public function addUpdated($obj, $message = null) {
380 380
 		$this->updated[] = $this->lastChange = array(
@@ -386,8 +386,8 @@  discard block
 block discarded – undo
386 386
 	}
387 387
 
388 388
 	/**
389
-	 * @param $obj DataObject
390
-	 * @param $message string
389
+	 * @param DataObject|null $obj DataObject
390
+	 * @param string $message string
391 391
 	 */
392 392
 	public function addDeleted($obj, $message = null) {
393 393
 		$data = $obj->toMap();
Please login to merge, or discard this patch.
control/HTTPRequest.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -385,9 +385,9 @@  discard block
 block discarded – undo
385 385
 	 * it's only advisable to send small files through this method.
386 386
 	 *
387 387
 	 * @static
388
-	 * @param $fileData
388
+	 * @param string $fileData
389 389
 	 * @param $fileName
390
-	 * @param null $mimeType
390
+	 * @param string $mimeType
391 391
 	 * @return SS_HTTPResponse
392 392
 	 */
393 393
 	public static function send_file($fileData, $fileName, $mimeType = null) {
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 	 * This is used by the request handler to prevent infinite parsing loops.
606 606
 	 *
607 607
 	 * @param $pattern
608
-	 * @return bool
608
+	 * @return boolean|null
609 609
 	 */
610 610
 	public function isEmptyPattern($pattern) {
611 611
 		if(preg_match('/^([A-Za-z]+) +(.*)$/', $pattern, $matches)) {
Please login to merge, or discard this patch.
thirdparty/Zend/Cache/Backend/BlackHole.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      * Test if a cache is available or not (for the given id)
57 57
      *
58 58
      * @param  string $id cache id
59
-     * @return mixed false (a cache is not available) or "last modified" timestamp (int) of the available cache record
59
+     * @return boolean false (a cache is not available) or "last modified" timestamp (int) of the available cache record
60 60
      */
61 61
     public function test($id)
62 62
     {
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
      * - mtime : timestamp of last modification time
193 193
      *
194 194
      * @param  string $id cache id
195
-     * @return array array of metadatas (false if the cache id is not found)
195
+     * @return boolean array of metadatas (false if the cache id is not found)
196 196
      */
197 197
     public function getMetadatas($id)
198 198
     {
Please login to merge, or discard this patch.
thirdparty/Zend/Loader/Autoloader/Resource.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@
 block discarded – undo
136 136
      * Helper method to calculate the correct class path
137 137
      *
138 138
      * @param string $class
139
-     * @return False if not matched other wise the correct path
139
+     * @return false|string if not matched other wise the correct path
140 140
      */
141 141
     public function getClassPath($class)
142 142
     {
Please login to merge, or discard this patch.
thirdparty/Zend/Loader/PluginLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -283,7 +283,7 @@
 block discarded – undo
283 283
      * Whether or not a Plugin by a specific name is loaded
284 284
      *
285 285
      * @param string $name
286
-     * @return Zend_Loader_PluginLoader
286
+     * @return boolean
287 287
      */
288 288
     public function isLoaded($name)
289 289
     {
Please login to merge, or discard this patch.
admin/code/LeftAndMain.php 1 patch
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -555,6 +555,7 @@  discard block
 block discarded – undo
555 555
 	 * Returns the menu title for the given LeftAndMain subclass.
556 556
 	 * Implemented static so that we can get this value without instantiating an object.
557 557
 	 * Menu title is *not* internationalised.
558
+	 * @return string
558 559
 	 */
559 560
 	public static function menu_title_for_class($class) {
560 561
 		$title = Config::inst()->get($class, 'menu_title', Config::FIRST_SET);
@@ -720,6 +721,7 @@  discard block
 block discarded – undo
720 721
 	 * Return a list of appropriate templates for this class, with the given suffix using
721 722
 	 * {@link SSViewer::get_templates_by_class()}
722 723
 	 *
724
+	 * @param string $suffix
723 725
 	 * @return array
724 726
 	 */
725 727
 	public function getTemplatesWithSuffix($suffix) {
@@ -1740,7 +1742,7 @@  discard block
 block discarded – undo
1740 1742
 	}
1741 1743
 
1742 1744
 	/**
1743
-	 * @return String
1745
+	 * @return DBField
1744 1746
 	 */
1745 1747
 	public function Locale() {
1746 1748
 		return DBField::create_field('DBLocale', i18n::get_locale());
@@ -1906,6 +1908,9 @@  discard block
 block discarded – undo
1906 1908
 		return (parent::isFinished() || $this->isFinished);
1907 1909
 	}
1908 1910
 
1911
+	/**
1912
+	 * @param boolean $bool
1913
+	 */
1909 1914
 	public function setIsFinished($bool) {
1910 1915
 		$this->isFinished = $bool;
1911 1916
 	}
Please login to merge, or discard this patch.
api/RSSFeed.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -219,6 +219,7 @@  discard block
 block discarded – undo
219 219
 	 * via the standard template inclusion process.
220 220
 	 *
221 221
 	 * @param string
222
+	 * @param string $template
222 223
 	 */
223 224
 	public function setTemplate($template) {
224 225
 		$this->template = $template;
@@ -315,6 +316,7 @@  discard block
 block discarded – undo
315 316
 	/**
316 317
 	 * Return the named field as an obj() call from $this->failover.
317 318
 	 * Default to the given class if there's no casting information.
319
+	 * @param string $fieldName
318 320
 	 */
319 321
 	public function rssField($fieldName, $defaultClass = 'Varchar') {
320 322
 		if($fieldName) {
Please login to merge, or discard this patch.
core/Object.php 1 patch
Doc Comments   +8 added lines, -9 removed lines patch added patch discarded remove patch
@@ -125,8 +125,6 @@  discard block
 block discarded – undo
125 125
 	 *    $list = DataList::create('SiteTree');
126 126
 	 *	  $list = SiteTree::get();
127 127
 	 *
128
-	 * @param string $class the class name
129
-	 * @param mixed $arguments,... arguments to pass to the constructor
130 128
 	 * @return static
131 129
 	 */
132 130
 	public static function create() {
@@ -149,7 +147,6 @@  discard block
 block discarded – undo
149 147
 	 * way to access instance methods which don't rely on instance
150 148
 	 * data (e.g. the custom SilverStripe static handling).
151 149
 	 *
152
-	 * @param string $className Optional classname (if called on Object directly)
153 150
 	 * @return static The singleton instance
154 151
 	 */
155 152
 	public static function singleton() {
@@ -334,8 +331,6 @@  discard block
 block discarded – undo
334 331
 	 * Similar to {@link Object::create()}, except that classes are only overloaded if you set the $strong parameter to
335 332
 	 * TRUE when using {@link Object::useCustomClass()}
336 333
 	 *
337
-	 * @param string $class the class name
338
-	 * @param mixed $arguments,... arguments to pass to the constructor
339 334
 	 * @return static
340 335
 	 */
341 336
 	public static function strong_create() {
@@ -387,8 +382,8 @@  discard block
 block discarded – undo
387 382
 	 * without any inheritance, merging or parent lookup if it doesn't exist on the given class.
388 383
 	 *
389 384
 	 * @static
390
-	 * @param $class - The class to get the static from
391
-	 * @param $name - The property to get from the class
385
+	 * @param string $class - The class to get the static from
386
+	 * @param string $name - The property to get from the class
392 387
 	 * @param null $default - The value to return if property doesn't exist on class
393 388
 	 * @return any - The value of the static property $name on class $class, or $default if that property is not
394 389
 	 *               defined
@@ -914,6 +909,7 @@  discard block
 block discarded – undo
914 909
 
915 910
 	/**
916 911
 	 * @see Object::get_static()
912
+	 * @param string $name
917 913
 	 */
918 914
 	public function stat($name, $uncached = false) {
919 915
 		return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::FIRST_SET);
@@ -921,6 +917,8 @@  discard block
 block discarded – undo
921 917
 
922 918
 	/**
923 919
 	 * @see Object::set_static()
920
+	 * @param string $name
921
+	 * @param string $value
924 922
 	 */
925 923
 	public function set_stat($name, $value) {
926 924
 		Config::inst()->update(($this->class ? $this->class : get_class($this)), $name, $value);
@@ -928,6 +926,7 @@  discard block
 block discarded – undo
928 926
 
929 927
 	/**
930 928
 	 * @see Object::uninherited_static()
929
+	 * @param string $name
931 930
 	 */
932 931
 	public function uninherited($name) {
933 932
 		return Config::inst()->get(($this->class ? $this->class : get_class($this)), $name, Config::UNINHERITED);
@@ -978,7 +977,7 @@  discard block
 block discarded – undo
978 977
 	 * all results into an array
979 978
 	 *
980 979
 	 * @param string $method the method name to call
981
-	 * @param mixed $argument a single argument to pass
980
+	 * @param string $argument a single argument to pass
982 981
 	 * @return mixed
983 982
 	 * @todo integrate inheritance rules
984 983
 	 */
@@ -1001,7 +1000,7 @@  discard block
 block discarded – undo
1001 1000
 	 * The extension methods are defined during {@link __construct()} in {@link defineMethods()}.
1002 1001
 	 *
1003 1002
 	 * @param string $method the name of the method to call on each extension
1004
-	 * @param mixed $a1,... up to 7 arguments to be passed to the method
1003
+	 * @param DataObject $a4
1005 1004
 	 * @return array
1006 1005
 	 */
1007 1006
 	public function extend($method, &$a1=null, &$a2=null, &$a3=null, &$a4=null, &$a5=null, &$a6=null, &$a7=null) {
Please login to merge, or discard this patch.