Use the factories instead of messing about with the container (#16)

Space48 · Apr 23, 2018 · 4c9c7f9 · 4c9c7f9
1 parent b75d23e
commit 4c9c7f9
Show file tree

Hide file tree

Showing 17 changed files with 160 additions and 78 deletions.
diff --git a/etc/di.php b/etc/di.php
@@ -19,22 +19,7 @@
         $commands = [];
 
         foreach ($c->get('commands') as $command) {
-            $manualArgs = [];
-
-            switch ($command) {
-                case 'Meanbee\Magedbm2\Command\LsCommand':
-                    // Ensure that we get two different instances of the object for our LsCommand. The default behaviour
-                    // of the container would give us the same instance.
-                    $manualArgs['dataStorage'] = $c->make(\Meanbee\Magedbm2\Service\StorageInterface::class);
-                case 'Meanbee\Magedbm2\Command\ExportCommand':
-                case 'Meanbee\Magedbm2\Command\GetCommand':
-                case 'Meanbee\Magedbm2\Command\ImportCommand':
-                case 'Meanbee\Magedbm2\Command\PutCommand':
-                case 'Meanbee\Magedbm2\Command\RmCommand':
-                    $manualArgs['storage'] = $c->make(\Meanbee\Magedbm2\Service\StorageInterface::class);
-            }
-
-            $commands[] = $c->make($command, $manualArgs);
+            $commands[] = $c->make($command);
         }
 
         foreach ($commands as $command) {

diff --git a/src/Command/ConfigureCommand.php b/src/Command/ConfigureCommand.php
@@ -4,6 +4,7 @@
 
 use Meanbee\Magedbm2\Application\ConfigFileResolver;
 use Meanbee\Magedbm2\Application\ConfigInterface;
+use Meanbee\Magedbm2\Service\FilesystemFactory;
 use Meanbee\Magedbm2\Service\FilesystemInterface;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
@@ -44,21 +45,22 @@ class ConfigureCommand extends BaseCommand
 
     /**
      * @param ConfigInterface $config
-     * @param FilesystemInterface $filesystem
+     * @param ConfigFileResolver $configFileResolver
+     * @param FilesystemFactory $filesystemFactory
      * @param Yaml $yaml
      * @param array|null $excluded_options
      */
     public function __construct(
         ConfigInterface $config,
         ConfigFileResolver $configFileResolver,
-        FilesystemInterface $filesystem,
+        FilesystemFactory $filesystemFactory,
         Yaml $yaml,
         array $excluded_options = null
     ) {
         parent::__construct($config, self::NAME);
 
         $this->config = $config;
-        $this->filesystem = $filesystem;
+        $this->filesystem = $filesystemFactory->create();
         $this->yaml = $yaml;
 
         if ($excluded_options) {

diff --git a/src/Command/ExportCommand.php b/src/Command/ExportCommand.php
@@ -5,7 +5,9 @@
 use Meanbee\Magedbm2\Application\Config\Option;
 use Meanbee\Magedbm2\Application\ConfigInterface;
 use Meanbee\Magedbm2\Service\Anonymiser\Export;
+use Meanbee\Magedbm2\Service\FilesystemFactory;
 use Meanbee\Magedbm2\Service\FilesystemInterface;
+use Meanbee\Magedbm2\Service\StorageFactory;
 use Meanbee\Magedbm2\Service\StorageInterface;
 use Meanbee\Magedbm2\Shell\Command\Gzip;
 use Meanbee\Magedbm2\Shell\Command\Mysqldump;
@@ -34,17 +36,17 @@ class ExportCommand extends BaseCommand
 
     /**
      * @param ConfigInterface $config
-     * @param StorageInterface $storage
-     * @param FilesystemInterface $filesystem
+     * @param StorageFactory $storageFactory
+     * @param FilesystemFactory $filesystemFactory
      */
-    public function __construct(ConfigInterface $config, StorageInterface $storage, FilesystemInterface $filesystem)
+    public function __construct(ConfigInterface $config, StorageFactory $storageFactory, FilesystemFactory $filesystemFactory)
     {
         parent::__construct($config, self::NAME);
         $this->anonymiser = new Export();
-        $this->storage = $storage;
-        $this->filesystem = $filesystem;
+        $this->storage = $storageFactory->create();
+        $this->filesystem = $filesystemFactory->create();
 
-        $storage->setPurpose(StorageInterface::PURPOSE_ANONYMISED_DATA);
+        $this->storage->setPurpose(StorageInterface::PURPOSE_ANONYMISED_DATA);
 
         $this->ensureServiceConfigurationValidated('storage', $this->storage);
     }

diff --git a/src/Command/GetCommand.php b/src/Command/GetCommand.php
@@ -4,9 +4,12 @@
 
 use Meanbee\Magedbm2\Application\ConfigInterface;
 use Meanbee\Magedbm2\Application\Config\Option;
+use Meanbee\Magedbm2\Service\DatabaseFactory;
 use Meanbee\Magedbm2\Service\DatabaseInterface;
+use Meanbee\Magedbm2\Service\FilesystemFactory;
 use Meanbee\Magedbm2\Service\FilesystemInterface;
 use Meanbee\Magedbm2\Exception\ServiceException;
+use Meanbee\Magedbm2\Service\StorageFactory;
 use Meanbee\Magedbm2\Service\StorageInterface;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
@@ -32,26 +35,24 @@ class GetCommand extends BaseCommand
     protected $filesystem;
 
     /**
-     * GetCommand constructor.
-     *
      * @param ConfigInterface $config
-     * @param DatabaseInterface $database
-     * @param StorageInterface $storage
-     * @param FilesystemInterface $filesystem
+     * @param DatabaseFactory $databaseFactory
+     * @param StorageFactory $storageFactory
+     * @param FilesystemFactory $filesystemFactory
      */
     public function __construct(
         ConfigInterface $config,
-        DatabaseInterface $database,
-        StorageInterface $storage,
-        FilesystemInterface $filesystem
+        DatabaseFactory $databaseFactory,
+        StorageFactory $storageFactory,
+        FilesystemFactory $filesystemFactory
     ) {
         parent::__construct($config, self::NAME);
 
-        $this->database = $database;
-        $this->storage = $storage;
-        $this->filesystem = $filesystem;
+        $this->database = $databaseFactory->create();
+        $this->storage = $storageFactory->create();
+        $this->filesystem = $filesystemFactory->create();
 
-        $storage->setPurpose(StorageInterface::PURPOSE_STRIPPED_DATABASE);
+        $this->storage->setPurpose(StorageInterface::PURPOSE_STRIPPED_DATABASE);
 
         $this->ensureServiceConfigurationValidated('storage', $this->storage);
     }

diff --git a/src/Command/ImportCommand.php b/src/Command/ImportCommand.php
@@ -5,7 +5,9 @@
 use Meanbee\Magedbm2\Application\Config\Option;
 use Meanbee\Magedbm2\Application\ConfigInterface;
 use Meanbee\Magedbm2\Exception\ConfigurationException;
+use Meanbee\Magedbm2\Service\FilesystemFactory;
 use Meanbee\Magedbm2\Service\FilesystemInterface;
+use Meanbee\Magedbm2\Service\StorageFactory;
 use Meanbee\Magedbm2\Service\StorageInterface;
 use Meanbee\Magedbm2\Shell\Command\Gunzip;
 use PDO;
@@ -48,15 +50,16 @@ class ImportCommand extends BaseCommand
 
     /**
      * @param ConfigInterface $config
-     * @throws \Symfony\Component\Console\Exception\LogicException
+     * @param StorageFactory $storageFactory
+     * @param FilesystemFactory $filesystemFactory
      */
-    public function __construct(ConfigInterface $config, StorageInterface $storage, FilesystemInterface $filesystem)
+    public function __construct(ConfigInterface $config, StorageFactory $storageFactory, FilesystemFactory $filesystemFactory)
     {
         parent::__construct($config, self::NAME);
-        $this->storage = $storage;
-        $this->filesystem = $filesystem;
+        $this->storage = $storageFactory->create();
+        $this->filesystem = $filesystemFactory->create();
 
-        $storage->setPurpose(StorageInterface::PURPOSE_ANONYMISED_DATA);
+        $this->storage->setPurpose(StorageInterface::PURPOSE_ANONYMISED_DATA);
 
         $this->ensureServiceConfigurationValidated('storage', $this->storage);
     }

diff --git a/src/Command/LsCommand.php b/src/Command/LsCommand.php
@@ -5,6 +5,7 @@
 use Meanbee\Magedbm2\Application\ConfigInterface;
 use Meanbee\Magedbm2\Exception\ServiceException;
 use Meanbee\Magedbm2\Service\Storage\Data\File;
+use Meanbee\Magedbm2\Service\StorageFactory;
 use Meanbee\Magedbm2\Service\StorageInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -24,14 +25,18 @@ class LsCommand extends BaseCommand
      */
     private $dataStorage;
 
-    public function __construct(ConfigInterface $config, StorageInterface $storage, StorageInterface $dataStorage)
+    /**
+     * @param ConfigInterface $config
+     * @param StorageFactory $storageFactory
+     */
+    public function __construct(ConfigInterface $config, StorageFactory $storageFactory)
     {
         parent::__construct($config, self::NAME);
 
-        $this->storage = $storage;
+        $this->storage = $storageFactory->create();
         $this->storage->setPurpose(StorageInterface::PURPOSE_STRIPPED_DATABASE);
 
-        $this->dataStorage = $dataStorage;
+        $this->dataStorage = $storageFactory->create();
         $this->dataStorage->setPurpose(StorageInterface::PURPOSE_ANONYMISED_DATA);
     }
 

diff --git a/src/Command/PutCommand.php b/src/Command/PutCommand.php
@@ -5,9 +5,12 @@
 use Meanbee\Magedbm2\Application\Config\Option;
 use Meanbee\Magedbm2\Application\ConfigInterface;
 use Meanbee\Magedbm2\Helper\TableGroupExpander;
+use Meanbee\Magedbm2\Service\DatabaseFactory;
 use Meanbee\Magedbm2\Service\DatabaseInterface;
+use Meanbee\Magedbm2\Service\FilesystemFactory;
 use Meanbee\Magedbm2\Service\FilesystemInterface;
 use Meanbee\Magedbm2\Exception\ServiceException;
+use Meanbee\Magedbm2\Service\StorageFactory;
 use Meanbee\Magedbm2\Service\StorageInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -36,25 +39,25 @@ class PutCommand extends BaseCommand
 
     /**
      * @param ConfigInterface $config
-     * @param DatabaseInterface $database
-     * @param StorageInterface $storage
-     * @param FilesystemInterface $filesystem
+     * @param DatabaseFactory $databaseFactory
+     * @param StorageFactory $storageFactory
+     * @param FilesystemFactory $filesystemFactory
      * @param TableGroupExpander $tableGroupExpander
      */
     public function __construct(
         ConfigInterface $config,
-        DatabaseInterface $database,
-        StorageInterface $storage,
-        FilesystemInterface $filesystem,
+        DatabaseFactory $databaseFactory,
+        StorageFactory $storageFactory,
+        FilesystemFactory $filesystemFactory,
         TableGroupExpander $tableGroupExpander = null
     ) {
-        $this->database = $database;
-        $this->storage = $storage;
-        $this->filesystem = $filesystem;
+        $this->database = $databaseFactory->create();
+        $this->storage = $storageFactory->create();
+        $this->filesystem = $filesystemFactory->create();
         $this->tableExpander = $tableGroupExpander ?? new TableGroupExpander();
         $this->config = $config;
 
-        $storage->setPurpose(StorageInterface::PURPOSE_STRIPPED_DATABASE);
+        $this->storage->setPurpose(StorageInterface::PURPOSE_STRIPPED_DATABASE);
 
         parent::__construct($config, self::NAME);
 

diff --git a/src/Command/RmCommand.php b/src/Command/RmCommand.php
@@ -4,6 +4,7 @@
 
 use Meanbee\Magedbm2\Application\ConfigInterface;
 use Meanbee\Magedbm2\Exception\ServiceException;
+use Meanbee\Magedbm2\Service\StorageFactory;
 use Meanbee\Magedbm2\Service\StorageInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -24,11 +25,15 @@ class RmCommand extends BaseCommand
     /** @var StorageInterface */
     protected $storage;
 
-    public function __construct(ConfigInterface $config, StorageInterface $storage)
+    /**
+     * @param ConfigInterface $config
+     * @param StorageFactory $storageFactory
+     */
+    public function __construct(ConfigInterface $config, StorageFactory $storageFactory)
     {
         parent::__construct($config, self::NAME);
 
-        $this->storage = $storage;
+        $this->storage = $storageFactory->create();
 
         $this->ensureServiceConfigurationValidated('storage', $this->storage);
     }

diff --git a/src/Service/DatabaseFactory.php b/src/Service/DatabaseFactory.php
@@ -7,21 +7,30 @@
 class DatabaseFactory
 {
     /**
-     * @param Container $container
+     * @var Container
+     */
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
      * @return DatabaseInterface
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public static function create(Container $container)
+    public function create()
     {
-        switch ($container->get('database_adapter')) {
+        switch ($this->container->get('database_adapter')) {
             case 'shell':
             default:
-                $instance = $container->make(\Meanbee\Magedbm2\Service\Database\Shell::class);
+                $instance = $this->container->make(\Meanbee\Magedbm2\Service\Database\Shell::class);
         }
 
         if ($instance instanceof \Psr\Log\LoggerAwareInterface) {
-            $instance->setLogger($container->get('logger'));
+            $instance->setLogger($this->container->get('logger'));
         }
 
         return $instance;

diff --git a/src/Service/FilesystemFactory.php b/src/Service/FilesystemFactory.php
@@ -7,21 +7,30 @@
 class FilesystemFactory
 {
     /**
-     * @param Container $container
+     * @var Container
+     */
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
      * @return FilesystemInterface
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public static function create(Container $container)
+    public function create()
     {
-        switch ($container->get('filesystem_adapter')) {
+        switch ($this->container->get('filesystem_adapter')) {
             case 'simple':
             default:
-                $instance = $container->make(\Meanbee\Magedbm2\Service\Filesystem\Simple::class);
+                $instance = $this->container->make(\Meanbee\Magedbm2\Service\Filesystem\Simple::class);
         }
 
         if ($instance instanceof \Psr\Log\LoggerAwareInterface) {
-            $instance->setLogger($container->get('logger'));
+            $instance->setLogger($this->container->get('logger'));
         }
 
         return $instance;

diff --git a/src/Service/StorageFactory.php b/src/Service/StorageFactory.php
@@ -7,24 +7,33 @@
 class StorageFactory
 {
     /**
-     * @param Container $container
+     * @var Container
+     */
+    private $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
      * @return StorageInterface
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public static function create(Container $container)
+    public function create()
     {
-        switch ($container->get('storage_adapter')) {
+        switch ($this->container->get('storage_adapter')) {
             case 's3':
-                $instance = $container->make(\Meanbee\Magedbm2\Service\Storage\S3::class);
+                $instance = $this->container->make(\Meanbee\Magedbm2\Service\Storage\S3::class);
                 break;
             case 'local':
             default:
-                $instance = $container->make(\Meanbee\Magedbm2\Service\Storage\Local::class);
+                $instance = $this->container->make(\Meanbee\Magedbm2\Service\Storage\Local::class);
         }
 
         if ($instance instanceof \Psr\Log\LoggerAwareInterface) {
-            $instance->setLogger($container->get('logger'));
+            $instance->setLogger($this->container->get('logger'));
         }
 
         return $instance;