Completed
Push — simpler-test-run ( 893237...c5d457 )
by Sam
07:57
created
Dev/Backtrace.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 	 * @param mixed $returnVal
117 117
 	 * @param bool $ignoreAjax
118 118
 	 * @param array $ignoredFunctions
119
-	 * @return mixed
119
+	 * @return string|null
120 120
 	 */
121 121
 	public static function backtrace($returnVal = false, $ignoreAjax = false, $ignoredFunctions = null) {
122 122
 		$plainText = Director::is_cli() || (Director::is_ajax() && !$ignoreAjax);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,6 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Dev/BulkLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@
 block discarded – undo
211 211
 	 *
212 212
 	 * @todo Mix in custom column mappings
213 213
 	 *
214
-	 * @return array
214
+	 * @return string
215 215
 	 **/
216 216
 	public function getImportSpec() {
217 217
 		$spec = array();
Please login to merge, or discard this patch.
Dev/BulkLoader_Result.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
 	/**
135 135
 	 * @param $obj DataObject
136
-	 * @param $message string
136
+	 * @param string $message string
137 137
 	 */
138 138
 	public function addCreated($obj, $message = null)
139 139
 	{
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 
148 148
 	/**
149 149
 	 * @param $obj DataObject
150
-	 * @param $message string
150
+	 * @param string $message string
151 151
 	 */
152 152
 	public function addUpdated($obj, $message = null)
153 153
 	{
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 	}
161 161
 
162 162
 	/**
163
-	 * @param $obj DataObject
164
-	 * @param $message string
163
+	 * @param DataObject|null $obj DataObject
164
+	 * @param string $message string
165 165
 	 */
166 166
 	public function addDeleted($obj, $message = null)
167 167
 	{
Please login to merge, or discard this patch.
Dev/CsvBulkLoader.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 	 * @param string $path Path to large file to split
94 94
 	 * @param int $lines Number of lines per file
95 95
 	 *
96
-	 * @return array List of file paths
96
+	 * @return string[] List of file paths
97 97
 	 */
98 98
 	protected function splitFile($path, $lines = null) {
99 99
 		$previous = ini_get('auto_detect_line_endings');
Please login to merge, or discard this patch.
Dev/CSVParser.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use SilverStripe\Filesystem\ImageManipulation;
6 6
 use SilverStripe\Filesystem\Storage\AssetContainer;
7 7
 use SilverStripe\Filesystem\Storage\AssetStore;
8
-
9 8
 use Injector;
10 9
 use AssetField;
11 10
 use File;
Please login to merge, or discard this patch.
Dev/Deprecation.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 	 * greater than or equal to this version, a message will be raised
73 73
 	 *
74 74
 	 * @static
75
-	 * @param $ver string -
75
+	 * @param string $ver string -
76 76
 	 *     A php standard version string, see http://php.net/manual/en/function.version-compare.php for details.
77 77
 	 * @param null $forModule string -
78 78
 	 *    The name of a module. The passed version will be used as the check value for
Please login to merge, or discard this patch.
Dev/FixtureBlueprint.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -264,6 +264,9 @@  discard block
 block discarded – undo
264 264
 		return $this;
265 265
 	}
266 266
 
267
+	/**
268
+	 * @param string $type
269
+	 */
267 270
 	protected function invokeCallbacks($type, $args = array()) {
268 271
 		foreach($this->callbacks[$type] as $callback) {
269 272
 			call_user_func_array($callback, $args);
@@ -303,6 +306,9 @@  discard block
 block discarded – undo
303 306
 		$obj->$name = $this->parseValue($value, $fixtures);
304 307
 	}
305 308
 
309
+	/**
310
+	 * @param string $fieldName
311
+	 */
306 312
 	protected function overrideField($obj, $fieldName, $value, $fixtures = null) {
307 313
 		$class = get_class($obj);
308 314
 		$table = DataObject::getSchema()->tableForField($class, $fieldName);
Please login to merge, or discard this patch.
Dev/SapphireTest.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -617,10 +617,10 @@  discard block
 block discarded – undo
617 617
 	/**
618 618
 	 * Assert that the matching email was sent since the last call to clearEmails()
619 619
 	 * All of the parameters can either be a string, or, if they start with "/", a PREG-compatible regular expression.
620
-	 * @param $to
620
+	 * @param string $to
621 621
 	 * @param $from
622
-	 * @param $subject
623
-	 * @param $content
622
+	 * @param string $subject
623
+	 * @param string $content
624 624
 	 * @return array Contains the keys: 'type', 'to', 'from', 'subject', 'content', 'plainContent', 'attachedFiles',
625 625
 	 *               'customHeaders', 'htmlContent', inlineImages'
626 626
 	 */
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 	 * @param string $expectedSQL
795 795
 	 * @param string $actualSQL
796 796
 	 * @param string $message
797
-	 * @param float|int $delta
797
+	 * @param integer $delta
798 798
 	 * @param integer $maxDepth
799 799
 	 * @param boolean $canonicalize
800 800
 	 * @param boolean $ignoreCase
Please login to merge, or discard this patch.
Dev/SapphireTestReporter.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 	 * @access private
320 320
 	 * @param obj PHPUnit_Framework_Test, current test that is being run
321 321
 	 * @param obj PHPUnit_Framework_AssertationFailedError, PHPUnit error
322
-	 * @return array
322
+	 * @return string
323 323
 	 */
324 324
 	private function getTestException(PHPUnit_Framework_Test $test, Exception $e) {
325 325
 		// get the name of the testFile from the test
@@ -406,6 +406,9 @@  discard block
 block discarded – undo
406 406
 
407 407
 	}
408 408
 
409
+	/**
410
+	 * @param string $name
411
+	 */
409 412
 	protected function testNameToPhrase($name) {
410 413
 		return ucfirst(preg_replace("/([a-z])([A-Z])/", "$1 $2", $name));
411 414
 	}
Please login to merge, or discard this patch.