Skip to content

Commit aceb037

Browse files
committed
Merge branch '3.2'
* 3.2: Revert "bug #21436 [DependencyInjection] check for circular refs caused by method calls (xabbuh)" Static code analysis with Php Inspections (EA Extended) [VarDumper] Added missing persistent stream cast remove unused translation file reverted usage of isNan
2 parents 22542ac + 1041a8a commit aceb037

File tree

3 files changed

+6
-23
lines changed

3 files changed

+6
-23
lines changed

Client.php

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
* Client simulates a browser and makes requests to a Kernel object.
2525
*
2626
* @author Fabien Potencier <fabien@symfony.com>
27+
*
28+
* @method Request|null getRequest() A Request instance
29+
* @method Response|null getResponse() A Response instance
2730
*/
2831
class Client extends BaseClient
2932
{
@@ -46,26 +49,6 @@ public function __construct(HttpKernelInterface $kernel, array $server = array()
4649
parent::__construct($server, $history, $cookieJar);
4750
}
4851

49-
/**
50-
* {@inheritdoc}
51-
*
52-
* @return Request|null A Request instance
53-
*/
54-
public function getRequest()
55-
{
56-
return parent::getRequest();
57-
}
58-
59-
/**
60-
* {@inheritdoc}
61-
*
62-
* @return Response|null A Response instance
63-
*/
64-
public function getResponse()
65-
{
66-
return parent::getResponse();
67-
}
68-
6952
/**
7053
* Makes a request.
7154
*

DataCollector/Util/ValueExporter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function exportValue($value, $depth = 1, $deep = false)
3737

3838
if (is_object($value)) {
3939
if ($value instanceof \DateTimeInterface) {
40-
return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ISO8601));
40+
return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ATOM));
4141
}
4242

4343
return sprintf('Object(%s)', get_class($value));

Tests/DataCollector/Util/ValueExporterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ protected function setUp()
3131
public function testDateTime()
3232
{
3333
$dateTime = new \DateTime('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
34-
$this->assertSame('Object(DateTime) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));
34+
$this->assertSame('Object(DateTime) - 2014-06-10T07:35:40+00:00', $this->valueExporter->exportValue($dateTime));
3535
}
3636

3737
public function testDateTimeImmutable()
3838
{
3939
$dateTime = new \DateTimeImmutable('2014-06-10 07:35:40', new \DateTimeZone('UTC'));
40-
$this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+0000', $this->valueExporter->exportValue($dateTime));
40+
$this->assertSame('Object(DateTimeImmutable) - 2014-06-10T07:35:40+00:00', $this->valueExporter->exportValue($dateTime));
4141
}
4242

4343
public function testIncompleteClass()

0 commit comments

Comments
 (0)