@@ -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'; |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | * Creates a single file based on a form-urlencoded upload. |
314 | 314 | * |
315 | 315 | * @param SS_HTTPRequest $request |
316 | - * @return SS_HTTPRequest|SS_HTTPResponse |
|
316 | + * @return SS_HTTPResponse |
|
317 | 317 | */ |
318 | 318 | public function apiCreateFile(SS_HTTPRequest $request) |
319 | 319 | { |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | * Creates a single folder, within an optional parent folder. |
375 | 375 | * |
376 | 376 | * @param SS_HTTPRequest $request |
377 | - * @return SS_HTTPRequest|SS_HTTPResponse |
|
377 | + * @return SS_HTTPResponse |
|
378 | 378 | */ |
379 | 379 | public function apiCreateFolder(SS_HTTPRequest $request) |
380 | 380 | { |