@@ -512,7 +512,7 @@ |
||
| 512 | 512 | * Get the HTML class attribute from a node in the sitetree |
| 513 | 513 | * |
| 514 | 514 | * @param $html |
| 515 | - * @param $node |
|
| 515 | + * @param DataObject|null $node |
|
| 516 | 516 | * @return string |
| 517 | 517 | */ |
| 518 | 518 | protected function getNodeClassFromTree($html, $node) { |
@@ -1,10 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | use Filesystem as SS_Filesystem; |
| 4 | -use League\Flysystem\Filesystem; |
|
| 5 | -use SilverStripe\Filesystem\Flysystem\AssetAdapter; |
|
| 6 | -use SilverStripe\Filesystem\Flysystem\FlysystemAssetStore; |
|
| 7 | -use SilverStripe\Filesystem\Flysystem\FlysystemUrlPlugin; |
|
| 8 | 4 | |
| 9 | 5 | /** |
| 10 | 6 | * @package framework |
@@ -651,7 +651,7 @@ |
||
| 651 | 651 | * Ensures that the latest version of a record is the expected value |
| 652 | 652 | * |
| 653 | 653 | * @param type $record |
| 654 | - * @param type $version |
|
| 654 | + * @param integer $version |
|
| 655 | 655 | */ |
| 656 | 656 | protected function assertRecordHasLatestVersion($record, $version) { |
| 657 | 657 | foreach(ClassInfo::ancestry(get_class($record), true) as $table) { |
@@ -175,6 +175,9 @@ |
||
| 175 | 175 | $this->assertEquals('', $this->parser->parse('[test_shortcode][test_shortcode]')); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | + /** |
|
| 179 | + * @param string $a |
|
| 180 | + */ |
|
| 178 | 181 | protected function assertEqualsIgnoringWhitespace($a, $b, $message = null) { |
| 179 | 182 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message); |
| 180 | 183 | } |
@@ -175,6 +175,10 @@ |
||
| 175 | 175 | |
| 176 | 176 | class GroupTest_MemberForm extends Form { |
| 177 | 177 | |
| 178 | + /** |
|
| 179 | + * @param GroupTest $controller |
|
| 180 | + * @param string $name |
|
| 181 | + */ |
|
| 178 | 182 | public function __construct($controller, $name) { |
| 179 | 183 | $fields = singleton('GroupTest_Member')->getCMSFields(); |
| 180 | 184 | $actions = new FieldList( |
@@ -913,6 +913,9 @@ |
||
| 913 | 913 | */ |
| 914 | 914 | class MemberTest_ValidatorExtension extends DataExtension implements TestOnly { |
| 915 | 915 | |
| 916 | + /** |
|
| 917 | + * @param Member_Validator $validator |
|
| 918 | + */ |
|
| 916 | 919 | public function updateValidator(&$validator) { |
| 917 | 920 | $validator->addRequiredField('Surname'); |
| 918 | 921 | $validator->removeRequiredField('FirstName'); |
@@ -580,6 +580,8 @@ discard block |
||
| 580 | 580 | /** |
| 581 | 581 | * Execute a log-in form using Director::test(). |
| 582 | 582 | * Helper method for the tests above |
| 583 | + * @param string $email |
|
| 584 | + * @param string $password |
|
| 583 | 585 | */ |
| 584 | 586 | public function doTestLoginForm($email, $password, $backURL = 'test/link') { |
| 585 | 587 | $this->get(Config::inst()->get('Security', 'logout_url')); |
@@ -600,6 +602,8 @@ discard block |
||
| 600 | 602 | |
| 601 | 603 | /** |
| 602 | 604 | * Helper method to execute a change password form |
| 605 | + * @param string $oldPassword |
|
| 606 | + * @param string $newPassword |
|
| 603 | 607 | */ |
| 604 | 608 | public function doTestChangepasswordForm($oldPassword, $newPassword) { |
| 605 | 609 | return $this->submitForm( |
@@ -5,6 +5,7 @@ |
||
| 5 | 5 | /** |
| 6 | 6 | * Small helper to render templates from strings |
| 7 | 7 | * Cloned from SSViewerTest |
| 8 | + * @param string $templateString |
|
| 8 | 9 | */ |
| 9 | 10 | private function render($templateString, $data = null) { |
| 10 | 11 | $t = SSViewer::fromString($templateString); |
@@ -28,6 +28,9 @@ discard block |
||
| 28 | 28 | "Versioned('Stage', 'Live')" |
| 29 | 29 | ); |
| 30 | 30 | |
| 31 | + /** |
|
| 32 | + * @param string $entropy |
|
| 33 | + */ |
|
| 31 | 34 | public function setEntropy($entropy) { |
| 32 | 35 | $this->entropy = $entropy; |
| 33 | 36 | } |
@@ -53,6 +56,9 @@ discard block |
||
| 53 | 56 | SS_Cache::set_cache_lifetime('cacheblock', $cacheOn ? 600 : -1); |
| 54 | 57 | } |
| 55 | 58 | |
| 59 | + /** |
|
| 60 | + * @param string $template |
|
| 61 | + */ |
|
| 56 | 62 | protected function _runtemplate($template, $data = null) { |
| 57 | 63 | if ($data === null) $data = $this->data; |
| 58 | 64 | if (is_array($data)) $data = $this->data->customise($data); |