Drupal 9 Support (#4259)

* update symfony dependencies

* update deprecation in UserDebug commands

* update deprecation in RestEnable command

* update Statistics command

* update UserDelete command

* update views commands

* remove deprecations

* update DC version

Author: dmouse

composer.json

@@ -36,17 +36,17 @@
         "docs": "https://docs.drupalconsole.com/"
     },
     "require": {
-        "php": "^5.5.9 || ^7.0",
+        "php": ">=7.0.8",
         "alchemy/zippy": "~0.4",
         "composer/installers": "~1.0",
         "doctrine/annotations": "^1.2",
         "doctrine/collections": "^1.3",
-        "drupal/console-core": "1.9.4",
+        "drupal/console-core": "1.9.5",
         "drupal/console-extend-plugin": "~0",
         "psy/psysh": "0.6.* || ~0.8",
-        "symfony/css-selector": "~2.8|~3.0",
-        "symfony/dom-crawler": "~2.8|~3.0",
-        "symfony/http-foundation": "~2.8|~3.0"
+        "symfony/css-selector": "~3.0|~4.0",
+        "symfony/dom-crawler": "~3.0|~4.0",
+        "symfony/http-foundation": "~3.0|~4.0"
     },
     "suggest": {
         "symfony/thanks": "Thank your favorite PHP projects on GitHub using the CLI",

config/services/debug.yml

@@ -23,7 +23,7 @@ services:
       - { name: drupal.command }
   console.user_debug:
     class: Drupal\Console\Command\Debug\UserCommand
-    arguments: ['@entity_type.manager','@entity.query', '@console.drupal_api']
+    arguments: ['@entity_type.manager', '@console.drupal_api']
     tags:
       - { name: drupal.command }
   console.views_debug:

config/services/rest.yml

@@ -10,6 +10,5 @@ services:
       - '@entity_type.manager'
       - '@?plugin.manager.rest'
       - '@authentication_collector'
-      - '@entity.manager'
     tags:
       - { name: drupal.command }

config/services/site.yml

@@ -16,7 +16,7 @@ services:
       - { name: drupal.command }
   console.site_statistics:
     class: Drupal\Console\Command\Site\StatisticsCommand
-    arguments: ['@console.drupal_api', '@entity.query', '@console.extension_manager', '@module_handler']
+    arguments: ['@console.drupal_api', '@entity_type.manager', '@console.extension_manager', '@module_handler']
     tags:
       - { name: drupal.command }
   console.site_status:

config/services/user.yml

@@ -1,7 +1,7 @@
 services:
   console.user_delete:
     class: Drupal\Console\Command\User\DeleteCommand
-    arguments: ['@entity_type.manager','@entity.query', '@console.drupal_api']
+    arguments: ['@entity_type.manager', '@console.drupal_api']
     tags:
       - { name: drupal.command }
   console.user_login_clear_attempts:

config/services/views.yml

@@ -1,11 +1,11 @@
 services:
   console.views_disable:
     class: Drupal\Console\Command\Views\DisableCommand
-    arguments: ['@entity_type.manager', '@entity.query']
+    arguments: ['@entity_type.manager']
     tags:
       - { name: drupal.command }
   console.views_enable:
     class: Drupal\Console\Command\Views\EnableCommand
-    arguments: ['@entity_type.manager', '@entity.query']
+    arguments: ['@entity_type.manager']
     tags:
       - { name: drupal.command }

src/Application.php

@@ -25,7 +25,7 @@ class Application extends BaseApplication
     /**
      * @var string
      */
-    const VERSION = '1.9.4';
+    const VERSION = '1.9.5';
 
     public function __construct(ContainerInterface $container)
     {

src/Command/Debug/UserCommand.php

@@ -12,7 +12,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Drupal\Console\Core\Command\Command;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Console\Utils\DrupalApi;
 
 /**
@@ -27,11 +26,6 @@ class UserCommand extends Command
      */
     protected $entityTypeManager;
 
-    /**
-     * @var QueryFactory
-     */
-    protected $entityQuery;
-
     /**
      * @var DrupalApi
      */
@@ -41,16 +35,13 @@ class UserCommand extends Command
      * DebugCommand constructor.
      *
      * @param EntityTypeManagerInterface $entityTypeManager
-     * @param QueryFactory               $entityQuery
      * @param DrupalApi                  $drupalApi
      */
     public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
-        QueryFactory $entityQuery,
         DrupalApi $drupalApi
     ) {
         $this->entityTypeManager = $entityTypeManager;
-        $this->entityQuery = $entityQuery;
         $this->drupalApi = $drupalApi;
         parent::__construct();
     }
@@ -110,7 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $userStorage = $this->entityTypeManager->getStorage('user');
         $systemRoles = $this->drupalApi->getRoles();
 
-        $query = $this->entityQuery->get('user');
+        $query = $this->entityTypeManager->getStorage('user')->getQuery();
         $query->condition('uid', 0, '>');
         $query->sort('uid');
 

src/Command/Rest/EnableCommand.php

@@ -16,7 +16,6 @@
 use Drupal\Console\Command\Shared\RestTrait;
 use Drupal\rest\Plugin\Type\ResourcePluginManager;
 use Drupal\Core\Authentication\AuthenticationCollector;
-use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
@@ -44,32 +43,21 @@ class EnableCommand extends ContainerAwareCommand
      */
     protected $authenticationCollector;
 
-    /**
-     * The entity manager.
-     *
-     * @var EntityManager
-     */
-    protected $entityManager;
-
     /**
      * EnableCommand constructor.
      *
      * @param EntityTypeManagerInterface $entityTypeManager
      * @param ResourcePluginManager      $pluginManagerRest
      * @param AuthenticationCollector    $authenticationCollector
-     * @param EntityManager              $entity_manager
-     *   The entity manager.
      */
     public function __construct(
         EntityTypeManagerInterface $entityTypeManager,
         ResourcePluginManager $pluginManagerRest,
-        AuthenticationCollector $authenticationCollector,
-        EntityManager $entity_manager
+        AuthenticationCollector $authenticationCollector
     ) {
         $this->entityTypeManager = $entityTypeManager;
         $this->pluginManagerRest = $pluginManagerRest;
         $this->authenticationCollector = $authenticationCollector;
-        $this->entityManager = $entity_manager;
         parent::__construct();
     }
 
@@ -146,9 +134,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         );
 
         $format_resource_id = str_replace(':', '.', $resource_id);
