Remove @expectedException annotation

tests/Spout/Writer/Common/Entity/SheetTest.php

@@ -4,6 +4,7 @@ namespace Box\Spout\Writer\Common\Entity;
 
 use Box\Spout\Common\Helper\StringHelper;
 use Box\Spout\Writer\Common\Manager\SheetManager;
+use Box\Spout\Writer\Exception\InvalidSheetNameException;
 
 /**
  * Class SheetTest
@@ -78,13 +79,14 @@ class SheetTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider dataProviderForInvalidSheetNames
-     * @expectedException \Box\Spout\Writer\Exception\InvalidSheetNameException
      *
      * @param string $customSheetName
      * @return void
      */
     public function testSetSheetNameShouldThrowOnInvalidName($customSheetName)
     {
+        $this->expectException(InvalidSheetNameException::class);
+
         $sheet = $this->createSheet(0, 'workbookId1');
         $sheet->setName($customSheetName);
     }
@@ -101,11 +103,12 @@ class SheetTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException \Box\Spout\Writer\Exception\InvalidSheetNameException
      * @return void
      */
     public function testSetSheetNameShouldThrowWhenNameIsAlreadyUsed()
     {
+        $this->expectException(InvalidSheetNameException::class);
+
         $customSheetName = 'Sheet name';
 
         $sheet = $this->createSheet(0, 'workbookId1');

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

@@ -6,6 +6,9 @@ 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;
+use Box\Spout\Writer\Exception\Border\InvalidNameException;
+use Box\Spout\Writer\Exception\Border\InvalidStyleException;
+use Box\Spout\Writer\Exception\Border\InvalidWidthException;
 
 /**
  * Class BorderTest
@@ -24,26 +27,32 @@ class BorderTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @expectedException \Box\Spout\Writer\Exception\Border\InvalidNameException
+     * @return void
      */
     public function testInvalidBorderPart()
     {
+        $this->expectException(InvalidNameException::class);
+
         new BorderPart('invalid');
     }
 
     /**
-     * @expectedException \Box\Spout\Writer\Exception\Border\InvalidStyleException
+     * @return void
      */
     public function testInvalidBorderPartStyle()
     {
+        $this->expectException(InvalidStyleException::class);
+
         new BorderPart(Border::LEFT, Color::BLACK, Border::WIDTH_THIN, 'invalid');
     }
 
     /**
-     * @expectedException \Box\Spout\Writer\Exception\Border\InvalidWidthException
+     * @return void
      */
     public function testInvalidBorderPartWidth()
     {
+        $this->expectException(InvalidWidthException::class);
+
         new BorderPart(Border::LEFT, Color::BLACK, 'invalid', Border::STYLE_DASHED);
     }
 

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

@@ -2,6 +2,8 @@
 
 namespace Box\Spout\Writer\Common\Entity\Style;
 
+use Box\Spout\Writer\Exception\InvalidColorException;
+
 /**
  * Class ColorTest
  */
@@ -76,7 +78,6 @@ class ColorTest extends \PHPUnit_Framework_TestCase
 
     /**
      * @dataProvider dataProviderForTestRGBAInvalidColorComponents
-     * @expectedException \Box\Spout\Writer\Exception\InvalidColorException
      *
      * @param int $red
      * @param int $green
@@ -85,6 +86,8 @@ class ColorTest extends \PHPUnit_Framework_TestCase
      */
     public function testRGBInvalidColorComponents($red, $green, $blue)
     {
+        $this->expectException(InvalidColorException::class);
+
         Color::rgb($red, $green, $blue);
     }
 }