@@ -556,7 +556,7 @@ discard block |
||
| 556 | 556 | * Check if the given field specification could be interpreted as an unquoted relation name |
| 557 | 557 | * |
| 558 | 558 | * @param string $field |
| 559 | - * @return bool |
|
| 559 | + * @return integer |
|
| 560 | 560 | */ |
| 561 | 561 | protected function isValidRelationName($field) |
| 562 | 562 | { |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
| 670 | 670 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
| 671 | 671 | * ORM have a value of 10. |
| 672 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
| 672 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
| 673 | 673 | * @return static |
| 674 | 674 | */ |
| 675 | 675 | public function innerJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | * @param int $order A numerical index to control the order that joins are added to the query; lower order values |
| 689 | 689 | * will cause the query to appear first. The default is 20, and joins created automatically by the |
| 690 | 690 | * ORM have a value of 10. |
| 691 | - * @param array $parameters Any additional parameters if the join is a parameterised subquery |
|
| 691 | + * @param string[] $parameters Any additional parameters if the join is a parameterised subquery |
|
| 692 | 692 | * @return static |
| 693 | 693 | */ |
| 694 | 694 | public function leftJoin($table, $onClause, $alias = null, $order = 20, $parameters = array()) |
@@ -836,7 +836,7 @@ discard block |
||
| 836 | 836 | * Return the maximum value of the given field in this DataList |
| 837 | 837 | * |
| 838 | 838 | * @param string $fieldName |
| 839 | - * @return mixed |
|
| 839 | + * @return string |
|
| 840 | 840 | */ |
| 841 | 841 | public function max($fieldName) |
| 842 | 842 | { |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | * Return the minimum value of the given field in this DataList |
| 848 | 848 | * |
| 849 | 849 | * @param string $fieldName |
| 850 | - * @return mixed |
|
| 850 | + * @return string |
|
| 851 | 851 | */ |
| 852 | 852 | public function min($fieldName) |
| 853 | 853 | { |
@@ -858,7 +858,7 @@ discard block |
||
| 858 | 858 | * Return the average value of the given field in this DataList |
| 859 | 859 | * |
| 860 | 860 | * @param string $fieldName |
| 861 | - * @return mixed |
|
| 861 | + * @return string |
|
| 862 | 862 | */ |
| 863 | 863 | public function avg($fieldName) |
| 864 | 864 | { |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | * Return the sum of the values of the given field in this DataList |
| 870 | 870 | * |
| 871 | 871 | * @param string $fieldName |
| 872 | - * @return mixed |
|
| 872 | + * @return string |
|
| 873 | 873 | */ |
| 874 | 874 | public function sum($fieldName) |
| 875 | 875 | { |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | /** |
| 929 | 929 | * Restrict the columns to fetch into this DataList |
| 930 | 930 | * |
| 931 | - * @param array $queriedColumns |
|
| 931 | + * @param string[] $queriedColumns |
|
| 932 | 932 | * @return static |
| 933 | 933 | */ |
| 934 | 934 | public function setQueriedColumns($queriedColumns) |
@@ -1174,7 +1174,7 @@ discard block |
||
| 1174 | 1174 | /** |
| 1175 | 1175 | * Returns item stored in list with index $key |
| 1176 | 1176 | * |
| 1177 | - * @param mixed $key |
|
| 1177 | + * @param integer $key |
|
| 1178 | 1178 | * @return DataObject |
| 1179 | 1179 | */ |
| 1180 | 1180 | public function offsetGet($key) |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * Return a date and time formatted as per a CMS user's settings. |
| 86 | 86 | * |
| 87 | 87 | * @param Member $member |
| 88 | - * @return boolean | string A time and date pair formatted as per user-defined settings. |
|
| 88 | + * @return null|string | string A time and date pair formatted as per user-defined settings. |
|
| 89 | 89 | */ |
| 90 | 90 | public function FormatFromSettings($member = null) |
| 91 | 91 | { |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | * Use {@link clear_mock_now()} to revert to the current system date. |
| 191 | 191 | * Caution: This sets a fixed date that doesn't increment with time. |
| 192 | 192 | * |
| 193 | - * @param DBDatetime|string $datetime Either in object format, or as a DBDatetime compatible string. |
|
| 193 | + * @param string $datetime Either in object format, or as a DBDatetime compatible string. |
|
| 194 | 194 | * @throws Exception |
| 195 | 195 | */ |
| 196 | 196 | public static function set_mock_now($datetime) |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | * column. Can contain a relation name in dot notation, which will automatically join |
| 75 | 75 | * the necessary tables (e.g. "Comments.Name" to join the "Comments" has-many relationship and |
| 76 | 76 | * search the "Name" column when applying this filter to a SiteTree class). |
| 77 | - * @param mixed $value |
|
| 77 | + * @param string $value |
|
| 78 | 78 | * @param array $modifiers |
| 79 | 79 | */ |
| 80 | 80 | public function __construct($fullName = null, $value = false, array $modifiers = array()) |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | /** |
| 189 | 189 | * Gets supported modifiers for this filter |
| 190 | 190 | * |
| 191 | - * @return array |
|
| 191 | + * @return string[] |
|
| 192 | 192 | */ |
| 193 | 193 | public function getSupportedModifiers() |
| 194 | 194 | { |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | /** |
| 429 | 429 | * Determines case sensitivity based on {@link getModifiers()}. |
| 430 | 430 | * |
| 431 | - * @return Mixed TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 431 | + * @return boolean|null TRUE or FALSE to enforce sensitivity, NULL to use field collation. |
|
| 432 | 432 | */ |
| 433 | 433 | protected function getCaseSensitive() |
| 434 | 434 | { |
@@ -130,7 +130,7 @@ |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | - * @param mixed $item |
|
| 133 | + * @param Tests\ManyManyThroughListTest\Item $item |
|
| 134 | 134 | * @param array $extraFields |
| 135 | 135 | */ |
| 136 | 136 | public function add($item, $extraFields = []) |
@@ -883,9 +883,9 @@ discard block |
||
| 883 | 883 | * }); |
| 884 | 884 | * </code> |
| 885 | 885 | * |
| 886 | - * @param Member|null|int $member Member or member ID to log in as. |
|
| 886 | + * @param Member|null $member Member or member ID to log in as. |
|
| 887 | 887 | * Set to null or 0 to act as a logged out user. |
| 888 | - * @param $callback |
|
| 888 | + * @param \Closure $callback |
|
| 889 | 889 | */ |
| 890 | 890 | public static function actAs($member, $callback) |
| 891 | 891 | { |
@@ -1732,7 +1732,7 @@ discard block |
||
| 1732 | 1732 | * This is likely to be customized for social sites etc. with a looser permission model. |
| 1733 | 1733 | * |
| 1734 | 1734 | * @param Member $member |
| 1735 | - * @return bool |
|
| 1735 | + * @return boolean|string |
|
| 1736 | 1736 | */ |
| 1737 | 1737 | public function canView($member = null) |
| 1738 | 1738 | { |
@@ -1763,7 +1763,7 @@ discard block |
||
| 1763 | 1763 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
| 1764 | 1764 | * |
| 1765 | 1765 | * @param Member $member |
| 1766 | - * @return bool |
|
| 1766 | + * @return boolean|string |
|
| 1767 | 1767 | */ |
| 1768 | 1768 | public function canEdit($member = null) |
| 1769 | 1769 | { |
@@ -1798,7 +1798,7 @@ discard block |
||
| 1798 | 1798 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
| 1799 | 1799 | * |
| 1800 | 1800 | * @param Member $member |
| 1801 | - * @return bool |
|
| 1801 | + * @return boolean|string |
|
| 1802 | 1802 | */ |
| 1803 | 1803 | public function canDelete($member = null) |
| 1804 | 1804 | { |
@@ -31,7 +31,6 @@ |
||
| 31 | 31 | use SilverStripe\ORM\Map; |
| 32 | 32 | use SilverStripe\ORM\ValidationException; |
| 33 | 33 | use SilverStripe\ORM\ValidationResult; |
| 34 | -use SilverStripe\View\SSViewer; |
|
| 35 | 34 | use SilverStripe\View\TemplateGlobalProvider; |
| 36 | 35 | use DateTime; |
| 37 | 36 | |
@@ -6,11 +6,9 @@ |
||
| 6 | 6 | /** @skipUpgrade */ |
| 7 | 7 | use SilverStripe\Admin\ModelAdmin; |
| 8 | 8 | /** @skipUpgrade */ |
| 9 | -use SilverStripe\Control\Controller as Cont ; |
|
| 10 | 9 | /** @skipUpgrade */ |
| 11 | -use SilverStripe\Control\HTTPRequest as Request, SilverStripe\Control\HTTPResponse as Response, SilverStripe\Security\PermissionProvider as P; |
|
| 10 | +use SilverStripe\Security\PermissionProvider as P; |
|
| 12 | 11 | /** @skipUpgrade */ |
| 13 | -use silverstripe\test\ClassA; |
|
| 14 | 12 | /** @skipUpgrade */ |
| 15 | 13 | use \SilverStripe\Core\Object; |
| 16 | 14 | |
@@ -1048,6 +1048,10 @@ |
||
| 1048 | 1048 | } |
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | + /** |
|
| 1052 | + * @param Requirements_Backend $backend |
|
| 1053 | + * @param string $type |
|
| 1054 | + */ |
|
| 1051 | 1055 | public function assertFileNotIncluded($backend, $type, $files) |
| 1052 | 1056 | { |
| 1053 | 1057 | $includedFiles = $this->getBackendFiles($backend, $type); |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
| 146 | - * @return AdapterInterface |
|
| 146 | + * @return Adapter |
|
| 147 | 147 | */ |
| 148 | 148 | public function getEmbed() |
| 149 | 149 | { |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | |
| 314 | 314 | /** |
| 315 | 315 | * @param array $properties |
| 316 | - * @return string |
|
| 316 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 317 | 317 | */ |
| 318 | 318 | public function Field($properties = array()) |
| 319 | 319 | { |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | |
| 480 | 480 | /** |
| 481 | 481 | * Marking a specific node in the tree as disabled |
| 482 | - * @param $node |
|
| 482 | + * @param DataObject $node |
|
| 483 | 483 | * @return boolean |
| 484 | 484 | */ |
| 485 | 485 | public function nodeIsDisabled($node) |