@@ -85,7 +85,7 @@ |
||
| 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 | { |
@@ -26,6 +26,9 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | const ISO_TIME = 'HH:mm:ss'; |
| 28 | 28 | |
| 29 | + /** |
|
| 30 | + * @param string $value |
|
| 31 | + */ |
|
| 29 | 32 | public function setValue($value, $record = null, $markChanged = true) |
| 30 | 33 | { |
| 31 | 34 | $value = $this->parseTime($value); |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | * Return a date formatted as per a CMS user's settings. |
| 246 | 246 | * |
| 247 | 247 | * @param Member $member |
| 248 | - * @return boolean | string A date formatted as per user-defined settings. |
|
| 248 | + * @return null|string | string A date formatted as per user-defined settings. |
|
| 249 | 249 | */ |
| 250 | 250 | public function FormatFromSettings($member = null) |
| 251 | 251 | { |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | * Attempt to split date string into year, month, day, and timestamp components. |
| 552 | 552 | * |
| 553 | 553 | * @param string $value |
| 554 | - * @return array |
|
| 554 | + * @return string[] |
|
| 555 | 555 | */ |
| 556 | 556 | protected function explodeDateString($value) |
| 557 | 557 | { |
@@ -31,6 +31,9 @@ |
||
| 31 | 31 | Injector::inst()->get(CacheInterface::class . '.cacheblock')->clear(); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | + /** |
|
| 35 | + * @param string $template |
|
| 36 | + */ |
|
| 34 | 37 | protected function _runtemplate($template, $data = null) |
| 35 | 38 | { |
| 36 | 39 | if ($data === null) { |
@@ -925,7 +925,7 @@ discard block |
||
| 925 | 925 | /** |
| 926 | 926 | * Returns true if the given file exists. Filename should be relative to the site root. |
| 927 | 927 | * |
| 928 | - * @param $file |
|
| 928 | + * @param string $file |
|
| 929 | 929 | * |
| 930 | 930 | * @return bool |
| 931 | 931 | */ |
@@ -1153,7 +1153,7 @@ discard block |
||
| 1153 | 1153 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
| 1154 | 1154 | * {@link Director::isLive()}. |
| 1155 | 1155 | * |
| 1156 | - * @return bool |
|
| 1156 | + * @return string |
|
| 1157 | 1157 | */ |
| 1158 | 1158 | public static function get_environment_type() |
| 1159 | 1159 | { |
@@ -28,6 +28,10 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | protected $composerData = null; |
| 30 | 30 | |
| 31 | + /** |
|
| 32 | + * @param string $path |
|
| 33 | + * @param string $base |
|
| 34 | + */ |
|
| 31 | 35 | public function __construct($path, $base) |
| 32 | 36 | { |
| 33 | 37 | $this->path = rtrim($path, '/\\'); |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | * Find an attribute in a SimpleXMLElement object by name. |
| 227 | 227 | * @param SimpleXMLElement $object |
| 228 | 228 | * @param string $attribute Name of attribute to find |
| 229 | - * @return SimpleXMLElement object of the attribute |
|
| 229 | + * @return boolean object of the attribute |
|
| 230 | 230 | */ |
| 231 | 231 | public function findAttribute($object, $attribute) |
| 232 | 232 | { |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | * Note: characters are stripped from the content; make sure that your assertions take this into account. |
| 261 | 261 | * |
| 262 | 262 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
| 263 | - * @param array|string $expectedMatches The content of at least one of the matched tags |
|
| 263 | + * @param string[] $expectedMatches The content of at least one of the matched tags |
|
| 264 | 264 | * @param string $message |
| 265 | 265 | * @throws PHPUnit_Framework_AssertionFailedError |
| 266 | 266 | */ |
@@ -184,6 +184,9 @@ discard block |
||
| 184 | 184 | return self::$is_running_test; |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | + /** |
|
| 188 | + * @param boolean $bool |
|
| 189 | + */ |
|
| 187 | 190 | public static function set_is_running_test($bool) |
| 188 | 191 | { |
| 189 | 192 | self::$is_running_test = $bool; |
@@ -658,10 +661,10 @@ discard block |
||
| 658 | 661 | /** |
| 659 | 662 | * Assert that the matching email was sent since the last call to clearEmails() |
| 660 | 663 | * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression. |
| 661 | - * @param $to |
|
| 664 | + * @param string $to |
|
| 662 | 665 | * @param $from |
| 663 | - * @param $subject |
|
| 664 | - * @param $content |
|
| 666 | + * @param string $subject |
|
| 667 | + * @param string $content |
|
| 665 | 668 | * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles', |
| 666 | 669 | * 'customHeaders', 'htmlContent', inlineImages' |
| 667 | 670 | */ |
@@ -894,7 +897,7 @@ discard block |
||
| 894 | 897 | * @param string $expectedSQL |
| 895 | 898 | * @param string $actualSQL |
| 896 | 899 | * @param string $message |
| 897 | - * @param float|int $delta |
|
| 900 | + * @param integer $delta |
|
| 898 | 901 | * @param integer $maxDepth |
| 899 | 902 | * @param boolean $canonicalize |
| 900 | 903 | * @param boolean $ignoreCase |
@@ -165,6 +165,11 @@ |
||
| 165 | 165 | return sprintf('%02d', self::$cost) . '$' . substr($generator->randomToken('sha1'), 0, 22); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | + /** |
|
| 169 | + * @param string|false $hash |
|
| 170 | + * @param string $password |
|
| 171 | + * @param string $salt |
|
| 172 | + */ |
|
| 168 | 173 | public function check($hash, $password, $salt = null, $member = null) |
| 169 | 174 | { |
| 170 | 175 | if (strpos($hash, '$2y$') === 0) { |