Refactor readers for better di (#457)

* Refactor readers to get a proper DI

Similar to what was done with writers, readers also needed to be updated to match the new way of doing things.
This commits promotes a better DI (factories, injection through constructors).

* Escapers should not be singletons

Instead, they should be proper object that can be injected where needed.

src/Spout/Writer/Common/Creator/InternalFactoryInterface.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Common\Creator;
 
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Manager\WorkbookManagerInterface;
 
 /**
@@ -17,4 +17,4 @@ interface InternalFactoryInterface
      * @return WorkbookManagerInterface
      */
     public function createWorkbookManager(OptionsManagerInterface $optionsManager);
-}
+}

src/Spout/Writer/Common/Entity/Options.php

@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\Common\Entity;
 
 /**
  * Class Options
- * Writer' options holder
+ * Writers' options holder
  *
  * @package Box\Spout\Writer\Common\Entity
  */

src/Spout/Writer/Common/Manager/OptionsManagerAbstract.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Manager;
-
-/**
- * Class OptionsManager
- * Writer' options manager
- *
- * @package Box\Spout\Writer\Common\Manager
- */
-abstract class OptionsManagerAbstract implements OptionsManagerInterface
-{
-    const PREFIX_OPTION = 'OPTION_';
-
-    /** @var string[] List of all supported option names */
-    private $supportedOptions = [];
-
-    /** @var array Associative array [OPTION_NAME => OPTION_VALUE] */
-    private $options = [];
-
-    /**
-     * WriterOptions constructor.
-     */
-    public function __construct()
-    {
-        $this->supportedOptions = $this->getSupportedOptions();
-        $this->setDefaultOptions();
-    }
-
-    /**
-     * @return array List of supported options
-     */
-    abstract protected function getSupportedOptions();
-
-    /**
-     * Sets the default options.
-     * To be overriden by child classes
-     *
-     * @return void
-     */
-    abstract protected function setDefaultOptions();
-
-    /**
-     * Sets the given option, if this option is supported.
-     *
-     * @param string $optionName
-     * @param mixed $optionValue
-     * @return void
-     */
-    public function setOption($optionName, $optionValue)
-    {
-        if (in_array($optionName, $this->supportedOptions)) {
-            $this->options[$optionName] = $optionValue;
-        }
-    }
-
-    /**
-     * @param string $optionName
-     * @return mixed|null The set option or NULL if no option with given name found
-     */
-    public function getOption($optionName)
-    {
-        $optionValue = null;
-
-        if (isset($this->options[$optionName])) {
-            $optionValue = $this->options[$optionName];
-        }
-
-        return $optionValue;
-    }
-}

src/Spout/Writer/Common/Manager/OptionsManagerInterface.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Manager;
-
-/**
- * Interface OptionsManagerInterface
- * Writer' options interface
- *
- * @package Box\Spout\Writer\Common\Manager
- */
-interface OptionsManagerInterface
-{
-    /**
-     * @param string $optionName
-     * @param mixed $optionValue
-     * @return void
-     */
-    public function setOption($optionName, $optionValue);
-
-    /**
-     * @param string $optionName
-     * @return mixed|null The set option or NULL if no option with given name found
-     */
-    public function getOption($optionName);
-}

src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php

@@ -3,6 +3,7 @@
 namespace Box\Spout\Writer\Common\Manager;
 
 use Box\Spout\Common\Exception\IOException;
+use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\Common\Manager\Style\StyleManagerInterface;
@@ -312,4 +313,4 @@ abstract class WorkbookManagerAbstract implements WorkbookManagerInterface
         $rootFolder = $this->fileSystemHelper->getRootFolder();
         $this->fileSystemHelper->deleteFolderRecursively($rootFolder);
     }
-}
+}