@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | |
| 561 | 561 | /** |
| 562 | 562 | * @param bool $unlinked |
| 563 | - * @return ArrayList |
|
| 563 | + * @return \ArrayList |
|
| 564 | 564 | */ |
| 565 | 565 | public function breadcrumbs($unlinked = false) |
| 566 | 566 | { |
@@ -605,6 +605,7 @@ discard block |
||
| 605 | 605 | /** |
| 606 | 606 | * Don't include class namespace in template names |
| 607 | 607 | * @todo Make code in framework more namespace-savvy so that we don't need this duplication |
| 608 | + * @param string $suffix |
|
| 608 | 609 | */ |
| 609 | 610 | public function getTemplatesWithSuffix($suffix) |
| 610 | 611 | { |
@@ -18,7 +18,6 @@ discard block |
||
| 18 | 18 | use Form; |
| 19 | 19 | use FormAction; |
| 20 | 20 | use CheckboxField; |
| 21 | -use Convert; |
|
| 22 | 21 | use ArrayData; |
| 23 | 22 | use File; |
| 24 | 23 | use Session; |
@@ -30,7 +29,6 @@ discard block |
||
| 30 | 29 | use Folder; |
| 31 | 30 | use Security; |
| 32 | 31 | use CMSForm; |
| 33 | -use CMSBatchAction; |
|
| 34 | 32 | use SS_List; |
| 35 | 33 | use CompositeField; |
| 36 | 34 | use SSViewer; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * |
| 148 | 148 | * @param SS_HTTPRequest $request |
| 149 | 149 | * |
| 150 | - * @return SS_HTTPResponse |
|
| 150 | + * @return Controller|null |
|
| 151 | 151 | */ |
| 152 | 152 | public function item(SS_HTTPRequest $request) |
| 153 | 153 | { |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | /** |
| 539 | 539 | * @param null|string $folder |
| 540 | 540 | * |
| 541 | - * @return null|Folder |
|
| 541 | + * @return null|\DataObject |
|
| 542 | 542 | */ |
| 543 | 543 | protected function getFolder($folder = null) |
| 544 | 544 | { |
@@ -775,7 +775,6 @@ discard block |
||
| 775 | 775 | } |
| 776 | 776 | |
| 777 | 777 | /** |
| 778 | - * @param boolean $bulkActions |
|
| 779 | 778 | * |
| 780 | 779 | * @return $this |
| 781 | 780 | */ |
@@ -11,8 +11,6 @@ |
||
| 11 | 11 | use SS_HTTPRequest; |
| 12 | 12 | use SS_HTTPResponse; |
| 13 | 13 | use DataList; |
| 14 | -use Convert; |
|
| 15 | -use SilverStripe\Filesystem\Storage\AssetContainer; |
|
| 16 | 14 | |
| 17 | 15 | /** |
| 18 | 16 | * Class AssetGalleryField |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | * This method is identical to `AssetGalleryField::getObjectFromData`. |
| 49 | 49 | * Ideally this would be on File, and be available at some endpoint, similar to the form field schema. |
| 50 | 50 | * |
| 51 | - * @param $file |
|
| 51 | + * @param \SilverStripe\Filesystem\Storage\AssetContainer $file |
|
| 52 | 52 | * |
| 53 | 53 | * @return array |
| 54 | 54 | */ |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SS_HTTPRequest; |
| 8 | 8 | use SS_HTTPResponse; |
| 9 | 9 | use Folder; |
| 10 | -use DataObject; |
|
| 11 | 10 | |
| 12 | 11 | /** |
| 13 | 12 | * Class DropzoneUploadField |
@@ -2,13 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Cms\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use SilverStripe\BehatExtension\Context\SilverStripeContext, |
|
| 6 | - SilverStripe\BehatExtension\Context\BasicContext, |
|
| 7 | - SilverStripe\BehatExtension\Context\LoginContext, |
|
| 8 | - SilverStripe\BehatExtension\Context\FixtureContext, |
|
| 9 | - SilverStripe\Framework\Test\Behaviour\CmsFormsContext, |
|
| 10 | - SilverStripe\Framework\Test\Behaviour\CmsUiContext, |
|
| 11 | - SilverStripe\Cms\Test\Behaviour; |
|
| 5 | +use SilverStripe\BehatExtension\Context\FixtureContext; |
|
| 6 | +use SilverStripe\Cms\Test\Behaviour; |
|
| 12 | 7 | |
| 13 | 8 | // PHPUnit |
| 14 | 9 | require_once 'PHPUnit/Autoload.php'; |
@@ -52,6 +52,9 @@ discard block |
||
| 52 | 52 | $this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | + /** |
|
| 56 | + * @param string $filename |
|
| 57 | + */ |
|
| 55 | 58 | protected function requireFile($filename, $content) |
| 56 | 59 | { |
| 57 | 60 | // Already exists |
@@ -69,6 +72,9 @@ discard block |
||
| 69 | 72 | } |
| 70 | 73 | } |
| 71 | 74 | |
| 75 | + /** |
|
| 76 | + * @param string $dirname |
|
| 77 | + */ |
|
| 72 | 78 | protected function requireDir($dirname) |
| 73 | 79 | { |
| 74 | 80 | // Directory doesn't exist, create it and mark it for deletion |
@@ -2,15 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Cms\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use Behat\Behat\Context\ClosuredContextInterface, |
|
| 6 | - Behat\Behat\Context\TranslatedContextInterface, |
|
| 7 | - Behat\Behat\Context\BehatContext, |
|
| 8 | - Behat\Behat\Context\Step, |
|
| 9 | - Behat\Behat\Event\StepEvent, |
|
| 10 | - Behat\Behat\Exception\PendingException, |
|
| 11 | - Behat\Mink\Driver\Selenium2Driver, |
|
| 12 | - Behat\Gherkin\Node\PyStringNode, |
|
| 13 | - Behat\Gherkin\Node\TableNode; |
|
| 5 | +use Behat\Behat\Context\BehatContext; |
|
| 14 | 6 | |
| 15 | 7 | // PHPUnit |
| 16 | 8 | require_once 'PHPUnit/Autoload.php'; |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | * @param string $from Created from date |
| 54 | 54 | * @param string $to Createi to date |
| 55 | 55 | * @param string $category |
| 56 | - * @return SS_List |
|
| 56 | + * @return \SS_List |
|
| 57 | 57 | */ |
| 58 | 58 | protected function getResultsForSearch($name = '', $from = '', $to = '', $category = '') |
| 59 | 59 | { |