Completed
Pull Request — master (#6)
by Sam
09:38
created
tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
 	}
39 39
 
40 40
 	/**
41
-	 * @return Form
41
+	 * @return Mockery\MockInterface
42 42
 	 */
43 43
 	protected function getNewRequestMock() {
44 44
 		$mock = Mockery::mock('SS_HTTPRequest');
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace SilverStripe\Forms\SegmentFieldModifier;
4 4
 
5 5
 use SilverStripe\Forms\Filter\SlugFilter;
6
-
7 6
 use SilverStripe\Control\HTTPRequest;
8 7
 
9 8
 
Please login to merge, or discard this patch.
tests/SegmentFieldTest.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,14 +71,14 @@
 block discarded – undo
71 71
 	}
72 72
 
73 73
 	/**
74
-	 * @return SS_HTTPRequest
74
+	 * @return Mockery\MockInterface
75 75
 	 */
76 76
 	protected function getNewRequestMock() {
77 77
 		return Mockery::mock('SS_HTTPRequest');
78 78
 	}
79 79
 
80 80
 	/**
81
-	 * @return Form
81
+	 * @return Mockery\MockInterface
82 82
 	 */
83 83
 	protected function getNewFormMock() {
84 84
 		return Mockery::mock('Form');
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -4,10 +4,8 @@
 block discarded – undo
4 4
 
5 5
 
6 6
 use Mockery;
7
-
8 7
 use SilverStripe\Forms\SegmentField;
9 8
 use SilverStripe\Forms\SegmentFieldModifier\AbstractSegmentFieldModifier;
10
-
11 9
 use SilverStripe\Dev\SapphireTest;
12 10
 
13 11
 
Please login to merge, or discard this patch.
tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
 	}
39 39
 
40 40
 	/**
41
-	 * @return Form
41
+	 * @return Mockery\MockInterface
42 42
 	 */
43 43
 	protected function getNewRequestMock() {
44 44
 		$mock = Mockery::mock('SS_HTTPRequest');
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -4,9 +4,7 @@
 block discarded – undo
4 4
 
5 5
 
6 6
 use Mockery;
7
-
8 7
 use SilverStripe\Forms\SegmentFieldModifier\IDSegmentFieldModifier;
9
-use stdClass;
10 8
 use SilverStripe\Dev\SapphireTest;
11 9
 
12 10
 
Please login to merge, or discard this patch.
code/SegmentField.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 *
73 73
 	 * @param array $properties
74 74
 	 *
75
-	 * @return string
75
+	 * @return \SilverStripe\ORM\FieldType\DBHTMLText
76 76
 	 */
77 77
 	public function Field($properties = array()) {
78 78
 		Requirements::javascript('http://code.jquery.com/jquery-1.7.2.min.js');
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	/**
86 86
 	 * @inheritdoc
87 87
 	 *
88
-	 * @param mixed $request
88
+	 * @param \Mockery\MockInterface $request
89 89
 	 *
90 90
 	 * @return string
91 91
 	 */
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 
117 117
 	/**
118 118
 	 * @param SegmentFieldModifier $modifier
119
-	 * @param mixed $form
119
+	 * @param Form $form
120 120
 	 * @param mixed $request
121 121
 	 *
122 122
 	 * @return $this
Please login to merge, or discard this patch.