@@ -86,7 +86,7 @@ |
||
86 | 86 | /** |
87 | 87 | * Global permissions required to edit |
88 | 88 | * |
89 | - * @param array $permissions |
|
89 | + * @param string[] $permissions |
|
90 | 90 | * @return $this |
91 | 91 | */ |
92 | 92 | public function setGlobalEditPermissions($permissions) |
@@ -19,6 +19,11 @@ |
||
19 | 19 | parent::__construct(); |
20 | 20 | } |
21 | 21 | |
22 | + /** |
|
23 | + * @param ManifestFileFinder $finder |
|
24 | + * @param null|string $base |
|
25 | + * @param string[] $expect |
|
26 | + */ |
|
22 | 27 | public function assertFinderFinds($finder, $base, $expect, $message = null) |
23 | 28 | { |
24 | 29 | if (!$base) { |
@@ -42,6 +42,9 @@ |
||
42 | 42 | return Injector::inst()->get(PermissionChecker::class.'.testpermissions'); |
43 | 43 | } |
44 | 44 | |
45 | + /** |
|
46 | + * @param DataObject $member |
|
47 | + */ |
|
45 | 48 | public function canEdit($member = null) |
46 | 49 | { |
47 | 50 | if (!$member) { |
@@ -159,6 +159,10 @@ discard block |
||
159 | 159 | ]); |
160 | 160 | } |
161 | 161 | |
162 | + /** |
|
163 | + * @param \SilverStripe\ORM\FieldType\DBHTMLText $result |
|
164 | + * @param string[] $expected |
|
165 | + */ |
|
162 | 166 | private function assertExpectedStrings($result, $expected) |
163 | 167 | { |
164 | 168 | foreach ($expected as $expectedStr) { |
@@ -1089,6 +1093,10 @@ discard block |
||
1089 | 1093 | $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult); |
1090 | 1094 | } |
1091 | 1095 | |
1096 | + /** |
|
1097 | + * @param string $a |
|
1098 | + * @param string $b |
|
1099 | + */ |
|
1092 | 1100 | public function assertEqualIgnoringWhitespace($a, $b, $message = '') |
1093 | 1101 | { |
1094 | 1102 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message); |
@@ -1817,6 +1825,11 @@ discard block |
||
1817 | 1825 | $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']); |
1818 | 1826 | } |
1819 | 1827 | } |
1828 | + |
|
1829 | + /** |
|
1830 | + * @param string $name |
|
1831 | + * @param string $expected |
|
1832 | + */ |
|
1820 | 1833 | private function _renderWithSourceFileComments($name, $expected) |
1821 | 1834 | { |
1822 | 1835 | $viewer = new SSViewer(array($name)); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | /** |
20 | 20 | * Common method for setting up form, since that will always be a dependency for the validator. |
21 | 21 | * |
22 | - * @param array $fieldNames |
|
22 | + * @param string[] $fieldNames |
|
23 | 23 | * @return Form |
24 | 24 | */ |
25 | 25 | protected function getForm(array $fieldNames = array()) |
@@ -310,6 +310,9 @@ |
||
310 | 310 | |
311 | 311 | private static $method_from_cache = array(); |
312 | 312 | |
313 | + /** |
|
314 | + * @param string $method |
|
315 | + */ |
|
313 | 316 | public static function has_method_from($class, $method, $compclass) |
314 | 317 | { |
315 | 318 | $lClass = strtolower($class); |
@@ -190,7 +190,7 @@ |
||
190 | 190 | /** |
191 | 191 | * Ensure that the query is ready to execute. |
192 | 192 | * |
193 | - * @param array|null $queriedColumns Any columns to filter the query by |
|
193 | + * @param string[] $queriedColumns Any columns to filter the query by |
|
194 | 194 | * @return SQLSelect The finalised sql query |
195 | 195 | */ |
196 | 196 | public function getFinalisedQuery($queriedColumns = null) |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | * - array('fields' => array('A','B','C'), 'type' => 'index/unique/fulltext'): This gives you full |
332 | 332 | * control over the index. |
333 | 333 | * @param boolean $hasAutoIncPK A flag indicating that the primary key on this table is an autoincrement type |
334 | - * @param array $options Create table options (ENGINE, etc.) |
|
334 | + * @param string|null $options Create table options (ENGINE, etc.) |
|
335 | 335 | * @param array|bool $extensions List of extensions |
336 | 336 | */ |
337 | 337 | public function requireTable( |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | * |
596 | 596 | * @param string $table The table name. |
597 | 597 | * @param string $field The field name. |
598 | - * @param array|string $spec The field specification. If passed in array syntax, the specific database |
|
598 | + * @param string $spec The field specification. If passed in array syntax, the specific database |
|
599 | 599 | * driver takes care of the ALTER TABLE syntax. If passed as a string, its assumed to |
600 | 600 | * be prepared as a direct SQL framgment ready for insertion into ALTER TABLE. In this case you'll |
601 | 601 | * need to take care of database abstraction in your DBField subclass. |
@@ -304,6 +304,7 @@ discard block |
||
304 | 304 | * call this function directly, Please use {@link Convert::xml2array()} |
305 | 305 | * |
306 | 306 | * @param SimpleXMLElement |
307 | + * @param SimpleXMLElement $xml |
|
307 | 308 | * |
308 | 309 | * @return mixed |
309 | 310 | */ |
@@ -517,7 +518,7 @@ discard block |
||
517 | 518 | * - IDField => idField |
518 | 519 | * - iDField => iDField |
519 | 520 | * |
520 | - * @param $str |
|
521 | + * @param string $str |
|
521 | 522 | * @return string |
522 | 523 | */ |
523 | 524 | public static function upperCamelToLowerCamel($str) |