@@ -12,8 +12,6 @@ |
||
12 | 12 | * Note: While the returned object is used as a singleton (by the originating Injector->get() call), |
13 | 13 | * this cache object shouldn't be a singleton itself - it has varying constructor args for the same service name. |
14 | 14 | * |
15 | - * @param string $class |
|
16 | - * @param array $args |
|
17 | 15 | * @return CacheInterface |
18 | 16 | */ |
19 | 17 | public function create($service, array $params = array()); |
@@ -1002,7 +1002,7 @@ discard block |
||
1002 | 1002 | * {@link SSViewer::get_templates_by_class()} |
1003 | 1003 | * |
1004 | 1004 | * @param string $suffix |
1005 | - * @return array |
|
1005 | + * @return string |
|
1006 | 1006 | */ |
1007 | 1007 | public function getTemplatesWithSuffix($suffix) |
1008 | 1008 | { |
@@ -2154,7 +2154,7 @@ discard block |
||
2154 | 2154 | } |
2155 | 2155 | |
2156 | 2156 | /** |
2157 | - * @return String |
|
2157 | + * @return DBField |
|
2158 | 2158 | */ |
2159 | 2159 | public function Locale() |
2160 | 2160 | { |
@@ -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); |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | * The callback can opt out of handling specific responses by returning NULL, |
495 | 495 | * in which case the default form behaviour will kick in. |
496 | 496 | * |
497 | - * @param $callback |
|
497 | + * @param \Closure $callback |
|
498 | 498 | * @return self |
499 | 499 | */ |
500 | 500 | public function setValidationResponseCallback($callback) |
@@ -596,6 +596,7 @@ discard block |
||
596 | 596 | * Set actions that are exempt from validation |
597 | 597 | * |
598 | 598 | * @param array |
599 | + * @param string[] $actions |
|
599 | 600 | * @return $this |
600 | 601 | */ |
601 | 602 | public function setValidationExemptActions($actions) |
@@ -1043,7 +1044,7 @@ discard block |
||
1043 | 1044 | * If set to false (the default), then the form method is only used to construct the default |
1044 | 1045 | * form. |
1045 | 1046 | * |
1046 | - * @param $bool boolean |
|
1047 | + * @param boolean $bool boolean |
|
1047 | 1048 | * @return $this |
1048 | 1049 | */ |
1049 | 1050 | public function setStrictFormMethodCheck($bool) |