Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e395e56

Browse filesBrowse files
fabpotfabpot
committed
minor #25943 Removed assertDateTimeEquals() methods (derrabus)
This PR was merged into the 2.7 branch. Discussion ---------- Removed assertDateTimeEquals() methods | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A All PHPUnit versions that we use on Travis support comparing `DateTime` objects via `assertEquals()`. Yet, we have our own code in place to check for equality of `DateTime` objects. This PR removes that code. Commits ------- 5b73d1c Removed assertDateTimeEquals() methods.
2 parents d007bbd + 5b73d1c commit e395e56
Copy full SHA for e395e56
Expand file treeCollapse file tree

10 files changed

+41
-63
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Test/TypeTestCase.php
-5Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeTestCase.php
-22Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
+6-5Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+10-9Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
+4-3Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
+4-3Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
+4-3Lines 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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testSubmitDateTime()
4949

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

52-
$this->assertDateTimeEquals($dateTime, $form->getData());
52+
$this->assertEquals($dateTime, $form->getData());
5353
}
5454

5555
public function testSubmitString()
@@ -133,7 +133,7 @@ public function testSubmitWithoutMinutes()
133133

134134
$form->submit($input);
135135

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

139139
public function testSubmitWithSeconds()
@@ -165,7 +165,7 @@ public function testSubmitWithSeconds()
165165

166166
$form->submit($input);
167167

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

171171
public function testSubmitDifferentTimezones()
@@ -215,7 +215,7 @@ public function testSubmitDifferentTimezonesDateTime()
215215

216216
$outputTime->setTimezone(new \DateTimeZone('America/New_York'));
217217

218-
$this->assertDateTimeEquals($outputTime, $form->getData());
218+
$this->assertEquals($outputTime, $form->getData());
219219
$this->assertEquals('2010-06-02T03:04:00-10:00', $form->getViewData());
220220
}
221221

@@ -266,7 +266,7 @@ public function testSubmitDifferentPattern()
266266
'time' => '03:04',
267267
));
268268

269-
$this->assertDateTimeEquals($dateTime, $form->getData());
269+
$this->assertEquals($dateTime, $form->getData());
270270
}
271271

272272
public function testInitializeWithDateTime()

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
6464

6565
$form->submit('2010-06-02');
6666

67-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
67+
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
6868
$this->assertEquals('2010-06-02', $form->getViewData());
6969
}
7070

@@ -80,7 +80,7 @@ public function testSubmitFromSingleTextDateTimeWithCustomFormat()
8080

8181
$form->submit('2010');
8282

83-
$this->assertDateTimeEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
83+
$this->assertEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
8484
$this->assertEquals('2010', $form->getViewData());
8585
}
8686

@@ -101,7 +101,7 @@ public function testSubmitFromSingleTextDateTime()
101101

102102
$form->submit('2.6.2010');
103103

104-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
104+
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
105105
$this->assertEquals('02.06.2010', $form->getViewData());
106106
}
107107

@@ -194,7 +194,7 @@ public function testSubmitFromText()
194194

195195
$dateTime = new \DateTime('2010-06-02 UTC');
196196

197-
$this->assertDateTimeEquals($dateTime, $form->getData());
197+
$this->assertEquals($dateTime, $form->getData());
198198
$this->assertEquals($text, $form->getViewData());
199199
}
200200

@@ -217,7 +217,7 @@ public function testSubmitFromChoice()
217217

218218
$dateTime = new \DateTime('2010-06-02 UTC');
219219

220-
$this->assertDateTimeEquals($dateTime, $form->getData());
220+
$this->assertEquals($dateTime, $form->getData());
221221
$this->assertEquals($text, $form->getViewData());
222222
}
223223

@@ -254,7 +254,7 @@ public function testSubmitFromInputDateTimeDifferentPattern()
254254

255255
$form->submit('06*2010*02');
256256

257-
$this->assertDateTimeEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
257+
$this->assertEquals(new \DateTime('2010-06-02 UTC'), $form->getData());
258258
$this->assertEquals('06*2010*02', $form->getViewData());
259259
}
260260

@@ -468,7 +468,7 @@ public function testSetDataWithNegativeTimezoneOffsetDateTimeInput()
468468

469469
// 2010-06-02 00:00:00 UTC
470470
// 2010-06-01 20:00:00 UTC-4
471-
$this->assertDateTimeEquals($dateTime, $form->getData());
471+
$this->assertEquals($dateTime, $form->getData());
472472
$this->assertEquals('01.06.2010', $form->getViewData());
473473
}
474474

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public function testSetDataDifferentTimezonesDateTime()
315315
'second' => (int) $outputTime->format('s'),
316316
);
317317

318-
$this->assertDateTimeEquals($dateTime, $form->getData());
318+
$this->assertEquals($dateTime, $form->getData());
319319
$this->assertEquals($displayedData, $form->getViewData());
320320
}
321321

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.