@@ -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 | */ |
@@ -2,14 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Dev; |
| 4 | 4 | |
| 5 | -use SilverStripe\Control\Controller; |
|
| 6 | 5 | use SilverStripe\Control\Session; |
| 7 | 6 | use SilverStripe\Control\HTTPResponse; |
| 8 | 7 | use SilverStripe\Core\Config\Config; |
| 9 | -use SilverStripe\ORM\DataObject; |
|
| 10 | 8 | use SilverStripe\Security\BasicAuth; |
| 11 | -use SilverStripe\Security\Member; |
|
| 12 | -use SilverStripe\Security\Security; |
|
| 13 | 9 | use SilverStripe\Security\SecurityToken; |
| 14 | 10 | use SilverStripe\View\SSViewer; |
| 15 | 11 | use PHPUnit_Framework_AssertionFailedError; |
@@ -388,7 +388,7 @@ |
||
| 388 | 388 | /** |
| 389 | 389 | * Fields can have action to, let's check if anyone of the responds to $funcname them |
| 390 | 390 | * |
| 391 | - * @param SS_List|array $fields |
|
| 391 | + * @param FieldList $fields |
|
| 392 | 392 | * @param callable $funcName |
| 393 | 393 | * @return FormField |
| 394 | 394 | */ |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use BadMethodCallException; |
| 6 | 6 | use SilverStripe\Control\Controller; |
| 7 | -use SilverStripe\Control\Director; |
|
| 8 | 7 | use SilverStripe\Control\HTTPRequest; |
| 9 | 8 | use SilverStripe\Control\HTTPResponse; |
| 10 | 9 | use SilverStripe\Control\HTTPResponse_Exception; |
@@ -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) { |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Forms\HTMLEditor\HTMLEditorField; |
| 6 | 6 | use SilverStripe\Dev\SapphireTest; |
| 7 | -use SilverStripe\Control\Controller; |
|
| 8 | 7 | use SilverStripe\Forms\FieldList; |
| 9 | 8 | use SilverStripe\Forms\Form; |
| 10 | 9 | use SilverStripe\Forms\Tests\FormScaffolderTest\Article; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Forms\Tests\GridField; |
| 4 | 4 | |
| 5 | -use SilverStripe\Control\Controller; |
|
| 6 | 5 | use SilverStripe\Dev\CSSContentParser; |
| 7 | 6 | use SilverStripe\Dev\FunctionalTest; |
| 8 | 7 | use SilverStripe\Forms\FieldList; |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\ORM\Tests; |
| 4 | 4 | |
| 5 | -use SilverStripe\Assets\Tests\FileMigrationHelperTest\Extension; |
|
| 6 | -use SilverStripe\Core\Config\Middleware\ExtensionMiddleware; |
|
| 7 | -use SilverStripe\Dev\Debug; |
|
| 8 | 5 | use SilverStripe\ORM\DataObject; |
| 9 | 6 | use SilverStripe\Core\Config\Config; |
| 10 | 7 | use SilverStripe\Dev\SapphireTest; |
@@ -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 | { |