Completed
Pull Request — master (#5247)
by Damian
11:40
created
dev/SapphireTest.php 1 patch
Doc Comments   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -139,6 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 	/**
141 141
 	 * Set the manifest to be used to look up test classes by helper functions
142
+	 * @param SS_ClassManifest $manifest
142 143
 	 */
143 144
 	public static function set_test_class_manifest($manifest) {
144 145
 		self::$test_class_manifest = $manifest;
@@ -422,7 +423,7 @@  discard block
 block discarded – undo
422 423
 	 * Will collate all IDs form all fixtures if multiple fixtures are provided.
423 424
 	 *
424 425
 	 * @param string $className
425
-	 * @return array A map of fixture-identifier => object-id
426
+	 * @return A A map of fixture-identifier => object-id
426 427
 	 */
427 428
 	protected function allFixtureIDs($className) {
428 429
 		return $this->getFixtureFactory()->getIds($className);
@@ -582,7 +583,7 @@  discard block
 block discarded – undo
582 583
 	/**
583 584
 	 * Assert that the matching email was sent since the last call to clearEmails()
584 585
 	 * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression.
585
-	 * @param $to
586
+	 * @param string $to
586 587
 	 * @param $from
587 588
 	 * @param $subject
588 589
 	 * @param $content
@@ -753,7 +754,7 @@  discard block
 block discarded – undo
753 754
 	 * @param string $expectedSQL
754 755
 	 * @param string $actualSQL
755 756
 	 * @param string $message
756
-	 * @param float $delta
757
+	 * @param integer $delta
757 758
 	 * @param integer $maxDepth
758 759
 	 * @param boolean $canonicalize
759 760
 	 * @param boolean $ignoreCase
@@ -1039,9 +1040,9 @@  discard block
 block discarded – undo
1039 1040
 	/**
1040 1041
 	 * Test against a theme.
1041 1042
 	 *
1042
-	 * @param $themeBaseDir string - themes directory
1043
-	 * @param $theme string - theme name
1044
-	 * @param $callback Closure
1043
+	 * @param string $themeBaseDir string - themes directory
1044
+	 * @param string $theme string - theme name
1045
+	 * @param Closure $callback Closure
1045 1046
 	 */
1046 1047
 	protected function useTestTheme($themeBaseDir, $theme, $callback) {
1047 1048
 		Config::nest();
Please login to merge, or discard this patch.
model/versioning/ChangeSetItem.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 	 * Find version of this object in the given stage
99 99
 	 *
100 100
 	 * @param string $stage
101
-	 * @return Versioned|DataObject
101
+	 * @return DataObject|null
102 102
 	 */
103 103
 	private function getObjectInStage($stage) {
104 104
 		return Versioned::get_by_stage($this->ObjectClass, $stage)->byID($this->ObjectID);
Please login to merge, or discard this patch.
tests/model/ChangeSetTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -27,6 +27,9 @@
 block discarded – undo
27 27
 		return $this->can(__FUNCTION__, $member, $context);
28 28
 	}
29 29
 
30
+	/**
31
+	 * @param string $perm
32
+	 */
30 33
 	public function can($perm, $member = null, $context = array()) {
31 34
 		$perms = [
32 35
 			"PERM_{$perm}",
Please login to merge, or discard this patch.