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/Reader/CSV/Creator/EntityFactory.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Box\Spout\Reader\CSV\Creator;
+
+use Box\Spout\Common\Creator\HelperFactory;
+use Box\Spout\Common\Helper\GlobalFunctionsHelper;
+use Box\Spout\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Reader\Common\Creator\EntityFactoryInterface;
+use Box\Spout\Reader\CSV\RowIterator;
+use Box\Spout\Reader\CSV\Sheet;
+use Box\Spout\Reader\CSV\SheetIterator;
+
+/**
+ * Class EntityFactory
+ * Factory to create entities
+ *
+ * @package Box\Spout\Reader\CSV\Creator
+ */
+class EntityFactory implements EntityFactoryInterface
+{
+    /** @var HelperFactory */
+    private $helperFactory;
+
+    /**
+     * @param HelperFactory $helperFactory
+     */
+    public function __construct(HelperFactory $helperFactory)
+    {
+        $this->helperFactory = $helperFactory;
+    }
+
+    /**
+     * @param resource $filePointer Pointer to the CSV file to read
+     * @param OptionsManagerInterface $optionsManager
+     * @param GlobalFunctionsHelper $globalFunctionsHelper
+     * @return SheetIterator
+     */
+    public function createSheetIterator($filePointer, $optionsManager, $globalFunctionsHelper)
+    {
+        return new SheetIterator($filePointer, $optionsManager, $globalFunctionsHelper, $this);
+    }
+
+    /**
+     * @param resource $filePointer Pointer to the CSV file to read
+     * @param OptionsManagerInterface $optionsManager
+     * @param GlobalFunctionsHelper $globalFunctionsHelper
+     * @return Sheet
+     */
+    public function createSheet($filePointer, $optionsManager, $globalFunctionsHelper)
+    {
+        return new Sheet($filePointer, $optionsManager, $globalFunctionsHelper, $this);
+    }
+
+    /**
+     * @param resource $filePointer Pointer to the CSV file to read
+     * @param OptionsManagerInterface $optionsManager
+     * @param GlobalFunctionsHelper $globalFunctionsHelper
+     * @return RowIterator
+     */
+    public function createRowIterator($filePointer, $optionsManager, $globalFunctionsHelper)
+    {
+        $encodingHelper = $this->helperFactory->createEncodingHelper($globalFunctionsHelper);
+        return new RowIterator($filePointer, $optionsManager, $encodingHelper, $globalFunctionsHelper);
+    }
+}

