Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 860884a

Browse files
fabpotfabpot
committed
minor #30596 [Tests] fixed compatbility of assertEquals(): void (HeahDude)
This PR was merged into the 3.4 branch. Discussion ---------- [Tests] fixed compatbility of assertEquals(): void | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Same as #30474. Commits ------- 3f7bedc [Tests] fixed compatbility of assertEquals(): void
2 parents 42c08b8 + 3f7bedc commit 860884a

File tree

4 files changed

+48
-41
lines changed

4 files changed

+48
-41
lines changed

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,11 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToHtml5LocalDateTimeTransformer;
16+
use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
1617

1718
class DateTimeToHtml5LocalDateTimeTransformerTest extends TestCase
1819
{
19-
public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
20-
{
21-
if ($expected instanceof \DateTime && $actual instanceof \DateTime) {
22-
$expected = $expected->format('c');
23-
$actual = $actual->format('c');
24-
}
25-
26-
parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
27-
}
20+
use DateTimeEqualsTrait;
2821

2922
public function transformProvider()
3023
{
@@ -96,7 +89,7 @@ public function testReverseTransform($toTz, $fromTz, $to, $from)
9689
$transformer = new DateTimeToHtml5LocalDateTimeTransformer($toTz, $fromTz);
9790

9891
if (null !== $to) {
99-
$this->assertEquals(new \DateTime($to), $transformer->reverseTransform($from));
92+
$this->assertDateTimeEquals(new \DateTime($to), $transformer->reverseTransform($from));
10093
} else {
10194
$this->assertNull($transformer->reverseTransform($from));
10295
}

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

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
16+
use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
1617
use Symfony\Component\Intl\Util\IntlTestHelper;
1718

1819
class DateTimeToLocalizedStringTransformerTest extends TestCase
1920
{
21+
use DateTimeEqualsTrait;
22+
2023
protected $dateTime;
2124
protected $dateTimeWithoutSeconds;
2225

@@ -39,16 +42,6 @@ protected function tearDown()
3942
$this->dateTimeWithoutSeconds = null;
4043
}
4144

42-
public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
43-
{
44-
if ($expected instanceof \DateTime && $actual instanceof \DateTime) {
45-
$expected = $expected->format('c');
46-
$actual = $actual->format('c');
47-
}
48-
49-
parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
50-
}
51-
5245
public function dataProvider()
5346
{
5447
return [
@@ -152,7 +145,7 @@ public function testReverseTransformWithNoConstructorParameters()
152145

153146
$dateTime = new \DateTime('2010-02-03 04:05');
154147

155-
$this->assertEquals(
148+
$this->assertDateTimeEquals(
156149
$dateTime->format('c'),
157150
$transformer->reverseTransform('03.02.2010, 04:05')->format('c')
158151
);
@@ -217,14 +210,14 @@ public function testReverseTransform($dateFormat, $timeFormat, $pattern, $input,
217210

218211
$output = new \DateTime($output);
219212

220-
$this->assertEquals($output, $transformer->reverseTransform($input));
213+
$this->assertDateTimeEquals($output, $transformer->reverseTransform($input));
221214
}
222215

223216
public function testReverseTransformFullTime()
224217
{
225218
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
226219

227-
$this->assertEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
220+
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010, 04:05:06 GMT+00:00'));
228221
}
229222

230223
public function testReverseTransformFromDifferentLocale()
@@ -233,7 +226,7 @@ public function testReverseTransformFromDifferentLocale()
233226

234227
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
235228

236-
$this->assertEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
229+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
237230
}
238231

239232
public function testReverseTransformWithDifferentTimezones()
@@ -243,7 +236,7 @@ public function testReverseTransformWithDifferentTimezones()
243236
$dateTime = new \DateTime('2010-02-03 04:05:00 Asia/Hong_Kong');
244237
$dateTime->setTimezone(new \DateTimeZone('America/New_York'));
245238

246-
$this->assertEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
239+
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('03.02.2010, 04:05'));
247240
}
248241

249242
public function testReverseTransformOnlyDateWithDifferentTimezones()
@@ -252,21 +245,21 @@ public function testReverseTransformOnlyDateWithDifferentTimezones()
252245

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

255-
$this->assertEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
248+
$this->assertDateTimeEquals($dateTime, $transformer->reverseTransform('2017-01-10'));
256249
}
257250

258251
public function testReverseTransformWithDifferentPatterns()
259252
{
260253
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'MM*yyyy*dd HH|mm|ss');
261254

262-
$this->assertEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
255+
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('02*2010*03 04|05|06'));
263256
}
264257

265258
public function testReverseTransformDateOnlyWithDstIssue()
266259
{
267260
$transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, 'dd/MM/yyyy');
268261

269-
$this->assertEquals(
262+
$this->assertDateTimeEquals(
270263
new \DateTime('1978-05-28', new \DateTimeZone('Europe/Rome')),
271264
$transformer->reverseTransform('28/05/1978')
272265
);
@@ -276,7 +269,7 @@ public function testReverseTransformDateOnlyWithDstIssueAndEscapedText()
276269
{
277270
$transformer = new DateTimeToLocalizedStringTransformer('Europe/Rome', 'Europe/Rome', \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, \IntlDateFormatter::GREGORIAN, "'day': dd 'month': MM 'year': yyyy");
278271

279-
$this->assertEquals(
272+
$this->assertDateTimeEquals(
280273
new \DateTime('1978-05-28', new \DateTimeZone('Europe/Rome')),
281274
$transformer->reverseTransform('day: 28 month: 05 year: 1978')
282275
);
@@ -330,7 +323,7 @@ public function testReverseTransformWithNonExistingDate()
330323
{
331324
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
332325

333-
$this->assertEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
326+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
334327
}
335328

336329
/**

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToRfc3339Transformer;
16+
use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
1617

1718
class DateTimeToRfc3339TransformerTest extends TestCase
1819
{
20+
use DateTimeEqualsTrait;
21+
1922
protected $dateTime;
2023
protected $dateTimeWithoutSeconds;
2124

@@ -33,16 +36,6 @@ protected function tearDown()
3336
$this->dateTimeWithoutSeconds = null;
3437
}
3538

36-
public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
37-
{
38-
if ($expected instanceof \DateTime && $actual instanceof \DateTime) {
39-
$expected = $expected->format('c');
40-
$actual = $actual->format('c');
41-
}
42-
43-
parent::assertEquals($expected, $actual, $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
44-
}
45-
4639
public function allProvider()
4740
{
4841
return [
@@ -108,7 +101,7 @@ public function testReverseTransform($toTz, $fromTz, $to, $from)
108101
$transformer = new DateTimeToRfc3339Transformer($toTz, $fromTz);
109102

110103
if (null !== $to) {
111-
$this->assertEquals(new \DateTime($to), $transformer->reverseTransform($from));
104+
$this->assertDateTimeEquals(new \DateTime($to), $transformer->reverseTransform($from));
112105
} else {
113106
$this->assertNull($transformer->reverseTransform($from));
114107
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits;
13+
14+
/**
15+
* @internal
16+
*/
17+
trait DateTimeEqualsTrait
18+
{
19+
public static function assertDateTimeEquals($expected, $actual)
20+
{
21+
if ($expected instanceof \DateTime && $actual instanceof \DateTime) {
22+
$expected = $expected->format('c');
23+
$actual = $actual->format('c');
24+
}
25+
26+
parent::assertEquals($expected, $actual);
27+
}
28+
}

0 commit comments

Comments
 (0)