@@ -1,7 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use SilverStripe\Core\Convert; |
| 4 | -use SilverStripe\Core\Config\Config; |
|
| 5 | 4 | use SilverStripe\Dev\SapphireTest; |
| 6 | 5 | use SilverStripe\View\Parsers\URLSegmentFilter; |
| 7 | 6 | |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use SilverStripe\ORM\DataObject; |
|
| 4 | 3 | use SilverStripe\Security\Member; |
| 5 | 4 | use SilverStripe\Security\Permission; |
| 6 | 5 | use SilverStripe\Security\Security; |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 | /** |
| 130 | 130 | * |
| 131 | 131 | * @param GridField $gridField |
| 132 | - * @return array |
|
| 132 | + * @return string[] |
|
| 133 | 133 | */ |
| 134 | 134 | public function getActions($gridField) { |
| 135 | 135 | return array('addto'); |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Filesystem\ImageManipulation; |
| 6 | 6 | use SilverStripe\Filesystem\Storage\AssetContainer; |
| 7 | 7 | use SilverStripe\Filesystem\Storage\AssetStore; |
| 8 | - |
|
| 9 | 8 | use Injector; |
| 10 | 9 | use AssetField; |
| 11 | 10 | use File; |
@@ -127,6 +127,10 @@ discard block |
||
| 127 | 127 | ); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | + /** |
|
| 131 | + * @param boolean $async |
|
| 132 | + * @param boolean $defer |
|
| 133 | + */ |
|
| 130 | 134 | protected function setupCombinedRequirementsJavascriptAsyncDefer($backend, $async, $defer) { |
| 131 | 135 | $basePath = $this->getCurrentRelativePath(); |
| 132 | 136 | $this->setupRequirements($backend); |
@@ -836,6 +840,9 @@ discard block |
||
| 836 | 840 | } |
| 837 | 841 | } |
| 838 | 842 | |
| 843 | + /** |
|
| 844 | + * @param string $type |
|
| 845 | + */ |
|
| 839 | 846 | public function assertFileNotIncluded($backend, $type, $files) { |
| 840 | 847 | $includedFiles = $this->getBackendFiles($backend, $type); |
| 841 | 848 | if(is_array($files)) { |
@@ -356,7 +356,7 @@ |
||
| 356 | 356 | * Simulates a file upload |
| 357 | 357 | * |
| 358 | 358 | * @param string $fileField Name of the field to mock upload for |
| 359 | - * @param array $tmpFileName Name of temporary file to upload |
|
| 359 | + * @param string $tmpFileName Name of temporary file to upload |
|
| 360 | 360 | * @return HTTPResponse form response |
| 361 | 361 | */ |
| 362 | 362 | protected function mockFileUpload($fileField, $tmpFileName) { |
@@ -946,7 +946,7 @@ discard block |
||
| 946 | 946 | * Simulates a file upload |
| 947 | 947 | * |
| 948 | 948 | * @param string $fileField Name of the field to mock upload for |
| 949 | - * @param array $tmpFileName Name of temporary file to upload |
|
| 949 | + * @param string $tmpFileName Name of temporary file to upload |
|
| 950 | 950 | * @return HTTPResponse form response |
| 951 | 951 | */ |
| 952 | 952 | protected function mockFileUpload($fileField, $tmpFileName) { |
@@ -958,6 +958,9 @@ discard block |
||
| 958 | 958 | ); |
| 959 | 959 | } |
| 960 | 960 | |
| 961 | + /** |
|
| 962 | + * @param string $fileField |
|
| 963 | + */ |
|
| 961 | 964 | protected function mockFileExists($fileField, $fileName) { |
| 962 | 965 | return $this->get( |
| 963 | 966 | "UploadFieldTest_Controller/Form/field/{$fileField}/fileexists?filename=".urlencode($fileName) |
@@ -1,9 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use League\Flysystem\Filesystem; |
|
| 4 | -use SilverStripe\Assets\Flysystem\AssetAdapter; |
|
| 5 | -use SilverStripe\Assets\Flysystem\FlysystemAssetStore; |
|
| 6 | -use SilverStripe\Assets\Flysystem\FlysystemUrlPlugin; |
|
| 7 | 3 | use SilverStripe\Assets\File; |
| 8 | 4 | use SilverStripe\Assets\Filesystem as SSFilesystem; |
| 9 | 5 | use SilverStripe\Assets\Image; |
@@ -160,7 +160,7 @@ |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * @param string|array $content If passed as an array, values will be concatenated with a comma. |
|
| 163 | + * @param string $content If passed as an array, values will be concatenated with a comma. |
|
| 164 | 164 | * @return array |
| 165 | 165 | */ |
| 166 | 166 | public static function getHTMLChunks($content) { |