src/Spout/Reader/CSV/Manager/OptionsManager.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Box\Spout\Reader\CSV\Manager;
+
+use Box\Spout\Common\Helper\EncodingHelper;
+use Box\Spout\Common\Manager\OptionsManagerAbstract;
+use Box\Spout\Reader\Common\Entity\Options;
+
+/**
+ * Class OptionsManager
+ * CSV Reader options manager
+ *
+ * @package Box\Spout\Reader\CSV\Manager
+ */
+class OptionsManager extends OptionsManagerAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getSupportedOptions()
+    {
+        return [
+            Options::SHOULD_FORMAT_DATES,
+            Options::SHOULD_PRESERVE_EMPTY_ROWS,
+            Options::FIELD_DELIMITER,
+            Options::FIELD_ENCLOSURE,
+            Options::ENCODING,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setDefaultOptions()
+    {
+        $this->setOption(Options::SHOULD_FORMAT_DATES, false);
+        $this->setOption(Options::SHOULD_PRESERVE_EMPTY_ROWS, false);
+        $this->setOption(Options::FIELD_DELIMITER, ',');
+        $this->setOption(Options::FIELD_ENCLOSURE, '"');
+        $this->setOption(Options::ENCODING, EncodingHelper::ENCODING_UTF8);
+    }
+}

src/Spout/Reader/CSV/Reader.php

@@ -2,7 +2,9 @@
 
 namespace Box\Spout\Reader\CSV;
 
-use Box\Spout\Reader\AbstractReader;
+use Box\Spout\Reader\Common\Entity\Options;
+use Box\Spout\Reader\CSV\Creator\EntityFactory;
+use Box\Spout\Reader\ReaderAbstract;
 use Box\Spout\Common\Exception\IOException;
 
 /**
@@ -11,7 +13,7 @@ use Box\Spout\Common\Exception\IOException;
  *
  * @package Box\Spout\Reader\CSV
  */
-class Reader extends AbstractReader
+class Reader extends ReaderAbstract
 {
     /** @var resource Pointer to the file to be written */
     protected $filePointer;
@@ -22,19 +24,6 @@ class Reader extends AbstractReader
     /** @var string Original value for the "auto_detect_line_endings" INI value */
     protected $originalAutoDetectLineEndings;
 
-    /**
-     * Returns the reader's current options
-     *
-     * @return ReaderOptions
-     */
-    protected function getOptions()
-    {
-        if (!isset($this->options)) {
-            $this->options = new ReaderOptions();
-        }
-        return $this->options;
-    }
-
     /**
      * Sets the field delimiter for the CSV.
      * Needs to be called before opening the reader.
@@ -44,7 +33,7 @@ class Reader extends AbstractReader
      */
     public function setFieldDelimiter($fieldDelimiter)
     {
-        $this->getOptions()->setFieldDelimiter($fieldDelimiter);
+        $this->optionsManager->setOption(Options::FIELD_DELIMITER, $fieldDelimiter);
         return $this;
     }
 
@@ -57,7 +46,7 @@ class Reader extends AbstractReader
      */
     public function setFieldEnclosure($fieldEnclosure)
     {
-        $this->getOptions()->setFieldEnclosure($fieldEnclosure);
+        $this->optionsManager->setOption(Options::FIELD_ENCLOSURE, $fieldEnclosure);
         return $this;
     }
 
@@ -70,20 +59,7 @@ class Reader extends AbstractReader
      */
     public function setEncoding($encoding)
     {
-        $this->getOptions()->setEncoding($encoding);
-        return $this;
-    }
-
-    /**
-     * Sets the EOL for the CSV.
-     * Needs to be called before opening the reader.
-     *
-     * @param string $endOfLineCharacter used to properly get lines from the CSV file.
-     * @return Reader
-     */
-    public function setEndOfLineCharacter($endOfLineCharacter)
-    {
-        $this->getOptions()->setEndOfLineCharacter($endOfLineCharacter);
+        $this->optionsManager->setOption(Options::ENCODING, $encoding);
         return $this;
     }
 
@@ -115,9 +91,12 @@ class Reader extends AbstractReader
             throw new IOException("Could not open file $filePath for reading.");
         }
 
-        $this->sheetIterator = new SheetIterator(
+        /** @var EntityFactory $entityFactory */
+        $entityFactory = $this->entityFactory;
+
+        $this->sheetIterator = $entityFactory->createSheetIterator(
             $this->filePointer,
-            $this->getOptions(),
+            $this->optionsManager,
             $this->globalFunctionsHelper
         );
     }

src/Spout/Reader/CSV/ReaderOptions.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace Box\Spout\Reader\CSV;
-
-use Box\Spout\Common\Helper\EncodingHelper;
-
-/**
- * Class ReaderOptions
- * This class is used to customize the reader's behavior
- *
- * @package Box\Spout\Reader\CSV
- */
-class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
-{
-    /** @var string Defines the character used to delimit fields (one character only) */
-    protected $fieldDelimiter = ',';
-
-    /** @var string Defines the character used to enclose fields (one character only) */
-    protected $fieldEnclosure = '"';
-
-    /** @var string Encoding of the CSV file to be read */
-    protected $encoding = EncodingHelper::ENCODING_UTF8;
-
-    /** @var string Defines the End of line */
-    protected $endOfLineCharacter = "\n";
-
-    /**
-     * @return string
-     */
-    public function getFieldDelimiter()
-    {
-        return $this->fieldDelimiter;
-    }
-
-    /**
-     * Sets the field delimiter for the CSV.
-     * Needs to be called before opening the reader.
-     *
-     * @param string $fieldDelimiter Character that delimits fields
-     * @return ReaderOptions
-     */
-    public function setFieldDelimiter($fieldDelimiter)
-    {
-        $this->fieldDelimiter = $fieldDelimiter;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFieldEnclosure()
-    {
-        return $this->fieldEnclosure;
-    }
-
-    /**
-     * Sets the field enclosure for the CSV.
-     * Needs to be called before opening the reader.
-     *
-     * @param string $fieldEnclosure Character that enclose fields
-     * @return ReaderOptions
-     */
-    public function setFieldEnclosure($fieldEnclosure)
-    {
-        $this->fieldEnclosure = $fieldEnclosure;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Sets the encoding of the CSV file to be read.
-     * Needs to be called before opening the reader.
-     *
-     * @param string $encoding Encoding of the CSV file to be read
-     * @return ReaderOptions
-     */
-    public function setEncoding($encoding)
-    {
-        $this->encoding = $encoding;
-        return $this;
-    }
-
-    /**
-     * @return string EOL for the CSV
-     */
-    public function getEndOfLineCharacter()
-    {
-        return $this->endOfLineCharacter;
-    }
-
-    /**
-     * Sets the EOL for the CSV.
-     * Needs to be called before opening the reader.
-     *
-     * @param string $endOfLineCharacter used to properly get lines from the CSV file.
-     * @return ReaderOptions
-     */
-    public function setEndOfLineCharacter($endOfLineCharacter)
-    {
-        $this->endOfLineCharacter = $endOfLineCharacter;
-        return $this;
-    }
-}

src/Spout/Reader/CSV/RowIterator.php

@@ -2,6 +2,9 @@
 
 namespace Box\Spout\Reader\CSV;
 
+use Box\Spout\Common\Creator\HelperFactory;
+use Box\Spout\Reader\Common\Entity\Options;
+use Box\Spout\Reader\CSV\Creator\EntityFactory;
 use Box\Spout\Reader\IteratorInterface;
 use Box\Spout\Common\Helper\EncodingHelper;
 
@@ -39,9 +42,6 @@ class RowIterator implements IteratorInterface
     /** @var string Encoding of the CSV file to be read */
     protected $encoding;
 
-    /** @var string End of line delimiter, given by the user as input. */
-    protected $inputEOLDelimiter;
-
     /** @var bool Whether empty rows should be returned or skipped */
     protected $shouldPreserveEmptyRows;
 
@@ -51,25 +51,21 @@ class RowIterator implements IteratorInterface
     /** @var \Box\Spout\Common\Helper\EncodingHelper Helper to work with different encodings */
     protected $encodingHelper;
 
-    /** @var string End of line delimiter, encoded using the same encoding as the CSV */
-    protected $encodedEOLDelimiter;
-
     /**
      * @param resource $filePointer Pointer to the CSV file to read
-     * @param \Box\Spout\Reader\CSV\ReaderOptions $options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager
+     * @param \Box\Spout\Common\Helper\EncodingHelper $encodingHelper
      * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
      */
-    public function __construct($filePointer, $options, $globalFunctionsHelper)
+    public function __construct($filePointer, $optionsManager, $encodingHelper, $globalFunctionsHelper)
     {
         $this->filePointer = $filePointer;
-        $this->fieldDelimiter = $options->getFieldDelimiter();
-        $this->fieldEnclosure = $options->getFieldEnclosure();
-        $this->encoding = $options->getEncoding();
-        $this->inputEOLDelimiter = $options->getEndOfLineCharacter();
-        $this->shouldPreserveEmptyRows = $options->shouldPreserveEmptyRows();
+        $this->fieldDelimiter = $optionsManager->getOption(Options::FIELD_DELIMITER);
+        $this->fieldEnclosure = $optionsManager->getOption(Options::FIELD_ENCLOSURE);
+        $this->encoding = $optionsManager->getOption(Options::ENCODING);
+        $this->shouldPreserveEmptyRows = $optionsManager->getOption(Options::SHOULD_PRESERVE_EMPTY_ROWS);
+        $this->encodingHelper = $encodingHelper;
         $this->globalFunctionsHelper = $globalFunctionsHelper;
-
-        $this->encodingHelper = new EncodingHelper($globalFunctionsHelper);
     }
 
     /**
@@ -202,21 +198,6 @@ class RowIterator implements IteratorInterface
         return $encodedRowData;
     }
 
-    /**
-     * Returns the end of line delimiter, encoded using the same encoding as the CSV.
-     * The return value is cached.
-     *
-     * @return string
-     */
-    protected function getEncodedEOLDelimiter()
-    {
-        if (!isset($this->encodedEOLDelimiter)) {
-            $this->encodedEOLDelimiter = $this->encodingHelper->attemptConversionFromUTF8($this->inputEOLDelimiter, $this->encoding);
-        }
-
-        return $this->encodedEOLDelimiter;
-    }
-
     /**
      * @param array|bool $lineData Array containing the cells value for the line
      * @return bool Whether the given line is empty

src/Spout/Reader/CSV/Sheet.php

@@ -2,6 +2,7 @@
 
 namespace Box\Spout\Reader\CSV;
 
+use Box\Spout\Reader\CSV\Creator\EntityFactory;
 use Box\Spout\Reader\SheetInterface;
 
 /**
@@ -16,12 +17,13 @@ class Sheet implements SheetInterface
 
     /**
      * @param resource $filePointer Pointer to the CSV file to read
-     * @param \Box\Spout\Reader\CSV\ReaderOptions $options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager
      * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
+     * @param EntityFactory $entityFactory Factory to create entities
      */
-    public function __construct($filePointer, $options, $globalFunctionsHelper)
+    public function __construct($filePointer, $optionsManager, $globalFunctionsHelper, $entityFactory)
     {
-        $this->rowIterator = new RowIterator($filePointer, $options, $globalFunctionsHelper);
+        $this->rowIterator = $entityFactory->createRowIterator($filePointer, $optionsManager, $globalFunctionsHelper);
     }
 
     /**

src/Spout/Reader/CSV/SheetIterator.php

@@ -2,6 +2,7 @@
 
 namespace Box\Spout\Reader\CSV;
 
+use Box\Spout\Reader\CSV\Creator\EntityFactory;
 use Box\Spout\Reader\IteratorInterface;
 
 /**
@@ -20,12 +21,13 @@ class SheetIterator implements IteratorInterface
 
     /**
      * @param resource $filePointer
-     * @param \Box\Spout\Reader\CSV\ReaderOptions $options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager
      * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
+     * @param EntityFactory $entityFactory Factory to create entities
      */
-    public function __construct($filePointer, $options, $globalFunctionsHelper)
+    public function __construct($filePointer, $optionsManager, $globalFunctionsHelper, $entityFactory)
     {
-        $this->sheet = new Sheet($filePointer, $options, $globalFunctionsHelper);
+        $this->sheet = $entityFactory->createSheet($filePointer, $optionsManager, $globalFunctionsHelper);
     }
 
     /**

src/Spout/Reader/Common/Creator/EntityFactoryInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Box\Spout\Reader\Common\Creator;
+
+/**
+ * Interface EntityFactoryInterface
+ *
+ * @package Box\Spout\Reader\Common\Creator
+ */
+interface EntityFactoryInterface
+{
+}

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

@@ -0,0 +1,24 @@
+<?php
+
+namespace Box\Spout\Reader\Common\Entity;
+
+/**
+ * Class Options
+ * Readers' options holder
+ *
+ * @package Box\Spout\Reader\Common\Entity
+ */
+abstract class Options
+{
+    // Common options
+    const SHOULD_FORMAT_DATES = 'shouldFormatDates';
+    const SHOULD_PRESERVE_EMPTY_ROWS = 'shouldPreserveEmptyRows';
+
+    // CSV specific options
+    const FIELD_DELIMITER = 'fieldDelimiter';
+    const FIELD_ENCLOSURE = 'fieldEnclosure';
+    const ENCODING = 'encoding';
+
+    // XLSX specific options
+    const TEMP_FOLDER = 'tempFolder';
+}

src/Spout/Reader/ODS/Creator/EntityFactory.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Box\Spout\Reader\ODS\Creator;
+
+use Box\Spout\Common\Helper\GlobalFunctionsHelper;
+use Box\Spout\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Reader\Common\Creator\EntityFactoryInterface;
+use Box\Spout\Reader\Common\XMLProcessor;
+use Box\Spout\Reader\ODS\RowIterator;
+use Box\Spout\Reader\ODS\Sheet;
+use Box\Spout\Reader\ODS\SheetIterator;
+use Box\Spout\Reader\Wrapper\XMLReader;
+
+/**
+ * Class EntityFactory
+ * Factory to create entities
+ *
+ * @package Box\Spout\Reader\ODS\Creator
+ */
+class EntityFactory implements EntityFactoryInterface
+{
+    /** @var HelperFactory */
+    private $helperFactory;
+
+    /**
+     * @param HelperFactory $helperFactory
+     */
+    public function __construct(HelperFactory $helperFactory)
+    {
+        $this->helperFactory = $helperFactory;
+    }
+
+    /**
+     * @param string $filePath Path of the file to be read
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @return SheetIterator
+     */
+    public function createSheetIterator($filePath, $optionsManager)
+    {
+        return new SheetIterator($filePath, $optionsManager, $this, $this->helperFactory);
+    }
+
+    /**
+     * @param XMLReader $xmlReader XML Reader
+     * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
+     * @param string $sheetName Name of the sheet
+     * @param bool $isSheetActive Whether the sheet was defined as active
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @return Sheet
+     */
+    public function createSheet($xmlReader, $sheetIndex, $sheetName, $isSheetActive, $optionsManager)
+    {
+        return new Sheet($xmlReader, $sheetIndex, $sheetName, $isSheetActive, $optionsManager, $this);
+    }
+
+    /**
+     * @param XMLReader $xmlReader XML Reader
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @return RowIterator
+     */
+    public function createRowIterator($xmlReader, $optionsManager)
+    {
+        return new RowIterator($xmlReader, $optionsManager, $this, $this->helperFactory);
+    }
+
+    /**
+     * @return XMLReader
+     */
+    public function createXMLReader()
+    {
+        return new XMLReader();
+    }
+
+    /**
+     * @param $xmlReader
+     * @return XMLProcessor
+     */
+    public function createXMLProcessor($xmlReader)
+    {
+        return new XMLProcessor($xmlReader);
+    }
+
+    /**
+     * @return \ZipArchive
+     */
+    public function createZipArchive()
+    {
+        return new \ZipArchive();
+    }
+}

src/Spout/Reader/ODS/Creator/HelperFactory.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Box\Spout\Reader\ODS\Creator;
+
+use Box\Spout\Reader\ODS\Helper\CellValueFormatter;
+use Box\Spout\Reader\ODS\Helper\SettingsHelper;
+
+
+/**
+ * Class EntityFactory
+ * Factory to create helpers
+ *
+ * @package Box\Spout\Reader\ODS\Creator
+ */
+class HelperFactory extends \Box\Spout\Common\Creator\HelperFactory
+{
+    /**
+     * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings
+     * @return CellValueFormatter
+     */
+    public function createCellValueFormatter($shouldFormatDates)
+    {
+        $escaper = $this->createStringsEscaper();
+        return new CellValueFormatter($shouldFormatDates, $escaper);
+    }
+
+    /**
+     * @return SettingsHelper
+     */
+    public function createSettingsHelper()
+    {
+        return new SettingsHelper();
+    }
+
+    /**
+     * @return \Box\Spout\Common\Helper\Escaper\ODS
+     */
+    public function createStringsEscaper()
+    {
+        /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+        return new \Box\Spout\Common\Helper\Escaper\ODS();
+    }
+}

src/Spout/Reader/ODS/Helper/CellValueFormatter.php

@@ -38,18 +38,17 @@ class CellValueFormatter
     /** @var bool Whether date/time values should be returned as PHP objects or be formatted as strings */
     protected $shouldFormatDates;
 
-    /** @var \Box\Spout\Common\Escaper\ODS Used to unescape XML data */
+    /** @var \Box\Spout\Common\Helper\Escaper\ODS Used to unescape XML data */
     protected $escaper;
 
     /**
      * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings
+     * @param \Box\Spout\Common\Helper\Escaper\ODS $escaper Used to unescape XML data
      */
-    public function __construct($shouldFormatDates)
+    public function __construct($shouldFormatDates, $escaper)
     {
         $this->shouldFormatDates = $shouldFormatDates;
-
-        /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
-        $this->escaper = \Box\Spout\Common\Escaper\ODS::getInstance();
+        $this->escaper = $escaper;
     }
 
     /**

src/Spout/Reader/ODS/Manager/OptionsManager.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Box\Spout\Reader\ODS\Manager;
+
+use Box\Spout\Common\Manager\OptionsManagerAbstract;
+use Box\Spout\Reader\Common\Entity\Options;
+
+/**
+ * Class OptionsManager
+ * ODS Reader options manager
+ *
+ * @package Box\Spout\Reader\ODS\Manager
+ */
+class OptionsManager extends OptionsManagerAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getSupportedOptions()
+    {
+        return [
+            Options::SHOULD_FORMAT_DATES,
+            Options::SHOULD_PRESERVE_EMPTY_ROWS,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setDefaultOptions()
+    {
+        $this->setOption(Options::SHOULD_FORMAT_DATES, false);
+        $this->setOption(Options::SHOULD_PRESERVE_EMPTY_ROWS, false);
+    }
+}

src/Spout/Reader/ODS/Reader.php

@@ -3,7 +3,8 @@
 namespace Box\Spout\Reader\ODS;
 
 use Box\Spout\Common\Exception\IOException;
-use Box\Spout\Reader\AbstractReader;
+use Box\Spout\Reader\ODS\Creator\EntityFactory;
+use Box\Spout\Reader\ReaderAbstract;
 
 /**
  * Class Reader
@@ -11,7 +12,7 @@ use Box\Spout\Reader\AbstractReader;
  *
  * @package Box\Spout\Reader\ODS
  */
-class Reader extends AbstractReader
+class Reader extends ReaderAbstract
 {
     /** @var \ZipArchive */
     protected $zip;
@@ -19,19 +20,6 @@ class Reader extends AbstractReader
     /** @var SheetIterator To iterator over the ODS sheets */
     protected $sheetIterator;
 
-    /**
-     * Returns the reader's current options
-     *
-     * @return ReaderOptions
-     */
-    protected function getOptions()
-    {
-        if (!isset($this->options)) {
-            $this->options = new ReaderOptions();
-        }
-        return $this->options;
-    }
-
     /**
      * Returns whether stream wrappers are supported
      *
@@ -52,10 +40,15 @@ class Reader extends AbstractReader
      */
     protected function openReader($filePath)
     {
-        $this->zip = new \ZipArchive();
+        /** @var EntityFactory $entityFactory */
+        $entityFactory = $this->entityFactory;
+
+        $this->zip = $entityFactory->createZipArchive();
 
         if ($this->zip->open($filePath) === true) {
-            $this->sheetIterator = new SheetIterator($filePath, $this->getOptions());
+            /** @var EntityFactory $entityFactory */
+            $entityFactory = $this->entityFactory;
+            $this->sheetIterator = $entityFactory->createSheetIterator($filePath, $this->optionsManager);
         } else {
             throw new IOException("Could not open $filePath for reading.");
         }

src/Spout/Reader/ODS/ReaderOptions.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Box\Spout\Reader\ODS;
-
-/**
- * Class ReaderOptions
- * This class is used to customize the reader's behavior
- *
- * @package Box\Spout\Reader\ODS
- */
-class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
-{
-    // No extra options
-}

src/Spout/Reader/ODS/RowIterator.php

@@ -3,10 +3,12 @@
 namespace Box\Spout\Reader\ODS;
 
 use Box\Spout\Common\Exception\IOException;
+use Box\Spout\Reader\Common\Entity\Options;
 use Box\Spout\Reader\Exception\IteratorNotRewindableException;
 use Box\Spout\Reader\Exception\XMLProcessingException;
 use Box\Spout\Reader\IteratorInterface;
-use Box\Spout\Reader\ODS\Helper\CellValueFormatter;
+use Box\Spout\Reader\ODS\Creator\EntityFactory;
+use Box\Spout\Reader\ODS\Creator\HelperFactory;
 use Box\Spout\Reader\Wrapper\XMLReader;
 use Box\Spout\Reader\Common\XMLProcessor;
 
@@ -72,16 +74,18 @@ class RowIterator implements IteratorInterface
 
     /**
      * @param XMLReader $xmlReader XML Reader, positioned on the "<table:table>" element
-     * @param \Box\Spout\Reader\ODS\ReaderOptions $options Reader's current options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @param HelperFactory $helperFactory Factory to create helpers
      */
-    public function __construct($xmlReader, $options)
+    public function __construct($xmlReader, $optionsManager, $entityFactory, $helperFactory)
     {
         $this->xmlReader = $xmlReader;
-        $this->shouldPreserveEmptyRows = $options->shouldPreserveEmptyRows();
-        $this->cellValueFormatter = new CellValueFormatter($options->shouldFormatDates());
+        $this->shouldPreserveEmptyRows = $optionsManager->getOption(Options::SHOULD_PRESERVE_EMPTY_ROWS);
+        $this->cellValueFormatter = $helperFactory->createCellValueFormatter($optionsManager->getOption(Options::SHOULD_FORMAT_DATES));
 
         // Register all callbacks to process different nodes when reading the XML file
-        $this->xmlProcessor = new XMLProcessor($this->xmlReader);
+        $this->xmlProcessor = $entityFactory->createXMLProcessor($this->xmlReader);
         $this->xmlProcessor->registerCallback(self::XML_NODE_ROW, XMLProcessor::NODE_TYPE_START, [$this, 'processRowStartingNode']);
         $this->xmlProcessor->registerCallback(self::XML_NODE_CELL, XMLProcessor::NODE_TYPE_START, [$this, 'processCellStartingNode']);
         $this->xmlProcessor->registerCallback(self::XML_NODE_ROW, XMLProcessor::NODE_TYPE_END, [$this, 'processRowEndingNode']);

src/Spout/Reader/ODS/Sheet.php

@@ -2,6 +2,7 @@
 
 namespace Box\Spout\Reader\ODS;
 
+use Box\Spout\Reader\ODS\Creator\EntityFactory;
 use Box\Spout\Reader\SheetInterface;
 use Box\Spout\Reader\Wrapper\XMLReader;
 
@@ -33,11 +34,12 @@ class Sheet implements SheetInterface
      * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
      * @param string $sheetName Name of the sheet
      * @param bool $isSheetActive Whether the sheet was defined as active
-     * @param \Box\Spout\Reader\ODS\ReaderOptions $options Reader's current options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param EntityFactory $entityFactory Factory to create entities
      */
-    public function __construct($xmlReader, $sheetIndex, $sheetName, $isSheetActive, $options)
+    public function __construct($xmlReader, $sheetIndex, $sheetName, $isSheetActive, $optionsManager, $entityFactory)
     {
-        $this->rowIterator = new RowIterator($xmlReader, $options);
+        $this->rowIterator = $entityFactory->createRowIterator($xmlReader, $optionsManager);
         $this->index = $sheetIndex;
         $this->name = $sheetName;
         $this->isActive = $isSheetActive;

src/Spout/Reader/ODS/SheetIterator.php

@@ -5,6 +5,8 @@ namespace Box\Spout\Reader\ODS;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Reader\Exception\XMLProcessingException;
 use Box\Spout\Reader\IteratorInterface;
+use Box\Spout\Reader\ODS\Creator\EntityFactory;
+use Box\Spout\Reader\ODS\Creator\HelperFactory;
 use Box\Spout\Reader\ODS\Helper\SettingsHelper;
 use Box\Spout\Reader\Wrapper\XMLReader;
 
@@ -25,13 +27,16 @@ class SheetIterator implements IteratorInterface
     /** @var string $filePath Path of the file to be read */
     protected $filePath;
 
-    /** @var \Box\Spout\Reader\ODS\ReaderOptions Reader's current options */
-    protected $options;
+    /** @var \Box\Spout\Common\Manager\OptionsManagerInterface Reader's options manager */
+    protected $optionsManager;
+
+    /** @var EntityFactory $entityFactory Factory to create entities */
+    protected $entityFactory;
 
     /** @var XMLReader The XMLReader object that will help read sheet's XML data */
     protected $xmlReader;
 
-    /** @var \Box\Spout\Common\Escaper\ODS Used to unescape XML data */
+    /** @var \Box\Spout\Common\Helper\Escaper\ODS Used to unescape XML data */
     protected $escaper;
 
     /** @var bool Whether there are still at least a sheet to be read */
@@ -45,19 +50,20 @@ class SheetIterator implements IteratorInterface
 
     /**
      * @param string $filePath Path of the file to be read
-     * @param \Box\Spout\Reader\ODS\ReaderOptions $options Reader's current options
-     * @throws \Box\Spout\Reader\Exception\NoSheetsFoundException If there are no sheets in the file
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @param HelperFactory $helperFactory Factory to create helpers
      */
-    public function __construct($filePath, $options)
+    public function __construct($filePath, $optionsManager, $entityFactory, $helperFactory)
     {
         $this->filePath = $filePath;
-        $this->options = $options;
-        $this->xmlReader = new XMLReader();
+        $this->optionsManager = $optionsManager;
+        $this->entityFactory = $entityFactory;
+        $this->xmlReader = $entityFactory->createXMLReader();
 
-        /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
-        $this->escaper = \Box\Spout\Common\Escaper\ODS::getInstance();
+        $this->escaper = $helperFactory->createStringsEscaper();
 
-        $settingsHelper = new SettingsHelper();
+        $settingsHelper = $helperFactory->createSettingsHelper();
         $this->activeSheetName = $settingsHelper->getActiveSheetName($filePath);
     }
 
@@ -124,7 +130,7 @@ class SheetIterator implements IteratorInterface
         $sheetName = $this->escaper->unescape($escapedSheetName);
         $isActiveSheet = $this->isActiveSheet($sheetName, $this->currentSheetIndex, $this->activeSheetName);
 
-        return new Sheet($this->xmlReader, $this->currentSheetIndex, $sheetName, $isActiveSheet, $this->options);
+        return $this->entityFactory->createSheet($this->xmlReader, $this->currentSheetIndex, $sheetName, $isActiveSheet, $this->optionsManager);
     }
 
     /**

src/Spout/Reader/ReaderAbstract.php

@@ -3,31 +3,31 @@
 namespace Box\Spout\Reader;
 
 use Box\Spout\Common\Exception\IOException;
+use Box\Spout\Common\Helper\GlobalFunctionsHelper;
+use Box\Spout\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Reader\Common\Creator\EntityFactoryInterface;
+use Box\Spout\Reader\Common\Entity\Options;
 use Box\Spout\Reader\Exception\ReaderNotOpenedException;
 
 /**
- * Class AbstractReader
+ * Class ReaderAbstract
  *
  * @package Box\Spout\Reader
  * @abstract
  */
-abstract class AbstractReader implements ReaderInterface
+abstract class ReaderAbstract implements ReaderInterface
 {
     /** @var bool Indicates whether the stream is currently open */
     protected $isStreamOpened = false;
 
+    /** @var EntityFactoryInterface Factory to create entities */
+    protected $entityFactory;
+
     /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
-    /** @var \Box\Spout\Reader\Common\ReaderOptions Reader's customized options */
-    protected $options;
-
-    /**
-     * Returns the reader's current options
-     *
-     * @return \Box\Spout\Reader\Common\ReaderOptions
-     */
-    abstract protected function getOptions();
+    /** @var OptionsManagerInterface Writer options manager */
+    protected $optionsManager;
 
     /**
      * Returns whether stream wrappers are supported
@@ -47,25 +47,30 @@ abstract class AbstractReader implements ReaderInterface
     /**
      * Returns an iterator to iterate over sheets.
      *
-     * @return \Iterator To iterate over sheets
+     * @return IteratorInterface To iterate over sheets
      */
     abstract protected function getConcreteSheetIterator();
 
     /**
      * Closes the reader. To be used after reading the file.
      *
-     * @return AbstractReader
+     * @return ReaderAbstract
      */
     abstract protected function closeReader();
 
     /**
-     * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
-     * @return AbstractReader
+     * @param OptionsManagerInterface $optionsManager
+     * @param GlobalFunctionsHelper $globalFunctionsHelper
+     * @param EntityFactoryInterface $entityFactory
      */
-    public function setGlobalFunctionsHelper($globalFunctionsHelper)
+    public function __construct(
+        OptionsManagerInterface $optionsManager,
+        GlobalFunctionsHelper $globalFunctionsHelper,
+        EntityFactoryInterface $entityFactory)
     {
+        $this->optionsManager = $optionsManager;
         $this->globalFunctionsHelper = $globalFunctionsHelper;
-        return $this;
+        $this->entityFactory = $entityFactory;
     }
 
     /**
@@ -73,11 +78,11 @@ abstract class AbstractReader implements ReaderInterface
      *
      * @api
      * @param bool $shouldFormatDates
-     * @return AbstractReader
+     * @return ReaderAbstract
      */
     public function setShouldFormatDates($shouldFormatDates)
     {
-        $this->getOptions()->setShouldFormatDates($shouldFormatDates);
+        $this->optionsManager->setOption(Options::SHOULD_FORMAT_DATES, $shouldFormatDates);
         return $this;
     }
 
@@ -86,11 +91,11 @@ abstract class AbstractReader implements ReaderInterface
      *
      * @api
      * @param bool $shouldPreserveEmptyRows
-     * @return AbstractReader
+     * @return ReaderAbstract
      */
     public function setShouldPreserveEmptyRows($shouldPreserveEmptyRows)
     {
-        $this->getOptions()->setShouldPreserveEmptyRows($shouldPreserveEmptyRows);
+        $this->optionsManager->setOption(Options::SHOULD_PRESERVE_EMPTY_ROWS, $shouldPreserveEmptyRows);
         return $this;
     }
 

src/Spout/Reader/ReaderFactory.php

@@ -2,9 +2,11 @@
 
 namespace Box\Spout\Reader;
 
+use Box\Spout\Common\Creator\HelperFactory;
 use Box\Spout\Common\Exception\UnsupportedTypeException;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Type;
+use Box\Spout\Reader\XLSX\Helper\SharedStringsCaching\CachingStrategyFactory;
 
 /**
  * Class ReaderFactory
@@ -25,24 +27,53 @@ class ReaderFactory
      */
     public static function create($readerType)
     {
-        $reader = null;
 
         switch ($readerType) {
-            case Type::CSV:
-                $reader = new CSV\Reader();
-                break;
-            case Type::XLSX:
-                $reader = new XLSX\Reader();
-                break;
-            case Type::ODS:
-                $reader = new ODS\Reader();
-                break;
+            case Type::CSV: return self::getCSVReader();
+            case Type::XLSX: return self::getXLSXReader();
+            case Type::ODS: return self::getODSReader();
             default:
                 throw new UnsupportedTypeException('No readers supporting the given type: ' . $readerType);
         }
+    }
 
-        $reader->setGlobalFunctionsHelper(new GlobalFunctionsHelper());
+    /**
+     * @return CSV\Reader
+     */
+    private static function getCSVReader()
+    {
+        $optionsManager = new CSV\Manager\OptionsManager();
+        $helperFactory = new HelperFactory();
+        $entityFactory = new CSV\Creator\EntityFactory($helperFactory);
+        $globalFunctionsHelper = $helperFactory->createGlobalFunctionsHelper();
 
-        return $reader;
+        return new CSV\Reader($optionsManager, $globalFunctionsHelper, $entityFactory);
+    }
+
+    /**
+     * @return XLSX\Reader
+     */
+    private static function getXLSXReader()
+    {
+        $optionsManager = new XLSX\Manager\OptionsManager();
+        $cachingStrategyFactory = new CachingStrategyFactory();
+        $helperFactory = new XLSX\Creator\HelperFactory($cachingStrategyFactory);
+        $entityFactory = new XLSX\Creator\EntityFactory($helperFactory);
+        $globalFunctionsHelper = $helperFactory->createGlobalFunctionsHelper();
+
+        return new XLSX\Reader($optionsManager, $globalFunctionsHelper, $entityFactory, $helperFactory);
+    }
+
+    /**
+     * @return ODS\Reader
+     */
+    private static function getODSReader()
+    {
+        $optionsManager = new ODS\Manager\OptionsManager();
+        $helperFactory = new ODS\Creator\HelperFactory();
+        $entityFactory = new ODS\Creator\EntityFactory($helperFactory);
+        $globalFunctionsHelper = $helperFactory->createGlobalFunctionsHelper();
+
+        return new ODS\Reader($optionsManager, $globalFunctionsHelper, $entityFactory);
     }
 }

src/Spout/Reader/SheetInterface.php

@@ -12,7 +12,7 @@ interface SheetInterface
     /**
      * Returns an iterator to iterate over the sheet's rows.
      *
-     * @return \Iterator
+     * @return IteratorInterface
      */
     public function getRowIterator();
 }

src/Spout/Reader/Wrapper/XMLReader.php

@@ -1,7 +1,6 @@
 <?php
 
 namespace Box\Spout\Reader\Wrapper;
-use DOMNode;
 
 
 /**

src/Spout/Reader/XLSX/Creator/EntityFactory.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace Box\Spout\Reader\XLSX\Creator;
+
+use Box\Spout\Reader\Common\Creator\EntityFactoryInterface;
+use Box\Spout\Reader\Common\XMLProcessor;
+use Box\Spout\Reader\XLSX\Helper\SharedStringsHelper;
+use Box\Spout\Reader\XLSX\RowIterator;
+use Box\Spout\Reader\XLSX\Sheet;
+use Box\Spout\Reader\XLSX\SheetIterator;
+use Box\Spout\Reader\Wrapper\XMLReader;
+
+/**
+ * Class EntityFactory
+ * Factory to create entities
+ *
+ * @package Box\Spout\Reader\XLSX\Creator
+ */
+class EntityFactory implements EntityFactoryInterface
+{
+    /** @var HelperFactory */
+    private $helperFactory;
+
+    /**
+     * @param HelperFactory $helperFactory
+     */
+    public function __construct(HelperFactory $helperFactory)
+    {
+        $this->helperFactory = $helperFactory;
+    }
+
+    /**
+     * @param string $filePath Path of the file to be read
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
+     * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
+     * @return SheetIterator
+     */
+    public function createSheetIterator($filePath, $optionsManager, $sharedStringsHelper, $globalFunctionsHelper)
+    {
+        return new SheetIterator(
+            $filePath,
+            $optionsManager,
+            $sharedStringsHelper,
+            $globalFunctionsHelper,
+            $this,
+            $this->helperFactory
+        );
+    }
+
+    /**
+     * @param string $filePath Path of the XLSX file being read
+     * @param string $sheetDataXMLFilePath Path of the sheet data XML file as in [Content_Types].xml
+     * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
+     * @param string $sheetName Name of the sheet
+     * @param bool $isSheetActive Whether the sheet was defined as active
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
+     * @return Sheet
+     */
+    public function createSheet(
+        $filePath,
+        $sheetDataXMLFilePath,
+        $sheetIndex,
+        $sheetName,
+        $isSheetActive,
+        $optionsManager,
+        $sharedStringsHelper)
+    {
+        return new Sheet(
+            $filePath,
+            $sheetDataXMLFilePath,
+            $sheetIndex,
+            $sheetName,
+            $isSheetActive,
+            $optionsManager,
+            $sharedStringsHelper,
+            $this
+        );
+    }
+
+    /**
+     * @param string $filePath Path of the XLSX file being read
+     * @param string $sheetDataXMLFilePath Path of the sheet data XML file as in [Content_Types].xml
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
+     * @return RowIterator
+     */
+    public function createRowIterator($filePath, $sheetDataXMLFilePath, $optionsManager, $sharedStringsHelper)
+    {
+        return new RowIterator($filePath, $sheetDataXMLFilePath, $optionsManager, $sharedStringsHelper, $this, $this->helperFactory);
+    }
+
+    /**
+     * @return \ZipArchive
+     */
+    public function createZipArchive()
+    {
+        return new \ZipArchive();
+    }
+
+    /**
+     * @return XMLReader
+     */
+    public function createXMLReader()
+    {
+        return new XMLReader();
+    }
+
+    /**
+     * @param $xmlReader
+     * @return XMLProcessor
+     */
+    public function createXMLProcessor($xmlReader)
+    {
+        return new XMLProcessor($xmlReader);
+    }
+}

src/Spout/Reader/XLSX/Creator/HelperFactory.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Box\Spout\Reader\XLSX\Creator;
+
+use Box\Spout\Common\Helper\Escaper;
+use Box\Spout\Reader\XLSX\Helper\CellValueFormatter;
+use Box\Spout\Reader\XLSX\Helper\SharedStringsCaching\CachingStrategyFactory;
+use Box\Spout\Reader\XLSX\Helper\SharedStringsHelper;
+use Box\Spout\Reader\XLSX\Helper\SheetHelper;
+use Box\Spout\Reader\XLSX\Helper\StyleHelper;
+
+
+/**
+ * Class EntityFactory
+ * Factory to create helpers
+ *
+ * @package Box\Spout\Reader\XLSX\Creator
+ */
+class HelperFactory extends \Box\Spout\Common\Creator\HelperFactory
+{
+    /** @var CachingStrategyFactory */
+    private $cachingStrategyFactory;
+
+    /**
+     * @param CachingStrategyFactory $cachingStrategyFactory Factory to create shared strings caching strategies
+     */
+    public function __construct(CachingStrategyFactory $cachingStrategyFactory)
+    {
+        $this->cachingStrategyFactory = $cachingStrategyFactory;
+    }
+
+    /**
+     * @param string $filePath Path of the XLSX file being read
+     * @param string $tempFolder Temporary folder where the temporary files to store shared strings will be stored
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @return SharedStringsHelper
+     */
+    public function createSharedStringsHelper($filePath, $tempFolder, $entityFactory)
+    {
+        return new SharedStringsHelper($filePath, $tempFolder, $entityFactory, $this, $this->cachingStrategyFactory);
+    }
+
+    /**
+     * @param string $filePath Path of the XLSX file being read
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param \Box\Spout\Reader\XLSX\Helper\SharedStringsHelper Helper to work with shared strings
+     * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @return SheetHelper
+     */
+    public function createSheetHelper($filePath, $optionsManager, $sharedStringsHelper, $globalFunctionsHelper, $entityFactory)
+    {
+        $escaper = $this->createStringsEscaper();
+        return new SheetHelper($filePath, $optionsManager, $sharedStringsHelper, $globalFunctionsHelper, $escaper, $entityFactory);
+    }
+
+    /**
+     * @param string $filePath Path of the XLSX file being read
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @return StyleHelper
+     */
+    public function createStyleHelper($filePath, $entityFactory)
+    {
+        return new StyleHelper($filePath, $entityFactory);
+    }
+
+    /**
+     * @param SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
+     * @param StyleHelper $styleHelper Helper to work with styles
+     * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings
+     * @return CellValueFormatter
+     */
+    public function createCellValueFormatter($sharedStringsHelper, $styleHelper, $shouldFormatDates)
+    {
+        $escaper = $this->createStringsEscaper();
+        return new CellValueFormatter($sharedStringsHelper, $styleHelper, $shouldFormatDates, $escaper);
+    }
+
+    /**
+     * @return Escaper\XLSX
+     */
+    public function createStringsEscaper()
+    {
+        /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
+        return new Escaper\XLSX();
+    }
+}

src/Spout/Reader/XLSX/Helper/CellValueFormatter.php

@@ -47,22 +47,21 @@ class CellValueFormatter
     /** @var bool Whether date/time values should be returned as PHP objects or be formatted as strings */
     protected $shouldFormatDates;
 
-    /** @var \Box\Spout\Common\Escaper\XLSX Used to unescape XML data */
+    /** @var \Box\Spout\Common\Helper\Escaper\XLSX Used to unescape XML data */
     protected $escaper;
 
     /**
      * @param SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
      * @param StyleHelper $styleHelper Helper to work with styles
      * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings
+     * @param \Box\Spout\Common\Helper\Escaper\XLSX $escaper Used to unescape XML data
      */
-    public function __construct($sharedStringsHelper, $styleHelper, $shouldFormatDates)
+    public function __construct($sharedStringsHelper, $styleHelper, $shouldFormatDates, $escaper)
     {
         $this->sharedStringsHelper = $sharedStringsHelper;
         $this->styleHelper = $styleHelper;
         $this->shouldFormatDates = $shouldFormatDates;
-
-        /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
-        $this->escaper = \Box\Spout\Common\Escaper\XLSX::getInstance();
+        $this->escaper = $escaper;
     }
 
     /**

src/Spout/Reader/XLSX/Helper/SharedStringsCaching/CachingStrategyFactory.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace Box\Spout\Reader\XLSX\Helper\SharedStringsCaching;
+use Box\Spout\Reader\XLSX\Creator\HelperFactory;
 
 /**
  * Class CachingStrategyFactory
@@ -50,44 +51,22 @@ class CachingStrategyFactory
      */
     const MAX_NUM_STRINGS_PER_TEMP_FILE = 10000;
 
-    /** @var CachingStrategyFactory|null Singleton instance */
-    protected static $instance = null;
-
-    /**
-     * Private constructor for singleton
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Returns the singleton instance of the factory
-     *
-     * @return CachingStrategyFactory
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === null) {
-            self::$instance = new CachingStrategyFactory();
-        }
-
-        return self::$instance;
-    }
 
     /**
      * Returns the best caching strategy, given the number of unique shared strings
      * and the amount of memory available.
      *
      * @param int|null $sharedStringsUniqueCount Number of unique shared strings (NULL if unknown)
-     * @param string|void $tempFolder Temporary folder where the temporary files to store shared strings will be stored
+     * @param string $tempFolder Temporary folder where the temporary files to store shared strings will be stored
+     * @param HelperFactory $helperFactory Factory to create helpers
      * @return CachingStrategyInterface The best caching strategy
      */
-    public function getBestCachingStrategy($sharedStringsUniqueCount, $tempFolder = null)
+    public function createBestCachingStrategy($sharedStringsUniqueCount, $tempFolder, $helperFactory)
     {
         if ($this->isInMemoryStrategyUsageSafe($sharedStringsUniqueCount)) {
             return new InMemoryStrategy($sharedStringsUniqueCount);
         } else {
-            return new FileBasedStrategy($tempFolder, self::MAX_NUM_STRINGS_PER_TEMP_FILE);
+            return new FileBasedStrategy($tempFolder, self::MAX_NUM_STRINGS_PER_TEMP_FILE, $helperFactory);
         }
     }
 

src/Spout/Reader/XLSX/Helper/SharedStringsCaching/FileBasedStrategy.php

@@ -5,6 +5,7 @@ namespace Box\Spout\Reader\XLSX\Helper\SharedStringsCaching;
 use Box\Spout\Common\Helper\FileSystemHelper;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Reader\Exception\SharedStringNotFoundException;
+use Box\Spout\Reader\XLSX\Creator\HelperFactory;
 
 /**
  * Class FileBasedStrategy
@@ -51,18 +52,18 @@ class FileBasedStrategy implements CachingStrategyInterface
     protected $inMemoryTempFileContents;
 
     /**
-     * @param string|null $tempFolder Temporary folder where the temporary files to store shared strings will be stored
+     * @param string $tempFolder Temporary folder where the temporary files to store shared strings will be stored
      * @param int $maxNumStringsPerTempFile Maximum number of strings that can be stored in one temp file
+     * @param HelperFactory $helperFactory Factory to create helpers
      */
-    public function __construct($tempFolder, $maxNumStringsPerTempFile)
+    public function __construct($tempFolder, $maxNumStringsPerTempFile, $helperFactory)
     {
-        $rootTempFolder = ($tempFolder) ?: sys_get_temp_dir();
-        $this->fileSystemHelper = new FileSystemHelper($rootTempFolder);
-        $this->tempFolder = $this->fileSystemHelper->createFolder($rootTempFolder, uniqid('sharedstrings'));
+        $this->fileSystemHelper = $helperFactory->createFileSystemHelper($tempFolder);
+        $this->tempFolder = $this->fileSystemHelper->createFolder($tempFolder, uniqid('sharedstrings'));
 
         $this->maxNumStringsPerTempFile = $maxNumStringsPerTempFile;
 
-        $this->globalFunctionsHelper = new GlobalFunctionsHelper();
+        $this->globalFunctionsHelper = $helperFactory->createGlobalFunctionsHelper();
         $this->tempFilePointer = null;
     }
 

src/Spout/Reader/XLSX/Helper/SharedStringsHelper.php

@@ -5,6 +5,8 @@ namespace Box\Spout\Reader\XLSX\Helper;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Reader\Exception\XMLProcessingException;
 use Box\Spout\Reader\Wrapper\XMLReader;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
+use Box\Spout\Reader\XLSX\Creator\HelperFactory;
 use Box\Spout\Reader\XLSX\Helper\SharedStringsCaching\CachingStrategyFactory;
 use Box\Spout\Reader\XLSX\Helper\SharedStringsCaching\CachingStrategyInterface;
 
@@ -40,17 +42,32 @@ class SharedStringsHelper
     /** @var string Temporary folder where the temporary files to store shared strings will be stored */
     protected $tempFolder;
 
+    /** @var EntityFactory Factory to create entities */
+    protected $entityFactory;
+
+    /** @var HelperFactory $helperFactory Factory to create helpers */
+    protected $helperFactory;
+
+    /** @var CachingStrategyFactory Factory to create shared strings caching strategies */
+    protected $cachingStrategyFactory;
+
     /** @var CachingStrategyInterface The best caching strategy for storing shared strings */
     protected $cachingStrategy;
 
     /**
      * @param string $filePath Path of the XLSX file being read
-     * @param string|null|void $tempFolder Temporary folder where the temporary files to store shared strings will be stored
+     * @param string $tempFolder Temporary folder where the temporary files to store shared strings will be stored
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @param HelperFactory $helperFactory Factory to create helpers
+     * @param CachingStrategyFactory $cachingStrategyFactory Factory to create shared strings caching strategies
      */
-    public function __construct($filePath, $tempFolder = null)
+    public function __construct($filePath, $tempFolder, $entityFactory, $helperFactory, $cachingStrategyFactory)
     {
         $this->filePath = $filePath;
         $this->tempFolder = $tempFolder;
+        $this->entityFactory = $entityFactory;
+        $this->helperFactory = $helperFactory;
+        $this->cachingStrategyFactory = $cachingStrategyFactory;
     }
 
     /**
@@ -61,7 +78,7 @@ class SharedStringsHelper
     public function hasSharedStrings()
     {
         $hasSharedStrings = false;
-        $zip = new \ZipArchive();
+        $zip = $this->entityFactory->createZipArchive();
 
         if ($zip->open($this->filePath) === true) {
             $hasSharedStrings = ($zip->locateName(self::SHARED_STRINGS_XML_FILE_PATH) !== false);
@@ -86,7 +103,7 @@ class SharedStringsHelper
      */
     public function extractSharedStrings()
     {
-        $xmlReader = new XMLReader();
+        $xmlReader = $this->entityFactory->createXMLReader();
         $sharedStringIndex = 0;
 
         if ($xmlReader->openFileInZip($this->filePath, self::SHARED_STRINGS_XML_FILE_PATH) === false) {
@@ -151,8 +168,8 @@ class SharedStringsHelper
      */
     protected function getBestSharedStringsCachingStrategy($sharedStringsUniqueCount)
     {
-        return CachingStrategyFactory::getInstance()
-                ->getBestCachingStrategy($sharedStringsUniqueCount, $this->tempFolder);
+        return $this->cachingStrategyFactory
+                ->createBestCachingStrategy($sharedStringsUniqueCount, $this->tempFolder, $this->helperFactory);
     }
 
     /**

src/Spout/Reader/XLSX/Helper/SheetHelper.php

@@ -3,6 +3,7 @@
 namespace Box\Spout\Reader\XLSX\Helper;
 
 use Box\Spout\Reader\Wrapper\XMLReader;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
 use Box\Spout\Reader\XLSX\Sheet;
 
 /**
@@ -33,8 +34,8 @@ class SheetHelper
     /** @var string Path of the XLSX file being read */
     protected $filePath;
 
-    /** @var \Box\Spout\Reader\XLSX\ReaderOptions Reader's current options */
-    protected $options;
+    /** @var \Box\Spout\Common\Manager\OptionsManagerInterface Reader's options manager */
+    protected $optionsManager;
 
     /** @var \Box\Spout\Reader\XLSX\Helper\SharedStringsHelper Helper to work with shared strings */
     protected $sharedStringsHelper;
@@ -42,18 +43,28 @@ class SheetHelper
     /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
+    /** @var EntityFactory Factory to create entities */
+    protected $entityFactory;
+
+    /** @var \Box\Spout\Common\Helper\Escaper\XLSX Used to unescape XML data */
+    protected $escaper;
+
     /**
      * @param string $filePath Path of the XLSX file being read
-     * @param \Box\Spout\Reader\XLSX\ReaderOptions $options Reader's current options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
      * @param \Box\Spout\Reader\XLSX\Helper\SharedStringsHelper Helper to work with shared strings
      * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
+     * @param \Box\Spout\Common\Helper\Escaper\XLSX $escaper Used to unescape XML data
+     * @param EntityFactory $entityFactory Factory to create entities
      */
-    public function __construct($filePath, $options, $sharedStringsHelper, $globalFunctionsHelper)
+    public function __construct($filePath, $optionsManager, $sharedStringsHelper, $globalFunctionsHelper, $escaper, $entityFactory)
     {
         $this->filePath = $filePath;
-        $this->options = $options;
+        $this->optionsManager = $optionsManager;
         $this->sharedStringsHelper = $sharedStringsHelper;
         $this->globalFunctionsHelper = $globalFunctionsHelper;
+        $this->escaper = $escaper;
+        $this->entityFactory = $entityFactory;
     }
 
     /**
@@ -68,7 +79,8 @@ class SheetHelper
         $sheetIndex = 0;
         $activeSheetIndex = 0; // By default, the first sheet is active
 
-        $xmlReader = new XMLReader();
+        $xmlReader = $this->entityFactory->createXMLReader();
+
         if ($xmlReader->openFileInZip($this->filePath, self::WORKBOOK_XML_FILE_PATH)) {
             while ($xmlReader->read()) {
                 if ($xmlReader->isPositionedOnStartingNode(self::XML_NODE_WORKBOOK_VIEW)) {
@@ -105,17 +117,18 @@ class SheetHelper
     {
         $sheetId = $xmlReaderOnSheetNode->getAttribute(self::XML_ATTRIBUTE_R_ID);
         $escapedSheetName = $xmlReaderOnSheetNode->getAttribute(self::XML_ATTRIBUTE_NAME);
-
-        /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */
-        $escaper = \Box\Spout\Common\Escaper\XLSX::getInstance();
-        $sheetName = $escaper->unescape($escapedSheetName);
+        $sheetName = $this->escaper->unescape($escapedSheetName);
 
         $sheetDataXMLFilePath = $this->getSheetDataXMLFilePathForSheetId($sheetId);
 
-        return new Sheet(
-            $this->filePath, $sheetDataXMLFilePath,
-            $sheetIndexZeroBased, $sheetName, $isSheetActive,
-            $this->options, $this->sharedStringsHelper
+        return $this->entityFactory->createSheet(
+            $this->filePath,
+            $sheetDataXMLFilePath,
+            $sheetIndexZeroBased,
+            $sheetName,
+            $isSheetActive,
+            $this->optionsManager,
+            $this->sharedStringsHelper
         );
     }
 
@@ -128,7 +141,7 @@ class SheetHelper
         $sheetDataXMLFilePath = '';
 
         // find the file path of the sheet, by looking at the "workbook.xml.res" file
-        $xmlReader = new XMLReader();
+        $xmlReader = $this->entityFactory->createXMLReader();
         if ($xmlReader->openFileInZip($this->filePath, self::WORKBOOK_XML_RELS_FILE_PATH)) {
             while ($xmlReader->read()) {
                 if ($xmlReader->isPositionedOnStartingNode(self::XML_NODE_RELATIONSHIP)) {

src/Spout/Reader/XLSX/Helper/StyleHelper.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Reader\XLSX\Helper;
 
-use Box\Spout\Reader\Wrapper\XMLReader;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
 
 /**
  * Class StyleHelper
@@ -53,6 +53,9 @@ class StyleHelper
     /** @var string Path of the XLSX file being read */
     protected $filePath;
 
+    /** @var EntityFactory Factory to create entities */
+    protected $entityFactory;
+
     /** @var array Array containing the IDs of built-in number formats indicating a date */
     protected $builtinNumFmtIdIndicatingDates;
 
@@ -67,10 +70,12 @@ class StyleHelper
 
     /**
      * @param string $filePath Path of the XLSX file being read
+     * @param EntityFactory $entityFactory Factory to create entities
      */
-    public function __construct($filePath)
+    public function __construct($filePath, $entityFactory)
     {
         $this->filePath = $filePath;
+        $this->entityFactory = $entityFactory;
         $this->builtinNumFmtIdIndicatingDates = array_keys(self::$builtinNumFmtIdToNumFormatMapping);
     }
 
@@ -107,7 +112,7 @@ class StyleHelper
         $this->customNumberFormats = [];
         $this->stylesAttributes = [];
 
-        $xmlReader = new XMLReader();
+        $xmlReader = $this->entityFactory->createXMLReader();
 
         if ($xmlReader->openFileInZip($this->filePath, self::STYLES_XML_FILE_PATH)) {
             while ($xmlReader->read()) {

src/Spout/Reader/XLSX/Manager/OptionsManager.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Box\Spout\Reader\XLSX\Manager;
+
+use Box\Spout\Common\Manager\OptionsManagerAbstract;
+use Box\Spout\Reader\Common\Entity\Options;
+
+/**
+ * Class OptionsManager
+ * XLSX Reader options manager
+ *
+ * @package Box\Spout\Reader\XLSX\Manager
+ */
+class OptionsManager extends OptionsManagerAbstract
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getSupportedOptions()
+    {
+        return [
+            Options::TEMP_FOLDER,
+            Options::SHOULD_FORMAT_DATES,
+            Options::SHOULD_PRESERVE_EMPTY_ROWS,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function setDefaultOptions()
+    {
+        $this->setOption(Options::TEMP_FOLDER, sys_get_temp_dir());
+        $this->setOption(Options::SHOULD_FORMAT_DATES, false);
+        $this->setOption(Options::SHOULD_PRESERVE_EMPTY_ROWS, false);
+    }
+}

src/Spout/Reader/XLSX/Reader.php

@@ -3,8 +3,13 @@
 namespace Box\Spout\Reader\XLSX;
 
 use Box\Spout\Common\Exception\IOException;
-use Box\Spout\Reader\AbstractReader;
-use Box\Spout\Reader\XLSX\Helper\SharedStringsHelper;
+use Box\Spout\Common\Helper\GlobalFunctionsHelper;
+use Box\Spout\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Reader\Common\Creator\EntityFactoryInterface;
+use Box\Spout\Reader\Common\Entity\Options;
+use Box\Spout\Reader\ReaderAbstract;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
+use Box\Spout\Reader\XLSX\Creator\HelperFactory;
 
 /**
  * Class Reader
@@ -12,8 +17,11 @@ use Box\Spout\Reader\XLSX\Helper\SharedStringsHelper;
  *
  * @package Box\Spout\Reader\XLSX
  */
-class Reader extends AbstractReader
+class Reader extends ReaderAbstract
 {
+    /** @var HelperFactory */
+    protected $helperFactory;
+
     /** @var \ZipArchive */
     protected $zip;
 
@@ -25,16 +33,19 @@ class Reader extends AbstractReader
 
 
     /**
-     * Returns the reader's current options
-     *
-     * @return ReaderOptions
+     * @param OptionsManagerInterface $optionsManager
+     * @param GlobalFunctionsHelper $globalFunctionsHelper
+     * @param EntityFactoryInterface $entityFactory
+     * @param HelperFactory $helperFactory
      */
-    protected function getOptions()
+    public function __construct(
+        OptionsManagerInterface $optionsManager,
+        GlobalFunctionsHelper $globalFunctionsHelper,
+        EntityFactoryInterface $entityFactory,
+        HelperFactory $helperFactory)
     {
-        if (!isset($this->options)) {
-            $this->options = new ReaderOptions();
-        }
-        return $this->options;
+        parent::__construct($optionsManager, $globalFunctionsHelper, $entityFactory);
+        $this->helperFactory = $helperFactory;
     }
 
     /**
@@ -43,7 +54,7 @@ class Reader extends AbstractReader
      */
     public function setTempFolder($tempFolder)
     {
-        $this->getOptions()->setTempFolder($tempFolder);
+        $this->optionsManager->setOption(Options::TEMP_FOLDER, $tempFolder);
         return $this;
     }
 
@@ -69,17 +80,21 @@ class Reader extends AbstractReader
      */
     protected function openReader($filePath)
     {
-        $this->zip = new \ZipArchive();
+        /** @var EntityFactory $entityFactory */
+        $entityFactory = $this->entityFactory;
+
+        $this->zip = $entityFactory->createZipArchive();
 
         if ($this->zip->open($filePath) === true) {
-            $this->sharedStringsHelper = new SharedStringsHelper($filePath, $this->getOptions()->getTempFolder());
+            $tempFolder = $this->optionsManager->getOption(Options::TEMP_FOLDER);
+            $this->sharedStringsHelper = $this->helperFactory->createSharedStringsHelper($filePath, $tempFolder, $entityFactory);
 
             if ($this->sharedStringsHelper->hasSharedStrings()) {
                 // Extracts all the strings from the sheets for easy access in the future
                 $this->sharedStringsHelper->extractSharedStrings();
             }
 
-            $this->sheetIterator = new SheetIterator($filePath, $this->getOptions(), $this->sharedStringsHelper, $this->globalFunctionsHelper);
+            $this->sheetIterator = $entityFactory->createSheetIterator($filePath, $this->optionsManager, $this->sharedStringsHelper, $this->globalFunctionsHelper);
         } else {
             throw new IOException("Could not open $filePath for reading.");
         }

src/Spout/Reader/XLSX/ReaderOptions.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Box\Spout\Reader\XLSX;
-
-/**
- * Class ReaderOptions
- * This class is used to customize the reader's behavior
- *
- * @package Box\Spout\Reader\XLSX
- */
-class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
-{
-    /** @var string|null Temporary folder where the temporary files will be created */
-    protected $tempFolder = null;
-
-    /**
-     * @return string|null Temporary folder where the temporary files will be created
-     */
-    public function getTempFolder()
-    {
-        return $this->tempFolder;
-    }
-
-    /**
-     * @param string|null $tempFolder Temporary folder where the temporary files will be created
-     * @return ReaderOptions
-     */
-    public function setTempFolder($tempFolder)
-    {
-        $this->tempFolder = $tempFolder;
-        return $this;
-    }
-}

src/Spout/Reader/XLSX/RowIterator.php

@@ -3,9 +3,12 @@
 namespace Box\Spout\Reader\XLSX;
 
 use Box\Spout\Common\Exception\IOException;
+use Box\Spout\Reader\Common\Entity\Options;
 use Box\Spout\Reader\Exception\XMLProcessingException;
 use Box\Spout\Reader\IteratorInterface;
 use Box\Spout\Reader\Wrapper\XMLReader;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
+use Box\Spout\Reader\XLSX\Creator\HelperFactory;
 use Box\Spout\Reader\XLSX\Helper\CellHelper;
 use Box\Spout\Reader\XLSX\Helper\CellValueFormatter;
 use Box\Spout\Reader\XLSX\Helper\StyleHelper;
@@ -81,23 +84,25 @@ class RowIterator implements IteratorInterface
     /**
      * @param string $filePath Path of the XLSX file being read
      * @param string $sheetDataXMLFilePath Path of the sheet data XML file as in [Content_Types].xml
-     * @param \Box\Spout\Reader\XLSX\ReaderOptions $options Reader's current options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
      * @param Helper\SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @param HelperFactory $helperFactory Factory to create helpers
      */
-    public function __construct($filePath, $sheetDataXMLFilePath, $options, $sharedStringsHelper)
+    public function __construct($filePath, $sheetDataXMLFilePath, $optionsManager, $sharedStringsHelper, $entityFactory, $helperFactory)
     {
         $this->filePath = $filePath;
         $this->sheetDataXMLFilePath = $this->normalizeSheetDataXMLFilePath($sheetDataXMLFilePath);
 
-        $this->xmlReader = new XMLReader();
+        $this->xmlReader = $entityFactory->createXMLReader();
 
-        $this->styleHelper = new StyleHelper($filePath);
-        $this->cellValueFormatter = new CellValueFormatter($sharedStringsHelper, $this->styleHelper, $options->shouldFormatDates());
+        $this->styleHelper = $helperFactory->createStyleHelper($filePath, $entityFactory);
+        $this->cellValueFormatter = $helperFactory->createCellValueFormatter($sharedStringsHelper, $this->styleHelper, $optionsManager->getOption(Options::SHOULD_FORMAT_DATES));
 
-        $this->shouldPreserveEmptyRows = $options->shouldPreserveEmptyRows();
+        $this->shouldPreserveEmptyRows = $optionsManager->getOption(Options::SHOULD_PRESERVE_EMPTY_ROWS);
 
         // Register all callbacks to process different nodes when reading the XML file
-        $this->xmlProcessor = new XMLProcessor($this->xmlReader);
+        $this->xmlProcessor = $entityFactory->createXMLProcessor($this->xmlReader);
         $this->xmlProcessor->registerCallback(self::XML_NODE_DIMENSION, XMLProcessor::NODE_TYPE_START, [$this, 'processDimensionStartingNode']);
         $this->xmlProcessor->registerCallback(self::XML_NODE_ROW, XMLProcessor::NODE_TYPE_START, [$this, 'processRowStartingNode']);
         $this->xmlProcessor->registerCallback(self::XML_NODE_CELL, XMLProcessor::NODE_TYPE_START, [$this, 'processCellStartingNode']);

src/Spout/Reader/XLSX/Sheet.php

@@ -3,6 +3,7 @@
 namespace Box\Spout\Reader\XLSX;
 
 use Box\Spout\Reader\SheetInterface;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
 
 /**
  * Class Sheet
@@ -30,12 +31,20 @@ class Sheet implements SheetInterface
      * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based)
      * @param string $sheetName Name of the sheet
      * @param bool $isSheetActive Whether the sheet was defined as active
-     * @param \Box\Spout\Reader\XLSX\ReaderOptions $options Reader's current options
-     * @param Helper\SharedStringsHelper Helper to work with shared strings
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
+     * @param Helper\SharedStringsHelper $sharedStringsHelper Helper to work with shared strings
+     * @param EntityFactory $entityFactory Factory to create entities
      */
-    public function __construct($filePath, $sheetDataXMLFilePath, $sheetIndex, $sheetName, $isSheetActive, $options, $sharedStringsHelper)
+    public function __construct(
+        $filePath,
+        $sheetDataXMLFilePath,
+        $sheetIndex, $sheetName,
+        $isSheetActive,
+        $optionsManager,
+        $sharedStringsHelper,
+        $entityFactory)
     {
-        $this->rowIterator = new RowIterator($filePath, $sheetDataXMLFilePath, $options, $sharedStringsHelper);
+        $this->rowIterator = $entityFactory->createRowIterator($filePath, $sheetDataXMLFilePath, $optionsManager, $sharedStringsHelper);
         $this->index = $sheetIndex;
         $this->name = $sheetName;
         $this->isActive = $isSheetActive;

src/Spout/Reader/XLSX/SheetIterator.php

@@ -3,6 +3,8 @@
 namespace Box\Spout\Reader\XLSX;
 
 use Box\Spout\Reader\IteratorInterface;
+use Box\Spout\Reader\XLSX\Creator\EntityFactory;
+use Box\Spout\Reader\XLSX\Creator\HelperFactory;
 use Box\Spout\Reader\XLSX\Helper\SheetHelper;
 use Box\Spout\Reader\Exception\NoSheetsFoundException;
 
@@ -22,15 +24,23 @@ class SheetIterator implements IteratorInterface
 
     /**
      * @param string $filePath Path of the file to be read
-     * @param \Box\Spout\Reader\XLSX\ReaderOptions $options Reader's current options
+     * @param \Box\Spout\Common\Manager\OptionsManagerInterface $optionsManager Reader's options manager
      * @param \Box\Spout\Reader\XLSX\Helper\SharedStringsHelper $sharedStringsHelper
      * @param \Box\Spout\Common\Helper\GlobalFunctionsHelper $globalFunctionsHelper
+     * @param EntityFactory $entityFactory Factory to create entities
+     * @param HelperFactory $helperFactory Factory to create helpers
      * @throws \Box\Spout\Reader\Exception\NoSheetsFoundException If there are no sheets in the file
      */
-    public function __construct($filePath, $options, $sharedStringsHelper, $globalFunctionsHelper)
+    public function __construct(
+        $filePath,
+        $optionsManager,
+        $sharedStringsHelper,
+        $globalFunctionsHelper,
+        $entityFactory,
+        $helperFactory)
     {
         // Fetch all available sheets
-        $sheetHelper = new SheetHelper($filePath, $options, $sharedStringsHelper, $globalFunctionsHelper);
+        $sheetHelper = $helperFactory->createSheetHelper($filePath, $optionsManager, $sharedStringsHelper, $globalFunctionsHelper, $entityFactory);
         $this->sheets = $sheetHelper->getSheets();
 
         if (count($this->sheets) === 0) {