Rename setExpectedException to expectException for phpunit compatibility

Modules/Core/Tests/Asset/AsgardAssetManagerTest.php

@@ -83,7 +83,7 @@ class AsgardAssetManagerTest extends BaseTestCase
     /** @test */
     public function it_should_throw_an_exception_if_js_asset_not_found()
     {
-        $this->setExpectedException('Modules\Core\Foundation\Asset\AssetNotFoundException');
+        $this->expectException('Modules\Core\Foundation\Asset\AssetNotFoundException');
 
         $this->assetManager->addAsset('jquery', '/path/to/jquery.js');
 
@@ -93,7 +93,7 @@ class AsgardAssetManagerTest extends BaseTestCase
     /** @test */
     public function it_should_throw_an_exception_if_css_asset_not_found()
     {
-        $this->setExpectedException('Modules\Core\Foundation\Asset\AssetNotFoundException');
+        $this->expectException('Modules\Core\Foundation\Asset\AssetNotFoundException');
 
         $this->assetManager->addAsset('main', '/path/to/main.css');
 

Modules/Core/Tests/Asset/AsgardAssetPipelineTest.php

@@ -66,7 +66,7 @@ class AsgardAssetPipelineTest extends BaseTestCase
     /** @test */
     public function it_should_throw_an_exception_if_js_asset_not_found()
     {
-        $this->setExpectedException('Modules\Core\Foundation\Asset\AssetNotFoundException');
+        $this->expectException('Modules\Core\Foundation\Asset\AssetNotFoundException');
 
         $this->assetManager->addAsset('jquery', '/path/to/jquery.js');
 
@@ -76,7 +76,7 @@ class AsgardAssetPipelineTest extends BaseTestCase
     /** @test */
     public function it_should_throw_an_exception_if_css_asset_not_found()
     {
-        $this->setExpectedException('Modules\Core\Foundation\Asset\AssetNotFoundException');
+        $this->expectException('Modules\Core\Foundation\Asset\AssetNotFoundException');
 
         $this->assetManager->addAsset('main', '/path/to/main.css');
 

Modules/Core/Tests/Asset/AssetFactoryTest.php

@@ -23,7 +23,7 @@ class AssetFactoryTest extends BaseTestCase
     /** @test */
     public function it_throws_exception_if_asset_type_not_found()
     {
-        $this->setExpectedException(\InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
 
         $path = ['somehting' => 'some/path.something'];
 

Modules/Media/Tests/MediaPathTest.php

@@ -15,9 +15,9 @@ class MediaPathTest extends \PHPUnit_Framework_TestCase
     }
 
     /** @test */
-    public function it_only_acepts_a_string_as_argument()
+    public function it_only_accepts_a_string_as_argument()
     {
-        $this->setExpectedException(\InvalidArgumentException::class);
+        $this->expectException(\InvalidArgumentException::class);
 
         new MediaPath(['something']);
     }

Modules/Workshop/Tests/ModuleScaffoldTest.php

@@ -2,6 +2,7 @@
 
 namespace Modules\Workshop\Tests;
 
+use Modules\Workshop\Scaffold\Module\Exception\ModuleExistsException;
 use Modules\Workshop\Scaffold\Module\ModuleScaffold;
 
 class ModuleScaffoldTest extends BaseTestCase
@@ -85,7 +86,7 @@ class ModuleScaffoldTest extends BaseTestCase
      * @param $type
      * @param $entities
      * @param $valueObjects
-     * @throws \Modules\Workshop\Scaffold\Module\Exception\ModuleExistsException
+     * @throws ModuleExistsException
      */
     private function scaffoldModule($type, $entities, $valueObjects)
     {
@@ -348,14 +349,15 @@ class ModuleScaffoldTest extends BaseTestCase
         $this->cleanUp();
     }
 
+    /** @test */
     public function it_should_throw_exception_if_module_exists()
     {
-        $this->setExpectedException('Modules\Workshop\Scaffold\Exception\ModuleExistsException');
+        $this->expectException(ModuleExistsException::class);
 
         $this->scaffoldModuleWithEloquent();
         $this->scaffoldModuleWithEloquent();
 
-        $this->assertEquals('Modules\Workshop\Scaffold\Exception\ModuleExistsException', $this->getExpectedException());
+        $this->assertEquals(ModuleExistsException::class, $this->getExpectedException());
     }
 
     /** @test */

Modules/Workshop/Tests/ThemeScaffoldTest.php

@@ -66,7 +66,7 @@ class ThemeScaffoldTest extends BaseTestCase
     {
         $this->scaffold->setFiles(['OneTwoThree']);
 
-        $this->setExpectedException(FileTypeNotFoundException::class);
+        $this->expectException(FileTypeNotFoundException::class);
 
         $this->generateFrontendTheme();
     }
@@ -74,7 +74,7 @@ class ThemeScaffoldTest extends BaseTestCase
     /** @test */
     public function it_throws_exception_if_theme_exists()
     {
-        $this->setExpectedException(ThemeExistsException::class);
+        $this->expectException(ThemeExistsException::class);
 
         $this->scaffold->setFiles([]);
         $this->generateFrontendTheme();
@@ -84,7 +84,8 @@ class ThemeScaffoldTest extends BaseTestCase
     /** @test */
     public function it_throws_exception_if_no_name_provided()
     {
-        $this->setExpectedException(\InvalidArgumentException::class, 'You must provide a name');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('You must provide a name');
 
         $this->scaffold->setName('')->forType('frontend')->setVendor('asgardcms')->generate();
     }
@@ -92,7 +93,8 @@ class ThemeScaffoldTest extends BaseTestCase
     /** @test */
     public function it_throws_exception_if_no_type_provided()
     {
-        $this->setExpectedException(\InvalidArgumentException::class, 'You must provide a type');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('You must provide a type');
 
         $this->scaffold->setName($this->testThemeName)->forType('')->setVendor('asgardcms')->generate();
     }
@@ -100,7 +102,8 @@ class ThemeScaffoldTest extends BaseTestCase
     /** @test */
     public function it_throws_exception_if_no_vendor_provided()
     {
-        $this->setExpectedException(\InvalidArgumentException::class, 'You must provide a vendor name');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('You must provide a vendor name');
 
         $this->scaffold->setName($this->testThemeName)->forType('frontend')->setVendor('')->generate();
     }