From 0550fc242e1d4003e643d626a9bbefa39c847596 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Thu, 18 Oct 2018 13:21:17 +0200 Subject: [PATCH] Replaced '\n' with PHP_EOL constant --- .../ConvertXmlTextToRichTextCommand.php | 18 +++++++++--------- bundle/Command/ImportXmlCommand.php | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bundle/Command/ConvertXmlTextToRichTextCommand.php b/bundle/Command/ConvertXmlTextToRichTextCommand.php index 0da11fc4..bc87c308 100644 --- a/bundle/Command/ConvertXmlTextToRichTextCommand.php +++ b/bundle/Command/ConvertXmlTextToRichTextCommand.php @@ -149,10 +149,10 @@ protected function configure() 'export-dir-filter', null, InputOption::VALUE_OPTIONAL, - "To be used together with --export-dir option. Specify what kind of problems should be exported:\n - notice: ezxmltext contains problems which the conversion tool was able to fix automatically and likly do not need manual intervention\n - warning: the conversion tool was able to convert the ezxmltext to valid richtext, but data was maybe altered/removed/added in the process. Manual supervision recommended\n - error: the ezxmltext text cannot be converted and manual changes are required.", + 'To be used together with --export-dir option. Specify what kind of problems should be exported:' . PHP_EOL . + 'notice: ezxmltext contains problems which the conversion tool was able to fix automatically and likly do not need manual intervention' . PHP_EOL . + 'warning: the conversion tool was able to convert the ezxmltext to valid richtext, but data was maybe altered/removed/added in the process. Manual supervision recommended' . PHP_EOL . + 'error: the ezxmltext text cannot be converted and manual changes are required.', sprintf('%s,%s', LogLevel::WARNING, LogLevel::ERROR) ) ->addOption( @@ -171,9 +171,9 @@ protected function configure() 'fix-embedded-images-only', null, InputOption::VALUE_NONE, - "Use this option to ensure that embedded images in a database are tagget correctly so that the editor will detect them as such.\n - This option is needed if you have an existing ezplatform database which was converted with an earlier version of\n - 'ezxmltext:convert-to-richtext' which did not convert embedded images correctly." + 'Use this option to ensure that embedded images in a database are tagget correctly so that the editor will detect them as such.' . PHP_EOL . + 'This option is needed if you have an existing ezplatform database which was converted with an earlier version of' . PHP_EOL . + '\'ezxmltext:convert-to-richtext\' which did not convert embedded images correctly.' ) ->addOption( 'no-progress', @@ -197,7 +197,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($dryRun) { $output->writeln('Running in dry-run mode. No changes will actually be written to database'); if ($this->exportDir !== '') { - $output->writeln("Note: --export-dir option provided, files will be written to $this->exportDir even in dry-run mode\n"); + $output->writeln("Note: --export-dir option provided, files will be written to $this->exportDir even in dry-run mode" . PHP_EOL); } } @@ -209,7 +209,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } if ($input->getOption('fix-embedded-images-only')) { - $output->writeln("Fixing embedded images only. No other changes are done to the database\n"); + $output->writeln('Fixing embedded images only. No other changes are done to the database' . PHP_EOL); $this->fixEmbeddedImages($dryRun, $testContentId, $output); return; diff --git a/bundle/Command/ImportXmlCommand.php b/bundle/Command/ImportXmlCommand.php index aa87f51a..0df3e10c 100644 --- a/bundle/Command/ImportXmlCommand.php +++ b/bundle/Command/ImportXmlCommand.php @@ -97,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { $dryRun = false; if ($input->getOption('dry-run')) { - $output->writeln("Running in dry-run mode. No changes will actually be written to database\n"); + $output->writeln('Running in dry-run mode. No changes will actually be written to database' . PHP_EOL); $dryRun = true; }