Merge pull request ezsystems#2 from ezsystems/sf-3.2

Updated for current Symfony (3.2)
ezecosystem · Jun 12, 2017 · 2de9143 · 2de9143
2 parents 65bc86c + 88fdda3
commit 2de9143
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/php/eZ/Publish/ProfilerBundle/Command/ProfileCommand.php b/src/php/eZ/Publish/ProfilerBundle/Command/ProfileCommand.php
@@ -7,6 +7,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 
@@ -53,13 +54,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $executor = $this->getContainer()->get('ezpublish.profiler.executor.' . $input->getArgument('target'));
 
-        $dialog = $this->getHelper('dialog');
+        $dialog = $this->getHelper('question');
         if ($input->getOption('seed')) {
             mt_srand($input->getOption('seed'));
         }
 
+        $question = new ConfirmationQuestion('Really run the profiler? This will reset the database.', false);
         if (!$input->getOption('yes') &&
-            !$dialog->askConfirmation($output, "<question>Really run the profiler? This will reset the database.</question>", false)) {
+            !$dialog->ask($input, $output, $question)) {
             return 1;
         }
 

diff --git a/src/php/eZ/Publish/ProfilerBundle/Resources/config/services.xml b/src/php/eZ/Publish/ProfilerBundle/Resources/config/services.xml
@@ -71,9 +71,9 @@
 
         <!-- Should not be required, but is currently not exposed -->
         <service id="ezpublish.api.service.language"
-            factory-service="ezpublish.api.repository"
-            factory-method="getContentLanguageService"
             class="eZ\Publish\API\Repository\LanguageService">
+            <factory service="ezpublish.api.repository"
+                method="getContentLanguageService" />
         </service>
     </services>
 </container>