-        $config = $this->entityManager->getStorage('rest_resource_config')->load($format_resource_id);
+        $config = $this->entityTypeManager->getStorage('rest_resource_config')->load($format_resource_id);
         if (!$config) {
-            $config = $this->entityManager->getStorage('rest_resource_config')->create(
+            $config = $this->entityTypeManager->getStorage('rest_resource_config')->create(
                 [
                 'id' => $format_resource_id,
                 'granularity' => RestResourceConfigInterface::METHOD_GRANULARITY,

src/Command/Site/StatisticsCommand.php

@@ -10,10 +10,10 @@
 use Drupal\Console\Core\Command\Command;
 use Drupal\Console\Extension\Manager;
 use Drupal\Console\Utils\DrupalApi;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Class StatisticsCommand
@@ -27,11 +27,6 @@ class StatisticsCommand extends Command
      */
     protected $drupalApi;
 
-    /**
-     * @var QueryFactory
-     */
-    protected $entityQuery;
-
     /**
      * @var Manager
      */
@@ -42,22 +37,26 @@ class StatisticsCommand extends Command
      */
     protected $moduleHandler;
 
+    /**
+     * @var EntityTypeManagerInterface
+     */
+    protected $entityTypeManager;
+
     /**
      * StatisticsCommand constructor.
      *
      * @param DrupalApi $drupalApi
-     * @param QueryFactory $entityQuery ;
      * @param Manager $extensionManager
      * @param ModuleHandlerInterface $moduleHandler
      */
     public function __construct(
         DrupalApi $drupalApi,
-        QueryFactory $entityQuery,
+        EntityTypeManagerInterface $entityTypeManager,
         Manager $extensionManager,
         ModuleHandlerInterface $moduleHandler
     ) {
         $this->drupalApi = $drupalApi;
-        $this->entityQuery = $entityQuery;
+        $this->entityTypeManager = $entityTypeManager;
         $this->extensionManager = $extensionManager;
         $this->moduleHandler = $moduleHandler;
         parent::__construct();
@@ -131,7 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     private function getEntitiesCount($entity_type, $condition = [])
     {
-        $entityQuery = $this->entityQuery->get($entity_type)->count();
+        $entityQuery = $this->entityTypeManager->getStorage($entity_type)->getQuery()->count();
         if (!empty($condition)) {
             $entityQuery->condition($condition['name'], $condition['value'], $condition['condition']);
         }