Completed
Push — master ( fdd9ad...2548bf )
by Sam
11:48
created
tests/php/Security/SecurityTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -676,6 +676,8 @@  discard block
 block discarded – undo
676 676
     /**
677 677
      * Execute a log-in form using Director::test().
678 678
      * Helper method for the tests above
679
+     * @param string $email
680
+     * @param string $password
679 681
      */
680 682
     public function doTestLoginForm($email, $password, $backURL = 'test/link')
681 683
     {
@@ -697,6 +699,8 @@  discard block
 block discarded – undo
697 699
 
698 700
     /**
699 701
      * Helper method to execute a change password form
702
+     * @param string $oldPassword
703
+     * @param string $newPassword
700 704
      */
701 705
     public function doTestChangepasswordForm($oldPassword, $newPassword)
702 706
     {
Please login to merge, or discard this patch.
tests/php/View/SSViewerCacheBlockTest/VersionedModel.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -16,6 +16,9 @@
 block discarded – undo
16 16
         Versioned::class
17 17
     );
18 18
 
19
+    /**
20
+     * @param string $entropy
21
+     */
19 22
     public function setEntropy($entropy)
20 23
     {
21 24
         $this->entropy = $entropy;
Please login to merge, or discard this patch.
tests/php/View/SSViewerTest.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -173,6 +173,10 @@  discard block
 block discarded – undo
173 173
         );
174 174
     }
175 175
 
176
+    /**
177
+     * @param \SilverStripe\ORM\FieldType\DBHTMLText $result
178
+     * @param string[] $expected
179
+     */
176 180
     private function assertExpectedStrings($result, $expected)
177 181
     {
178 182
         foreach ($expected as $expectedStr) {
@@ -1088,6 +1092,10 @@  discard block
 block discarded – undo
1088 1092
         $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult);
1089 1093
     }
1090 1094
 
1095
+    /**
1096
+     * @param string $a
1097
+     * @param string $b
1098
+     */
1091 1099
     public function assertEqualIgnoringWhitespace($a, $b, $message = '')
1092 1100
     {
1093 1101
         $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
@@ -1819,6 +1827,11 @@  discard block
 block discarded – undo
1819 1827
             $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']);
1820 1828
         }
1821 1829
     }
1830
+
1831
+    /**
1832
+     * @param string $name
1833
+     * @param string $expected
1834
+     */
1822 1835
     private function _renderWithSourceFileComments($name, $expected)
1823 1836
     {
1824 1837
         $viewer = new SSViewer(array($name));
Please login to merge, or discard this patch.
src/Control/Email/Email.php 1 patch
Doc Comments   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
 
136 136
     /**
137 137
      * Email constructor.
138
-     * @param string|array|null $from
139
-     * @param string|array|null $to
138
+     * @param string $from
139
+     * @param string $to
140 140
      * @param string|null $subject
141 141
      * @param string|null $body
142
-     * @param string|array|null $cc
143
-     * @param string|array|null $bcc
142
+     * @param string $cc
143
+     * @param string $bcc
144 144
      * @param string|null $returnPath
145 145
      */
146 146
     public function __construct(
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     }
227 227
 
228 228
     /**
229
-     * @param string|array $address
229
+     * @param string $address
230 230
      * @param string|null $name
231 231
      * @return $this
232 232
      */
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
     }
239 239
 
240 240
     /**
241
-     * @return array
241
+     * @return string
242 242
      */
243 243
     public function getSender()
244 244
     {
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
     }
304 304
 
305 305
     /**
306
-     * @param string|array $address
306
+     * @param string $address
307 307
      * @param string|null $name
308 308
      * @return $this
309 309
      */
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
     }
336 336
 
337 337
     /**
338
-     * @param string|array $address
338
+     * @param string $address
339 339
      * @param string|null $name
340 340
      * @return $this
341 341
      */
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
     }
368 368
 
369 369
     /**
370
-     * @param string|array $address
370
+     * @param string $address
371 371
      * @param string|null $name
372 372
      * @return $this
373 373
      */
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
     }
