@@ -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) { |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace SilverStripe\Control\Tests; |
4 | 4 | |
5 | 5 | use InvalidArgumentException; |
6 | -use PHPUnit_Framework_Error; |
|
7 | -use SilverStripe\Control\RequestHandler; |
|
8 | 6 | use SilverStripe\Control\Tests\ControllerTest\AccessBaseController; |
9 | 7 | use SilverStripe\Control\Tests\ControllerTest\AccessSecuredController; |
10 | 8 | use SilverStripe\Control\Tests\ControllerTest\AccessWildcardSecuredController; |
@@ -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 | { |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | * table, or column name. Supports encoding of multi identfiers separated by |
204 | 204 | * a delimiter (e.g. ".") |
205 | 205 | * |
206 | - * @param string|array $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
206 | + * @param string $identifier The identifier to escape. E.g. 'SiteTree.Title' or list of identifiers |
|
207 | 207 | * to be joined via the separator. |
208 | 208 | * @param string $separator The string that delimits subsequent identifiers |
209 | 209 | * @return string The escaped identifier. E.g. '"SiteTree"."Title"' |
@@ -304,6 +304,7 @@ discard block |
||
304 | 304 | * call this function directly, Please use {@link Convert::xml2array()} |
305 | 305 | * |
306 | 306 | * @param SimpleXMLElement |
307 | + * @param SimpleXMLElement $xml |
|
307 | 308 | * |
308 | 309 | * @return mixed |
309 | 310 | */ |
@@ -517,7 +518,7 @@ discard block |
||
517 | 518 | * - IDField => idField |
518 | 519 | * - iDField => iDField |
519 | 520 | * |
520 | - * @param $str |
|
521 | + * @param string $str |
|
521 | 522 | * @return string |
522 | 523 | */ |
523 | 524 | public static function upperCamelToLowerCamel($str) |
@@ -140,6 +140,10 @@ |
||
140 | 140 | * |
141 | 141 | * @return BulkLoader_Result See {@link self::processAll()} |
142 | 142 | */ |
143 | + |
|
144 | + /** |
|
145 | + * @param string $filepath |
|
146 | + */ |
|
143 | 147 | public function load($filepath) |
144 | 148 | { |
145 | 149 | increase_time_limit_to(3600); |