Skip to content

Commit af1997c

Browse files
committed
Merge branch '3.2'
* 3.2: [WebProfilerBundle] Fix AJAX panel with fetch requests Don’t compile when Opcache is not enabled on CLI DateIntervalType: 'invert' should not inherit the 'required' option [Form] DateIntervalType: Do not try to translate choices [TwigBridge] fix constructor args check Allow simple-phpunit to be used with an HTTP proxy Minor fixes for 3.2 Fix a web profiler form issue with fields added to the form after the form was built do not trigger deprecations for valid YAML Write an exception message in a one heading line [Workflow] Added missing docblock [Finder] Refine phpdoc about argument for NumberComparator Fixed max width from ajax request url element (td) Fix unresolved parameters from default bundle configs in debug:config [github] Tweak PR template [Serializer] Optimize max depth checking
2 parents 32bde09 + 1d32f7a commit af1997c

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

Command/ConfigDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
105105

106106
$io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
107107

108-
$io->writeln(Yaml::dump($config, 10));
108+
$io->writeln(Yaml::dump($container->getParameterBag()->resolveValue($config), 10));
109109
}
110110

111111
private function compileContainer()

Command/WorkflowDumpCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Symfony\Component\Workflow\Dumper\GraphvizDumper;
1818
use Symfony\Component\Workflow\Dumper\StateMachineGraphvizDumper;
1919
use Symfony\Component\Workflow\Marking;
20-
use Symfony\Component\Workflow\Workflow;
2120

2221
/**
2322
* @author Grégoire Pineau <lyrixx@lyrixx.info>

Controller/Controller.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ protected function json($data, $status = 200, $headers = array(), $context = arr
137137
protected function file($file, $fileName = null, $disposition = ResponseHeaderBag::DISPOSITION_ATTACHMENT)
138138
{
139139
$response = new BinaryFileResponse($file);
140-
$response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFileName() : $fileName);
140+
$response->setContentDisposition($disposition, $fileName === null ? $response->getFile()->getFilename() : $fileName);
141141

142142
return $response;
143143
}

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
use Symfony\Component\Cache\Adapter\ProxyAdapter;
2121
use Symfony\Component\Cache\Adapter\RedisAdapter;
2222
use Symfony\Component\DependencyInjection\ContainerBuilder;
23-
use Symfony\Component\DependencyInjection\Definition;
2423
use Symfony\Component\DependencyInjection\DefinitionDecorator;
2524
use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
2625
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;

0 commit comments

Comments
 (0)