@@ -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 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | 135 | * @param $obj DataObject |
| 136 | - * @param $message string |
|
| 136 | + * @param string $message string |
|
| 137 | 137 | */ |
| 138 | 138 | public function addCreated($obj, $message = null) |
| 139 | 139 | { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | /** |
| 149 | 149 | * @param $obj DataObject |
| 150 | - * @param $message string |
|
| 150 | + * @param string $message string |
|
| 151 | 151 | */ |
| 152 | 152 | public function addUpdated($obj, $message = null) |
| 153 | 153 | { |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * @param $obj DataObject |
|
| 164 | - * @param $message string |
|
| 163 | + * @param DataObject|null $obj DataObject |
|
| 164 | + * @param string $message string |
|
| 165 | 165 | */ |
| 166 | 166 | public function addDeleted($obj, $message = null) |
| 167 | 167 | { |
@@ -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 |
@@ -264,6 +264,9 @@ discard block |
||
| 264 | 264 | return $this; |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | + /** |
|
| 268 | + * @param string $type |
|
| 269 | + */ |
|
| 267 | 270 | protected function invokeCallbacks($type, $args = array()) { |
| 268 | 271 | foreach($this->callbacks[$type] as $callback) { |
| 269 | 272 | call_user_func_array($callback, $args); |
@@ -303,6 +306,9 @@ discard block |
||
| 303 | 306 | $obj->$name = $this->parseValue($value, $fixtures); |
| 304 | 307 | } |
| 305 | 308 | |
| 309 | + /** |
|
| 310 | + * @param string $fieldName |
|
| 311 | + */ |
|
| 306 | 312 | protected function overrideField($obj, $fieldName, $value, $fixtures = null) { |
| 307 | 313 | $class = get_class($obj); |
| 308 | 314 | $table = DataObject::getSchema()->tableForField($class, $fieldName); |
@@ -617,10 +617,10 @@ discard block |
||
| 617 | 617 | /** |
| 618 | 618 | * Assert that the matching email was sent since the last call to clearEmails() |
| 619 | 619 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
| 620 | - * @param $to |
|
| 620 | + * @param string $to |
|
| 621 | 621 | * @param $from |
| 622 | - * @param $subject |
|
| 623 | - * @param $content |
|
| 622 | + * @param string $subject |
|
| 623 | + * @param string $content |
|
| 624 | 624 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
| 625 | 625 | * 'customHeaders', 'htmlContent', inlineImages' |
| 626 | 626 | */ |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | * @param string $expectedSQL |
| 795 | 795 | * @param string $actualSQL |
| 796 | 796 | * @param string $message |
| 797 | - * @param float|int $delta |
|
| 797 | + * @param integer $delta |
|
| 798 | 798 | * @param integer $maxDepth |
| 799 | 799 | * @param boolean $canonicalize |
| 800 | 800 | * @param boolean $ignoreCase |