Skip to content

Commit ced57d8

Browse files
BurgovBurgov
committed
reverse transform doesn't take a second argument
1 parent a01eee8 commit ced57d8

7 files changed

+48
-48
lines changed

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DataTransformerChainTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ public function testReverseTransform()
4848

4949
$chain = new DataTransformerChain(array($transformer1, $transformer2));
5050

51-
$this->assertEquals('baz', $chain->reverseTransform('foo', null));
51+
$this->assertEquals('baz', $chain->reverseTransform('foo'));
5252
}
5353
}

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function testTransform_differentTimezones()
124124
public function testTransformRequiresDateTime()
125125
{
126126
$transformer = new DateTimeToArrayTransformer();
127-
$transformer->reverseTransform('12345', null);
127+
$transformer->reverseTransform('12345');
128128
}
129129

130130
public function testReverseTransform()
@@ -142,7 +142,7 @@ public function testReverseTransform()
142142

143143
$output = new \DateTime('2010-02-03 04:05:06 UTC');
144144

145-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input, null));
145+
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
146146
}
147147

148148
public function testReverseTransformWithSomeZero()
@@ -160,7 +160,7 @@ public function testReverseTransformWithSomeZero()
160160

161161
$output = new \DateTime('2010-02-03 04:00:00 UTC');
162162

163-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input, null));
163+
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
164164
}
165165

166166
public function testReverseTransform_completelyEmpty()
@@ -176,7 +176,7 @@ public function testReverseTransform_completelyEmpty()
176176
'second' => '',
177177
);
178178

179-
$this->assertSame(null, $transformer->reverseTransform($input, null));
179+
$this->assertNull($transformer->reverseTransform($input));
180180
}
181181

182182
public function testReverseTransform_completelyEmpty_subsetOfFields()
@@ -189,7 +189,7 @@ public function testReverseTransform_completelyEmpty_subsetOfFields()
189189
'day' => '',
190190
);
191191

192-
$this->assertSame(null, $transformer->reverseTransform($input, null));
192+
$this->assertNull($transformer->reverseTransform($input));
193193
}
194194

