@@ -62,173 +62,173 @@ public function testArrayHint()
6262
6363
6464 /**
65- * Verify type hint parsing .
65+ * Verify variable .
6666 *
6767 * @return void
6868 */
69- public function testTypeHint ()
69+ public function testVariable ()
7070 {
7171 $ expected = [];
7272 $ expected [0 ] = [
73- 'name ' => '$var1 ' ,
74- 'content ' => 'foo $var1 ' ,
75- 'has_attributes ' => false ,
76- 'pass_by_reference ' => false ,
77- 'variable_length ' => false ,
78- 'type_hint ' => 'foo ' ,
79- 'nullable_type ' => false ,
80- ];
81-
82- $ expected [1 ] = [
83- 'name ' => '$var2 ' ,
84- 'content ' => 'bar $var2 ' ,
73+ 'name ' => '$var ' ,
74+ 'content ' => '$var ' ,
8575 'has_attributes ' => false ,
8676 'pass_by_reference ' => false ,
8777 'variable_length ' => false ,
88- 'type_hint ' => 'bar ' ,
78+ 'type_hint ' => '' ,
8979 'nullable_type ' => false ,
9080 ];
9181
9282 $ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
9383
94- }//end testTypeHint ()
84+ }//end testVariable ()
9585
9686
9787 /**
98- * Verify self type hint parsing.
88+ * Verify default value parsing with a single function param .
9989 *
10090 * @return void
10191 */
102- public function testSelfTypeHint ()
92+ public function testSingleDefaultValue ()
10393 {
10494 $ expected = [];
10595 $ expected [0 ] = [
106- 'name ' => '$var ' ,
107- 'content ' => 'self $var ' ,
96+ 'name ' => '$var1 ' ,
97+ 'content ' => '$var1=self::CONSTANT ' ,
10898 'has_attributes ' => false ,
99+ 'default ' => 'self::CONSTANT ' ,
109100 'pass_by_reference ' => false ,
110101 'variable_length ' => false ,
111- 'type_hint ' => 'self ' ,
102+ 'type_hint ' => '' ,
112103 'nullable_type ' => false ,
113104 ];
114105
115106 $ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
116107
117- }//end testSelfTypeHint ()
108+ }//end testSingleDefaultValue ()
118109
119110
120111 /**
121- * Verify nullable type hint parsing.
112+ * Verify default value parsing.
122113 *
123114 * @return void
124115 */
125- public function testNullableTypeHint ()
116+ public function testDefaultValues ()
126117 {
127118 $ expected = [];
128119 $ expected [0 ] = [
129120 'name ' => '$var1 ' ,
130- 'content ' => '?int $var1 ' ,
121+ 'content ' => '$var1=1 ' ,
131122 'has_attributes ' => false ,
123+ 'default ' => '1 ' ,
132124 'pass_by_reference ' => false ,
133125 'variable_length ' => false ,
134- 'type_hint ' => '?int ' ,
135- 'nullable_type ' => true ,
126+ 'type_hint ' => '' ,
127+ 'nullable_type ' => false ,
136128 ];
137-
138129 $ expected [1 ] = [
139130 'name ' => '$var2 ' ,
140- 'content ' => ' ?\bar $var2' ,
131+ 'content ' => "\ $var2='value' " ,
141132 'has_attributes ' => false ,
133+ 'default ' => "'value' " ,
142134 'pass_by_reference ' => false ,
143135 'variable_length ' => false ,
144- 'type_hint ' => '?\bar ' ,
145- 'nullable_type ' => true ,
136+ 'type_hint ' => '' ,
137+ 'nullable_type ' => false ,
146138 ];
147139
148140 $ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
149141
150- }//end testNullableTypeHint ()
142+ }//end testDefaultValues ()
151143
152144
153145 /**
154- * Verify variable .
146+ * Verify type hint parsing .
155147 *
156148 * @return void
157149 */
158- public function testVariable ()
150+ public function testTypeHint ()
159151 {
160152 $ expected = [];
161153 $ expected [0 ] = [
162- 'name ' => '$var ' ,
163- 'content ' => '$var ' ,
154+ 'name ' => '$var1 ' ,
155+ 'content ' => 'foo $var1 ' ,
164156 'has_attributes ' => false ,
165157 'pass_by_reference ' => false ,
166158 'variable_length ' => false ,
167- 'type_hint ' => '' ,
159+ 'type_hint ' => 'foo ' ,
160+ 'nullable_type ' => false ,
161+ ];
162+
163+ $ expected [1 ] = [
164+ 'name ' => '$var2 ' ,
165+ 'content ' => 'bar $var2 ' ,
166+ 'has_attributes ' => false ,
167+ 'pass_by_reference ' => false ,
168+ 'variable_length ' => false ,
169+ 'type_hint ' => 'bar ' ,
168170 'nullable_type ' => false ,
169171 ];
170172
171173 $ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
172174
173- }//end testVariable ()
175+ }//end testTypeHint ()
174176
175177
176178 /**
177- * Verify default value parsing with a single function param .
179+ * Verify self type hint parsing .
178180 *
179181 * @return void
180182 */
181- public function testSingleDefaultValue ()
183+ public function testSelfTypeHint ()
182184 {
183185 $ expected = [];
184186 $ expected [0 ] = [
185- 'name ' => '$var1 ' ,
186- 'content ' => '$var1= self::CONSTANT ' ,
187+ 'name ' => '$var ' ,
188+ 'content ' => 'self $var ' ,
187189 'has_attributes ' => false ,
188- 'default ' => 'self::CONSTANT ' ,
189190 'pass_by_reference ' => false ,
190191 'variable_length ' => false ,
191- 'type_hint ' => '' ,
192+ 'type_hint ' => 'self ' ,
192193 'nullable_type ' => false ,
193194 ];
194195
195196 $ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
196197
197- }//end testSingleDefaultValue ()
198+ }//end testSelfTypeHint ()
198199
199200
200201 /**
201- * Verify default value parsing.
202+ * Verify nullable type hint parsing.
202203 *
203204 * @return void
204205 */
205- public function testDefaultValues ()
206+ public function testNullableTypeHint ()
206207 {
207208 $ expected = [];
208209 $ expected [0 ] = [
209210 'name ' => '$var1 ' ,
210- 'content ' => '$var1=1 ' ,
211+ 'content ' => '?int $var1 ' ,
211212 'has_attributes ' => false ,
212- 'default ' => '1 ' ,
213213 'pass_by_reference ' => false ,
214214 'variable_length ' => false ,
215- 'type_hint ' => '' ,
216- 'nullable_type ' => false ,
215+ 'type_hint ' => '?int ' ,
216+ 'nullable_type ' => true ,
217217 ];
218+
218219 $ expected [1 ] = [
219220 'name ' => '$var2 ' ,
220- 'content ' => "\ $var2='value' " ,
221+ 'content ' => ' ?\bar $var2' ,
221222 'has_attributes ' => false ,
222- 'default ' => "'value' " ,
223223 'pass_by_reference ' => false ,
224224 'variable_length ' => false ,
225- 'type_hint ' => '' ,
226- 'nullable_type ' => false ,
225+ 'type_hint ' => '?\bar ' ,
226+ 'nullable_type ' => true ,
227227 ];
228228
229229 $ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
230230
231- }//end testDefaultValues ()
231+ }//end testNullableTypeHint ()
232232
233233
234234 /**
0 commit comments