@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use SilverStripe\Security\SecurityToken; |
| 15 | 15 | use SilverStripe\Dev\CSSContentParser; |
| 16 | 16 | use SilverStripe\Dev\SapphireTest; |
| 17 | -use SilverStripe\Control\Controller; |
|
| 18 | 17 | use SilverStripe\Control\HTTPRequest; |
| 19 | 18 | use SilverStripe\Control\Session; |
| 20 | 19 | use SilverStripe\Forms\FieldList; |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | use SilverStripe\Security\Member; |
| 12 | 12 | use SilverStripe\Dev\CSSContentParser; |
| 13 | 13 | use SilverStripe\Dev\SapphireTest; |
| 14 | -use SilverStripe\Control\Controller; |
|
| 15 | 14 | use SilverStripe\Forms\FieldList; |
| 16 | 15 | use SilverStripe\Forms\Form; |
| 17 | 16 | use SilverStripe\Forms\GridField\GridFieldConfig; |
@@ -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; |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * @param string $url The URL to visit. |
| 251 | 251 | * @param array $postVars The $_POST & $_FILES variables. |
| 252 | - * @param array|Session $session The {@link Session} object representing the current session. |
|
| 252 | + * @param Session|null $session The {@link Session} object representing the current session. |
|
| 253 | 253 | * By passing the same object to multiple calls of Director::test(), you can simulate a persisted |
| 254 | 254 | * session. |
| 255 | 255 | * @param string $httpMethod The HTTP method, such as GET or POST. It will default to POST if |
@@ -928,7 +928,7 @@ discard block |
||
| 928 | 928 | /** |
| 929 | 929 | * Returns true if the given file exists. Filename should be relative to the site root. |
| 930 | 930 | * |
| 931 | - * @param $file |
|
| 931 | + * @param string $file |
|
| 932 | 932 | * |
| 933 | 933 | * @return bool |
| 934 | 934 | */ |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | * Can also be checked with {@link Director::isDev()}, {@link Director::isTest()}, and |
| 1157 | 1157 | * {@link Director::isLive()}. |
| 1158 | 1158 | * |
| 1159 | - * @return bool |
|
| 1159 | + * @return string |
|
| 1160 | 1160 | */ |
| 1161 | 1161 | public static function get_environment_type() |
| 1162 | 1162 | { |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | * Remove an existing HTTP header |
| 350 | 350 | * |
| 351 | 351 | * @param string $header |
| 352 | - * @return mixed |
|
| 352 | + * @return string |
|
| 353 | 353 | */ |
| 354 | 354 | public function getHeader($header) |
| 355 | 355 | { |
@@ -458,9 +458,9 @@ discard block |
||
| 458 | 458 | * it's only advisable to send small files through this method. |
| 459 | 459 | * |
| 460 | 460 | * @static |
| 461 | - * @param $fileData |
|
| 461 | + * @param string $fileData |
|
| 462 | 462 | * @param $fileName |
| 463 | - * @param null $mimeType |
|
| 463 | + * @param string $mimeType |
|
| 464 | 464 | * @return HTTPResponse |
| 465 | 465 | */ |
| 466 | 466 | public static function send_file($fileData, $fileName, $mimeType = null) |
@@ -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); |