195195
/**
@@ -286,7 +286,7 @@ public function testReverseTransform_null()
286286
{
287287
$transformer = new DateTimeToArrayTransformer();
288288

289-
$this->assertNull($transformer->reverseTransform(null, null));
289+
$this->assertNull($transformer->reverseTransform(null));
290290
}
291291

292292
public function testReverseTransform_differentTimezones()
@@ -305,7 +305,7 @@ public function testReverseTransform_differentTimezones()
305305
$output = new \DateTime('2010-02-03 04:05:06 Asia/Hong_Kong');
306306
$output->setTimezone(new \DateTimeZone('America/New_York'));
307307

308-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input, null));
308+
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
309309
}
310310

311311
public function testReverseTransformToDifferentTimezone()
@@ -324,7 +324,7 @@ public function testReverseTransformToDifferentTimezone()
324324
$output = new \DateTime('2010-02-03 04:05:06 UTC');
325325
$output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
326326

327-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input, null));
327+
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
328328
}
329329

330330
/**
@@ -333,7 +333,7 @@ public function testReverseTransformToDifferentTimezone()
333333
public function testReverseTransformRequiresArray()
334334
{
335335
$transformer = new DateTimeToArrayTransformer();
336-
$transformer->reverseTransform('12345', null);
336+
$transformer->reverseTransform('12345');
337337
}
338338

339339
/**

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -164,49 +164,49 @@ public function testReverseTransformShortDate()
164164
{
165165
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
166166

167-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.10 04:05', null));
167+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.10 04:05'));
168168
}
169169

170170
public function testReverseTransformMediumDate()
171171
{
172172
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::MEDIUM);
173173

174-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.2010 04:05', null));
174+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.2010 04:05'));
175175
}
176176

177177
public function testReverseTransformLongDate()
178178
{
179179
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::LONG);
180180

181-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03. Februar 2010 04:05', null));
181+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03. Februar 2010 04:05'));
182182
}
183183

184184
public function testReverseTransformFullDate()
185185
{
186186
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL);
187187

188-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Mittwoch, 03. Februar 2010 04:05', null));
188+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Mittwoch, 03. Februar 2010 04:05'));
189189
}
190190

191191
public function testReverseTransformShortTime()
192192
{
193193
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::SHORT);
194194

195-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.2010 04:05', null));
195+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('03.02.2010 04:05'));
196196
}
197197

198198
public function testReverseTransformMediumTime()
199199
{
200200
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::MEDIUM);
201201

202-
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06', null));
202+
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06'));
203203
}
204204

205205
public function testReverseTransformLongTime()
206206
{
207207
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::LONG);
208208

209-
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00', null));
209+
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00'));
210210
}
211211

212212
public function testReverseTransformFullTime()
@@ -217,7 +217,7 @@ public function testReverseTransformFullTime()
217217

218218
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
219219

220-
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00', null));
220+
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00'));
221221
}
222222

223223
public function testReverseTransformFromDifferentLocale()
@@ -226,7 +226,7 @@ public function testReverseTransformFromDifferentLocale()
226226

227227
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
228228

229-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010 04:05 AM', null));
229+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010 04:05 AM'));
230230
}
231231

232232
public function testReverseTransform_differentTimezones()
@@ -236,21 +236,21 @@ public function testReverseTransform_differentTimezones()
236236
$dateTime = new \DateTime('2010-02-03 04:05:00 Asia/Hong_Kong');
237237
$dateTime->setTimezone(new \DateTimeZone('America/New_York'));
238238

239-
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010 04:05', null));
239+
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010 04:05'));
240240
}
241241

242242
public function testReverseTransform_differentPatterns()
243243
{
244244
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
245245

246-
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06', null));
246+
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
247247
}
248248

249249
public function testReverseTransform_empty()
250250
{
251251
$transformer = new DateTimeToLocalizedStringTransformer();
252252

253-
$this->assertSame(null, $transformer->reverseTransform('', null));
253+
$this->assertNull($transformer->reverseTransform(''));
254254
}
255255

256256
/**
@@ -259,7 +259,7 @@ public function testReverseTransform_empty()
259259
public function testReverseTransformRequiresString()
260260
{
261261
$transformer = new DateTimeToLocalizedStringTransformer();
262-
$transformer->reverseTransform(12345, null);
262+
$transformer->reverseTransform(12345);
263263
}
264264

265265
/**
@@ -268,7 +268,7 @@ public function testReverseTransformRequiresString()
268268
public function testReverseTransformWrapsIntlErrors()
269269
{
270270
$transformer = new DateTimeToLocalizedStringTransformer();
271-
$transformer->reverseTransform('12345', null);
271+
$transformer->reverseTransform('12345');
272272
}
273273

274274
/**

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testReverseTransform()
7777
$output = new \DateTime('2010-02-03 04:05:06 UTC');
7878
$input = $output->format('Y-m-d H:i:s');
7979

80-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input, null));
80+
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
8181
}
8282

8383
/**
@@ -90,7 +90,7 @@ public function testReverseTransformRandomFormat($format, $datetime)
9090
$dateTime = new \DateTime($datetime);
9191
$input = $dateTime->format($format);
9292

93-
$this->assertDateTimeEquals($dateTime, $reverseTransformer->reverseTransform($input, null));
93+
$this->assertDateTimeEquals($dateTime, $reverseTransformer->reverseTransform($input));
9494
}
9595

9696
public function getFormatAndDateTime()
@@ -109,7 +109,7 @@ public function testReverseTransform_empty()
109109
{
110110
$reverseTransformer = new DateTimeToStringTransformer();
111111

112-
$this->assertSame(null, $reverseTransformer->reverseTransform('', null));
112+
$this->assertNull($reverseTransformer->reverseTransform(''));
113113
}
114114

115115
public function testReverseTransform_differentTimezones()
@@ -120,7 +120,7 @@ public function testReverseTransform_differentTimezones()
120120
$input = $output->format('Y-m-d H:i:s');
121121
$output->setTimeZone(new \DateTimeZone('America/New_York'));
122122

123-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input, null));
123+
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
124124
}
125125

126126
public function testReverseTransformExpectsString()
@@ -129,7 +129,7 @@ public function testReverseTransformExpectsString()
129129

130130
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
131131

132-
$reverseTransformer->reverseTransform(1234, null);
132+
$reverseTransformer->reverseTransform(1234);
133133
}
134134

135135
public function testReverseTransformExpectsValidDateString()
@@ -138,6 +138,6 @@ public function testReverseTransformExpectsValidDateString()
138138

139139
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
140140

141-
$reverseTransformer->reverseTransform('2010-2010-2010', null);
141+
$reverseTransformer->reverseTransform('2010-2010-2010');
142142
}
143143
}

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ public function testReverseTransform()
7474
$output = new \DateTime('2010-02-03 04:05:06 UTC');
7575
$input = $output->format('U');
7676

77-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input, null));
77+
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
7878
}
7979

8080
public function testReverseTransform_empty()
8181
{
8282
$reverseTransformer = new DateTimeToTimestampTransformer();
8383

84-
$this->assertSame(null, $reverseTransformer->reverseTransform(null, null));
84+
$this->assertNull($reverseTransformer->reverseTransform(null));
8585
}
8686

8787
public function testReverseTransform_differentTimezones()
@@ -92,7 +92,7 @@ public function testReverseTransform_differentTimezones()
9292
$input = $output->format('U');
9393
$output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
9494

95-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input, null));
95+
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
9696
}
9797

9898
public function testReverseTransformExpectsValidTimestamp()
@@ -101,6 +101,6 @@ public function testReverseTransformExpectsValidTimestamp()
101101

102102
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
103103

104-
$reverseTransformer->reverseTransform('2010-2010-2010', null);
104+
$reverseTransformer->reverseTransform('2010-2010-2010');
105105
}
106106
}

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function testReverseTransform()
5252
{
5353
$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
5454

55-
$this->assertEquals(123, $transformer->reverseTransform('1,23', null));
55+
$this->assertEquals(123, $transformer->reverseTransform('1,23'));
5656
}
5757

5858
public function testReverseTransformExpectsString()
@@ -61,13 +61,13 @@ public function testReverseTransformExpectsString()
6161

6262
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
6363

64-
$transformer->reverseTransform(12345, null);
64+
$transformer->reverseTransform(12345);
6565
}
6666

6767
public function testReverseTransform_empty()
6868
{
6969
$transformer = new MoneyToLocalizedStringTransformer();
7070

71-
$this->assertSame(null, $transformer->reverseTransform('', null));
71+
$this->assertNull($transformer->reverseTransform(''));
7272
}
7373
}

‎tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,34 @@ public function testReverseTransform()
6262
{
6363
$transformer = new PercentToLocalizedStringTransformer();
6464

65-
$this->assertEquals(0.1, $transformer->reverseTransform('10', null));
66-
$this->assertEquals(0.15, $transformer->reverseTransform('15', null));
67-
$this->assertEquals(0.12, $transformer->reverseTransform('12', null));
68-
$this->assertEquals(2, $transformer->reverseTransform('200', null));
65+
$this->assertEquals(0.1, $transformer->reverseTransform('10'));
66+
$this->assertEquals(0.15, $transformer->reverseTransform('15'));
67+
$this->assertEquals(0.12, $transformer->reverseTransform('12'));
68+
$this->assertEquals(2, $transformer->reverseTransform('200'));
6969
}
7070

7171
public function testReverseTransform_empty()
7272
{
7373
$transformer = new PercentToLocalizedStringTransformer();
7474

75-
$this->assertSame(null, $transformer->reverseTransform('', null));
75+
$this->assertNull($transformer->reverseTransform(''));
7676
}
7777

7878
public function testReverseTransformWithInteger()
7979
{
8080
$transformer = new PercentToLocalizedStringTransformer(null, 'integer');
8181

82-
$this->assertEquals(10, $transformer->reverseTransform('10', null));
83-
$this->assertEquals(15, $transformer->reverseTransform('15', null));
84-
$this->assertEquals(12, $transformer->reverseTransform('12', null));
85-
$this->assertEquals(200, $transformer->reverseTransform('200', null));
82+
$this->assertEquals(10, $transformer->reverseTransform('10'));
83+
$this->assertEquals(15, $transformer->reverseTransform('15'));
84+
$this->assertEquals(12, $transformer->reverseTransform('12'));
85+
$this->assertEquals(200, $transformer->reverseTransform('200'));
8686
}
8787

8888
public function testReverseTransformWithPrecision()
8989
{
9090
$transformer = new PercentToLocalizedStringTransformer(2);
9191

92-
$this->assertEquals(0.1234, $transformer->reverseTransform('12,34', null));
92+
$this->assertEquals(0.1234, $transformer->reverseTransform('12,34'));
9393
}
9494

9595
public function testTransformExpectsNumeric()
@@ -107,6 +107,6 @@ public function testReverseTransformExpectsString()
107107

108108
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
109109

110-
$transformer->reverseTransform(1, null);
110+
$transformer->reverseTransform(1);
111111
}
112112
}

0 commit comments

Comments
 (0)