Completed
Pull Request — 3.6 (#8611)
by Loz
10:02
created
tests/model/DbDatetimeTest.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -13,6 +13,7 @@
 block discarded – undo
13 13
 	/**
14 14
 	 * Check if dates match more or less. This takes into the account the db query
15 15
 	 * can overflow to the next second giving offset readings.
16
+	 * @param integer $offset
16 17
 	 */
17 18
 	private function matchesRoughly($date1, $date2, $comment = '', $offset) {
18 19
 		$allowedDifference = 5 + abs($offset); // seconds
Please login to merge, or discard this patch.
tests/model/HierarchyTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -512,7 +512,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
tests/parsers/ShortcodeParserTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -175,6 +175,10 @@
 block discarded – undo
175 175
 		$this->assertEquals('', $this->parser->parse('[test_shortcode][test_shortcode]'));
176 176
 	}
177 177
 	
178
+	/**
179
+	 * @param string $a
180
+	 * @param string $b
181
+	 */
178 182
 	protected function assertEqualsIgnoringWhitespace($a, $b, $message = null) {
179 183
 		$this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message);
180 184
 	}
Please login to merge, or discard this patch.
tests/security/GroupTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -175,6 +175,10 @@
 block discarded – undo
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(
Please login to merge, or discard this patch.
tests/security/MemberTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -913,6 +913,9 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
tests/security/SecurityTest.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -577,6 +577,8 @@  discard block
 block discarded – undo
577 577
 	/**
578 578
 	 * Execute a log-in form using Director::test().
579 579
 	 * Helper method for the tests above
580
+	 * @param string $email
581
+	 * @param string $password
580 582
 	 */
581 583
 	public function doTestLoginForm($email, $password, $backURL = 'test/link') {
582 584
 		$this->get(Config::inst()->get('Security', 'logout_url'));
@@ -597,6 +599,8 @@  discard block
 block discarded – undo
597 599
 
598 600
 	/**
599 601
 	 * Helper method to execute a change password form
602
+	 * @param string $oldPassword
603
+	 * @param string $newPassword
600 604
 	 */
601 605
 	public function doTestChangepasswordForm($oldPassword, $newPassword) {
602 606
 		return $this->submitForm(
Please login to merge, or discard this patch.
tests/view/ContentNegotiatorTest.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -5,6 +5,7 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
tests/view/SSViewerCacheBlockTest.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -28,6 +28,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
tests/view/SSViewerTest.php 1 patch
Doc Comments   +13 added lines patch added patch discarded remove patch
@@ -112,6 +112,10 @@  discard block
 block discarded – undo
112 112
 		));
113 113
 	}
114 114
 
115
+	/**
116
+	 * @param HTMLText $result
117
+	 * @param string[] $expected
118
+	 */
115 119
 	private function assertExpectedStrings($result, $expected) {
116 120
 		foreach ($expected as $expectedStr) {
117 121
 			$this->assertTrue(
@@ -718,6 +722,10 @@  discard block
 block discarded – undo
718 722
 		$this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult);
719 723
 	}
720 724
 
725
+	/**
726
+	 * @param string $a
727
+	 * @param string $b
728
+	 */
721 729
 	public function assertEqualIgnoringWhitespace($a, $b) {
722 730
 		$this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b));
723 731
 	}
@@ -1328,6 +1336,11 @@  discard block
 block discarded – undo
1328 1336
 		Config::inst()->update('SSViewer', 'source_file_comments', false);
1329 1337
 		Config::inst()->update('Director', 'environment_type', $origEnv);
1330 1338
 	}
1339
+
1340
+	/**
1341
+	 * @param string $name
1342
+	 * @param string $expected
1343
+	 */
1331 1344
 	private function _renderWithSourceFileComments($name, $expected) {
1332 1345
 		$viewer = new SSViewer(array($name));
1333 1346
 		$data = new ArrayData(array());
Please login to merge, or discard this patch.