Skip to content

Commit 9606f02

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: Removed assertDateTimeEquals() methods.
2 parents b99ca76 + e395e56 commit 9606f02

10 files changed

+41
-63
lines changed

‎src/Symfony/Component/Form/Test/TypeTestCase.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,4 @@ protected function setUp()
3333
$this->dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
3434
$this->builder = new FormBuilder(null, null, $this->dispatcher, $this->factory);
3535
}
36-
37-
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
38-
{
39-
self::assertEquals($expected->format('c'), $actual->format('c'));
40-
}
4136
}

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeTestCase.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
1516

16-
class DateTimeToArrayTransformerTest extends DateTimeTestCase
17+
class DateTimeToArrayTransformerTest extends TestCase
1718
{
1819
public function testTransform()
1920
{
@@ -163,7 +164,7 @@ public function testReverseTransform()
163164

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

166-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
167+
$this->assertEquals($output, $transformer->reverseTransform($input));
167168
}
168169

169170
public function testReverseTransformWithSomeZero()
@@ -181,7 +182,7 @@ public function testReverseTransformWithSomeZero()
181182

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

184-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
185+
$this->assertEquals($output, $transformer->reverseTransform($input));
185186
}
186187

187188
public function testReverseTransformCompletelyEmpty()
@@ -326,7 +327,7 @@ public function testReverseTransformDifferentTimezones()
326327
$output = new \DateTime('2010-02-03 04:05:06 Asia/Hong_Kong');
327328
$output->setTimezone(new \DateTimeZone('America/New_York'));
328329

329-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
330+
$this->assertEquals($output, $transformer->reverseTransform($input));
330331
}
331332

332333
public function testReverseTransformToDifferentTimezone()
@@ -345,7 +346,7 @@ public function testReverseTransformToDifferentTimezone()
345346
$output = new \DateTime('2010-02-03 04:05:06 UTC');
346347
$output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
347348

348-
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
349+
$this->assertEquals($output, $transformer->reverseTransform($input));
349350
}
350351

