From 69b091b37cb1ac82ee9c4521daf77f6d1fb3b540 Mon Sep 17 00:00:00 2001
From: Adrien Loison <adrilo@users.noreply.github.com>
Date: Mon, 29 May 2017 22:34:25 +0200
Subject: [PATCH] Move OptionManager from Common/Manager to Manager (#428)

---
 src/Spout/Writer/CSV/Manager/OptionsManager.php             | 3 ++-
 src/Spout/Writer/Factory/InternalFactoryInterface.php       | 2 +-
 .../OptionsManagerAbstract.php}                             | 6 +++---
 .../Writer/{Common => }/Manager/OptionsManagerInterface.php | 4 ++--
 src/Spout/Writer/Manager/WorkbookManagerAbstract.php        | 2 +-
 src/Spout/Writer/ODS/Factory/InternalFactory.php            | 2 +-
 src/Spout/Writer/ODS/Manager/OptionsManager.php             | 3 ++-
 src/Spout/Writer/WriterAbstract.php                         | 6 +++---
 src/Spout/Writer/WriterMultiSheetsAbstract.php              | 2 +-
 src/Spout/Writer/XLSX/Factory/InternalFactory.php           | 2 +-
 src/Spout/Writer/XLSX/Manager/OptionsManager.php            | 3 ++-
 src/Spout/Writer/XLSX/Manager/WorksheetManager.php          | 2 +-
 .../Writer/{Common => }/Manager/OptionsManagerTest.php      | 6 +++---
 13 files changed, 23 insertions(+), 20 deletions(-)
 rename src/Spout/Writer/{Common/Manager/OptionsManager.php => Manager/OptionsManagerAbstract.php} (90%)
 rename src/Spout/Writer/{Common => }/Manager/OptionsManagerInterface.php (84%)
 rename tests/Spout/Writer/{Common => }/Manager/OptionsManagerTest.php (92%)

diff --git a/src/Spout/Writer/CSV/Manager/OptionsManager.php b/src/Spout/Writer/CSV/Manager/OptionsManager.php
index a9cbfab..fc96170 100644
--- a/src/Spout/Writer/CSV/Manager/OptionsManager.php
+++ b/src/Spout/Writer/CSV/Manager/OptionsManager.php
@@ -3,6 +3,7 @@
 namespace Box\Spout\Writer\CSV\Manager;
 
 use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Manager\OptionsManagerAbstract;
 
 /**
  * Class OptionsManager
@@ -10,7 +11,7 @@ use Box\Spout\Writer\Common\Options;
  *
  * @package Box\Spout\Writer\CSV\Manager
  */
