@@ -62,173 +62,173 @@ public function testArrayHint()
62
62
63
63
64
64
/**
65
- * Verify type hint parsing .
65
+ * Verify variable .
66
66
*
67
67
* @return void
68
68
*/
69
- public function testTypeHint ()
69
+ public function testVariable ()
70
70
{
71
71
$ expected = [];
72
72
$ 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 ' ,
85
75
'has_attributes ' => false ,
86
76
'pass_by_reference ' => false ,
87
77
'variable_length ' => false ,
88
- 'type_hint ' => 'bar ' ,
78
+ 'type_hint ' => '' ,
89
79
'nullable_type ' => false ,
90
80
];
91
81
92
82
$ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
93
83
94
- }//end testTypeHint ()
84
+ }//end testVariable ()
95
85
96
86
97
87
/**
98
- * Verify self type hint parsing.
88
+ * Verify default value parsing with a single function param .
99
89
*
100
90
* @return void
101
91
*/
102
- public function testSelfTypeHint ()
92
+ public function testSingleDefaultValue ()
103
93
{
104
94
$ expected = [];
105
95
$ expected [0 ] = [
106
- 'name ' => '$var ' ,
107
- 'content ' => 'self $var ' ,
96
+ 'name ' => '$var1 ' ,
97
+ 'content ' => '$var1=self::CONSTANT ' ,
108
98
'has_attributes ' => false ,
99
+ 'default ' => 'self::CONSTANT ' ,
109
100
'pass_by_reference ' => false ,
110
101
'variable_length ' => false ,
111
- 'type_hint ' => 'self ' ,
102
+ 'type_hint ' => '' ,
112
103
'nullable_type ' => false ,
113
104
];
114
105
115
106
$ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
116
107
117
- }//end testSelfTypeHint ()
108
+ }//end testSingleDefaultValue ()
118
109
119
110
120
111
/**
121
- * Verify nullable type hint parsing.
112
+ * Verify default value parsing.
122
113
*
123
114
* @return void
124
115
*/
125
- public function testNullableTypeHint ()
116
+ public function testDefaultValues ()
126
117
{
127
118
$ expected = [];
128
119
$ expected [0 ] = [
129
120
'name ' => '$var1 ' ,
130
- 'content ' => '?int $var1 ' ,
121
+ 'content ' => '$var1=1 ' ,
131
122
'has_attributes ' => false ,
123
+ 'default ' => '1 ' ,
132
124
'pass_by_reference ' => false ,
133
125
'variable_length ' => false ,
134
- 'type_hint ' => '?int ' ,
135
- 'nullable_type ' => true ,
126
+ 'type_hint ' => '' ,
127
+ 'nullable_type ' => false ,
136
128
];
137
-
138
129
$ expected [1 ] = [
139
130
'name ' => '$var2 ' ,
140
- 'content ' => ' ?\bar $var2' ,
131
+ 'content ' => "\ $var2='value' " ,
141
132
'has_attributes ' => false ,
133
+ 'default ' => "'value' " ,
142
134
'pass_by_reference ' => false ,
143
135
'variable_length ' => false ,
144
- 'type_hint ' => '?\bar ' ,
145
- 'nullable_type ' => true ,
136
+ 'type_hint ' => '' ,
137
+ 'nullable_type ' => false ,
146
138
];
147
139
148
140
$ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
149
141
150
- }//end testNullableTypeHint ()
142
+ }//end testDefaultValues ()
151
143
152
144
153
145
/**
154
- * Verify variable .
146
+ * Verify type hint parsing .
155
147
*
156
148
* @return void
157
149
*/
158
- public function testVariable ()
150
+ public function testTypeHint ()
159
151
{
160
152
$ expected = [];
161
153
$ expected [0 ] = [
162
- 'name ' => '$var ' ,
163
- 'content ' => '$var ' ,
154
+ 'name ' => '$var1 ' ,
155
+ 'content ' => 'foo $var1 ' ,
164
156
'has_attributes ' => false ,
165
157
'pass_by_reference ' => false ,
166
158
'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 ' ,
168
170
'nullable_type ' => false ,
169
171
];
170
172
171
173
$ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
172
174
173
- }//end testVariable ()
175
+ }//end testTypeHint ()
174
176
175
177
176
178
/**
177
- * Verify default value parsing with a single function param .
179
+ * Verify self type hint parsing .
178
180
*
179
181
* @return void
180
182
*/
181
- public function testSingleDefaultValue ()
183
+ public function testSelfTypeHint ()
182
184
{
183
185
$ expected = [];
184
186
$ expected [0 ] = [
185
- 'name ' => '$var1 ' ,
186
- 'content ' => '$var1= self::CONSTANT ' ,
187
+ 'name ' => '$var ' ,
188
+ 'content ' => 'self $var ' ,
187
189
'has_attributes ' => false ,
188
- 'default ' => 'self::CONSTANT ' ,
189
190
'pass_by_reference ' => false ,
190
191
'variable_length ' => false ,
191
- 'type_hint ' => '' ,
192
+ 'type_hint ' => 'self ' ,
192
193
'nullable_type ' => false ,
193
194
];
194
195
195
196
$ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
196
197
197
- }//end testSingleDefaultValue ()
198
+ }//end testSelfTypeHint ()
198
199
199
200
200
201
/**
201
- * Verify default value parsing.
202
+ * Verify nullable type hint parsing.
202
203
*
203
204
* @return void
204
205
*/
205
- public function testDefaultValues ()
206
+ public function testNullableTypeHint ()
206
207
{
207
208
$ expected = [];
208
209
$ expected [0 ] = [
209
210
'name ' => '$var1 ' ,
210
- 'content ' => '$var1=1 ' ,
211
+ 'content ' => '?int $var1 ' ,
211
212
'has_attributes ' => false ,
212
- 'default ' => '1 ' ,
213
213
'pass_by_reference ' => false ,
214
214
'variable_length ' => false ,
215
- 'type_hint ' => '' ,
216
- 'nullable_type ' => false ,
215
+ 'type_hint ' => '?int ' ,
216
+ 'nullable_type ' => true ,
217
217
];
218
+
218
219
$ expected [1 ] = [
219
220
'name ' => '$var2 ' ,
220
- 'content ' => "\ $var2='value' " ,
221
+ 'content ' => ' ?\bar $var2' ,
221
222
'has_attributes ' => false ,
222
- 'default ' => "'value' " ,
223
223
'pass_by_reference ' => false ,
224
224
'variable_length ' => false ,
225
- 'type_hint ' => '' ,
226
- 'nullable_type ' => false ,
225
+ 'type_hint ' => '?\bar ' ,
226
+ 'nullable_type ' => true ,
227
227
];
228
228
229
229
$ this ->getMethodParametersTestHelper ('/* ' .__FUNCTION__ .' */ ' , $ expected );
230
230
231
- }//end testDefaultValues ()
231
+ }//end testNullableTypeHint ()
232
232
233
233
234
234
/**
0 commit comments