@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | * @param mixed $data Data context |
| 649 | 649 | * @param array $arguments Additional arguments |
| 650 | 650 | * @param Object $scope |
| 651 | - * @return string Evaluated result |
|
| 651 | + * @return DBHTMLText Evaluated result |
|
| 652 | 652 | */ |
| 653 | 653 | public static function execute_template($template, $data, $arguments = null, $scope = null) |
| 654 | 654 | { |
@@ -676,6 +676,9 @@ discard block |
||
| 676 | 676 | return $v->process($data, $arguments); |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | + /** |
|
| 680 | + * @param string $content |
|
| 681 | + */ |
|
| 679 | 682 | public function parseTemplateContent($content, $template = "") |
| 680 | 683 | { |
| 681 | 684 | return $this->getParser()->compileString( |
@@ -33,6 +33,10 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected $underlay; |
| 35 | 35 | |
| 36 | + /** |
|
| 37 | + * @param ViewableData $item |
|
| 38 | + * @param ViewableData $inheritedScope |
|
| 39 | + */ |
|
| 36 | 40 | public function __construct($item, $overlay = null, $underlay = null, $inheritedScope = null) |
| 37 | 41 | { |
| 38 | 42 | parent::__construct($item, $inheritedScope); |
@@ -65,6 +69,10 @@ discard block |
||
| 65 | 69 | $this->underlay = $underlay ? $underlay : array(); |
| 66 | 70 | } |
| 67 | 71 | |
| 72 | + /** |
|
| 73 | + * @param string $interfaceToQuery |
|
| 74 | + * @param string $variableMethod |
|
| 75 | + */ |
|
| 68 | 76 | protected function createCallableArray(&$extraArray, $interfaceToQuery, $variableMethod, $createObject = false) |
| 69 | 77 | { |
| 70 | 78 | $implementers = ClassInfo::implementorsOf($interfaceToQuery); |
@@ -30,6 +30,9 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | protected $cacheTemplate; |
| 32 | 32 | |
| 33 | + /** |
|
| 34 | + * @param string $content |
|
| 35 | + */ |
|
| 33 | 36 | public function __construct($content, TemplateParser $parser = null) |
| 34 | 37 | { |
| 35 | 38 | if ($parser) { |
@@ -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\Dev\Debug; |
|
| 4 | 3 | use SilverStripe\ORM\DataObjectSchema; |
| 5 | 4 | use SilverStripe\ORM\DB; |
| 6 | 5 | use SilverStripe\ORM\HasManyList; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\ORM\Tests; |
| 4 | 4 | |
| 5 | -use SilverStripe\ORM\DB; |
|
| 6 | 5 | use SilverStripe\ORM\FieldType\DBVarchar; |
| 7 | 6 | use SilverStripe\ORM\FieldType\DBText; |
| 8 | 7 | use SilverStripe\ORM\FieldType\DBField; |
@@ -2,11 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\ORM\Tests; |
| 4 | 4 | |
| 5 | -use SilverStripe\ORM\DataObject; |
|
| 6 | -use SilverStripe\ORM\DataExtension; |
|
| 7 | 5 | use SilverStripe\Core\Object; |
| 8 | 6 | use SilverStripe\Dev\SapphireTest; |
| 9 | -use SilverStripe\Dev\TestOnly; |
|
| 10 | 7 | |
| 11 | 8 | class ManyManyListExtensionTest extends SapphireTest { |
| 12 | 9 | |
@@ -11,11 +11,9 @@ |
||
| 11 | 11 | use SilverStripe\Security\Member; |
| 12 | 12 | use SilverStripe\Security\MemberAuthenticator; |
| 13 | 13 | use SilverStripe\Security\Security; |
| 14 | -use SilverStripe\Security\Permission; |
|
| 15 | 14 | use SilverStripe\Core\Config\Config; |
| 16 | 15 | use SilverStripe\Core\Convert; |
| 17 | 16 | use SilverStripe\Dev\FunctionalTest; |
| 18 | -use SilverStripe\Dev\TestOnly; |
|
| 19 | 17 | use SilverStripe\Control\HTTPResponse; |
| 20 | 18 | use SilverStripe\Control\Session; |
| 21 | 19 | use SilverStripe\Control\Director; |
@@ -676,6 +676,8 @@ discard block |
||
| 676 | 676 | /** |
| 677 | 677 | * Execute a log-in form using Director::test(). |
| 678 | 678 | * Helper method for the tests above |
| 679 | + * @param string $email |
|
| 680 | + * @param string $password |
|
| 679 | 681 | */ |
| 680 | 682 | public function doTestLoginForm($email, $password, $backURL = 'test/link') |
| 681 | 683 | { |
@@ -697,6 +699,8 @@ discard block |
||
| 697 | 699 | |
| 698 | 700 | /** |
| 699 | 701 | * Helper method to execute a change password form |
| 702 | + * @param string $oldPassword |
|
| 703 | + * @param string $newPassword |
|
| 700 | 704 | */ |
| 701 | 705 | public function doTestChangepasswordForm($oldPassword, $newPassword) |
| 702 | 706 | { |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use SilverStripe\Dev\Debug; |
|
| 4 | 3 | use SilverStripe\ORM\DataObjectSchema; |
| 5 | 4 | use SilverStripe\ORM\DB; |
| 6 | 5 | use SilverStripe\ORM\HasManyList; |
@@ -173,6 +173,10 @@ discard block |
||
| 173 | 173 | ); |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | + /** |
|
| 177 | + * @param \SilverStripe\ORM\FieldType\DBHTMLText $result |
|
| 178 | + * @param string[] $expected |
|
| 179 | + */ |
|
| 176 | 180 | private function assertExpectedStrings($result, $expected) |
| 177 | 181 | { |
| 178 | 182 | foreach ($expected as $expectedStr) { |
@@ -1088,6 +1092,10 @@ discard block |
||
| 1088 | 1092 | $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult); |
| 1089 | 1093 | } |
| 1090 | 1094 | |
| 1095 | + /** |
|
| 1096 | + * @param string $a |
|
| 1097 | + * @param string $b |
|
| 1098 | + */ |
|
| 1091 | 1099 | public function assertEqualIgnoringWhitespace($a, $b, $message = '') |
| 1092 | 1100 | { |
| 1093 | 1101 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message); |
@@ -1816,6 +1824,11 @@ discard block |
||
| 1816 | 1824 | $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']); |
| 1817 | 1825 | } |
| 1818 | 1826 | } |
| 1827 | + |
|
| 1828 | + /** |
|
| 1829 | + * @param string $name |
|
| 1830 | + * @param string $expected |
|
| 1831 | + */ |
|
| 1819 | 1832 | private function _renderWithSourceFileComments($name, $expected) |
| 1820 | 1833 | { |
| 1821 | 1834 | $viewer = new SSViewer(array($name)); |