@@ -54,6 +54,9 @@ discard block |
||
| 54 | 54 | $this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | + /** |
|
| 58 | + * @param string $filename |
|
| 59 | + */ |
|
| 57 | 60 | protected function requireFile($filename, $content) |
| 58 | 61 | { |
| 59 | 62 | // Already exists |
@@ -71,6 +74,9 @@ discard block |
||
| 71 | 74 | } |
| 72 | 75 | } |
| 73 | 76 | |
| 77 | + /** |
|
| 78 | + * @param string $dirname |
|
| 79 | + */ |
|
| 74 | 80 | protected function requireDir($dirname) |
| 75 | 81 | { |
| 76 | 82 | // Directory doesn't exist, create it and mark it for deletion |
@@ -2,15 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Siteconfig\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use Behat\Behat\Context\ClosuredContextInterface; |
|
| 6 | -use Behat\Behat\Context\TranslatedContextInterface; |
|
| 7 | 5 | use Behat\Behat\Context\BehatContext; |
| 8 | -use Behat\Behat\Context\Step; |
|
| 9 | -use Behat\Behat\Event\StepEvent; |
|
| 10 | -use Behat\Behat\Exception\PendingException; |
|
| 11 | -use Behat\Mink\Driver\Selenium2Driver; |
|
| 12 | -use Behat\Gherkin\Node\PyStringNode; |
|
| 13 | -use Behat\Gherkin\Node\TableNode; |
|
| 14 | 6 | |
| 15 | 7 | /** |
| 16 | 8 | * Context used to create fixtures in the SilverStripe ORM. |
@@ -242,7 +242,7 @@ |
||
| 242 | 242 | * Can a user view this SiteConfig instance? |
| 243 | 243 | * |
| 244 | 244 | * @param Member $member |
| 245 | - * @return boolean |
|
| 245 | + * @return boolean|string |
|
| 246 | 246 | */ |
| 247 | 247 | public function canView($member = null) |
| 248 | 248 | { |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | * |
| 135 | 135 | * @param array $data |
| 136 | 136 | * @param Form $form |
| 137 | - * @return String |
|
| 137 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 138 | 138 | */ |
| 139 | 139 | public function save_siteconfig($data, $form) |
| 140 | 140 | { |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use SilverStripe\Forms\HiddenField; |
| 9 | 9 | use SilverStripe\Forms\LiteralField; |
| 10 | 10 | use SilverStripe\Forms\Form; |
| 11 | -use SilverStripe\ORM\ValidationException; |
|
| 12 | 11 | use SilverStripe\ORM\ArrayList; |
| 13 | 12 | use SilverStripe\ORM\ValidationResult; |
| 14 | 13 | use SilverStripe\View\ArrayData; |
@@ -2,9 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Siteconfig\Test\Behaviour; |
| 4 | 4 | |
| 5 | -use SilverStripe\BehatExtension\Context\SilverStripeContext; |
|
| 6 | -use SilverStripe\BehatExtension\Context\BasicContext; |
|
| 7 | -use SilverStripe\BehatExtension\Context\LoginContext; |
|
| 8 | 5 | use SilverStripe\BehatExtension\Context\FixtureContext; |
| 9 | 6 | use SilverStripe\Cms\Test\Behaviour; |
| 10 | 7 | use SilverStripe\Core\ClassInfo; |