Completed
Pull Request — master (#6266)
by Sam
14:39 queued 17s
created
thirdparty/Zend/Cache/Core.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@
 block discarded – undo
191 191
     /**
192 192
      * Returns the backend
193 193
      *
194
-     * @return Zend_Cache_Backend backend object
194
+     * @return Zend_Cache_Backend_Interface backend object
195 195
      */
196 196
     public function getBackend()
197 197
     {
Please login to merge, or discard this patch.
admin/code/MemberImportForm.php 1 patch
Doc Comments   +5 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,6 +23,10 @@  discard block
 block discarded – undo
23 23
 	 */
24 24
 	protected $group;
25 25
 
26
+	/**
27
+	 * @param SecurityAdmin $controller
28
+	 * @param string $name
29
+	 */
26 30
 	public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) {
27 31
 		if(!$fields) {
28 32
 			$helpHtml = _t(
@@ -109,7 +113,7 @@  discard block
 block discarded – undo
109 113
 	}
110 114
 
111 115
 	/**
112
-	 * @param $group Group
116
+	 * @param Group $group Group
113 117
 	 */
114 118
 	public function setGroup($group) {
115 119
 		$this->group = $group;
Please login to merge, or discard this patch.
admin/code/SecurityAdmin.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	/**
252 252
 	 * @see SecurityAdmin_MemberImportForm
253 253
 	 *
254
-	 * @return Form
254
+	 * @return null|MemberImportForm
255 255
 	 */
256 256
 	public function MemberImportForm() {
257 257
 		if(!Permission::check('ADMIN')) {
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 	 * @see SecurityAdmin_MemberImportForm
287 287
 	 *
288 288
 	 * @skipUpgrade
289
-	 * @return Form
289
+	 * @return null|GroupImportForm
290 290
 	 */
291 291
 	public function GroupImportForm() {
292 292
 		if(!Permission::check('ADMIN')) {
Please login to merge, or discard this patch.
tests/forms/GridFieldTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
 	/**
130 130
 	 *
131 131
 	 * @param GridField $gridField
132
-	 * @return array
132
+	 * @return string[]
133 133
 	 */
134 134
 	public function getActions($gridField) {
135 135
 		return array('addto');
Please login to merge, or discard this patch.
tests/forms/RequirementsTest.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -127,6 +127,10 @@  discard block
 block discarded – undo
127 127
 		);
128 128
 	}
129 129
 
130
+	/**
131
+	 * @param boolean $async
132
+	 * @param boolean $defer
133
+	 */
130 134
 	protected function setupCombinedRequirementsJavascriptAsyncDefer($backend, $async, $defer) {
131 135
         $basePath = $this->getCurrentRelativePath();
132 136
         $this->setupRequirements($backend);
@@ -836,6 +840,9 @@  discard block
 block discarded – undo
836 840
 		}
837 841
 	}
838 842
 
843
+	/**
844
+	 * @param string $type
845
+	 */
839 846
 	public function assertFileNotIncluded($backend, $type, $files) {
840 847
 		$includedFiles = $this->getBackendFiles($backend, $type);
841 848
 		if(is_array($files)) {
Please login to merge, or discard this patch.
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/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.