Move Style classes into Common folder (#432)

tests/Spout/Writer/Common/Entity/Style/BorderTest.php

@@ -1,7 +1,17 @@
 <?php
 
-namespace Box\Spout\Writer\Style;
+namespace Box\Spout\Writer\Common\EntityStyle;
 
+use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Border;
+use Box\Spout\Writer\Common\Entity\Style\BorderPart;
+use Box\Spout\Writer\Common\Entity\Style\Color;
+
+/**
+ * Class BorderTest
+ *
+ * @package Box\Spout\Writer\Common\EntityStyle
+ */
 class BorderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -20,7 +30,7 @@ class BorderTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidBorderPart()
     {
-        $invalidBorderPart = new BorderPart('invalid');
+        new BorderPart('invalid');
     }
 
     /**
@@ -28,7 +38,7 @@ class BorderTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidBorderPartStyle()
     {
-        $invalidBorderPartStyle = new BorderPart(Border::LEFT, Color::BLACK, Border::WIDTH_THIN, 'invalid');
+        new BorderPart(Border::LEFT, Color::BLACK, Border::WIDTH_THIN, 'invalid');
     }
 
     /**
@@ -36,7 +46,7 @@ class BorderTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidBorderPartWidth()
     {
-        $invalidBorderPartStyle = new BorderPart(Border::LEFT, Color::BLACK, 'invalid', Border::STYLE_DASHED);
+        new BorderPart(Border::LEFT, Color::BLACK, 'invalid', Border::STYLE_DASHED);
     }
 
     /**

tests/Spout/Writer/Common/Entity/Style/ColorTest.php

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

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

@@ -1,14 +1,31 @@
 <?php
 
-namespace Box\Spout\Writer\Style;
+namespace Box\Spout\Writer\Common\Manager;
+
+use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
+use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Border;
+use Box\Spout\Writer\Common\Entity\Style\Color;
+use Box\Spout\Writer\Common\Entity\Style\Style;
 
 /**
- * Class StyleTest
+ * Class StyleManagerTest
  *
- * @package Box\Spout\Writer\Style
+ * @package Box\Spout\Writer\Common\Manager
  */
-class StyleTest extends \PHPUnit_Framework_TestCase
+class StyleManagerTest extends \PHPUnit_Framework_TestCase
 {
+    /** @var StyleManager */
+    private $styleManager;
+
+    /**
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->styleManager = new StyleManager();
+    }
+
     /**
      * @return void
      */
@@ -20,7 +37,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
         $style2 = (new StyleBuilder())->setFontBold()->build();
         $style2->setId(2);
 
-        $this->assertEquals($style1->serialize(), $style2->serialize());
+        $this->assertEquals($this->styleManager->serialize($style1), $this->styleManager->serialize($style2));
     }
 
     /**
@@ -30,7 +47,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
     {
         $baseStyle = (new StyleBuilder())->build();
         $currentStyle = (new StyleBuilder())->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
         $this->assertNotSame($mergedStyle, $currentStyle);
     }
@@ -42,7 +59,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
     {
         $baseStyle = (new StyleBuilder())->setFontSize(99)->setFontBold()->build();
         $currentStyle = (new StyleBuilder())->setFontName('Font')->setFontUnderline()->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
         $this->assertNotEquals(99, $currentStyle->getFontSize());
         $this->assertFalse($currentStyle->isFontBold());
@@ -60,7 +77,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
     {
         $baseStyle = (new StyleBuilder())->setFontSize(10)->build();
         $currentStyle = (new StyleBuilder())->setFontSize(99)->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
         $this->assertEquals(99, $mergedStyle->getFontSize());
     }
@@ -72,7 +89,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
     {
         $baseStyle = (new StyleBuilder())->build();
         $currentStyle = (new StyleBuilder())->setFontItalic()->setFontStrikethrough()->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
         $this->assertFalse($baseStyle->isFontItalic());
         $this->assertFalse($baseStyle->isFontStrikethrough());
@@ -93,7 +110,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
             ->setShouldWrapText()
             ->build();
         $currentStyle = (new StyleBuilder())->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
         $this->assertFalse($currentStyle->isFontUnderline());
         $this->assertTrue($mergedStyle->isFontUnderline());
@@ -109,10 +126,10 @@ class StyleTest extends \PHPUnit_Framework_TestCase
     {
         $baseStyle = (new StyleBuilder())->build();
         $currentStyle = (new StyleBuilder())->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
-        $this->assertTrue($baseStyle->serialize() === $currentStyle->serialize());
-        $this->assertTrue($currentStyle->serialize() === $mergedStyle->serialize());
+        $this->assertTrue($this->styleManager->serialize($baseStyle) === $this->styleManager->serialize($currentStyle));
+        $this->assertTrue($this->styleManager->serialize($currentStyle) === $this->styleManager->serialize($mergedStyle));
     }
 
     /**
@@ -125,9 +142,9 @@ class StyleTest extends \PHPUnit_Framework_TestCase
             ->setFontSize(Style::DEFAULT_FONT_SIZE)
             ->build();
         $currentStyle = (new StyleBuilder())->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
-        $this->assertTrue($currentStyle->serialize() === $mergedStyle->serialize());
+        $this->assertTrue($this->styleManager->serialize($currentStyle) === $this->styleManager->serialize($mergedStyle));
     }
 
     /**
@@ -151,10 +168,10 @@ class StyleTest extends \PHPUnit_Framework_TestCase
 
         $baseStyle = (new StyleBuilder())->setBorder($border)->build();
         $currentStyle = (new StyleBuilder())->build();
-        $mergedStyle = $currentStyle->mergeWith($baseStyle);
+        $mergedStyle = $this->styleManager->merge($currentStyle, $baseStyle);
 
         $this->assertEquals(null, $currentStyle->getBorder(), 'Current style has no border');
-        $this->assertInstanceOf('Box\Spout\Writer\Style\Border', $baseStyle->getBorder(), 'Base style has a border');
-        $this->assertInstanceOf('Box\Spout\Writer\Style\Border', $mergedStyle->getBorder(), 'Merged style has a border');
+        $this->assertInstanceOf('Box\Spout\Writer\Common\Entity\Style\Border', $baseStyle->getBorder(), 'Base style has a border');
+        $this->assertInstanceOf('Box\Spout\Writer\Common\Entity\Style\Border', $mergedStyle->getBorder(), 'Merged style has a border');
     }
 }

tests/Spout/Writer/ODS/Helper/StyleHelperTest.php

@@ -2,7 +2,9 @@
 
 namespace Box\Spout\Writer\ODS\Helper;
 
-use Box\Spout\Writer\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Writer\Common\Manager\StyleManager;
 
 /**
  * Class StyleHelperTest
@@ -11,15 +13,19 @@ use Box\Spout\Writer\Style\StyleBuilder;
  */
 class StyleHelperTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Box\Spout\Writer\Style\Style */
+    /** @var Style */
     protected $defaultStyle;
 
+    /** @var StyleHelper */
+    private $styleHelper;
+
     /**
      * @return void
      */
     public function setUp()
     {
         $this->defaultStyle = (new StyleBuilder())->build();
+        $this->styleHelper = new StyleHelper($this->defaultStyle, new StyleManager());
     }
 
     /**
@@ -34,9 +40,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($style1->getId());
         $this->assertNull($style2->getId());
 
-        $styleHelper = new StyleHelper($this->defaultStyle);
-        $registeredStyle1 = $styleHelper->registerStyle($style1);
-        $registeredStyle2 = $styleHelper->registerStyle($style2);
+        $registeredStyle1 = $this->styleHelper->registerStyle($style1);
+        $registeredStyle2 = $this->styleHelper->registerStyle($style2);
 
         $this->assertEquals(1, $registeredStyle1->getId());
         $this->assertEquals(2, $registeredStyle2->getId());
@@ -49,9 +54,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
     {
         $style = (new StyleBuilder())->setFontBold()->build();
 
-        $styleHelper = new StyleHelper($this->defaultStyle);
-        $registeredStyle1 = $styleHelper->registerStyle($style);
-        $registeredStyle2 = $styleHelper->registerStyle($style);
+        $registeredStyle1 = $this->styleHelper->registerStyle($style);
+        $registeredStyle2 = $this->styleHelper->registerStyle($style);
 
         $this->assertEquals(1, $registeredStyle1->getId());
         $this->assertEquals(1, $registeredStyle2->getId());
@@ -63,11 +67,10 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
     public function testApplyExtraStylesIfNeededShouldApplyWrapTextIfCellContainsNewLine()
     {
         $style = clone $this->defaultStyle;
-        $styleHelper = new StyleHelper($this->defaultStyle);
 
         $this->assertFalse($style->shouldWrapText());
 
-        $updatedStyle = $styleHelper->applyExtraStylesIfNeeded($style, [12, 'single line', "multi\nlines", null]);
+        $updatedStyle = $this->styleHelper->applyExtraStylesIfNeeded($style, [12, 'single line', "multi\nlines", null]);
 
         $this->assertTrue($updatedStyle->shouldWrapText());
     }
@@ -78,11 +81,10 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
     public function testApplyExtraStylesIfNeededShouldDoNothingIfWrapTextAlreadyApplied()
     {
         $style = (new StyleBuilder())->setShouldWrapText()->build();
-        $styleHelper = new StyleHelper($this->defaultStyle);
 
         $this->assertTrue($style->shouldWrapText());
 
-        $updatedStyle = $styleHelper->applyExtraStylesIfNeeded($style, ["multi\nlines"]);
+        $updatedStyle = $this->styleHelper->applyExtraStylesIfNeeded($style, ["multi\nlines"]);
 
         $this->assertTrue($updatedStyle->shouldWrapText());
     }

tests/Spout/Writer/ODS/WriterWithStyleTest.php

@@ -6,11 +6,11 @@ use Box\Spout\Common\Type;
 use Box\Spout\Reader\Wrapper\XMLReader;
 use Box\Spout\TestUsingResource;
 use Box\Spout\Writer\ODS\Helper\BorderHelper;
-use Box\Spout\Writer\Style\Border;
-use Box\Spout\Writer\Style\BorderBuilder;
-use Box\Spout\Writer\Style\Color;
-use Box\Spout\Writer\Style\Style;
-use Box\Spout\Writer\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Border;
+use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Color;
+use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
 use Box\Spout\Writer\WriterFactory;
 
 /**
@@ -22,7 +22,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
 {
     use TestUsingResource;
 
-    /** @var \Box\Spout\Writer\Style\Style */
+    /** @var \Box\Spout\Writer\Common\Entity\Style\Style */
     protected $defaultStyle;
 
     /**
@@ -67,7 +67,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
      * @dataProvider dataProviderForInvalidStyle
      * @expectedException \Box\Spout\Common\Exception\InvalidArgumentException
      *
-     * @param \Box\Spout\Writer\Style\Style $style
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
      */
     public function testAddRowWithStyleShouldThrowExceptionIfInvalidStyleGiven($style)
     {
@@ -84,7 +84,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
      * @dataProvider dataProviderForInvalidStyle
      * @expectedException \Box\Spout\Common\Exception\InvalidArgumentException
      *
-     * @param \Box\Spout\Writer\Style\Style $style
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
      */
     public function testAddRowsWithStyleShouldThrowExceptionIfInvalidStyleGiven($style)
     {
@@ -346,7 +346,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
     /**
      * @param array $allRows
      * @param string $fileName
-     * @param \Box\Spout\Writer\Style\Style $style
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
      * @return Writer
      */
     private function writeToODSFile($allRows, $fileName, $style)
@@ -367,7 +367,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
     /**
      * @param array $allRows
      * @param string $fileName
-     * @param \Box\Spout\Writer\Style\Style|null $defaultStyle
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style|null $defaultStyle
      * @return Writer
      */
     private function writeToODSFileWithDefaultStyle($allRows, $fileName, $defaultStyle)
@@ -389,7 +389,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
     /**
      * @param array $allRows
      * @param string $fileName
-     * @param \Box\Spout\Writer\Style\Style|null[] $styles
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style|null[] $styles
      * @return Writer
      */
     private function writeToODSFileWithMultipleStyles($allRows, $fileName, $styles)

tests/Spout/Writer/XLSX/Helper/StyleHelperTest.php

@@ -2,10 +2,12 @@
 
 namespace Box\Spout\Writer\XLSX\Helper;
 
-use Box\Spout\Writer\Style\Border;
-use Box\Spout\Writer\Style\BorderBuilder;
-use Box\Spout\Writer\Style\Color;
-use Box\Spout\Writer\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Border;
+use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Color;
+use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Writer\Common\Manager\StyleManager;
 
 /**
  * Class StyleHelperTest
@@ -14,15 +16,19 @@ use Box\Spout\Writer\Style\StyleBuilder;
  */
 class StyleHelperTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Box\Spout\Writer\Style\Style */
+    /** @var Style */
     protected $defaultStyle;
 
+    /** @var StyleHelper */
+    private $styleHelper;
+
     /**
      * @return void
      */
     public function setUp()
     {
         $this->defaultStyle = (new StyleBuilder())->build();
+        $this->styleHelper = new StyleHelper($this->defaultStyle, new StyleManager());
     }
 
     /**
@@ -37,9 +43,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($style1->getId());
         $this->assertNull($style2->getId());
 
-        $styleHelper = new StyleHelper($this->defaultStyle);
-        $registeredStyle1 = $styleHelper->registerStyle($style1);
-        $registeredStyle2 = $styleHelper->registerStyle($style2);
+        $registeredStyle1 = $this->styleHelper->registerStyle($style1);
+        $registeredStyle2 = $this->styleHelper->registerStyle($style2);
 
         $this->assertEquals(1, $registeredStyle1->getId());
         $this->assertEquals(2, $registeredStyle2->getId());
@@ -52,9 +57,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
     {
         $style = (new StyleBuilder())->setFontBold()->build();
 
-        $styleHelper = new StyleHelper($this->defaultStyle);
-        $registeredStyle1 = $styleHelper->registerStyle($style);
-        $registeredStyle2 = $styleHelper->registerStyle($style);
+        $registeredStyle1 = $this->styleHelper->registerStyle($style);
+        $registeredStyle2 = $this->styleHelper->registerStyle($style);
 
         $this->assertEquals(1, $registeredStyle1->getId());
         $this->assertEquals(1, $registeredStyle2->getId());
@@ -71,14 +75,13 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
         $border = (new BorderBuilder())->setBorderBottom(Color::GREEN)->build();
         $styleWithBorder = (new StyleBuilder())->setBorder($border)->build();
 
-        $styleHelper = new StyleHelper($this->defaultStyle);
-        $styleHelper->registerStyle($styleWithFont);
-        $styleHelper->registerStyle($styleWithBackground);
-        $styleHelper->registerStyle($styleWithBorder);
+        $this->styleHelper->registerStyle($styleWithFont);
+        $this->styleHelper->registerStyle($styleWithBackground);
+        $this->styleHelper->registerStyle($styleWithBorder);
 
-        $this->assertFalse($styleHelper->shouldApplyStyleOnEmptyCell($styleWithFont->getId()));
-        $this->assertTrue($styleHelper->shouldApplyStyleOnEmptyCell($styleWithBackground->getId()));
-        $this->assertTrue($styleHelper->shouldApplyStyleOnEmptyCell($styleWithBorder->getId()));
+        $this->assertFalse($this->styleHelper->shouldApplyStyleOnEmptyCell($styleWithFont->getId()));
+        $this->assertTrue($this->styleHelper->shouldApplyStyleOnEmptyCell($styleWithBackground->getId()));
+        $this->assertTrue($this->styleHelper->shouldApplyStyleOnEmptyCell($styleWithBorder->getId()));
     }
 
     /**
@@ -87,11 +90,10 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
     public function testApplyExtraStylesIfNeededShouldApplyWrapTextIfCellContainsNewLine()
     {
         $style = clone $this->defaultStyle;
-        $styleHelper = new StyleHelper($this->defaultStyle);
 
         $this->assertFalse($style->shouldWrapText());
 
-        $updatedStyle = $styleHelper->applyExtraStylesIfNeeded($style, [12, 'single line', "multi\nlines", null]);
+        $updatedStyle = $this->styleHelper->applyExtraStylesIfNeeded($style, [12, 'single line', "multi\nlines", null]);
 
         $this->assertTrue($updatedStyle->shouldWrapText());
     }
@@ -102,11 +104,10 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
     public function testApplyExtraStylesIfNeededShouldDoNothingIfWrapTextAlreadyApplied()
     {
         $style = (new StyleBuilder())->setShouldWrapText()->build();
-        $styleHelper = new StyleHelper($this->defaultStyle);
 
         $this->assertTrue($style->shouldWrapText());
 
-        $updatedStyle = $styleHelper->applyExtraStylesIfNeeded($style, ["multi\nlines"]);
+        $updatedStyle = $this->styleHelper->applyExtraStylesIfNeeded($style, ["multi\nlines"]);
 
         $this->assertTrue($updatedStyle->shouldWrapText());
     }

tests/Spout/Writer/XLSX/WriterWithStyleTest.php

@@ -5,11 +5,12 @@ namespace Box\Spout\Writer\XLSX;
 use Box\Spout\Common\Type;
 use Box\Spout\Reader\Wrapper\XMLReader;
 use Box\Spout\TestUsingResource;
-use Box\Spout\Writer\Style\Border;
-use Box\Spout\Writer\Style\BorderBuilder;
-use Box\Spout\Writer\Style\Color;
-use Box\Spout\Writer\Style\Style;
-use Box\Spout\Writer\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Border;
+use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
+use Box\Spout\Writer\Common\Entity\Style\Color;
+use Box\Spout\Writer\Common\Entity\Style\Style;
+use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Manager\StyleManager;
 use Box\Spout\Writer\WriterFactory;
 use Box\Spout\Writer\XLSX\Manager\OptionsManager;
 
@@ -22,7 +23,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
 {
     use TestUsingResource;
 
-    /** @var \Box\Spout\Writer\Style\Style */
+    /** @var \Box\Spout\Writer\Common\Entity\Style\Style */
     protected $defaultStyle;
 
     /**
@@ -67,7 +68,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
      * @dataProvider dataProviderForInvalidStyle
      * @expectedException \Box\Spout\Common\Exception\InvalidArgumentException
      *
-     * @param \Box\Spout\Writer\Style\Style $style
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
      */
     public function testAddRowWithStyleShouldThrowExceptionIfInvalidStyleGiven($style)
     {
@@ -84,7 +85,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
      * @dataProvider dataProviderForInvalidStyle
      * @expectedException \Box\Spout\Common\Exception\InvalidArgumentException
      *
-     * @param \Box\Spout\Writer\Style\Style $style
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
      */
     public function testAddRowsWithStyleShouldThrowExceptionIfInvalidStyleGiven($style)
     {
@@ -462,7 +463,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
         $fontStyle = (new StyleBuilder())->setFontBold()->build();
         $emptyStyle = (new StyleBuilder())->build();
 
-        $borderRightFontBoldStyle = $borderRightStyle->mergeWith($fontStyle);
+        $borderRightFontBoldStyle = (new StyleManager())->merge($borderRightStyle, $fontStyle);
 
         $dataRows = [
             ['Border-Left'],
@@ -517,7 +518,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
     /**
      * @param array $allRows
      * @param string $fileName
-     * @param \Box\Spout\Writer\Style\Style $style
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style $style
      * @return Writer
      */
     private function writeToXLSXFile($allRows, $fileName, $style)
@@ -539,7 +540,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
     /**
      * @param array $allRows
      * @param string $fileName
-     * @param \Box\Spout\Writer\Style\Style|null $defaultStyle
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style|null $defaultStyle
      * @return Writer
      */
     private function writeToXLSXFileWithDefaultStyle($allRows, $fileName, $defaultStyle)
@@ -562,7 +563,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
     /**
      * @param array $allRows
      * @param string $fileName
-     * @param \Box\Spout\Writer\Style\Style|null[] $styles
+     * @param \Box\Spout\Writer\Common\Entity\Style\Style|null[] $styles
      * @return Writer
      */
     private function writeToXLSXFileWithMultipleStyles($allRows, $fileName, $styles)