@@ -144,7 +144,7 @@ |
||
| 144 | 144 | /** |
| 145 | 145 | * Make an xpath query against this HTML |
| 146 | 146 | * |
| 147 | - * @param $query string - The xpath query string |
|
| 147 | + * @param string $query string - The xpath query string |
|
| 148 | 148 | * @return DOMNodeList |
| 149 | 149 | */ |
| 150 | 150 | public function query($query) { |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | protected $transliterator; |
| 107 | 107 | |
| 108 | 108 | /** |
| 109 | - * @return SS_Transliterator|NULL |
|
| 109 | + * @return SS_Transliterator |
|
| 110 | 110 | */ |
| 111 | 111 | public function getTransliterator() { |
| 112 | 112 | if($this->transliterator === null && $this->config()->default_use_transliterator) { |
@@ -129,6 +129,7 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | /** |
| 131 | 131 | * @param boolean |
| 132 | + * @param boolean $bool |
|
| 132 | 133 | */ |
| 133 | 134 | public function setAllowMultibyte($bool) { |
| 134 | 135 | $this->allowMultibyte = $bool; |
@@ -179,7 +179,7 @@ |
||
| 179 | 179 | * @param array $searchParams |
| 180 | 180 | * @param array|bool|string $sort |
| 181 | 181 | * @param array|bool|string $limit |
| 182 | - * @return SS_List |
|
| 182 | + * @return DataList |
|
| 183 | 183 | * @throws Exception |
| 184 | 184 | */ |
| 185 | 185 | public function getResults($searchParams, $sort = false, $limit = false) { |
@@ -843,6 +843,10 @@ discard block |
||
| 843 | 843 | * Assist with testing of specific protected methods |
| 844 | 844 | */ |
| 845 | 845 | class i18nTextCollectorTest_Collector extends i18nTextCollector implements TestOnly { |
| 846 | + |
|
| 847 | + /** |
|
| 848 | + * @param string $directory |
|
| 849 | + */ |
|
| 846 | 850 | public function getModules_Test($directory) { |
| 847 | 851 | return $this->getModules($directory); |
| 848 | 852 | } |
@@ -851,6 +855,9 @@ discard block |
||
| 851 | 855 | return $this->resolveDuplicateConflicts($entitiesByModule); |
| 852 | 856 | } |
| 853 | 857 | |
| 858 | + /** |
|
| 859 | + * @param string $module |
|
| 860 | + */ |
|
| 854 | 861 | public function getFileListForModule_Test($module) { |
| 855 | 862 | return $this->getFileListForModule($module); |
| 856 | 863 | } |
@@ -859,6 +866,9 @@ discard block |
||
| 859 | 866 | return $this->getConflicts($entitiesByModule); |
| 860 | 867 | } |
| 861 | 868 | |
| 869 | + /** |
|
| 870 | + * @param string $class |
|
| 871 | + */ |
|
| 862 | 872 | public function findModuleForClass_Test($class) { |
| 863 | 873 | return $this->findModuleForClass($class); |
| 864 | 874 | } |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | /** |
| 731 | 731 | * All custom objects with the same number. E.g. 'Page 1' owns 'Custom 1' |
| 732 | 732 | * |
| 733 | - * @return DataList |
|
| 733 | + * @return SilverStripe\ORM\DataList |
|
| 734 | 734 | */ |
| 735 | 735 | public function Custom() { |
| 736 | 736 | $title = str_replace('Page', 'Custom', $this->Title); |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | /** |
| 785 | 785 | * All pages with the same number. E.g. 'Page 1' owns 'Custom 1' |
| 786 | 786 | * |
| 787 | - * @return DataList |
|
| 787 | + * @return SilverStripe\ORM\DataList |
|
| 788 | 788 | */ |
| 789 | 789 | public function Pages() { |
| 790 | 790 | $title = str_replace('Custom', 'Page', $this->Title); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * left. |
| 100 | 100 | * @param array $attributes an array of attributes to include on the link. |
| 101 | 101 | * |
| 102 | - * @return boolean The result of the operation. |
|
| 102 | + * @return boolean|null The result of the operation. |
|
| 103 | 103 | */ |
| 104 | 104 | public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null) { |
| 105 | 105 | return self::add_menu_item($code, $menuTitle, $url, null, $priority, $attributes); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * have the rights to access some other part of the admin area. |
| 120 | 120 | * @param int $priority |
| 121 | 121 | * @param array $attributes an array of attributes to include on the link. |
| 122 | - * @return bool Success |
|
| 122 | + * @return boolean|null Success |
|
| 123 | 123 | */ |
| 124 | 124 | public static function add_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1, |
| 125 | 125 | $attributes = null) { |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | * have the rights to access some other part of the admin area. |
| 251 | 251 | * @param int $priority |
| 252 | 252 | * @param array $attributes an array of attributes to include on the link. |
| 253 | - * @return bool Success |
|
| 253 | + * @return boolean|null Success |
|
| 254 | 254 | */ |
| 255 | 255 | public static function replace_menu_item($code, $menuTitle, $url, $controllerClass = null, $priority = -1, |
| 256 | 256 | $attributes = null) { |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | /** |
| 204 | 204 | * Gets the combined configuration of all LeafAndMain subclasses required by the client app. |
| 205 | 205 | * |
| 206 | - * @return array |
|
| 206 | + * @return string |
|
| 207 | 207 | * |
| 208 | 208 | * WARNING: Experimental API |
| 209 | 209 | */ |
@@ -646,6 +646,9 @@ discard block |
||
| 646 | 646 | } |
| 647 | 647 | } |
| 648 | 648 | |
| 649 | + /** |
|
| 650 | + * @param SS_HTTPRequest $request |
|
| 651 | + */ |
|
| 649 | 652 | public function index($request) { |
| 650 | 653 | return $this->getResponseNegotiator()->respond($request); |
| 651 | 654 | } |
@@ -1774,7 +1777,7 @@ discard block |
||
| 1774 | 1777 | * The controller might not have any previewable content, in which case |
| 1775 | 1778 | * this method returns FALSE. |
| 1776 | 1779 | * |
| 1777 | - * @return String|boolean |
|
| 1780 | + * @return boolean |
|
| 1778 | 1781 | */ |
| 1779 | 1782 | public function LinkPreview() { |
| 1780 | 1783 | return false; |
@@ -1961,7 +1964,7 @@ discard block |
||
| 1961 | 1964 | } |
| 1962 | 1965 | |
| 1963 | 1966 | /** |
| 1964 | - * @return String |
|
| 1967 | + * @return DBField |
|
| 1965 | 1968 | */ |
| 1966 | 1969 | public function Locale() { |
| 1967 | 1970 | return DBField::create_field('Locale', i18n::get_locale()); |
@@ -2127,6 +2130,9 @@ discard block |
||
| 2127 | 2130 | return (parent::isFinished() || $this->isFinished); |
| 2128 | 2131 | } |
| 2129 | 2132 | |
| 2133 | + /** |
|
| 2134 | + * @param boolean $bool |
|
| 2135 | + */ |
|
| 2130 | 2136 | public function setIsFinished($bool) { |
| 2131 | 2137 | $this->isFinished = $bool; |
| 2132 | 2138 | } |
@@ -282,7 +282,7 @@ |
||
| 282 | 282 | * |
| 283 | 283 | * Must not raise SS_HTTPResponse_Exceptions - instead it should return |
| 284 | 284 | * |
| 285 | - * @param $request |
|
| 285 | + * @param SS_HTTPRequest $request |
|
| 286 | 286 | * @param $action |
| 287 | 287 | * @return SS_HTTPResponse |
| 288 | 288 | */ |
@@ -116,7 +116,7 @@ |
||
| 116 | 116 | * @param mixed $returnVal |
| 117 | 117 | * @param bool $ignoreAjax |
| 118 | 118 | * @param array $ignoredFunctions |
| 119 | - * @return mixed |
|
| 119 | + * @return string|null |
|
| 120 | 120 | */ |
| 121 | 121 | public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) { |
| 122 | 122 | $plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax); |