Issue #3002041 by chrisolof: Conflicts with devel webprofiler

modules/salesforce_mapping/src/Commands/SalesforceMappingCommands.php

@@ -4,7 +4,7 @@ namespace Drupal\salesforce_mapping\Commands;
 
 use Drupal\Core\Config\ConfigFactory;
 use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\salesforce\Commands\SalesforceCommandsBase;
 use Drupal\salesforce\Rest\RestClient;
 use Drupal\salesforce\SelectQuery;
@@ -27,7 +27,7 @@ class SalesforceMappingCommands extends SalesforceCommandsBase {
 
   protected $salesforceConfig;
   protected $database;
-  public function __construct(RestClient $client, EntityTypeManager $etm, ConfigFactory $configFactory, Connection $database) {
+  public function __construct(RestClient $client, EntityTypeManagerInterface $etm, ConfigFactory $configFactory, Connection $database) {
     parent::__construct($client, $etm);
     $this->database = $database;
     $this->salesforceConfig = $configFactory->get('salesforce.settings');

modules/salesforce_pull/src/Commands/SalesforcePullCommands.php

@@ -3,7 +3,7 @@
 namespace Drupal\salesforce_pull\Commands;
 
 use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\salesforce\Commands\SalesforceCommandsBase;
 use Drupal\salesforce\Event\SalesforceEvents;
 use Drupal\salesforce\Rest\RestClient;
@@ -36,10 +36,10 @@ class SalesforcePullCommands extends SalesforceCommandsBase {
    * SalesforcePullCommands constructor.
    *
    * @param \Drupal\salesforce\Rest\RestClient $client
-   * @param \Drupal\Core\Entity\EntityTypeManager $etm
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $etm
    * @param \Drupal\salesforce_pull\QueueHandler $pullQueue
    */
-  public function __construct(RestClient $client, EntityTypeManager $etm, QueueHandler $pullQueue, ContainerAwareEventDispatcher $eventDispatcher) {
+  public function __construct(RestClient $client, EntityTypeManagerInterface $etm, QueueHandler $pullQueue, ContainerAwareEventDispatcher $eventDispatcher) {
     parent::__construct($client, $etm);
     $this->pullQueue = $pullQueue;
     $this->eventDispatcher = $eventDispatcher;
@@ -159,7 +159,7 @@ class SalesforcePullCommands extends SalesforceCommandsBase {
    * Given a mapping, enqueue a list of object IDs to be pulled from a CSV file, e.g. a Salesforce report. The first column of the CSV file must be SFIDs. Additional columns will be ignored.
    *
    * @param $file
-   *   CSV file name of 15- or 18-character Salesforce ids to be pulled. 
+   *   CSV file name of 15- or 18-character Salesforce ids to be pulled.
    * @param $name
    *   Machine name of the Salesforce Mapping for which to queue pull records.
    *

modules/salesforce_push/src/Commands/SalesforcePushCommands.php

@@ -3,7 +3,7 @@
 namespace Drupal\salesforce_push\Commands;
 
 use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\salesforce\Commands\SalesforceCommandsBase;
 use Drupal\salesforce\Rest\RestClient;
 use Drupal\salesforce_push\PushQueue;
@@ -28,7 +28,7 @@ class SalesforcePushCommands extends SalesforceCommandsBase {
   /** @var \Drupal\salesforce_push\PushQueue $pushQueue */
   protected $pushQueue;
 
-  public function __construct(RestClient $client, EntityTypeManager $etm, PushQueue $pushQueue, Connection $database) {
+  public function __construct(RestClient $client, EntityTypeManagerInterface $etm, PushQueue $pushQueue, Connection $database) {
     parent::__construct($client, $etm);
     $this->pushQueue = $pushQueue;
     $this->database = $database;

src/Commands/SalesforceCommandsBase.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\salesforce\Commands;
 
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\salesforce\Rest\RestClient;
 use Drupal\salesforce_mapping\Entity\SalesforceMapping;
 use Drush\Commands\DrushCommands;
@@ -15,14 +15,14 @@ abstract class SalesforceCommandsBase extends DrushCommands {
 
   /** @var \Drupal\salesforce\Rest\RestClient */
   protected $client;
-  /** @var \Drupal\Core\Entity\EntityTypeManager */
+  /** @var \Drupal\Core\Entity\EntityTypeManagerInterface */
   protected $etm;
   /** @var \Drupal\salesforce_mapping\SalesforceMappingStorage */
   protected $mappingStorage;
   /** @var \Drupal\salesforce_mapping\MappedObjectStorage */
   protected $mappedObjectStorage;
 
-  public function __construct(RestClient $client, EntityTypeManager $etm) {
+  public function __construct(RestClient $client, EntityTypeManagerInterface $etm) {
     $this->client = $client;
     $this->etm = $etm;
     $this->mappingStorage = $etm->getStorage('salesforce_mapping');
@@ -177,4 +177,4 @@ abstract class SalesforceCommandsBase extends DrushCommands {
     return $query;
   }
 
-}
\ No newline at end of file
+}