385 385
 
386 386
     /**
387
-     * @param string|array $address
387
+     * @param string $address
388 388
      * @param string|null $name
389 389
      * @return $this
390 390
      */
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
     }
397 397
 
398 398
     /**
399
-     * @param string|array $address
399
+     * @param string $address
400 400
      * @param string|null $name
401 401
      * @return $this
402 402
      */
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
     }
503 503
 
504 504
     /**
505
-     * @param string|array $name The data name to add or array to names => value
505
+     * @param string $name The data name to add or array to names => value
506 506
      * @param string|null $value The value of the data to add
507 507
      * @return $this
508 508
      */
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
     }
673 673
 
674 674
     /**
675
-     * @return array|bool
675
+     * @return boolean
676 676
      */
677 677
     public function sendPlain()
678 678
     {
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
     }
729 729
 
730 730
     /**
731
-     * @return Swift_MimePart|false
731
+     * @return \Swift_Mime_MimeEntity
732 732
      */
733 733
     public function findPlainPart()
734 734
     {
Please login to merge, or discard this patch.
src/Forms/GridField/GridFieldAddExistingAutocompleter.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     /**
156 156
      *
157 157
      * @param GridField $gridField
158
-     * @return array
158
+     * @return string[]
159 159
      */
160 160
     public function getActions($gridField)
161 161
     {
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
      *
220 220
      * @param GridField $gridField
221 221
      * @param HTTPRequest $request
222
-     * @return string
222
+     * @return HTTPResponse
223 223
      */
224 224
     public function doSearch($gridField, $request)
225 225
     {
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
     }
300 300
 
301 301
     /**
302
-     * @param array $fields
302
+     * @param string[] $fields
303 303
      * @return $this
304 304
      */
305 305
     public function setSearchFields($fields)
Please login to merge, or discard this patch.
src/ORM/ListDecorator.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -41,6 +41,7 @@
 block discarded – undo
41 41
      * Useful for keeping a decorator/paginated list configuration intact while modifying
42 42
      * the underlying list.
43 43
      *
44
+     * @param SS_List $list
44 45
      * @return SS_List
45 46
      */
46 47
     public function setList($list)
Please login to merge, or discard this patch.
src/View/SSViewer_DataPresenter.php 1 patch
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -33,6 +33,10 @@  discard block
 block discarded – undo
33 33
      */
34 34
     protected $underlay;
35 35
 
36
+    /**
37
+     * @param ViewableData $item
38
+     * @param ViewableData $inheritedScope
39
+     */
36 40
     public function __construct($item, $overlay = null, $underlay = null, $inheritedScope = null)
37 41
     {
38 42
         parent::__construct($item, $inheritedScope);
@@ -65,6 +69,9 @@  discard block
 block discarded – undo
65 69
         $this->underlay = $underlay ? $underlay : array();
66 70
     }
67 71
 
72
+    /**
73
+     * @param string $variableMethod
74
+     */
68 75
     protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false)
69 76
     {
70 77
         $implementers = ClassInfo::implementorsOf($interfaceToQuery);
Please login to merge, or discard this patch.
thirdparty/php-peg/Parser.php 1 patch
Doc Comments   +28 added lines patch added patch discarded remove patch
@@ -9,6 +9,10 @@  discard block
 block discarded – undo
9 9
  *  the bracket if a failed match + restore has moved the current position backwards - so we have to check that too.
10 10
  */
11 11
 class ParserRegexp {
12
+
13
+	/**
14
+	 * @param Parser $parser
15
+	 */
12 16
 	function __construct( $parser, $rx ) {
13 17
 		$this->parser = $parser ;
14 18
 		$this->rx = $rx . 'Sx' ;
@@ -83,6 +87,9 @@  discard block
 block discarded – undo
83 87
 		return FALSE ;
84 88
 	}
85 89
 
90
+ 	/**
91
+ 	 * @param string $token
92
+ 	 */
86 93
  	function literal( $token ) {
87 94
  		/* Debugging: * / print( "Looking for token '$token' @ '" . substr( $this->string, $this->pos ) . "'\n" ) ; /* */
88 95
  		$toklen = strlen( $token ) ;
@@ -94,11 +101,17 @@  discard block
 block discarded – undo
94 101
 		return FALSE ;
95 102
 	}
96 103
 
104
+	/**
105
+	 * @param string $rx
106
+	 */
97 107
 	function rx( $rx ) {
98 108
 		if ( !isset( $this->regexps[$rx] ) ) $this->regexps[$rx] = new ParserRegexp( $this, $rx ) ;
99 109
 		return $this->regexps[$rx]->match() ;
100 110
 	}
101 111
 
112
+	/**
113
+	 * @param string $value
114
+	 */
102 115
 	function expression( $result, $stack, $value ) {
103 116
 		$stack[] = $result; $rv = false;
104 117
 		
@@ -120,14 +133,26 @@  discard block
 block discarded – undo
120 133
 		return is_array($rv) ? $rv['text'] : ($rv ? $rv : '');
121 134
 	}
122 135
 	
136
+	/**
137
+	 * @param string $key
138
+	 * @param integer $pos
139
+	 */
123 140
 	function packhas( $key, $pos ) {
124 141
 		return false ;
125 142
 	}
126 143
 
144
+	/**
145
+	 * @param string $key
146
+	 * @param integer $pos
147
+	 */
127 148
 	function packread( $key, $pos ) {
128 149
 		throw new \Exception('PackRead after PackHas=>false in Parser.php');
129 150
 	}
130 151
 
152
+	/**
153
+	 * @param string $key
154
+	 * @param integer $pos
155
+	 */
131 156
 	function packwrite( $key, $pos, $res ) {
132 157
 		return $res ;
133 158
 	}
@@ -164,6 +189,9 @@  discard block
 block discarded – undo
164 189
 		return $result ;
165 190
 	}
166 191
 
192
+	/**
193
+	 * @param string $storetag
194
+	 */
167 195
 	function store ( &$result, $subres, $storetag = NULL ) {
168 196
 		$result['text'] .= $subres['text'] ;
169 197
 
Please login to merge, or discard this patch.
src/Core/Core.php 1 patch
Doc Comments   +4 added lines, -7 removed lines patch added patch discarded remove patch
@@ -136,6 +136,9 @@  discard block
 block discarded – undo
136 136
     return Injector::inst()->get($className);
137 137
 }
138 138
 
139
+/**
140
+ * @return string
141
+ */
139 142
 function project()
140 143
 {
141 144
     global $project;
@@ -152,12 +155,6 @@  discard block
 block discarded – undo
152 155
      * @param string $entity Entity that identifies the string. It must be in the form
153 156
      * "Namespace.Entity" where Namespace will be usually the class name where this
154 157
      * string is used and Entity identifies the string inside the namespace.
155
-     * @param mixed $arg,... Additional arguments are parsed as such:
156
-     *  - Next string argument is a default. Pass in a `|` pipe-delimeted value with `{count}`
157
-     *    to do pluralisation.
158
-     *  - Any other string argument after default is context for i18nTextCollector
159
-     *  - Any array argument in any order is an injection parameter list. Pass in a `count`
160
-     *    injection parameter to pluralise.
161 158
      * @return string
162 159
      */
163 160
 function _t($entity, $arg = null)
@@ -171,7 +168,7 @@  discard block
 block discarded – undo
171 168
  * Only increases up to the maximum defined in {@link set_increase_memory_limit_max()},
172 169
  * and defaults to the 'memory_limit' setting in the PHP configuration.
173 170
  *
174
- * @param string|int $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
171
+ * @param integer $memoryLimit A memory limit string, such as "64M".  If omitted, unlimited memory will be set.
175 172
  * @return Boolean TRUE indicates a successful change, FALSE a denied change.
176 173
  */
177 174
 function increase_memory_limit_to($memoryLimit = -1)
Please login to merge, or discard this patch.