-class OptionsManager extends \Box\Spout\Writer\Common\Manager\OptionsManager
+class OptionsManager extends OptionsManagerAbstract
 {
     /**
      * @inheritdoc
diff --git a/src/Spout/Writer/Factory/InternalFactoryInterface.php b/src/Spout/Writer/Factory/InternalFactoryInterface.php
index 5588aa4..bbf6775 100644
--- a/src/Spout/Writer/Factory/InternalFactoryInterface.php
+++ b/src/Spout/Writer/Factory/InternalFactoryInterface.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Factory;
 
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Manager\WorkbookManagerInterface;
 
 /**
diff --git a/src/Spout/Writer/Common/Manager/OptionsManager.php b/src/Spout/Writer/Manager/OptionsManagerAbstract.php
similarity index 90%
rename from src/Spout/Writer/Common/Manager/OptionsManager.php
rename to src/Spout/Writer/Manager/OptionsManagerAbstract.php
index 9e2bd8b..e9adfb8 100644
--- a/src/Spout/Writer/Common/Manager/OptionsManager.php
+++ b/src/Spout/Writer/Manager/OptionsManagerAbstract.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Box\Spout\Writer\Common\Manager;
+namespace Box\Spout\Writer\Manager;
 
 /**
  * Class OptionsManager
  * Writer' options manager
  *
- * @package Box\Spout\Writer\Common\Manager
+ * @package Box\Spout\Writer\Manager
  */
-abstract class OptionsManager implements OptionsManagerInterface
+abstract class OptionsManagerAbstract implements OptionsManagerInterface
 {
     const PREFIX_OPTION = 'OPTION_';
 
diff --git a/src/Spout/Writer/Common/Manager/OptionsManagerInterface.php b/src/Spout/Writer/Manager/OptionsManagerInterface.php
similarity index 84%
rename from src/Spout/Writer/Common/Manager/OptionsManagerInterface.php
rename to src/Spout/Writer/Manager/OptionsManagerInterface.php
index 80ac9b4..8994120 100644
--- a/src/Spout/Writer/Common/Manager/OptionsManagerInterface.php
+++ b/src/Spout/Writer/Manager/OptionsManagerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Common\Manager;
+namespace Box\Spout\Writer\Manager;
 
 /**
  * Interface OptionsManagerInterface
  * Writer' options interface
  *
- * @package Box\Spout\Writer\Common\Manager
+ * @package Box\Spout\Writer\Manager
  */
 interface OptionsManagerInterface
 {
diff --git a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php b/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
index a6f6bd3..1d6028d 100644
--- a/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
+++ b/src/Spout/Writer/Manager/WorkbookManagerAbstract.php
@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\Manager;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Helper\StyleHelperInterface;
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Options;
 use Box\Spout\Writer\Common\Sheet;
 use Box\Spout\Writer\Entity\Workbook;
diff --git a/src/Spout/Writer/ODS/Factory/InternalFactory.php b/src/Spout/Writer/ODS/Factory/InternalFactory.php
index 9158d0f..c6d71a2 100644
--- a/src/Spout/Writer/ODS/Factory/InternalFactory.php
+++ b/src/Spout/Writer/ODS/Factory/InternalFactory.php
@@ -3,7 +3,7 @@
 namespace Box\Spout\Writer\ODS\Factory;
 
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Options;
 use Box\Spout\Writer\Factory\EntityFactory;
 use Box\Spout\Writer\Factory\InternalFactoryInterface;
diff --git a/src/Spout/Writer/ODS/Manager/OptionsManager.php b/src/Spout/Writer/ODS/Manager/OptionsManager.php
index 7681cdc..af342cf 100644
--- a/src/Spout/Writer/ODS/Manager/OptionsManager.php
+++ b/src/Spout/Writer/ODS/Manager/OptionsManager.php
@@ -3,6 +3,7 @@
 namespace Box\Spout\Writer\ODS\Manager;
 
 use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**
@@ -11,7 +12,7 @@ use Box\Spout\Writer\Style\StyleBuilder;
  *
  * @package Box\Spout\Writer\ODS\Manager
  */
-class OptionsManager extends \Box\Spout\Writer\Common\Manager\OptionsManager
+class OptionsManager extends OptionsManagerAbstract
 {
     /** @var StyleBuilder Style builder */
     protected $styleBuilder;
diff --git a/src/Spout/Writer/WriterAbstract.php b/src/Spout/Writer/WriterAbstract.php
index d383b0b..3f21ef7 100644
--- a/src/Spout/Writer/WriterAbstract.php
+++ b/src/Spout/Writer/WriterAbstract.php
@@ -6,7 +6,7 @@ use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Exception\SpoutException;
 use Box\Spout\Common\Helper\FileSystemHelper;
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Options;
 use Box\Spout\Writer\Exception\WriterAlreadyOpenedException;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
@@ -31,7 +31,7 @@ abstract class WriterAbstract implements WriterInterface
     /** @var \Box\Spout\Common\Helper\GlobalFunctionsHelper Helper to work with global functions */
     protected $globalFunctionsHelper;
 
-    /** @var \Box\Spout\Writer\Common\Manager\OptionsManagerInterface Writer options manager */
+    /** @var \Box\Spout\Writer\Manager\OptionsManagerInterface Writer options manager */
     protected $optionsManager;
 
     /** @var Style\Style Style to be applied to the next written row(s) */
@@ -66,7 +66,7 @@ abstract class WriterAbstract implements WriterInterface
     abstract protected function closeWriter();
 
     /**
-     * @param \Box\Spout\Writer\Common\Manager\OptionsManagerInterface $optionsManager
+     * @param \Box\Spout\Writer\Manager\OptionsManagerInterface $optionsManager
      */
     public function __construct(OptionsManagerInterface $optionsManager)
     {
diff --git a/src/Spout/Writer/WriterMultiSheetsAbstract.php b/src/Spout/Writer/WriterMultiSheetsAbstract.php
index 88e7446..8dce4b1 100644
--- a/src/Spout/Writer/WriterMultiSheetsAbstract.php
+++ b/src/Spout/Writer/WriterMultiSheetsAbstract.php
@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer;
 
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Options;
 use Box\Spout\Writer\Entity\Worksheet;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
diff --git a/src/Spout/Writer/XLSX/Factory/InternalFactory.php b/src/Spout/Writer/XLSX/Factory/InternalFactory.php
index d1991ce..d52176c 100644
--- a/src/Spout/Writer/XLSX/Factory/InternalFactory.php
+++ b/src/Spout/Writer/XLSX/Factory/InternalFactory.php
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\XLSX\Factory;
 
 use Box\Spout\Common\Escaper;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Options;
 use Box\Spout\Writer\Factory\EntityFactory;
 use Box\Spout\Writer\Factory\InternalFactoryInterface;
diff --git a/src/Spout/Writer/XLSX/Manager/OptionsManager.php b/src/Spout/Writer/XLSX/Manager/OptionsManager.php
index d2a7663..ea029c2 100644
--- a/src/Spout/Writer/XLSX/Manager/OptionsManager.php
+++ b/src/Spout/Writer/XLSX/Manager/OptionsManager.php
@@ -3,6 +3,7 @@
 namespace Box\Spout\Writer\XLSX\Manager;
 
 use Box\Spout\Writer\Common\Options;
+use Box\Spout\Writer\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**
@@ -11,7 +12,7 @@ use Box\Spout\Writer\Style\StyleBuilder;
  *
  * @package Box\Spout\Writer\XLSX\Manager
  */
-class OptionsManager extends \Box\Spout\Writer\Common\Manager\OptionsManager
+class OptionsManager extends OptionsManagerAbstract
 {
     /** Default style font values */
     const DEFAULT_FONT_SIZE = 12;
diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
index 45903f4..b1bf0f8 100644
--- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
+++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php
@@ -7,7 +7,7 @@ use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Common\Cell;
 use Box\Spout\Writer\Common\Helper\CellHelper;
-use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Options;
 use Box\Spout\Writer\Entity\Worksheet;
 use Box\Spout\Writer\Manager\WorksheetManagerInterface;
diff --git a/tests/Spout/Writer/Common/Manager/OptionsManagerTest.php b/tests/Spout/Writer/Manager/OptionsManagerTest.php
similarity index 92%
rename from tests/Spout/Writer/Common/Manager/OptionsManagerTest.php
rename to tests/Spout/Writer/Manager/OptionsManagerTest.php
index 66889b4..2f9b4d4 100644
--- a/tests/Spout/Writer/Common/Manager/OptionsManagerTest.php
+++ b/tests/Spout/Writer/Manager/OptionsManagerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Box\Spout\Writer\Common\Manager;
+namespace Box\Spout\Writer\Manager;
 
 /**
  * Class OptionsManagerTest
  *
- * @package Box\Spout\Writer\Common\Manager
+ * @package Box\Spout\Writer\Manager
  */
 class OptionsManagerTest extends \PHPUnit_Framework_TestCase
 {
@@ -51,7 +51,7 @@ class OptionsManagerTest extends \PHPUnit_Framework_TestCase
 
 
 // TODO: Convert this to anonymous class when PHP < 7 support is dropped
-class FakeOptionsManager extends OptionsManager
+class FakeOptionsManager extends OptionsManagerAbstract
 {
     protected function getSupportedOptions()
     {