Skip to content

Commit fd683a8

Browse files
minor #20870 Minor fixes for 3.2 (ogizanagi)
This PR was merged into the 3.2 branch. Discussion ---------- Minor fixes for 3.2 | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A This only fix minor issues in the codebase introduced in 3.2. Refs: - YamlEncoder symfony/symfony@9366a7d - File helper: symfony/symfony@d9a8499 - VarDumper ClassStub: symfony/symfony@788f7e8 - Cache tag based invalidation symfony/symfony@19764af - CacheWarmer for Serializer: symfony/symfony@810f469 - SymfonyStyle simplified test: symfony/symfony@85e5060 - Workflow Definition builder: symfony/symfony@ffaeba3 --- There are other issues in older branches, but I guess it's not worth it for them, as it'll only add more conflicts. But for 3.2, it should be feasible. Commits ------- 7bdfc84 Minor fixes for 3.2
2 parents 57cd859 + df91907 commit fd683a8

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

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)