Skip to content

Commit 977adc9

Browse files
committed
minor #14474 [2.3] Static Code Analysis for Components (kalessil)
This PR was merged into the 2.3 branch. Discussion ---------- [2.3] Static Code Analysis for Components | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Static Code Analysis with Php Inspections (EA Extended), no functional changes: - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString - resolved callable name case mismatches Commits ------- 9eb2b14 Php Inspections (EA Extended): - resolved possible PHP Fatal in \Symfony\Component\BrowserKit\Cookie::__toString -resolved implicit magic methods calls -resolved callable name case mismatches
2 parents d3bf6f3 + 6163477 commit 977adc9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

DataCollector/RequestDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function collect(Request $request, Response $response, \Exception $except
122122
$this->data['controller'] = array(
123123
'class' => is_object($controller[0]) ? get_class($controller[0]) : $controller[0],
124124
'method' => $controller[1],
125-
'file' => $r->getFilename(),
125+
'file' => $r->getFileName(),
126126
'line' => $r->getStartLine(),
127127
);
128128
} catch (\ReflectionException $re) {
@@ -141,7 +141,7 @@ public function collect(Request $request, Response $response, \Exception $except
141141
$this->data['controller'] = array(
142142
'class' => $r->getName(),
143143
'method' => null,
144-
'file' => $r->getFilename(),
144+
'file' => $r->getFileName(),
145145
'line' => $r->getStartLine(),
146146
);
147147
} else {

HttpCache/HttpCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ protected function validate(Request $request, Response $entry, $catch = false)
367367
// We keep the etags from the client to handle the case when the client
368368
// has a different private valid entry which is not cached here.
369369
$cachedEtags = $entry->getEtag() ? array($entry->getEtag()) : array();
370-
$requestEtags = $request->getEtags();
370+
$requestEtags = $request->getETags();
371371
if ($etags = array_unique(array_merge($cachedEtags, $requestEtags))) {
372372
$subRequest->headers->set('if_none_match', implode(', ', $etags));
373373
}

Profiler/MemcacheProfilerStorage.php

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

4343
$memcache = new \Memcache();
44-
$memcache->addServer($host, $port);
44+
$memcache->addserver($host, $port);
4545

4646
$this->memcache = $memcache;
4747
}

Tests/DataCollector/ConfigDataCollectorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public function testCollect()
3636

3737
// if else clause because we don't know it
3838
if (extension_loaded('xdebug')) {
39-
$this->assertTrue($c->hasXdebug());
39+
$this->assertTrue($c->hasXDebug());
4040
} else {
41-
$this->assertFalse($c->hasXdebug());
41+
$this->assertFalse($c->hasXDebug());
4242
}
4343

4444
// if else clause because we don't know it

0 commit comments

Comments
 (0)