Update compatibility

console.services.yml

@@ -0,0 +1,6 @@
+services:
+  content_sync.import:
+    class: Drupal\content_sync\Command\ImportCommand
+    arguments: []
+    tags:
+      - { name: drupal.command }

src/Command/AbstractCommand.php

@@ -7,15 +7,18 @@
 
 namespace Drupal\content_sync\Command;
 
-use Drupal\Console\Command\ContainerAwareCommand;
+use Drupal\Console\Core\Command\Command;
+use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
 use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Class AbstractCommand.
  *
  * @package Drupal\content_sync\Command
  */
-abstract class AbstractCommand extends ContainerAwareCommand {
+abstract class AbstractCommand extends Command {
+
+  use ContainerAwareCommandTrait;
 
   /**
    * Content manager service.
@@ -28,8 +31,15 @@ abstract class AbstractCommand extends ContainerAwareCommand {
    * {@inheritdoc}
    */
   protected function configure() {
-    $this->contentManager = $this->getService('content_sync.manager');
     $this->addArgument('folder', InputArgument::REQUIRED, $this->trans('command.content-sync.arguments.folder'));
   }
 
+  /**
+   * @return \Drupal\content_sync\ContentSyncManagerInterface
+   */
+  protected function getContentManager() {
+    $this->contentManager = $this->get('content_sync.manager');
+    return $this->contentManager;
+  }
+
 }

src/Command/AbstractExportCommand.php

@@ -31,7 +31,7 @@ protected function configure() {
    * {@inheritdoc}
    */
   protected function execute(InputInterface $input, OutputInterface $output) {
-    $this->contentManager->exportContentToFolder($input->getArgument('folder'), $this->getEntityTypeId(), $input->getOption('conditions'));
+    $this->getContentManager()->exportContentToFolder($input->getArgument('folder'), $this->getEntityTypeId(), $input->getOption('conditions'));
     $output->writeln("Content exported to " . $input->getArgument('folder'), OutputInterface::OUTPUT_NORMAL);
   }
 

src/Command/ImportCommand.php

@@ -7,14 +7,19 @@
 
 namespace Drupal\content_sync\Command;
 
+use Drupal\Console\Annotations\DrupalCommand;
+use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Class ImportCommand.
  *
- * @package Drupal\content_sync
+ * @DrupalCommand (
+ *     extension="content_sync",
+ *     extensionType="module"
+ * )
  */
 class ImportCommand extends AbstractCommand {
 
@@ -23,15 +28,16 @@ class ImportCommand extends AbstractCommand {
    */
   protected function configure() {
     parent::configure();
-    $this->setName('content-sync:import')->setDescription($this->trans('command.content-sync.import.description'));
+    $this->setName('content-sync:import')
+      ->setDescription($this->trans('command.content-sync.import.description'));
     $this->addOption('update', 'u', InputOption::VALUE_NONE, $this->trans('command.content-sync.import.options.update'));
   }
 
   /**
    * {@inheritdoc}
    */
   protected function execute(InputInterface $input, OutputInterface $output) {
-    $this->contentManager->importContentFromFolder($input->getArgument('folder'), $input->getOption('update'));
+    $this->getContentManager()->importContentFromFolder($input->getArgument('folder'), $input->getOption('update'));
     $output->writeln("Content imported from " . $input->getArgument('folder'), OutputInterface::OUTPUT_NORMAL);
   }