@@ -2176,7 +2176,7 @@ discard block |
||
2176 | 2176 | * Called by {@link __get()} and any getFieldName() methods you might create. |
2177 | 2177 | * |
2178 | 2178 | * @param string $field The name of the field |
2179 | - * @return mixed The field value |
|
2179 | + * @return string|null The field value |
|
2180 | 2180 | */ |
2181 | 2181 | public function getField($field) |
2182 | 2182 | { |
@@ -2458,6 +2458,7 @@ discard block |
||
2458 | 2458 | |
2459 | 2459 | /** |
2460 | 2460 | * {@inheritdoc} |
2461 | + * @param string $field |
|
2461 | 2462 | */ |
2462 | 2463 | public function castingHelper($field) |
2463 | 2464 | { |
@@ -2563,7 +2564,7 @@ discard block |
||
2563 | 2564 | * </code> |
2564 | 2565 | * |
2565 | 2566 | * @param string $methodName Method on the same object, e.g. {@link canEdit()} |
2566 | - * @param Member|int $member |
|
2567 | + * @param null|Member $member |
|
2567 | 2568 | * @param array $context Optional context |
2568 | 2569 | * @return boolean|null |
2569 | 2570 | */ |
@@ -2586,7 +2587,7 @@ discard block |
||
2586 | 2587 | |
2587 | 2588 | /** |
2588 | 2589 | * @param Member $member |
2589 | - * @return boolean |
|
2590 | + * @return boolean|string |
|
2590 | 2591 | */ |
2591 | 2592 | public function canView($member = null) |
2592 | 2593 | { |
@@ -2599,7 +2600,7 @@ discard block |
||
2599 | 2600 | |
2600 | 2601 | /** |
2601 | 2602 | * @param Member $member |
2602 | - * @return boolean |
|
2603 | + * @return boolean|string |
|
2603 | 2604 | */ |
2604 | 2605 | public function canEdit($member = null) |
2605 | 2606 | { |
@@ -2612,7 +2613,7 @@ discard block |
||
2612 | 2613 | |
2613 | 2614 | /** |
2614 | 2615 | * @param Member $member |
2615 | - * @return boolean |
|
2616 | + * @return boolean|string |
|
2616 | 2617 | */ |
2617 | 2618 | public function canDelete($member = null) |
2618 | 2619 | { |
@@ -2627,7 +2628,7 @@ discard block |
||
2627 | 2628 | * @param Member $member |
2628 | 2629 | * @param array $context Additional context-specific data which might |
2629 | 2630 | * affect whether (or where) this object could be created. |
2630 | - * @return boolean |
|
2631 | + * @return boolean|string |
|
2631 | 2632 | */ |
2632 | 2633 | public function canCreate($member = null, $context = array()) |
2633 | 2634 | { |
@@ -2742,7 +2743,7 @@ discard block |
||
2742 | 2743 | * Traverses to a field referenced by relationships between data objects, returning the value |
2743 | 2744 | * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName) |
2744 | 2745 | * |
2745 | - * @param $fieldName string |
|
2746 | + * @param string $fieldName string |
|
2746 | 2747 | * @return string | null - will return null on a missing value |
2747 | 2748 | */ |
2748 | 2749 | public function relField($fieldName) |
@@ -2820,7 +2821,7 @@ discard block |
||
2820 | 2821 | * @param string $callerClass The class of objects to be returned |
2821 | 2822 | * @param string|array $filter A filter to be inserted into the WHERE clause. |
2822 | 2823 | * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples. |
2823 | - * @param string|array $sort A sort expression to be inserted into the ORDER |
|
2824 | + * @param string $sort A sort expression to be inserted into the ORDER |
|
2824 | 2825 | * BY clause. If omitted, self::$default_sort will be used. |
2825 | 2826 | * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead. |
2826 | 2827 | * @param string|array $limit A limit expression to be inserted into the LIMIT clause. |
@@ -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()) |
@@ -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 | { |
@@ -997,6 +997,7 @@ discard block |
||
997 | 997 | * |
998 | 998 | * @param string $name |
999 | 999 | * @param mixed $argument,... arguments to pass to the constructor |
1000 | + * @param string $argument |
|
1000 | 1001 | * @return mixed A new instance of the specified object |
1001 | 1002 | */ |
1002 | 1003 | public function create($name, $argument = null) |