From 3a330debb366396e4e384a7c113226f827240d80 Mon Sep 17 00:00:00 2001
From: Adrien Loison <adrilo@users.noreply.github.com>
Date: Tue, 18 Oct 2016 16:55:05 -0700
Subject: [PATCH] Move ReaderCommonOptions class to Common folder (#343)

---
 src/Spout/Reader/AbstractReader.php                  |  4 ++--
 src/Spout/Reader/CSV/ReaderOptions.php               |  3 +--
 .../ReaderOptions.php}                               | 12 ++++++------
 src/Spout/Reader/ODS/ReaderOptions.php               |  4 +---
 src/Spout/Reader/XLSX/ReaderOptions.php              |  4 +---
 5 files changed, 11 insertions(+), 16 deletions(-)
 rename src/Spout/Reader/{ReaderOptionsCommon.php => Common/ReaderOptions.php} (88%)

diff --git a/src/Spout/Reader/AbstractReader.php b/src/Spout/Reader/AbstractReader.php
index 0708ce84..880efbd5 100644
--- a/src/Spout/Reader/AbstractReader.php
+++ b/src/Spout/Reader/AbstractReader.php
@@ -19,13 +19,13 @@ abstract class AbstractReader implements ReaderInterface
     /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
-    /** @var \Box\Spout\Reader\ReaderOptionsCommon Reader's customized options */
+    /** @var \Box\Spout\Reader\Common\ReaderOptions Reader's customized options */
     protected $options;
 
     /**
      * Returns the reader's current options
      *
-     * @return \Box\Spout\Reader\ReaderOptionsCommon
+     * @return \Box\Spout\Reader\Common\ReaderOptions
      */
     abstract protected function getOptions();
 
diff --git a/src/Spout/Reader/CSV/ReaderOptions.php b/src/Spout/Reader/CSV/ReaderOptions.php
index 7d03f633..9a1adb89 100644
--- a/src/Spout/Reader/CSV/ReaderOptions.php
+++ b/src/Spout/Reader/CSV/ReaderOptions.php
@@ -3,7 +3,6 @@
 namespace Box\Spout\Reader\CSV;
 
 use Box\Spout\Common\Helper\EncodingHelper;
-use Box\Spout\Reader\ReaderOptionsCommon;
 
 /**
  * Class ReaderOptions
@@ -11,7 +10,7 @@
  *
  * @package Box\Spout\Reader\CSV
  */
-class ReaderOptions extends ReaderOptionsCommon
+class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
 {
     /** @var string Defines the character used to delimit fields (one character only) */
     protected $fieldDelimiter = ',';
diff --git a/src/Spout/Reader/ReaderOptionsCommon.php b/src/Spout/Reader/Common/ReaderOptions.php
similarity index 88%
rename from src/Spout/Reader/ReaderOptionsCommon.php
rename to src/Spout/Reader/Common/ReaderOptions.php
index 05f8fccf..4ab7a07f 100644
--- a/src/Spout/Reader/ReaderOptionsCommon.php
+++ b/src/Spout/Reader/Common/ReaderOptions.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Box\Spout\Reader;
+namespace Box\Spout\Reader\Common;
 
 /**
- * Class ReaderOptionsCommon
+ * Class ReaderOptions
  * Readers' common options
  *
- * @package Box\Spout\Reader
+ * @package Box\Spout\Reader\Common
  */
-class ReaderOptionsCommon
+class ReaderOptions
 {
     /** @var bool Whether date/time values should be returned as PHP objects or be formatted as strings */
     protected $shouldFormatDates = false;
@@ -28,7 +28,7 @@ public function shouldFormatDates()
      * Sets whether date/time values should be returned as PHP objects or be formatted as strings.
      *
      * @param bool $shouldFormatDates
-     * @return ReaderOptionsCommon
+     * @return ReaderOptions
      */
     public function setShouldFormatDates($shouldFormatDates)
     {
@@ -48,7 +48,7 @@ public function shouldPreserveEmptyRows()
      * Sets whether empty rows should be returned or skipped.
      *
      * @param bool $shouldPreserveEmptyRows
-     * @return ReaderOptionsCommon
+     * @return ReaderOptions
      */
     public function setShouldPreserveEmptyRows($shouldPreserveEmptyRows)
     {
diff --git a/src/Spout/Reader/ODS/ReaderOptions.php b/src/Spout/Reader/ODS/ReaderOptions.php
index 84061d7c..2d29640f 100644
--- a/src/Spout/Reader/ODS/ReaderOptions.php
+++ b/src/Spout/Reader/ODS/ReaderOptions.php
@@ -2,15 +2,13 @@
 
 namespace Box\Spout\Reader\ODS;
 
-use Box\Spout\Reader\ReaderOptionsCommon;
-
 /**
  * Class ReaderOptions
  * This class is used to customize the reader's behavior
  *
  * @package Box\Spout\Reader\ODS
  */
-class ReaderOptions extends ReaderOptionsCommon
+class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
 {
     // No extra options
 }
diff --git a/src/Spout/Reader/XLSX/ReaderOptions.php b/src/Spout/Reader/XLSX/ReaderOptions.php
index 35321c43..5f78c5d2 100644
--- a/src/Spout/Reader/XLSX/ReaderOptions.php
+++ b/src/Spout/Reader/XLSX/ReaderOptions.php
@@ -2,15 +2,13 @@
 
 namespace Box\Spout\Reader\XLSX;
 
-use Box\Spout\Reader\ReaderOptionsCommon;
-
 /**
  * Class ReaderOptions
  * This class is used to customize the reader's behavior
  *
  * @package Box\Spout\Reader\XLSX
  */
-class ReaderOptions extends ReaderOptionsCommon
+class ReaderOptions extends \Box\Spout\Reader\Common\ReaderOptions
 {
     /** @var string|null Temporary folder where the temporary files will be created */
     protected $tempFolder = null;