Completed
Pull Request — master (#6714)
by Filis
09:44
created
thirdparty/difflib/difflib.php 1 patch
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -245,6 +245,10 @@  discard block
 block discarded – undo
245 245
      * match.  The caller must trim matching lines from the beginning and end
246 246
      * of the portions it is going to specify.
247 247
      */
248
+
249
+    /**
250
+     * @param double $nchunks
251
+     */
248 252
     private function diag($xoff, $xlim, $yoff, $ylim, $nchunks)
249 253
     {
250 254
         $flip = false;
@@ -356,6 +360,11 @@  discard block
 block discarded – undo
356 360
      * Note that XLIM, YLIM are exclusive bounds.
357 361
      * All line numbers are origin-0 and discarded lines are not counted.
358 362
      */
363
+
364
+    /**
365
+     * @param integer $xoff
366
+     * @param integer $yoff
367
+     */
359 368
     private function compareseq($xoff, $xlim, $yoff, $ylim)
360 369
     {
361 370
         // Slide down the bottom initial diagonal.
@@ -779,6 +788,9 @@  discard block
 block discarded – undo
779 788
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
780 789
     }
781 790
 
791
+    /**
792
+     * @param string $header
793
+     */
782 794
     protected function start_block($header)
783 795
     {
784 796
         echo $header;
Please login to merge, or discard this patch.
thirdparty/simpletest/page.php 1 patch
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
     /**
146 146
      *    Reads the raw content and send events
147 147
      *    into the page to be built.
148
-     *    @param $response SimpleHttpResponse  Fetched response.
148
+     *    @param SilverStripe\Dev\TestSession_STResponseWrapper $response SimpleHttpResponse  Fetched response.
149 149
      *    @return SimplePage                   Newly parsed page.
150 150
      *    @access public
151 151
      */
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 
171 171
     /**
172 172
      *    Creates the parser used with the builder.
173
-     *    @param $listener SimpleSaxListener   Target of parser.
174
-     *    @return SimpleSaxParser              Parser to generate
173
+     *    @param SimplePageBuilder $listener SimpleSaxListener   Target of parser.
174
+     *    @return SimpleHtmlSaxParser              Parser to generate
175 175
      *                                         events for the builder.
176 176
      *    @access protected
177 177
      */
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 
407 407
     /**
408 408
      *    Original request as bytes sent down the wire.
409
-     *    @return mixed              Sent content.
409
+     *    @return string|false              Sent content.
410 410
      *    @access public
411 411
      */
412 412
     function getRequest() {
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
     /**
417 417
      *    Accessor for raw text of page.
418
-     *    @return string        Raw unparsed content.
418
+     *    @return boolean        Raw unparsed content.
419 419
      *    @access public
420 420
      */
421 421
     function getRaw() {
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 
468 468
     /**
469 469
      *    Base URL if set via BASE tag page url otherwise
470
-     *    @return SimpleUrl        Base url.
470
+     *    @return boolean        Base url.
471 471
      *    @access public
472 472
      */
473 473
     function getBaseUrl() {
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
     /**
659 659
      *    Opens a frameset. A frameset may contain nested
660 660
      *    frameset tags.
661
-     *    @param SimpleFramesetTag $tag      Tag to accept.
661
+     *    @param SimpleTag $tag      Tag to accept.
662 662
      *    @access public
663 663
      */
664 664
     function acceptFramesetStart(&$tag) {
Please login to merge, or discard this patch.
src/Assets/File.php 1 patch
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
      * Check if this file can be modified
424 424
      *
425 425
      * @param Member $member
426
-     * @return boolean
426
+     * @return boolean|string
427 427
      */
428 428
     public function canEdit($member = null)
429 429
     {
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
      *
445 445
      * @param Member $member
446 446
      * @param array $context
447
-     * @return boolean
447
+     * @return boolean|string
448 448
      */
449 449
     public function canCreate($member = null, $context = array())
450 450
     {
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
      * Check if this file can be deleted
465 465
      *
466 466
      * @param Member $member
467
-     * @return boolean
467
+     * @return boolean|string
468 468
      */
469 469
     public function canDelete($member = null)
470 470
     {
@@ -697,7 +697,7 @@  discard block
 block discarded – undo
697 697
      *
698 698
      * @param string $condition The PHP condition to be evaluated.  The page will be called $item
699 699
      * @param array $collator An array, passed by reference, to collect all of the matching descendants.
700
-     * @return true|null
700
+     * @return boolean|null
701 701
      */
702 702
     public function collateDescendants($condition, &$collator)
703 703
     {
@@ -1089,6 +1089,7 @@  discard block
 block discarded – undo
1089 1089
      *
1090 1090
      * @param String File extension, without dot prefix. Use an asterisk ('*')
1091 1091
      * to specify a generic fallback if no mapping is found for an extension.
1092
+     * @param string $ext
1092 1093
      * @return String Classname for a subclass of {@link File}
1093 1094
      */
1094 1095
     public static function get_class_for_file_extension($ext)
@@ -1248,7 +1249,6 @@  discard block
 block discarded – undo
1248 1249
      * Note that the result will not have a leading slash, and should not be used
1249 1250
      * with local file paths.
1250 1251
      *
1251
-     * @param string $part,... Parts
1252 1252
      * @return string
1253 1253
      */
1254 1254
     public static function join_paths($part = null)
Please login to merge, or discard this patch.
src/Assets/Folder.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
      * Find the given folder or create it as a database record
63 63
      *
64 64
      * @param string $folderPath Directory path relative to assets root
65
-     * @return Folder|null
65
+     * @return null|\SilverStripe\ORM\DataObject
66 66
      */
67 67
     public static function find_or_make($folderPath)
68 68
     {
Please login to merge, or discard this patch.
src/Assets/GDBackend.php 1 patch
Doc Comments   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      * Check if this image has previously crashed GD when attempting to open it - if it's opened
199 199
      * successfully, the manipulation's cache key is removed.
200 200
      *
201
-     * @param string $arg,... Any number of args that identify this image
201
+     * @param string $arg
202 202
      * @return bool True if failed
203 203
      */
204 204
     public function failedResample($arg = null)
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
     /**
211 211
      * Mark a file as failed
212 212
      *
213
-     * @param string $arg,... Any number of args that identify this image
213
+     * @param string $arg
214 214
      */
215 215
     protected function markFailed($arg = null)
216 216
     {
@@ -221,7 +221,6 @@  discard block
 block discarded – undo
221 221
     /**
222 222
      * Mark a file as succeeded
223 223
      *
224
-     * @param string $arg,... Any number of args that identify this image
225 224
      */
226 225
     protected function markSucceeded($arg = null)
227 226
     {
@@ -378,7 +377,7 @@  discard block
 block discarded – undo
378 377
      * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu)
379 378
      *
380 379
      * @param float $angle Angle in degrees
381
-     * @return static
380
+     * @return null|resource
382 381
      */
383 382
     public function rotatePixelByPixel($angle)
384 383
     {
Please login to merge, or discard this patch.
src/Assets/ImageManipulation.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -804,7 +804,6 @@
 block discarded – undo
804 804
      * Name a variant based on a format with arbitrary parameters
805 805
      *
806 806
      * @param string $format The format name.
807
-     * @param mixed $arg,... Additional arguments
808 807
      * @return string
809 808
      * @throws InvalidArgumentException
810 809
      */
Please login to merge, or discard this patch.
src/Assets/Upload.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
      * Set a different instance than {@link Upload_Validator}
129 129
      * for this upload session.
130 130
      *
131
-     * @param object $validator
131
+     * @param Upload_Validator $validator
132 132
      */
133 133
     public function setValidator($validator)
134 134
     {
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
     /**
394 394
      * Determines wether previous operations caused an error.
395 395
      *
396
-     * @return boolean
396
+     * @return integer
397 397
      */
398 398
     public function isError()
399 399
     {
Please login to merge, or discard this patch.
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.