Completed
Pull Request — master (#5986)
by Sam
12:37
created
tests/forms/uploadfield/AssetFieldTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -359,7 +359,7 @@
 block discarded – undo
359 359
 	 * Simulates a file upload
360 360
 	 *
361 361
 	 * @param string $fileField Name of the field to mock upload for
362
-	 * @param array $tmpFileName Name of temporary file to upload
362
+	 * @param string $tmpFileName Name of temporary file to upload
363 363
 	 * @return SS_HTTPResponse form response
364 364
 	 */
365 365
 	protected function mockFileUpload($fileField, $tmpFileName) {
Please login to merge, or discard this patch.
tests/forms/uploadfield/UploadFieldTest.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -946,7 +946,7 @@  discard block
 block discarded – undo
946 946
 	 * Simulates a file upload
947 947
 	 *
948 948
 	 * @param string $fileField Name of the field to mock upload for
949
-	 * @param array $tmpFileName Name of temporary file to upload
949
+	 * @param string $tmpFileName Name of temporary file to upload
950 950
 	 * @return SS_HTTPResponse form response
951 951
 	 */
952 952
 	protected function mockFileUpload($fileField, $tmpFileName) {
@@ -958,6 +958,9 @@  discard block
 block discarded – undo
958 958
 		);
959 959
 	}
960 960
 
961
+	/**
962
+	 * @param string $fileField
963
+	 */
961 964
 	protected function mockFileExists($fileField, $fileName) {
962 965
 		return $this->get(
963 966
 			"UploadFieldTest_Controller/Form/field/{$fileField}/fileexists?filename=".urlencode($fileName)
Please login to merge, or discard this patch.
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/HTML_BBCodeParser2/HTML/BBCodeParser2.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -398,6 +398,7 @@  discard block
 block discarded – undo
398 398
      * array as an associative array.
399 399
      *
400 400
      * @param    string          string to build tag from
401
+     * @param string $str
401 402
      * @return   array           tag in array format
402 403
      * @access   private
403 404
      * @see      _buildTagArray()
@@ -832,7 +833,7 @@  discard block
 block discarded – undo
832 833
     /**
833 834
      * Quick method to do setText(), parse() and getParsed at once
834 835
      *
835
-     * @return   none
836
+     * @return   string
836 837
      * @access   public
837 838
      * @see      parse()
838 839
      * @see      $_text
@@ -848,7 +849,7 @@  discard block
 block discarded – undo
848 849
     /**
849 850
      * Quick static method to do setText(), parse() and getParsed at once
850 851
      *
851
-     * @return   none
852
+     * @return   string
852 853
      * @access   public
853 854
      * @see      parse()
854 855
      * @see      $_text
Please login to merge, or discard this patch.
thirdparty/HTML_BBCodeParser2/tests/HTML_BBCodeParser2Test.php 1 patch
Doc Comments   +24 added lines patch added patch discarded remove patch
@@ -28,6 +28,10 @@  discard block
 block discarded – undo
28 28
 		$this->emailBBCode($bbc, 'qparse');
29 29
 	}
30 30
 
31
+	/**
32
+	 * @param HTML_BBCodeParser2 $bbc
33
+	 * @param string $funcNam
34
+	 */
31 35
 	function emailBBCode($bbc, $funcNam)
32 36
     {
33 37
 		$this->assertEquals('<a href="mailto:[email protected]">[email protected]</a>', $bbc->$funcNam('[email protected]'));
@@ -35,6 +39,10 @@  discard block
 block discarded – undo
35 39
 		$this->assertEquals('<a href="mailto:[email protected]">[email protected]</a>', $bbc->$funcNam('[email][email protected][/email]'));
36 40
 	}
37 41
 
42
+	/**
43
+	 * @param HTML_BBCodeParser2 $bbc
44
+	 * @param string $funcNam
45
+	 */
38 46
 	function imgBBCode($bbc, $funcNam)
39 47
     {
40 48
         $this->assertEquals('<img src="/images/Enthalpy Wheel.png" alt="Enthalpy Wheel" width="100" height="99" />', $bbc->$funcNam('[img w=100 h=99 alt=Enthalpy Wheel]/images/Enthalpy Wheel.png[/img]'));
@@ -42,6 +50,10 @@  discard block
 block discarded – undo
42 50
 		$this->assertEquals('<img src="http://www.server.org/image.jpg" alt="" width="100" height="200" />', $bbc->$funcNam('[img w=100 h=200]http://www.server.org/image.jpg[/img]'));
43 51
 	}
44 52
 
53
+	/**
54
+	 * @param HTML_BBCodeParser2 $bbc
55
+	 * @param string $funcNam
56
+	 */
45 57
 	function basicBBCode($bbc, $funcNam)
46 58
     {
47 59
 		$this->assertEquals('<strong>txt</strong>', $bbc->$funcNam('[b]txt[/b]'));
@@ -58,6 +70,10 @@  discard block
 block discarded – undo
58 70
 		$this->assertEquals('<em><strong>txt</strong></em>', $bbc->$funcNam('[i][b]txt[/i][/b]'));
59 71
 	}
60 72
 
73
+	/**
74
+	 * @param HTML_BBCodeParser2 $bbc
75
+	 * @param string $funcNam
76
+	 */
61 77
 	function listBBCode($bbc, $funcNam)
62 78
     {
63 79
 		$this->assertEquals('<ul><li>txt</li></ul>', $bbc->$funcNam('[*]txt'));
@@ -107,6 +123,10 @@  discard block
 block discarded – undo
107 123
             $bbc->$funcNam('[list=1][*] Item one[*] Item two[*] Item three[/list]'));
108 124
 	}
109 125
 
126
+	/**
127
+	 * @param HTML_BBCodeParser2 $bbc
128
+	 * @param string $funcNam
129
+	 */
110 130
 	function linkBBCode($bbc, $funcNam)
111 131
     {
112 132
 		$this->assertEquals(
@@ -170,6 +190,10 @@  discard block
 block discarded – undo
170 190
         */
171 191
 	}
172 192
 
193
+	/**
194
+	 * @param HTML_BBCodeParser2 $bbc
195
+	 * @param string $funcNam
196
+	 */
173 197
 	function extBBCode($bbc, $funcNam)
174 198
     {
175 199
 		$this->assertEquals('<h2>txt</h2>', $bbc->$funcNam('[h2]txt[/h2]'));
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.
View/Parsers/Diff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	 * @param string|array $content If passed as an array, values will be concatenated with a comma.
163
+	 * @param string $content If passed as an array, values will be concatenated with a comma.
164 164
 	 * @return array
165 165
 	 */
166 166
 	public static function getHTMLChunks($content) {
Please login to merge, or discard this patch.
View/Parsers/ShortcodeParser.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -168,6 +168,9 @@
 block discarded – undo
168 168
 
169 169
 	// --------------------------------------------------------------------------------------------------------------
170 170
 
171
+	/**
172
+	 * @param DOMElement $node
173
+	 */
171 174
 	protected function removeNode($node) {
172 175
 		$node->parentNode->removeChild($node);
173 176
 	}
Please login to merge, or discard this patch.
View/Parsers/URLSegmentFilter.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -89,6 +89,7 @@
 block discarded – undo
89 89
 	 * Determines if the field should render open or closed by default.
90 90
 	 * 
91 91
 	 * @param boolean
92
+	 * @param boolean $bool
92 93
 	 */
93 94
 	public function startClosed($bool) {
94 95
 		($bool) ? $this->addExtraClass('startClosed') : $this->removeExtraClass('startClosed');
Please login to merge, or discard this patch.