@@ -58,7 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * Get permissions |
60 | 60 | * |
61 | - * @return array Associative array of permissions in this permission |
|
61 | + * @return string Associative array of permissions in this permission |
|
62 | 62 | * group. The array indicies are the permission codes as |
63 | 63 | * used in {@link Permission::check()}. The value is |
64 | 64 | * suitable for using in an interface. |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | protected $name = null; |
58 | 58 | |
59 | 59 | /** |
60 | - * @param $name |
|
60 | + * @param string $name |
|
61 | 61 | */ |
62 | 62 | public function __construct($name = null) { |
63 | 63 | $this->name = ($name) ? $name : self::get_default_name(); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | /** |
110 | 110 | * Returns the value of an the global SecurityToken in the current session |
111 | - * @return int |
|
111 | + * @return string |
|
112 | 112 | */ |
113 | 113 | public static function getSecurityID() { |
114 | 114 | $token = SecurityToken::inst(); |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | /** |
191 | 191 | * Get security token from request |
192 | 192 | * |
193 | - * @param SS_HTTPREquest $request |
|
193 | + * @param SS_HTTPRequest $request |
|
194 | 194 | * @return string |
195 | 195 | */ |
196 | 196 | protected function getRequestToken($request) { |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | * care of this yourself. |
211 | 211 | * |
212 | 212 | * @param FieldList $fieldset |
213 | - * @return HiddenField|false |
|
213 | + * @return \SilverStripe\Forms\Form |
|
214 | 214 | */ |
215 | 215 | public function updateFieldSet(&$fieldset) { |
216 | 216 | if(!$fieldset->fieldByName($this->getName())) { |
@@ -129,7 +129,7 @@ |
||
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'); |
@@ -127,6 +127,10 @@ discard block |
||
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 |
||
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)) { |
@@ -359,7 +359,7 @@ |
||
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) { |
@@ -946,7 +946,7 @@ discard block |
||
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 |
||
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) |
@@ -245,6 +245,10 @@ discard block |
||
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 |
||
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 |
||
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; |
@@ -398,6 +398,7 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -28,6 +28,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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]')); |