Merge pull request #4 from Spooky063/fix/dependency-inversion

fix dependency inversion principle

Author: GMoneger

drupal_gdpr.info.yml

@@ -3,4 +3,4 @@ name: GDPR
 type: module
 description: Gives basic GDPR features
 core: 8.x
-version: 8.x-1.0
+version: 8.x-1.0.1

src/Controller/GDPRController.php

@@ -5,8 +5,9 @@
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityFieldManager;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\File\FileSystem;
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\drupal_gdpr\Form\CSVExportSettingsForm;
 use Drupal\user\Entity\User;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -20,13 +21,13 @@ class GDPRController extends ControllerBase
 {
     const CSV_EXPORTS_FOLDER = 'public://gdpr/csv_exports';
 
-    /** @var EntityFieldManager */
+    /** @var EntityFieldManagerInterface */
     protected $entityFieldManager;
 
-    /** @var FileSystem */
+    /** @var FileSystemInterface */
     private $fileSystem;
 
-    public function __construct(EntityFieldManager $entityFieldManager, FileSystem $fileSystem)
+    public function __construct(EntityFieldManagerInterface $entityFieldManager, FileSystemInterface $fileSystem)
     {
         $this->entityFieldManager = $entityFieldManager;
         $this->fileSystem = $fileSystem;

src/Form/CSVExportSettingsForm.php

@@ -4,9 +4,9 @@
 
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityFieldManager;
-use Drupal\Core\Entity\EntityTypeBundleInfo;
-use Drupal\Core\Entity\EntityTypeManager;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -28,17 +28,17 @@ class CSVExportSettingsForm extends ConfigFormBase
     const USER_FIELDS = 'user_fields';
     const USER_FIELDSET = 'user_fieldset';
 
-    /** @var EntityFieldManager */
+    /** @var EntityFieldManagerInterface */
     protected $entityFieldManager;
 
-    /** @var EntityTypeBundleInfo */
+    /** @var EntityTypeBundleInfoInterface */
     protected $entityTypeBundleInfo;
 
-    /** @var EntityTypeManager */
+    /** @var EntityTypeManagerInterface */
     protected $entityTypeManager;
 
     /** {@inheritdoc} */
-    public function __construct(ConfigFactoryInterface $config_factory, EntityFieldManager $entityFieldManager, EntityTypeBundleInfo $entityTypeBundleInfo, EntityTypeManager $entityTypeManager)
+    public function __construct(ConfigFactoryInterface $config_factory, EntityFieldManagerInterface $entityFieldManager, EntityTypeBundleInfoInterface $entityTypeBundleInfo, EntityTypeManagerInterface $entityTypeManager)
     {
         parent::__construct($config_factory);
         $this->entityFieldManager = $entityFieldManager;