351352
/**

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
1516
use Symfony\Component\Intl\Util\IntlTestHelper;
1617

17-
class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
18+
class DateTimeToLocalizedStringTransformerTest extends TestCase
1819
{
1920
protected $dateTime;
2021
protected $dateTimeWithoutSeconds;
@@ -226,7 +227,7 @@ public function testReverseTransformFullTime()
226227
{
227228
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
228229

229-
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
230+
$this->assertEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
230231
}
231232

232233
public function testReverseTransformFromDifferentLocale()
@@ -235,7 +236,7 @@ public function testReverseTransformFromDifferentLocale()
235236

236237
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
237238

238-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
239+
$this->assertEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
239240
}
240241

241242
public function testReverseTransformWithDifferentTimezones()
@@ -245,7 +246,7 @@ public function testReverseTransformWithDifferentTimezones()
245246
$dateTime = new \DateTime('2010-02-03 04:05:00 Asia/Hong_Kong');
246247
$dateTime->setTimezone(new \DateTimeZone('America/New_York'));
247248

248-
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
249+
$this->assertEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
249250
}
250251

251252
public function testReverseTransformOnlyDateWithDifferentTimezones()
@@ -254,21 +255,21 @@ public function testReverseTransformOnlyDateWithDifferentTimezones()
254255

255256
$dateTime = new \DateTime('2017-01-10 11:00', new \DateTimeZone('Europe/Berlin'));
256257

257-
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
258+
$this->assertEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
258259
}
259260

260261
public function testReverseTransformWithDifferentPatterns()
261262
{
262263
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
263264

264-
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
265+
$this->assertEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
265266
}
266267

267268
public function testReverseTransformDateOnlyWithDstIssue()
268269
{
269270
$transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'dd/MM/yyyy');
270271

271-
$this->assertDateTimeEquals(
272+
$this->assertEquals(
272273
new \DateTime('1978-05-28', new \DateTimeZone('Europe/Rome')),
273274
$transformer->reverseTransform('28/05/1978')
274275
);
@@ -278,7 +279,7 @@ public function testReverseTransformDateOnlyWithDstIssueAndEscapedText()
278279
{
279280
$transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, "'day': dd 'month': MM 'year': yyyy");
280281

281-
$this->assertDateTimeEquals(
282+
$this->assertEquals(
282283
new \DateTime('1978-05-28', new \DateTimeZone('Europe/Rome')),
283284
$transformer->reverseTransform('day: 28 month: 05 year: 1978')
284285
);
@@ -332,7 +333,7 @@ public function testReverseTransformWithNonExistingDate()
332333
{
333334
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
334335

335-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
336+
$this->assertEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
336337
}
337338

338339
/**

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
1516

16-
class DateTimeToRfc3339TransformerTest extends DateTimeTestCase
17+
class DateTimeToRfc3339TransformerTest extends TestCase
1718
{
1819
protected $dateTime;
1920
protected $dateTimeWithoutSeconds;
@@ -107,9 +108,9 @@ public function testReverseTransform($toTz, $fromTz, $to, $from)
107108
$transformer = new DateTimeToRfc3339Transformer($toTz, $fromTz);
108109

109110
if (null !== $to) {
110-
$this->assertDateTimeEquals(new \DateTime($to), $transformer->reverseTransform($from));
111+
$this->assertEquals(new \DateTime($to), $transformer->reverseTransform($from));
111112
} else {
112-
$this->assertSame($to, $transformer->reverseTransform($from));
113+
$this->assertNull($transformer->reverseTransform($from));
113114
}
114115
}
115116

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
1516

16-
class DateTimeToStringTransformerTest extends DateTimeTestCase
17+
class DateTimeToStringTransformerTest extends TestCase
1718
{
1819
public function dataProvider()
1920
{
@@ -126,7 +127,7 @@ public function testReverseTransform($format, $input, $output)
126127

127128
$output = new \DateTime($output);
128129

129-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
130+
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
130131
}
131132

132133
public function testReverseTransformEmpty()
@@ -144,7 +145,7 @@ public function testReverseTransformWithDifferentTimezones()
144145
$input = $output->format('Y-m-d H:i:s');
145146
$output->setTimezone(new \DateTimeZone('America/New_York'));
146147

147-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
148+
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
148149
}
149150

150151
public function testReverseTransformExpectsString()

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
1516

16-
class DateTimeToTimestampTransformerTest extends DateTimeTestCase
17+
class DateTimeToTimestampTransformerTest extends TestCase
1718
{
1819
public function testTransform()
1920
{
@@ -86,7 +87,7 @@ public function testReverseTransform()
8687
$output = new \DateTime('2010-02-03 04:05:06 UTC');
8788
$input = $output->format('U');
8889

89-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
90+
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
9091
}
9192

9293
public function testReverseTransformEmpty()
@@ -104,7 +105,7 @@ public function testReverseTransformWithDifferentTimezones()
104105
$input = $output->format('U');
105106
$output->setTimezone(new \DateTimeZone('Asia/Hong_Kong'));
106107

107-
$this->assertDateTimeEquals($output, $reverseTransformer->reverseTransform($input));
108+
$this->assertEquals($output, $reverseTransformer->reverseTransform($input));
108109
}
109110

110111
public function testReverseTransformExpectsValidTimestamp()

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testSubmitDateTime()
5959

6060
$dateTime = new \DateTime('2010-06-02 03:04:00 UTC');
6161

62-
$this->assertDateTimeEquals($dateTime, $form->getData());
62+
$this->assertEquals($dateTime, $form->getData());
6363
}
6464

6565
public function testSubmitString()
@@ -143,7 +143,7 @@ public function testSubmitWithoutMinutes()
143143

144144
$form->submit($input);
145145

146-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 03:00:00 UTC'), $form->getData());
146+
$this->assertEquals(new \DateTime('2010-06-02 03:00:00 UTC'), $form->getData());
147147
}
148148

149149
public function testSubmitWithSeconds()
@@ -175,7 +175,7 @@ public function testSubmitWithSeconds()
175175

176176
$form->submit($input);
177177

178-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 03:04:05 UTC'), $form->getData());
178+
$this->assertEquals(new \DateTime('2010-06-02 03:04:05 UTC'), $form->getData());
179179
}
180180

181181
public function testSubmitDifferentTimezones()
@@ -225,7 +225,7 @@ public function testSubmitDifferentTimezonesDateTime()
225225

226226
$outputTime->setTimezone(new \DateTimeZone('America/New_York'));
227227

228-
$this->assertDateTimeEquals($outputTime, $form->getData());
228+
$this->assertEquals($outputTime, $form->getData());
229229
$this->assertEquals('2010-06-02T03:04:00-10:00', $form->getViewData());
230230
}
231231

@@ -276,7 +276,7 @@ public function testSubmitDifferentPattern()
276276
'time' => '03:04',
277277
));
278278

279-
$this->assertDateTimeEquals($dateTime, $form->getData());
279+
$this->assertEquals($dateTime, $form->getData());
280280
}
281281

282282
public function testInitializeWithDateTime()

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
7474

7575
$form->submit('2010-06-02');
7676

77-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
77+
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
7878
$this->assertEquals('2010-06-02', $form->getViewData());
7979
}
8080

@@ -90,7 +90,7 @@ public function testSubmitFromSingleTextDateTimeWithCustomFormat()
9090

9191
$form->submit('2010');
9292

93-
$this->assertDateTimeEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
93+
$this->assertEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
9494
$this->assertEquals('2010', $form->getViewData());
9595
}
9696

@@ -111,7 +111,7 @@ public function testSubmitFromSingleTextDateTime()
111111

112112
$form->submit('2.6.2010');
113113

114-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
114+
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
115115
$this->assertEquals('02.06.2010', $form->getViewData());
116116
}
117117

@@ -204,7 +204,7 @@ public function testSubmitFromText()
204204

205205
$dateTime = new \DateTime('2010-06-02 UTC');
206206

207-
$this->assertDateTimeEquals($dateTime, $form->getData());
207+
$this->assertEquals($dateTime, $form->getData());
208208
$this->assertEquals($text, $form->getViewData());
209209
}
210210

@@ -227,7 +227,7 @@ public function testSubmitFromChoice()
227227

228228
$dateTime = new \DateTime('2010-06-02 UTC');
229229

230-
$this->assertDateTimeEquals($dateTime, $form->getData());
230+
$this->assertEquals($dateTime, $form->getData());
231231
$this->assertEquals($text, $form->getViewData());
232232
}
233233

@@ -264,7 +264,7 @@ public function testSubmitFromInputDateTimeDifferentPattern()
264264

265265
$form->submit('06*2010*02');
266266

267-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
267+
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
268268
$this->assertEquals('06*2010*02', $form->getViewData());
269269
}
270270

@@ -478,7 +478,7 @@ public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
478478

479479
// 2010-06-02 00:00:00 UTC
480480
// 2010-06-01 20:00:00 UTC-4
481-
$this->assertDateTimeEquals($dateTime, $form->getData());
481+
$this->assertEquals($dateTime, $form->getData());
482482
$this->assertEquals('01.06.2010', $form->getViewData());
483483
}
484484

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public function testSetDataDifferentTimezonesDateTime()
325325
'second' => (int) $outputTime->format('s'),
326326
);
327327

328-
$this->assertDateTimeEquals($dateTime, $form->getData());
328+
$this->assertEquals($dateTime, $form->getData());
329329
$this->assertEquals($displayedData, $form->getViewData());
330330
}
331331

0 commit comments

Comments
 (0)