Skip to content

Commit 3c5ab9f

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: 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
2 parents f24e7e5 + 54fb41e commit 3c5ab9f

File tree

4 files changed

+7
-24
lines changed

4 files changed

+7
-24
lines changed

Client.php

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
* Client simulates a browser and makes requests to a Kernel object.
2626
*
2727
* @author Fabien Potencier <[email protected]>
28+
*
29+
* @method Request|null getRequest() A Request instance
30+
* @method Response|null getResponse() A Response instance
2831
*/
2932
class Client extends BaseClient
3033
{
@@ -47,26 +50,6 @@ public function __construct(HttpKernelInterface $kernel, array $server = array()
4750
parent::__construct($server, $history, $cookieJar);
4851
}
4952

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

DataCollector/Util/ValueExporter.php

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

3434
if (is_object($value)) {
3535
if ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
36-
return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ISO8601));
36+
return sprintf('Object(%s) - %s', get_class($value), $value->format(\DateTime::ATOM));
3737
}
3838

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

Profiler/MemcacheProfilerStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function getMemcache()
4646
$port = $matches[3];
4747

4848
$memcache = new \Memcache();
49-
$memcache->addserver($host, $port);
49+
$memcache->addServer($host, $port);
5050

5151
$this->memcache = $memcache;
5252
}

Tests/DataCollector/Util/ValueExporterTest.php

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

3434
/**
@@ -37,7 +37,7 @@ public function testDateTime()
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)