Completed
Pull Request — master (#6604)
by Andrew
11:36
created
src/Control/Controller.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -147,6 +147,7 @@  discard block
 block discarded – undo
147 147
      * {@inheritdoc}
148 148
      *
149 149
      * Also set the URLParams
150
+     * @param HTTPRequest $request
150 151
      */
151 152
     public function setRequest($request)
152 153
     {
@@ -523,7 +524,7 @@  discard block
 block discarded – undo
523 524
      *
524 525
      * @param array $params
525 526
      *
526
-     * @return string
527
+     * @return DBHTMLText
527 528
      */
528 529
     public function render($params = null)
529 530
     {
@@ -702,7 +703,7 @@  discard block
 block discarded – undo
702 703
      * Tests whether a redirection has been requested. If redirect() has been called, it will return
703 704
      * the URL redirected to. Otherwise, it will return null.
704 705
      *
705
-     * @return null|string
706
+     * @return boolean
706 707
      */
707 708
     public function redirectedTo()
708 709
     {
@@ -736,7 +737,6 @@  discard block
 block discarded – undo
736 737
      *
737 738
      * Caution: All parameters are expected to be URI-encoded already.
738 739
      *
739
-     * @param string|array $arg,.. One or more link segments, or list of link segments as an array
740 740
      * @return string
741 741
      */
742 742
     public static function join_links($arg = null)
Please login to merge, or discard this patch.
src/Control/CookieJar.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@
 block discarded – undo
151 151
      * @see http://uk3.php.net/manual/en/function.setcookie.php
152 152
      *
153 153
      * @param string $name The name of the cookie
154
-     * @param string|array $value The value for the cookie to hold
154
+     * @param false|string $value The value for the cookie to hold
155 155
      * @param int $expiry The number of days until expiry
156 156
      * @param string $path The path to save the cookie on (falls back to site base)
157 157
      * @param string $domain The domain to make the cookie available on
Please login to merge, or discard this patch.
src/Control/HTTPRequest.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -458,9 +458,9 @@
 block discarded – undo
458 458
      * it's only advisable to send small files through this method.
459 459
      *
460 460
      * @static
461
-     * @param $fileData
461
+     * @param string $fileData
462 462
      * @param $fileName
463
-     * @param null $mimeType
463
+     * @param string $mimeType
464 464
      * @return HTTPResponse
465 465
      */
466 466
     public static function send_file($fileData, $fileName, $mimeType = null)
Please login to merge, or discard this patch.
src/Control/RequestHandler.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
      *
297 297
      * Must not raise HTTPResponse_Exceptions - instead it should return
298 298
      *
299
-     * @param $request
299
+     * @param HTTPRequest $request
300 300
      * @param $action
301 301
      * @return HTTPResponse
302 302
      */
Please login to merge, or discard this patch.
src/Control/RSS/RSSFeed.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -248,6 +248,7 @@
 block discarded – undo
248 248
      * via the standard template inclusion process.
249 249
      *
250 250
      * @param string
251
+     * @param string|null $template
251 252
      */
252 253
     public function setTemplate($template)
253 254
     {
Please login to merge, or discard this patch.
src/Control/Session.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -330,6 +330,9 @@  discard block
 block discarded – undo
330 330
         }
331 331
     }
332 332
 
333
+    /**
334
+     * @param string $name
335
+     */
333 336
     public function inst_set($name, $val)
334 337
     {
335 338
         // Quicker execution path for "."-free names
@@ -379,6 +382,9 @@  discard block
 block discarded – undo
379 382
         $diffVar[sizeof($var)-1] = $val;
380 383
     }
381 384
 
385
+    /**
386
+     * @param string $name
387
+     */
382 388
     public function inst_get($name)
383 389
     {
384 390
         // Quicker execution path for "."-free names
Please login to merge, or discard this patch.
src/Core/ClassInfo.php 1 patch
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -297,6 +297,9 @@  discard block
 block discarded – undo
297 297
 
298 298
     private static $method_from_cache = array();
299 299
 
300
+    /**
301
+     * @param string $method
302
+     */
300 303
     public static function has_method_from($class, $method, $compclass)
301 304
     {
302 305
         $lClass = strtolower($class);
@@ -322,6 +325,8 @@  discard block
 block discarded – undo
322 325
 
323 326
     /**
324 327
      * @deprecated 4.0..5.0
328
+     * @param string $candidateClass
329
+     * @param string $fieldName
325 330
      */
326 331
     public static function table_for_object_field($candidateClass, $fieldName)
327 332
     {
Please login to merge, or discard this patch.
src/Core/Config/Config.php 1 patch
Doc Comments   +7 added lines, -1 removed lines patch added patch discarded remove patch
@@ -521,12 +521,18 @@  discard block
 block discarded – undo
521 521
 
522 522
     protected $extraConfigSources = array();
523 523
 
524
+    /**
525
+     * @param string $class
526
+     */
524 527
     public function extraConfigSourcesChanged($class)
525 528
     {
526 529
         unset($this->extraConfigSources[$class]);
527 530
         $this->cache->clean("__{$class}");
528 531
     }
529 532
 
533
+    /**
534
+     * @param integer $sourceOptions
535
+     */
530 536
     protected function getUncached($class, $name, $sourceOptions, &$result, $suppress, &$tags)
531 537
     {
532 538
         $tags[] = "__{$class}";
@@ -627,7 +633,7 @@  discard block
 block discarded – undo
627 633
      * caching heavily here.
628 634
      *
629 635
      * @param $class string - The name of the class to get the value for
630
-     * @param $name string - The property to get the value for
636
+     * @param string $name string - The property to get the value for
631 637
      * @param int $sourceOptions Bitmask which can be set to some combintain of Config::UNINHERITED,
632 638
      *                           Config::FIRST_SET, and Config::EXCLUDE_EXTENSIONS.
633 639
      *
Please login to merge, or discard this patch.
src/Core/Convert.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
      *
58 58
      * @see http://www.w3.org/TR/REC-html40/types.html#type-cdata
59 59
      *
60
-     * @param array|string $val String to escape, or array of strings
60
+     * @param string $val String to escape, or array of strings
61 61
      *
62
-     * @return array|string
62
+     * @return string
63 63
      */
64 64
     public static function raw2htmlname($val)
65 65
     {
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
      * table, or column name. Supports encoding of multi identfiers separated by
201 201
      * a delimiter (e.g. ".")
202 202
      *
203
-     * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers
203
+     * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers
204 204
      * to be joined via the separator.
205 205
      * @param string $separator The string that delimits subsequent identifiers
206 206
      * @return string The escaped identifier. E.g. '"SiteTree"."Title"'
@@ -301,6 +301,7 @@  discard block
 block discarded – undo
301 301
      * call this function directly, Please use {@link Convert::xml2array()}
302 302
      *
303 303
      * @param SimpleXMLElement
304
+     * @param SimpleXMLElement $xml
304 305
      *
305 306
      * @return mixed
306 307
      */
@@ -514,7 +515,7 @@  discard block
 block discarded – undo
514 515
      * - IDField => idField
515 516
      * - iDField => iDField
516 517
      *
517
-     * @param $str
518
+     * @param string $str
518 519
      * @return string
519 520
      */
520 521
     public static function upperCamelToLowerCamel($str)
Please login to merge, or discard this patch.