Skip to content

Commit 18c25ba

Browse files
committed
Merge branch '5.1' into 5.x
2 parents 7069df3 + 69d7f68 commit 18c25ba

File tree

5 files changed

+4
-9
lines changed

5 files changed

+4
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CHANGELOG
1818

1919
5.1.0
2020
-----
21-
21+
* Removed `--no-backup` option from `translation:update` command (broken since `5.0.0`)
2222
* Added link to source for controllers registered as named services
2323
* Added link to source on controller on `router:match`/`debug:router` (when `framework.ide` is configured)
2424
* Added the `framework.router.default_uri` configuration option to configure the default `RequestContext`

Command/TranslationUpdateCommand.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ protected function configure()
7979
new InputOption('output-format', null, InputOption::VALUE_OPTIONAL, 'Override the default output format', 'xlf'),
8080
new InputOption('dump-messages', null, InputOption::VALUE_NONE, 'Should the messages be dumped in the console'),
8181
new InputOption('force', null, InputOption::VALUE_NONE, 'Should the update be done'),
82-
new InputOption('no-backup', null, InputOption::VALUE_NONE, 'Should backup be disabled'),
8382
new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
8483
new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'Specify the domain to update'),
8584
new InputOption('xliff-version', null, InputOption::VALUE_OPTIONAL, 'Override the default xliff version', '1.2'),
@@ -290,10 +289,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
290289
$resultMessage = sprintf('%d message%s successfully extracted', $extractedMessagesCount, $extractedMessagesCount > 1 ? 's were' : ' was');
291290
}
292291

293-
if (true === $input->getOption('no-backup')) {
294-
$this->writer->disableBackup();
295-
}
296-
297292
// save the files
298293
if (true === $input->getOption('force')) {
299294
$io->comment('Writing files...');

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
669669
$container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
670670

671671
// Choose storage class based on the DSN
672-
list($class) = explode(':', $config['dsn'], 2);
672+
[$class] = explode(':', $config['dsn'], 2);
673673
if ('file' !== $class) {
674674
throw new \LogicException(sprintf('Driver "%s" is not supported for the profiler.', $class));
675675
}

Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function showFlashAction(Request $request)
7171
$session = $request->getSession();
7272

7373
if ($session->getFlashBag()->has('notice')) {
74-
list($output) = $session->getFlashBag()->get('notice');
74+
[$output] = $session->getFlashBag()->get('notice');
7575
} else {
7676
$output = 'No flash was set.';
7777
}

Translation/Translator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ protected function initialize()
155155
$this->addResourceFiles();
156156
}
157157
foreach ($this->resources as $key => $params) {
158-
list($format, $resource, $locale, $domain) = $params;
158+
[$format, $resource, $locale, $domain] = $params;
159159
parent::addResource($format, $resource, $locale, $domain);
160160
}
161161
$this->resources = [];

0 commit comments

Comments
 (0)