Skip to content

Commit 578f167

Browse files
Merge branch '3.3' into 3.4
* 3.3: [DI] Fix dumping with custom base class [HttpFoundation] Add test [HttpFoundation] Fix session-related BC break [Process] Workaround PHP bug #75515 in ProcessTest::testSimpleInputStream() fix method name
2 parents 9b7afbb + 4e84f5a commit 578f167

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Dumper/PhpDumper.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,12 @@ public function dump(array $options = array())
126126
$this->asFiles = $options['as_files'];
127127
$this->hotPathTag = $options['hot_path_tag'];
128128
$this->inlineRequires = $this->container->hasParameter($options['inline_class_loader_parameter']) && $this->container->getParameter($options['inline_class_loader_parameter']);
129-
$this->initializeMethodNamesMap($options['base_class']);
129+
130+
if (0 !== strpos($baseClass = $options['base_class'], '\\') && 'Container' !== $baseClass) {
131+
$baseClass = sprintf('%s\%s', $options['namespace'] ? '\\'.$options['namespace'] : '', $baseClass);
132+
}
133+
134+
$this->initializeMethodNamesMap('Container' === $baseClass ? Container::class : $baseClass);
130135

131136
$this->docStar = $options['debug'] ? '*' : '';
132137

@@ -156,7 +161,7 @@ public function dump(array $options = array())
156161
}
157162

158163
$code =
159-
$this->startClass($options['class'], $options['base_class']).
164+
$this->startClass($options['class'], $baseClass).
160165
$this->addServices().
161166
$this->addDefaultParametersMethod().
162167
$this->endClass()

Tests/Fixtures/php/services1-1.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @final since Symfony 3.3
1818
*/
19-
class Container extends AbstractContainer
19+
class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
2020
{
2121
private $parameters;
2222
private $targetDirs = array();

0 commit comments

Comments
 (0)