Move entities and managers back to Common (#431)

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\CSV\Manager;
 
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Manager\OptionsManagerAbstract;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerAbstract;
 
 /**
  * Class OptionsManager

src/Spout/Writer/CSV/Writer.php

@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\CSV;
 use Box\Spout\Writer\WriterAbstract;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\EncodingHelper;
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 
 /**
  * Class Writer

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

@@ -1,16 +1,16 @@
 <?php
 
-namespace Box\Spout\Writer\Creator;
+namespace Box\Spout\Writer\Common\Creator;
 
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Entity\Workbook;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Workbook;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 
 /**
  * Class EntityFactory
  * Factory to create entities
  *
- * @package Box\Spout\Writer\Creator
+ * @package Box\Spout\Writer\Common\Creator
  */
 class EntityFactory
 {

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

@@ -1,14 +1,14 @@
 <?php
 
-namespace Box\Spout\Writer\Creator;
+namespace Box\Spout\Writer\Common\Creator;
 
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Manager\WorkbookManagerInterface;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerInterface;
 
 /**
  * Interface GeneralFactoryInterface
  *
- * @package Box\Spout\Writer\Creator
+ * @package Box\Spout\Writer\Common\Creator
  */
 interface InternalFactoryInterface
 {

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

@@ -1,13 +1,13 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 use Box\Spout\Writer\Common\Helper\CellHelper;
 
 /**
  * Class Cell
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 class Cell
 {

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

@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 /**
  * Class Options
  * Writer' options holder
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 abstract class Options
 {

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

@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 /**
  * Class Workbook
  * Entity describing a workbook
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 class Workbook
 {

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace Box\Spout\Writer\Entity;
+namespace Box\Spout\Writer\Common\Entity;
 
 use Box\Spout\Writer\Common\Sheet;
 
@@ -8,7 +8,7 @@ use Box\Spout\Writer\Common\Sheet;
  * Class Worksheet
  * Entity describing a Worksheet
  *
- * @package Box\Spout\Writer\Entity
+ * @package Box\Spout\Writer\Common\Entity
  */
 class Worksheet
 {

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

@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 /**
  * Class OptionsManager
  * Writer' options manager
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 abstract class OptionsManagerAbstract implements OptionsManagerInterface
 {

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

@@ -1,12 +1,12 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 /**
  * Interface OptionsManagerInterface
  * Writer' options interface
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 interface OptionsManagerInterface
 {

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

@@ -1,25 +1,24 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\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\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Entity\Workbook;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Workbook;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Exception\SheetNotFoundException;
 use Box\Spout\Writer\Exception\WriterException;
-use Box\Spout\Writer\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
 use Box\Spout\Writer\Style\Style;
 
 /**
  * Class WorkbookManagerAbstract
  * Abstract workbook manager, providing the generic interfaces to work with workbook.
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 abstract class WorkbookManagerAbstract implements WorkbookManagerInterface
 {

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

@@ -1,11 +1,11 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Entity\Workbook;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Workbook;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Exception\SheetNotFoundException;
 use Box\Spout\Writer\Exception\WriterException;
 use Box\Spout\Writer\Style\Style;
@@ -14,7 +14,7 @@ use Box\Spout\Writer\Style\Style;
  * Interface WorkbookManagerInterface
  * workbook manager interface, providing the generic interfaces to work with workbook.
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 interface WorkbookManagerInterface
 {

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

@@ -1,15 +1,15 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Style\Style;
 
 /**
  * Interface WorksheetManagerInterface
  * Inteface for worksheet managers, providing the generic interfaces to work with worksheets.
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 interface WorksheetManagerInterface
 {

src/Spout/Writer/ODS/Creator/InternalFactory.php

@@ -3,10 +3,10 @@
 namespace Box\Spout\Writer\ODS\Creator;
 
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Creator\EntityFactory;
-use Box\Spout\Writer\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\InternalFactoryInterface;
 use Box\Spout\Writer\ODS\Helper\FileSystemHelper;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 use Box\Spout\Writer\ODS\Manager\WorkbookManager;

src/Spout/Writer/ODS/Helper/FileSystemHelper.php

@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\ODS\Helper;
 
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\ODS\Manager\WorksheetManager;
 
 /**

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\ODS\Manager;
 
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Manager\OptionsManagerAbstract;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**

src/Spout/Writer/ODS/Manager/WorkbookManager.php

@@ -3,7 +3,7 @@
 namespace Box\Spout\Writer\ODS\Manager;
 
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Manager\WorkbookManagerAbstract;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerAbstract;
 use Box\Spout\Writer\ODS\Helper\FileSystemHelper;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 

src/Spout/Writer/ODS/Manager/WorksheetManager.php

@@ -5,9 +5,9 @@ namespace Box\Spout\Writer\ODS\Manager;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Entity\Cell;
-use Box\Spout\Writer\Entity\Worksheet;
-use Box\Spout\Writer\Manager\WorksheetManagerInterface;
+use Box\Spout\Writer\Common\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Worksheet;
+use Box\Spout\Writer\Common\Manager\WorksheetManagerInterface;
 use Box\Spout\Writer\ODS\Helper\StyleHelper;
 use Box\Spout\Writer\Style\Style;
 

src/Spout/Writer/ODS/Writer.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\ODS;
 
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\WriterMultiSheetsAbstract;
 
 /**

src/Spout/Writer/WriterAbstract.php

@@ -6,8 +6,8 @@ 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\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\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\Manager\OptionsManagerInterface Writer options manager */
+    /** @var \Box\Spout\Writer\Common\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\Manager\OptionsManagerInterface $optionsManager
+     * @param \Box\Spout\Writer\Common\Manager\OptionsManagerInterface $optionsManager
      */
     public function __construct(OptionsManagerInterface $optionsManager)
     {

src/Spout/Writer/WriterFactory.php

@@ -5,7 +5,7 @@ namespace Box\Spout\Writer;
 use Box\Spout\Common\Exception\UnsupportedTypeException;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Type;
-use Box\Spout\Writer\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**

src/Spout/Writer/WriterMultiSheetsAbstract.php

@@ -2,12 +2,12 @@
 
 namespace Box\Spout\Writer;
 
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
-use Box\Spout\Writer\Creator\InternalFactoryInterface;
-use Box\Spout\Writer\Manager\WorkbookManagerInterface;
+use Box\Spout\Writer\Common\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerInterface;
 
 /**
  * Class WriterMultiSheetsAbstract

src/Spout/Writer/XLSX/Creator/InternalFactory.php

@@ -4,12 +4,12 @@ namespace Box\Spout\Writer\XLSX\Creator;
 
 use Box\Spout\Common\Escaper;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Creator\EntityFactory;
-use Box\Spout\Writer\Creator\InternalFactoryInterface;
-use Box\Spout\Writer\Creator\WorkbookFactory;
-use Box\Spout\Writer\Creator\WorksheetFactory;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Creator\EntityFactory;
+use Box\Spout\Writer\Common\Creator\InternalFactoryInterface;
+use Box\Spout\Writer\Common\Creator\WorkbookFactory;
+use Box\Spout\Writer\Common\Creator\WorksheetFactory;
 use Box\Spout\Writer\XLSX\Helper\FileSystemHelper;
 use Box\Spout\Writer\XLSX\Helper\SharedStringsHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;

src/Spout/Writer/XLSX/Helper/FileSystemHelper.php

@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\XLSX\Helper;
 
 use Box\Spout\Writer\Common\Helper\FileSystemWithRootFolderHelperInterface;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
-use Box\Spout\Writer\Entity\Worksheet;
+use Box\Spout\Writer\Common\Entity\Worksheet;
 
 /**
  * Class FileSystemHelper

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\XLSX\Manager;
 
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Manager\OptionsManagerAbstract;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Manager\OptionsManagerAbstract;
 use Box\Spout\Writer\Style\StyleBuilder;
 
 /**

src/Spout/Writer/XLSX/Manager/WorkbookManager.php

@@ -3,7 +3,7 @@
 namespace Box\Spout\Writer\XLSX\Manager;
 
 use Box\Spout\Writer\Common\Sheet;
-use Box\Spout\Writer\Manager\WorkbookManagerAbstract;
+use Box\Spout\Writer\Common\Manager\WorkbookManagerAbstract;
 use Box\Spout\Writer\XLSX\Helper\FileSystemHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;
 

src/Spout/Writer/XLSX/Manager/WorksheetManager.php

@@ -6,11 +6,11 @@ use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Common\Helper\CellHelper;
-use Box\Spout\Writer\Manager\OptionsManagerInterface;
-use Box\Spout\Writer\Entity\Options;
-use Box\Spout\Writer\Entity\Cell;
-use Box\Spout\Writer\Entity\Worksheet;
-use Box\Spout\Writer\Manager\WorksheetManagerInterface;
+use Box\Spout\Writer\Common\Manager\OptionsManagerInterface;
+use Box\Spout\Writer\Common\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Worksheet;
+use Box\Spout\Writer\Common\Manager\WorksheetManagerInterface;
 use Box\Spout\Writer\Style\Style;
 use Box\Spout\Writer\XLSX\Helper\SharedStringsHelper;
 use Box\Spout\Writer\XLSX\Helper\StyleHelper;

src/Spout/Writer/XLSX/Writer.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\XLSX;
 
-use Box\Spout\Writer\Entity\Options;
+use Box\Spout\Writer\Common\Entity\Options;
 use Box\Spout\Writer\WriterMultiSheetsAbstract;
 
 /**

tests/Spout/Writer/CSV/WriterTest.php

@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\CSV;
 use Box\Spout\TestUsingResource;
 use Box\Spout\Common\Type;
 use Box\Spout\Common\Helper\EncodingHelper;
-use Box\Spout\Writer\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 
 /**

tests/Spout/Writer/Common/Manager/OptionsManagerTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Box\Spout\Writer\Manager;
+namespace Box\Spout\Writer\Common\Manager;
 
 /**
  * Class OptionsManagerTest
  *
- * @package Box\Spout\Writer\Manager
+ * @package Box\Spout\Writer\Common\Manager
  */
 class OptionsManagerTest extends \PHPUnit_Framework_TestCase
 {

tests/Spout/Writer/ODS/WriterTest.php

@@ -7,7 +7,7 @@ use Box\Spout\Common\Type;
 use Box\Spout\Reader\Wrapper\XMLReader;
 use Box\Spout\TestUsingResource;
 use Box\Spout\Writer\Common\Helper\ZipHelper;
-use Box\Spout\Writer\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 
 /**

tests/Spout/Writer/XLSX/WriterTest.php

@@ -5,7 +5,7 @@ namespace Box\Spout\Writer\XLSX;
 use Box\Spout\Common\Exception\SpoutException;
 use Box\Spout\Common\Type;
 use Box\Spout\TestUsingResource;
-use Box\Spout\Writer\Entity\Cell;
+use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\WriterFactory;
 use Box\Spout\Writer\XLSX\Manager\WorksheetManager;