Merge Reader and Writer entities

Merged Cell/Row/Style entities

src/Spout/Writer/CSV/Writer.php

@@ -2,10 +2,10 @@
 
 namespace Box\Spout\Writer\CSV;
 
+use Box\Spout\Common\Entity\Row;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\EncodingHelper;
 use Box\Spout\Writer\Common\Entity\Options;
-use Box\Spout\Writer\Common\Entity\Row;
 use Box\Spout\Writer\WriterAbstract;
 
 /**

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

@@ -2,9 +2,9 @@
 
 namespace Box\Spout\Writer\Common\Creator;
 
-use Box\Spout\Writer\Common\Entity\Cell;
-use Box\Spout\Writer\Common\Entity\Row;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Cell;
+use Box\Spout\Common\Entity\Row;
+use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Writer\WriterInterface;
 
 /**

src/Spout/Writer/Common/Creator/Style/BorderBuilder.php

@@ -2,9 +2,9 @@
 
 namespace Box\Spout\Writer\Common\Creator\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Border;
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
-use Box\Spout\Writer\Common\Entity\Style\Color;
+use Box\Spout\Common\Entity\Style\Border;
+use Box\Spout\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\Color;
 
 /**
  * Class BorderBuilder

src/Spout/Writer/Common/Creator/Style/StyleBuilder.php

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\Common\Creator\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Border;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Style\Border;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Class StyleBuilder

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

@@ -1,194 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Entity;
-
-use Box\Spout\Common\Helper\CellTypeHelper;
-use Box\Spout\Writer\Common\Entity\Style\Style;
-
-/**
- * Class Cell
- */
-class Cell
-{
-    /**
-     * Numeric cell type (whole numbers, fractional numbers, dates)
-     */
-    const TYPE_NUMERIC = 0;
-
-    /**
-     * String (text) cell type
-     */
-    const TYPE_STRING = 1;
-
-    /**
-     * Formula cell type
-     * Not used at the moment
-     */
-    const TYPE_FORMULA = 2;
-
-    /**
-     * Empty cell type
-     */
-    const TYPE_EMPTY = 3;
-
-    /**
-     * Boolean cell type
-     */
-    const TYPE_BOOLEAN = 4;
-
-    /**
-     * Error cell type
-     */
-    const TYPE_ERROR = 5;
-
-    /**
-     * The value of this cell
-     * @var mixed|null
-     */
-    protected $value;
-
-    /**
-     * The cell type
-     * @var int|null
-     */
-    protected $type;
-
-    /**
-     * The cell style
-     * @var Style
-     */
-    protected $style;
-
-    /**
-     * @param $value mixed
-     * @param Style|null $style
-     */
-    public function __construct($value, Style $style = null)
-    {
-        $this->setValue($value);
-        $this->setStyle($style);
-    }
-
-    /**
-     * @param mixed|null $value
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-        $this->type = $this->detectType($value);
-    }
-
-    /**
-     * @return mixed|null
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * @param Style|null $style
-     */
-    public function setStyle($style)
-    {
-        $this->style = $style ?: new Style();
-    }
-
-    /**
-     * @return Style
-     */
-    public function getStyle()
-    {
-        return $this->style;
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Get the current value type
-     *
-     * @param mixed|null $value
-     * @return int
-     */
-    protected function detectType($value)
-    {
-        if (CellTypeHelper::isBoolean($value)) {
-            return self::TYPE_BOOLEAN;
-        }
-        if (CellTypeHelper::isEmpty($value)) {
-            return self::TYPE_EMPTY;
-        }
-        if (CellTypeHelper::isNumeric($this->getValue())) {
-            return self::TYPE_NUMERIC;
-        }
-        if (CellTypeHelper::isNonEmptyString($value)) {
-            return self::TYPE_STRING;
-        }
-
-        return self::TYPE_ERROR;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isBoolean()
-    {
-        return $this->type === self::TYPE_BOOLEAN;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return $this->type === self::TYPE_EMPTY;
-    }
-
-    /**
-     * Not used at the moment
-     *
-     * @return bool
-     */
-    public function isFormula()
-    {
-        return $this->type === self::TYPE_FORMULA;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isNumeric()
-    {
-        return $this->type === self::TYPE_NUMERIC;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isString()
-    {
-        return $this->type === self::TYPE_STRING;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isError()
-    {
-        return $this->type === self::TYPE_ERROR;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
-}

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

@@ -1,92 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Entity;
-
-use Box\Spout\Writer\Common\Entity\Style\Style;
-
-class Row
-{
-    /**
-     * The cells in this row
-     * @var Cell[]
-     */
-    protected $cells = [];
-
-    /**
-     * The row style
-     * @var Style
-     */
-    protected $style;
-
-    /**
-     * Row constructor.
-     * @param Cell[] $cells
-     * @param Style|null $style
-     */
-    public function __construct(array $cells, $style)
-    {
-        $this
-            ->setCells($cells)
-            ->setStyle($style);
-    }
-
-    /**
-     * @return Cell[] $cells
-     */
-    public function getCells()
-    {
-        return $this->cells;
-    }
-
-    /**
-     * @param Cell[] $cells
-     * @return $this
-     */
-    public function setCells(array $cells)
-    {
-        $this->cells = [];
-        foreach ($cells as $cell) {
-            $this->addCell($cell);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return Style
-     */
-    public function getStyle()
-    {
-        return $this->style;
-    }
-
-    /**
-     * @param Style|null $style
-     * @return Row
-     */
-    public function setStyle($style)
-    {
-        $this->style = $style ?: new Style();
-
-        return $this;
-    }
-
-    /**
-     * @param Cell $cell
-     * @return Row
-     */
-    public function addCell(Cell $cell)
-    {
-        $this->cells[] = $cell;
-
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumCells()
-    {
-        return count($this->cells);
-    }
-}

src/Spout/Writer/Common/Entity/Style/Border.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Entity\Style;
-
-/**
- * Class Border
- */
-class Border
-{
-    const LEFT = 'left';
-    const RIGHT = 'right';
-    const TOP = 'top';
-    const BOTTOM = 'bottom';
-
-    const STYLE_NONE = 'none';
-    const STYLE_SOLID = 'solid';
-    const STYLE_DASHED = 'dashed';
-    const STYLE_DOTTED = 'dotted';
-    const STYLE_DOUBLE = 'double';
-
-    const WIDTH_THIN = 'thin';
-    const WIDTH_MEDIUM = 'medium';
-    const WIDTH_THICK = 'thick';
-
-    /** @var array A list of BorderPart objects for this border. */
-    private $parts = [];
-
-    /**
-     * @param array $borderParts
-     */
-    public function __construct(array $borderParts = [])
-    {
-        $this->setParts($borderParts);
-    }
-
-    /**
-     * @param string $name The name of the border part
-     * @return BorderPart|null
-     */
-    public function getPart($name)
-    {
-        return $this->hasPart($name) ? $this->parts[$name] : null;
-    }
-
-    /**
-     * @param string $name The name of the border part
-     * @return bool
-     */
-    public function hasPart($name)
-    {
-        return isset($this->parts[$name]);
-    }
-
-    /**
-     * @return array
-     */
-    public function getParts()
-    {
-        return $this->parts;
-    }
-
-    /**
-     * Set BorderParts
-     * @param array $parts
-     * @return void
-     */
-    public function setParts($parts)
-    {
-        unset($this->parts);
-        foreach ($parts as $part) {
-            $this->addPart($part);
-        }
-    }
-
-    /**
-     * @param BorderPart $borderPart
-     * @return Border
-     */
-    public function addPart(BorderPart $borderPart)
-    {
-        $this->parts[$borderPart->getName()] = $borderPart;
-
-        return $this;
-    }
-}

src/Spout/Writer/Common/Entity/Style/BorderPart.php

@@ -1,184 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Entity\Style;
-
-use Box\Spout\Writer\Exception\Border\InvalidNameException;
-use Box\Spout\Writer\Exception\Border\InvalidStyleException;
-use Box\Spout\Writer\Exception\Border\InvalidWidthException;
-
-/**
- * Class BorderPart
- */
-class BorderPart
-{
-    /**
-     * @var string The style of this border part.
-     */
-    protected $style;
-
-    /**
-     * @var string The name of this border part.
-     */
-    protected $name;
-
-    /**
-     * @var string The color of this border part.
-     */
-    protected $color;
-
-    /**
-     * @var string The width of this border part.
-     */
-    protected $width;
-
-    /**
-     * @var array Allowed style constants for parts.
-     */
-    protected static $allowedStyles = [
-        'none',
-        'solid',
-        'dashed',
-        'dotted',
-        'double',
-    ];
-
-    /**
-     * @var array Allowed names constants for border parts.
-     */
-    protected static $allowedNames = [
-        'left',
-        'right',
-        'top',
-        'bottom',
-    ];
-
-    /**
-     * @var array Allowed width constants for border parts.
-     */
-    protected static $allowedWidths = [
-        'thin',
-        'medium',
-        'thick',
-    ];
-
-    /**
-     * @param string $name @see  BorderPart::$allowedNames
-     * @param string $color A RGB color code
-     * @param string $width @see BorderPart::$allowedWidths
-     * @param string $style @see BorderPart::$allowedStyles
-     * @throws InvalidNameException
-     * @throws InvalidStyleException
-     * @throws InvalidWidthException
-     */
-    public function __construct($name, $color = Color::BLACK, $width = Border::WIDTH_MEDIUM, $style = Border::STYLE_SOLID)
-    {
-        $this->setName($name);
-        $this->setColor($color);
-        $this->setWidth($width);
-        $this->setStyle($style);
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name The name of the border part @see BorderPart::$allowedNames
-     * @throws InvalidNameException
-     * @return void
-     */
-    public function setName($name)
-    {
-        if (!in_array($name, self::$allowedNames)) {
-            throw new InvalidNameException($name);
-        }
-        $this->name = $name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getStyle()
-    {
-        return $this->style;
-    }
-
-    /**
-     * @param string $style The style of the border part @see BorderPart::$allowedStyles
-     * @throws InvalidStyleException
-     * @return void
-     */
-    public function setStyle($style)
-    {
-        if (!in_array($style, self::$allowedStyles)) {
-            throw new InvalidStyleException($style);
-        }
-        $this->style = $style;
-    }
-
-    /**
-     * @return string
-     */
-    public function getColor()
-    {
-        return $this->color;
-    }
-
-    /**
-     * @param string $color The color of the border part @see Color::rgb()
-     * @return void
-     */
-    public function setColor($color)
-    {
-        $this->color = $color;
-    }
-
-    /**
-     * @return string
-     */
-    public function getWidth()
-    {
-        return $this->width;
-    }
-
-    /**
-     * @param string $width The width of the border part @see BorderPart::$allowedWidths
-     * @throws InvalidWidthException
-     * @return void
-     */
-    public function setWidth($width)
-    {
-        if (!in_array($width, self::$allowedWidths)) {
-            throw new InvalidWidthException($width);
-        }
-        $this->width = $width;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getAllowedStyles()
-    {
-        return self::$allowedStyles;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getAllowedNames()
-    {
-        return self::$allowedNames;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getAllowedWidths()
-    {
-        return self::$allowedWidths;
-    }
-}

src/Spout/Writer/Common/Entity/Style/Color.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Entity\Style;
-
-use Box\Spout\Writer\Exception\InvalidColorException;
-
-/**
- * Class Color
- * This class provides constants and functions to work with colors
- */
-class Color
-{
-    /** Standard colors - based on Office Online */
-    const BLACK = '000000';
-    const WHITE = 'FFFFFF';
-    const RED = 'FF0000';
-    const DARK_RED = 'C00000';
-    const ORANGE = 'FFC000';
-    const YELLOW = 'FFFF00';
-    const LIGHT_GREEN = '92D040';
-    const GREEN = '00B050';
-    const LIGHT_BLUE = '00B0E0';
-    const BLUE = '0070C0';
-    const DARK_BLUE = '002060';
-    const PURPLE = '7030A0';
-
-    /**
-     * Returns an RGB color from R, G and B values
-     *
-     * @param int $red Red component, 0 - 255
-     * @param int $green Green component, 0 - 255
-     * @param int $blue Blue component, 0 - 255
-     * @return string RGB color
-     */
-    public static function rgb($red, $green, $blue)
-    {
-        self::throwIfInvalidColorComponentValue($red);
-        self::throwIfInvalidColorComponentValue($green);
-        self::throwIfInvalidColorComponentValue($blue);
-
-        return strtoupper(
-            self::convertColorComponentToHex($red) .
-            self::convertColorComponentToHex($green) .
-            self::convertColorComponentToHex($blue)
-        );
-    }
-
-    /**
-     * Throws an exception is the color component value is outside of bounds (0 - 255)
-     *
-     * @param int $colorComponent
-     * @throws \Box\Spout\Writer\Exception\InvalidColorException
-     * @return void
-     */
-    protected static function throwIfInvalidColorComponentValue($colorComponent)
-    {
-        if (!is_int($colorComponent) || $colorComponent < 0 || $colorComponent > 255) {
-            throw new InvalidColorException("The RGB components must be between 0 and 255. Received: $colorComponent");
-        }
-    }
-
-    /**
-     * Converts the color component to its corresponding hexadecimal value
-     *
-     * @param int $colorComponent Color component, 0 - 255
-     * @return string Corresponding hexadecimal value, with a leading 0 if needed. E.g "0f", "2d"
-     */
-    protected static function convertColorComponentToHex($colorComponent)
-    {
-        return str_pad(dechex($colorComponent), 2, '0', STR_PAD_LEFT);
-    }
-
-    /**
-     * Returns the ARGB color of the given RGB color,
-     * assuming that alpha value is always 1.
-     *
-     * @param string $rgbColor RGB color like "FF08B2"
-     * @return string ARGB color
-     */
-    public static function toARGB($rgbColor)
-    {
-        return 'FF' . $rgbColor;
-    }
-}

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

@@ -1,386 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Common\Entity\Style;
-
-/**
- * Class Style
- * Represents a style to be applied to a cell
- */
-class Style
-{
-    /** Default font values */
-    const DEFAULT_FONT_SIZE = 11;
-    const DEFAULT_FONT_COLOR = Color::BLACK;
-    const DEFAULT_FONT_NAME = 'Arial';
-
-    /** @var int|null Style ID */
-    private $id;
-
-    /** @var bool Whether the font should be bold */
-    private $fontBold = false;
-    /** @var bool Whether the bold property was set */
-    private $hasSetFontBold = false;
-
-    /** @var bool Whether the font should be italic */
-    private $fontItalic = false;
-    /** @var bool Whether the italic property was set */
-    private $hasSetFontItalic = false;
-
-    /** @var bool Whether the font should be underlined */
-    private $fontUnderline = false;
-    /** @var bool Whether the underline property was set */
-    private $hasSetFontUnderline = false;
-
-    /** @var bool Whether the font should be struck through */
-    private $fontStrikethrough = false;
-    /** @var bool Whether the strikethrough property was set */
-    private $hasSetFontStrikethrough = false;
-
-    /** @var int Font size */
-    private $fontSize = self::DEFAULT_FONT_SIZE;
-    /** @var bool Whether the font size property was set */
-    private $hasSetFontSize = false;
-
-    /** @var string Font color */
-    private $fontColor = self::DEFAULT_FONT_COLOR;
-    /** @var bool Whether the font color property was set */
-    private $hasSetFontColor = false;
-
-    /** @var string Font name */
-    private $fontName = self::DEFAULT_FONT_NAME;
-    /** @var bool Whether the font name property was set */
-    private $hasSetFontName = false;
-
-    /** @var bool Whether specific font properties should be applied */
-    private $shouldApplyFont = false;
-
-    /** @var bool Whether the text should wrap in the cell (useful for long or multi-lines text) */
-    private $shouldWrapText = false;
-    /** @var bool Whether the wrap text property was set */
-    private $hasSetWrapText = false;
-
-    /** @var Border */
-    private $border;
-
-    /** @var bool Whether border properties should be applied */
-    private $shouldApplyBorder = false;
-
-    /** @var string Background color */
-    private $backgroundColor;
-
-    /** @var bool */
-    private $hasSetBackgroundColor = false;
-
-    /**
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     * @return Style
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * @return Border
-     */
-    public function getBorder()
-    {
-        return $this->border;
-    }
-
-    /**
-     * @param Border $border
-     * @return Style
-     */
-    public function setBorder(Border $border)
-    {
-        $this->shouldApplyBorder = true;
-        $this->border = $border;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function shouldApplyBorder()
-    {
-        return $this->shouldApplyBorder;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFontBold()
-    {
-        return $this->fontBold;
-    }
-
-    /**
-     * @return Style
-     */
-    public function setFontBold()
-    {
-        $this->fontBold = true;
-        $this->hasSetFontBold = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontBold()
-    {
-        return $this->hasSetFontBold;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFontItalic()
-    {
-        return $this->fontItalic;
-    }
-
-    /**
-     * @return Style
-     */
-    public function setFontItalic()
-    {
-        $this->fontItalic = true;
-        $this->hasSetFontItalic = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontItalic()
-    {
-        return $this->hasSetFontItalic;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFontUnderline()
-    {
-        return $this->fontUnderline;
-    }
-
-    /**
-     * @return Style
-     */
-    public function setFontUnderline()
-    {
-        $this->fontUnderline = true;
-        $this->hasSetFontUnderline = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontUnderline()
-    {
-        return $this->hasSetFontUnderline;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isFontStrikethrough()
-    {
-        return $this->fontStrikethrough;
-    }
-
-    /**
-     * @return Style
-     */
-    public function setFontStrikethrough()
-    {
-        $this->fontStrikethrough = true;
-        $this->hasSetFontStrikethrough = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontStrikethrough()
-    {
-        return $this->hasSetFontStrikethrough;
-    }
-
-    /**
-     * @return int
-     */
-    public function getFontSize()
-    {
-        return $this->fontSize;
-    }
-
-    /**
-     * @param int $fontSize Font size, in pixels
-     * @return Style
-     */
-    public function setFontSize($fontSize)
-    {
-        $this->fontSize = $fontSize;
-        $this->hasSetFontSize = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontSize()
-    {
-        return $this->hasSetFontSize;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFontColor()
-    {
-        return $this->fontColor;
-    }
-
-    /**
-     * Sets the font color.
-     *
-     * @param string $fontColor ARGB color (@see Color)
-     * @return Style
-     */
-    public function setFontColor($fontColor)
-    {
-        $this->fontColor = $fontColor;
-        $this->hasSetFontColor = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontColor()
-    {
-        return $this->hasSetFontColor;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFontName()
-    {
-        return $this->fontName;
-    }
-
-    /**
-     * @param string $fontName Name of the font to use
-     * @return Style
-     */
-    public function setFontName($fontName)
-    {
-        $this->fontName = $fontName;
-        $this->hasSetFontName = true;
-        $this->shouldApplyFont = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetFontName()
-    {
-        return $this->hasSetFontName;
-    }
-
-    /**
-     * @return bool
-     */
-    public function shouldWrapText()
-    {
-        return $this->shouldWrapText;
-    }
-
-    /**
-     * @param bool $shouldWrap Should the text be wrapped
-     * @return Style
-     */
-    public function setShouldWrapText($shouldWrap = true)
-    {
-        $this->shouldWrapText = $shouldWrap;
-        $this->hasSetWrapText = true;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSetWrapText()
-    {
-        return $this->hasSetWrapText;
-    }
-
-    /**
-     * @return bool Whether specific font properties should be applied
-     */
-    public function shouldApplyFont()
-    {
-        return $this->shouldApplyFont;
-    }
-
-    /**
-     * Sets the background color
-     * @param string $color ARGB color (@see Color)
-     * @return Style
-     */
-    public function setBackgroundColor($color)
-    {
-        $this->hasSetBackgroundColor = true;
-        $this->backgroundColor = $color;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBackgroundColor()
-    {
-        return $this->backgroundColor;
-    }
-
-    /**
-     * @return bool Whether the background color should be applied
-     */
-    public function shouldApplyBackgroundColor()
-    {
-        return $this->hasSetBackgroundColor;
-    }
-}

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\Common\Manager;
 
-use Box\Spout\Writer\Common\Entity\Cell;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Cell;
+use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Writer\Common\Manager\Style\StyleMerger;
 
 class CellManager

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

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Common\Manager;
 
-use Box\Spout\Writer\Common\Entity\Row;
+use Box\Spout\Common\Entity\Row;
 
 class RowManager
 {

src/Spout/Writer/Common/Manager/Style/StyleManager.php

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\Common\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Cell;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Cell;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Class StyleManager
@@ -69,7 +69,7 @@ class StyleManager implements StyleManagerInterface
      *        on the Windows version of Excel...
      *
      * @param Cell $cell The cell the style should be applied to
-     * @return \Box\Spout\Writer\Common\Entity\Style\Style The eventually updated style
+     * @return \Box\Spout\Common\Entity\Style\Style The eventually updated style
      */
     protected function applyWrapTextIfCellContainsNewLine(Cell $cell)
     {

src/Spout/Writer/Common/Manager/Style/StyleManagerInterface.php

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\Common\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Cell;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Cell;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Interface StyleHManagernterface

src/Spout/Writer/Common/Manager/Style/StyleMerger.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Common\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Class StyleMerger

src/Spout/Writer/Common/Manager/Style/StyleRegistry.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Common\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Class StyleRegistry

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

@@ -2,12 +2,12 @@
 
 namespace Box\Spout\Writer\Common\Manager;
 
+use Box\Spout\Common\Entity\Row;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Creator\InternalEntityFactory;
 use Box\Spout\Writer\Common\Creator\ManagerFactoryInterface;
 use Box\Spout\Writer\Common\Entity\Options;
-use Box\Spout\Writer\Common\Entity\Row;
 use Box\Spout\Writer\Common\Entity\Sheet;
 use Box\Spout\Writer\Common\Entity\Workbook;
 use Box\Spout\Writer\Common\Entity\Worksheet;

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\Common\Manager;
 
+use Box\Spout\Common\Entity\Row;
 use Box\Spout\Common\Exception\IOException;
-use Box\Spout\Writer\Common\Entity\Row;
 use Box\Spout\Writer\Common\Entity\Sheet;
 use Box\Spout\Writer\Common\Entity\Workbook;
 use Box\Spout\Writer\Common\Entity\Worksheet;

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

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Common\Manager;
 
-use Box\Spout\Writer\Common\Entity\Row;
+use Box\Spout\Common\Entity\Row;
 use Box\Spout\Writer\Common\Entity\Worksheet;
 
 /**

src/Spout/Writer/Exception/Border/InvalidNameException.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Exception\Border;
 
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\BorderPart;
 use Box\Spout\Writer\Exception\WriterException;
 
 class InvalidNameException extends WriterException

src/Spout/Writer/Exception/Border/InvalidStyleException.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Exception\Border;
 
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\BorderPart;
 use Box\Spout\Writer\Exception\WriterException;
 
 class InvalidStyleException extends WriterException

src/Spout/Writer/Exception/Border/InvalidWidthException.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\Exception\Border;
 
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\BorderPart;
 use Box\Spout\Writer\Exception\WriterException;
 
 class InvalidWidthException extends WriterException

src/Spout/Writer/Exception/InvalidColorException.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Box\Spout\Writer\Exception;
-
-/**
- * Class InvalidColorException
- */
-class InvalidColorException extends WriterException
-{
-}

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\ODS\Helper;
 
-use Box\Spout\Writer\Common\Entity\Style\Border;
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\Border;
+use Box\Spout\Common\Entity\Style\BorderPart;
 
 /**
  * Class BorderHelper

src/Spout/Writer/ODS/Manager/Style/StyleManager.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\ODS\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\BorderPart;
 use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\ODS\Helper\BorderHelper;
 
@@ -189,7 +189,7 @@ EOD;
     /**
      * Returns the contents of the "<style:style>" section, inside "<office:automatic-styles>" section
      *
-     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
+     * @param \Box\Spout\Common\Entity\Style\Style $style
      * @return string
      */
     protected function getStyleSectionContent($style)
@@ -209,7 +209,7 @@ EOD;
     /**
      * Returns the contents of the "<style:text-properties>" section, inside "<style:style>" section
      *
-     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
+     * @param \Box\Spout\Common\Entity\Style\Style $style
      * @return string
      */
     private function getTextPropertiesSectionContent($style)
@@ -226,7 +226,7 @@ EOD;
     /**
      * Returns the contents of the "<style:text-properties>" section, inside "<style:style>" section
      *
-     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
+     * @param \Box\Spout\Common\Entity\Style\Style $style
      * @return string
      */
     private function getFontSectionContent($style)
@@ -271,7 +271,7 @@ EOD;
     /**
      * Returns the contents of the "<style:table-cell-properties>" section, inside "<style:style>" section
      *
-     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
+     * @param \Box\Spout\Common\Entity\Style\Style $style
      * @return string
      */
     private function getTableCellPropertiesSectionContent($style)
@@ -306,7 +306,7 @@ EOD;
     /**
      * Returns the contents of the borders definition for the "<style:table-cell-properties>" section
      *
-     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
+     * @param \Box\Spout\Common\Entity\Style\Style $style
      * @return string
      */
     private function getBorderXMLContent($style)
@@ -323,7 +323,7 @@ EOD;
     /**
      * Returns the contents of the background color definition for the "<style:table-cell-properties>" section
      *
-     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
+     * @param \Box\Spout\Common\Entity\Style\Style $style
      * @return string
      */
     private function getBackgroundColorXMLContent($style)

src/Spout/Writer/ODS/Manager/Style/StyleRegistry.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\ODS\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Class StyleRegistry

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

@@ -2,13 +2,13 @@
 
 namespace Box\Spout\Writer\ODS\Manager;
 
+use Box\Spout\Common\Entity\Cell;
+use Box\Spout\Common\Entity\Row;
+use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\Escaper\ODS as ODSEscaper;
 use Box\Spout\Common\Helper\StringHelper;
-use Box\Spout\Writer\Common\Entity\Cell;
-use Box\Spout\Writer\Common\Entity\Row;
-use Box\Spout\Writer\Common\Entity\Style\Style;
 use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Common\Manager\Style\StyleMerger;
 use Box\Spout\Writer\Common\Manager\WorksheetManagerInterface;

src/Spout/Writer/WriterAbstract.php

@@ -3,14 +3,14 @@
 namespace Box\Spout\Writer;
 
 use Box\Spout\Common\Creator\HelperFactory;
+use Box\Spout\Common\Entity\Row;
+use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Exception\SpoutException;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Entity\Options;
-use Box\Spout\Writer\Common\Entity\Row;
-use Box\Spout\Writer\Common\Entity\Style\Style;
 use Box\Spout\Writer\Exception\WriterAlreadyOpenedException;
 use Box\Spout\Writer\Exception\WriterNotOpenedException;
 

src/Spout/Writer/WriterInterface.php

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer;
 
-use Box\Spout\Writer\Common\Entity\Row;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Row;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Interface WriterInterface

src/Spout/Writer/WriterMultiSheetsAbstract.php

@@ -3,11 +3,11 @@
 namespace Box\Spout\Writer;
 
 use Box\Spout\Common\Creator\HelperFactory;
+use Box\Spout\Common\Entity\Row;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;
 use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Creator\ManagerFactoryInterface;
 use Box\Spout\Writer\Common\Entity\Options;
-use Box\Spout\Writer\Common\Entity\Row;
 use Box\Spout\Writer\Common\Entity\Sheet;
 use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Common\Manager\WorkbookManagerInterface;

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

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\XLSX\Helper;
 
-use Box\Spout\Writer\Common\Entity\Style\Border;
-use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Common\Entity\Style\Border;
+use Box\Spout\Common\Entity\Style\BorderPart;
 
 class BorderHelper
 {

src/Spout/Writer/XLSX/Manager/Style/StyleManager.php

@@ -2,8 +2,8 @@
 
 namespace Box\Spout\Writer\XLSX\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Color;
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Style\Color;
+use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Writer\XLSX\Helper\BorderHelper;
 
 /**
@@ -153,7 +153,7 @@ EOD;
         $content .= '<border><left/><right/><top/><bottom/></border>';
 
         foreach ($registeredBorders as $styleId) {
-            /** @var \Box\Spout\Writer\Common\Entity\Style\Style $style */
+            /** @var \Box\Spout\Common\Entity\Style\Style $style */
             $style = $this->styleRegistry->getStyleFromStyleId($styleId);
             $border = $style->getBorder();
             $content .= '<border>';
@@ -163,7 +163,7 @@ EOD;
 
             foreach ($sortOrder as $partName) {
                 if ($border->hasPart($partName)) {
-                    /** @var $part \Box\Spout\Writer\Common\Entity\Style\BorderPart */
+                    /** @var $part \Box\Spout\Common\Entity\Style\BorderPart */
                     $part = $border->getPart($partName);
                     $content .= BorderHelper::serializeBorderPart($part);
                 }

src/Spout/Writer/XLSX/Manager/Style/StyleRegistry.php

@@ -2,7 +2,7 @@
 
 namespace Box\Spout\Writer\XLSX\Manager\Style;
 
-use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Common\Entity\Style\Style;
 
 /**
  * Class StyleRegistry

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

@@ -2,16 +2,16 @@
 
 namespace Box\Spout\Writer\XLSX\Manager;
 
+use Box\Spout\Common\Entity\Cell;
+use Box\Spout\Common\Entity\Row;
+use Box\Spout\Common\Entity\Style\Style;
 use Box\Spout\Common\Exception\InvalidArgumentException;
 use Box\Spout\Common\Exception\IOException;
 use Box\Spout\Common\Helper\Escaper\XLSX as XLSXEscaper;
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Common\Manager\OptionsManagerInterface;
 use Box\Spout\Writer\Common\Creator\InternalEntityFactory;
-use Box\Spout\Writer\Common\Entity\Cell;
 use Box\Spout\Writer\Common\Entity\Options;
-use Box\Spout\Writer\Common\Entity\Row;
-use Box\Spout\Writer\Common\Entity\Style\Style;
 use Box\Spout\Writer\Common\Entity\Worksheet;
 use Box\Spout\Writer\Common\Helper\CellHelper;
 use Box\Spout\Writer\Common\Manager\RowManager;