@@ -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)); |
@@ -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. |
@@ -49,6 +49,9 @@ discard block |
||
49 | 49 | return parent::login($request, Authenticator::CMS_LOGIN); |
50 | 50 | } |
51 | 51 | |
52 | + /** |
|
53 | + * @param string $action |
|
54 | + */ |
|
52 | 55 | public function Link($action = null) |
53 | 56 | { |
54 | 57 | /** @skipUpgrade */ |
@@ -79,6 +82,9 @@ discard block |
||
79 | 82 | return null; |
80 | 83 | } |
81 | 84 | |
85 | + /** |
|
86 | + * @param string $title |
|
87 | + */ |
|
82 | 88 | public function getResponseController($title) |
83 | 89 | { |
84 | 90 | // Use $this to prevent use of Page to render underlying templates |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | * |
372 | 372 | * @param string $property |
373 | 373 | * the name of the property |
374 | - * @param object $object |
|
374 | + * @param string $object |
|
375 | 375 | * the object to be set |
376 | 376 | * @return $this |
377 | 377 | */ |
@@ -466,7 +466,7 @@ discard block |
||
466 | 466 | * The name of the service to update the definition for |
467 | 467 | * @param string $property |
468 | 468 | * The name of the property to update. |
469 | - * @param mixed $value |
|
469 | + * @param string $value |
|
470 | 470 | * The value to set |
471 | 471 | * @param boolean $append |
472 | 472 | * Whether to append (the default) when the property is an array |
@@ -788,7 +788,7 @@ discard block |
||
788 | 788 | /** |
789 | 789 | * @deprecated 4.0.0:5.0.0 Use Injector::has() instead |
790 | 790 | * @param $name |
791 | - * @return string |
|
791 | + * @return boolean |
|
792 | 792 | */ |
793 | 793 | public function hasService($name) |
794 | 794 | { |
@@ -488,7 +488,7 @@ |
||
488 | 488 | * Cache all indexes for the given class. |
489 | 489 | * Will do nothing if already cached |
490 | 490 | * |
491 | - * @param $class |
|
491 | + * @param string $class |
|
492 | 492 | */ |
493 | 493 | protected function cacheDatabaseIndexes($class) |
494 | 494 | { |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * @param string|array $permissionCode Optional |
60 | 60 | * @param boolean $tryUsingSessionLogin If true, then the method with authenticate against the |
61 | 61 | * session log-in if those credentials are disabled. |
62 | - * @return bool|Member |
|
62 | + * @return null|Member |
|
63 | 63 | * @throws HTTPResponse_Exception |
64 | 64 | */ |
65 | 65 | public static function requireLogin( |