@@ -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) { |
@@ -163,6 +163,9 @@ discard block |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
| 166 | + /** |
|
| 167 | + * @param string $fileID |
|
| 168 | + */ |
|
| 166 | 169 | public function getOriginalFilename($fileID) |
| 167 | 170 | { |
| 168 | 171 | return parent::getOriginalFilename($fileID); |
@@ -173,6 +176,9 @@ discard block |
||
| 173 | 176 | return parent::removeVariant($fileID); |
| 174 | 177 | } |
| 175 | 178 | |
| 179 | + /** |
|
| 180 | + * @param null|string $variant |
|
| 181 | + */ |
|
| 176 | 182 | public function getDefaultConflictResolution($variant) |
| 177 | 183 | { |
| 178 | 184 | return parent::getDefaultConflictResolution($variant); |
@@ -390,7 +390,7 @@ |
||
| 390 | 390 | /** |
| 391 | 391 | * Fields can have action to, let's check if anyone of the responds to $funcname them |
| 392 | 392 | * |
| 393 | - * @param SS_List|array $fields |
|
| 393 | + * @param FieldList $fields |
|
| 394 | 394 | * @param callable $funcName |
| 395 | 395 | * @return FormField |
| 396 | 396 | */ |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | /** |
| 79 | 79 | * Determine if apcu is supported |
| 80 | 80 | * |
| 81 | - * @return bool |
|
| 81 | + * @return boolean|null |
|
| 82 | 82 | */ |
| 83 | 83 | protected function isAPCUSupported() |
| 84 | 84 | { |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | /** |
| 93 | 93 | * Determine if PHP files is supported |
| 94 | 94 | * |
| 95 | - * @return bool |
|
| 95 | + * @return boolean|null |
|
| 96 | 96 | */ |
| 97 | 97 | protected function isPHPFilesSupported() |
| 98 | 98 | { |