@@ -235,7 +235,7 @@ |
||
| 235 | 235 | * Returns an array containing all the descendants (direct and indirect) |
| 236 | 236 | * of a class. |
| 237 | 237 | * |
| 238 | - * @param string|object $class |
|
| 238 | + * @param string $class |
|
| 239 | 239 | * @return array |
| 240 | 240 | */ |
| 241 | 241 | public function getDescendantsOf($class) { |
@@ -500,7 +500,7 @@ |
||
| 500 | 500 | * Returns false if the prefilterable parts of the rule aren't met, and true if they are |
| 501 | 501 | * |
| 502 | 502 | * @param $rules array - A hash of rules as allowed in the only or except portion of a config fragment header |
| 503 | - * @return bool - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
| 503 | + * @return boolean|string - True if the rules are met, false if not. (Note that depending on whether we were passed an |
|
| 504 | 504 | * only or an except rule, |
| 505 | 505 | * which values means accept or reject a fragment |
| 506 | 506 | */ |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | /** |
| 101 | 101 | * Get value of display_errors ini value |
| 102 | 102 | * |
| 103 | - * @return mixed |
|
| 103 | + * @return string |
|
| 104 | 104 | */ |
| 105 | 105 | protected function getDisplayErrors() { |
| 106 | 106 | return ini_get('display_errors'); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | * Add this callback to the chain of callbacks to call along with the state |
| 111 | 111 | * that $error must be in this point in the chain for the callback to be called |
| 112 | 112 | * |
| 113 | - * @param $callback - The callback to call |
|
| 113 | + * @param callable $callback - The callback to call |
|
| 114 | 114 | * @param $onErrorState - false if only call if no errors yet, true if only call if already errors, null for either |
| 115 | 115 | * @return $this |
| 116 | 116 | */ |
@@ -36,6 +36,9 @@ discard block |
||
| 36 | 36 | */ |
| 37 | 37 | protected $token = null; |
| 38 | 38 | |
| 39 | + /** |
|
| 40 | + * @param string $token |
|
| 41 | + */ |
|
| 39 | 42 | protected function pathForToken($token) { |
| 40 | 43 | return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token); |
| 41 | 44 | } |
@@ -235,7 +238,7 @@ discard block |
||
| 235 | 238 | * Given a list of token names, suppress all tokens that have not been validated, and |
| 236 | 239 | * return the non-validated token with the highest priority |
| 237 | 240 | * |
| 238 | - * @param array $keys List of token keys in ascending priority (low to high) |
|
| 241 | + * @param string[] $keys List of token keys in ascending priority (low to high) |
|
| 239 | 242 | * @return ParameterConfirmationToken The token container for the unvalidated $key given with the highest priority |
| 240 | 243 | */ |
| 241 | 244 | public static function prepare_tokens($keys) { |
@@ -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); |
@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use SilverStripe\Core\Convert; |
| 4 | -use SilverStripe\Core\Config\Config; |
|
| 5 | 4 | use SilverStripe\Dev\SapphireTest; |
| 6 | 5 | use SilverStripe\View\Parsers\URLSegmentFilter; |
| 7 | 6 | |
@@ -211,7 +211,7 @@ |
||
| 211 | 211 | * |
| 212 | 212 | * @todo Mix in custom column mappings |
| 213 | 213 | * |
| 214 | - * @return array |
|
| 214 | + * @return string |
|
| 215 | 215 | **/ |
| 216 | 216 | public function getImportSpec() { |
| 217 | 217 | $spec = array(); |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | * @param string $path Path to large file to split |
| 94 | 94 | * @param int $lines Number of lines per file |
| 95 | 95 | * |
| 96 | - * @return array List of file paths |
|
| 96 | + * @return string[] List of file paths |
|
| 97 | 97 | */ |
| 98 | 98 | protected function splitFile($path, $lines = null) { |
| 99 | 99 | $previous = ini_get('auto_detect_line_endings'); |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Filesystem\ImageManipulation; |
| 6 | 6 | use SilverStripe\Filesystem\Storage\AssetContainer; |
| 7 | 7 | use SilverStripe\Filesystem\Storage\AssetStore; |
| 8 | - |
|
| 9 | 8 | use Injector; |
| 10 | 9 | use AssetField; |
| 11 | 10 | use File; |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | * greater than or equal to this version, a message will be raised |
| 73 | 73 | * |
| 74 | 74 | * @static |
| 75 | - * @param $ver string - |
|
| 75 | + * @param string $ver string - |
|
| 76 | 76 | * A php standard version string, see http://php.net/manual/en/function.version-compare.php for details. |
| 77 | 77 | * @param null $forModule string - |
| 78 | 78 | * The name of a module. The passed version will be used as the check value for |