Upgrade PHPUnit

composer.json

@@ -35,7 +35,7 @@
         "symfony/yaml": "~2.7|~3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6.1",
+        "phpunit/phpunit": "^6.4.3",
         "symfony/finder": "~2.7|~3.0"
     },
     "config": {

test/src/DeployerTest.php

@@ -52,11 +52,10 @@ public function testCollections($collection)
         $this->assertInstanceOf(CollectionInterface::class, $this->deployer->{$collection});
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testCollectionsE()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->deployer->some_collection;
     }
 
@@ -106,12 +105,11 @@ public function testAddDefault()
         $this->assertEquals($expected, Deployer::getDefault('config'));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Configuration parameter `config` isn't array.
-     */
     public function testAddDefaultToNotArray()
     {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Configuration parameter `config` isn\'t array.');
+
         Deployer::setDefault('config', 'option');
         Deployer::addDefault('config', ['three']);
     }

test/src/Host/HostSelectorTest.php

@@ -20,11 +20,10 @@ public function testCanBeCreatedFromEmptyHostCollection()
         $this->assertInstanceOf($classname, $hostSelector);
     }
 
-    /**
-     * @expectedException Exception
-     */
     public function testThrowExceptionIfStageOrHostnameNotFound()
     {
+        $this->expectException(\Exception::class);
+
         $hostSelector = new HostSelector(new HostCollection());
         $hostSelector->getHosts('ThisHostDoNotExists');
     }
@@ -75,11 +74,10 @@ public function testReturnCorrectSizeOfHostsArray()
         $this->assertSame(count($hosts), 100);
     }
 
-    /**
-     * @expectedException Exception
-     */
     public function testShouldThrowExceptionIfHostNameOrStageNotFound()
     {
+        $this->expectException(\Exception::class);
+
         $host = new Host('app');
         $hostCollection = new HostCollection();
         $hostCollection->set('app', $host);

test/src/Initiaizer/InitializerTest.php

@@ -69,12 +69,12 @@ public function tearDown()
 
     /**
      * Test with template not found
-     *
-     * @expectedException \Deployer\Initializer\Exception\TemplateNotFoundException
-     * @expectedExceptionMessage Not found template with name "foo". Available templates: "test"
      */
     public function testWithTemplateNotFound()
     {
+        $this->expectException(\Deployer\Initializer\Exception\TemplateNotFoundException::class);
+        $this->expectExceptionMessage('Not found template with name "foo". Available templates: "test"');
+
         $this->initializer->initialize('foo', sys_get_temp_dir(), 'deploy.php');
     }
 

test/src/Task/GroupTaskTest.php

@@ -11,11 +11,10 @@
 
 class GroupTaskTest extends TestCase
 {
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testGroupTask()
     {
+        $this->expectException(\RuntimeException::class);
+
         $context = $this->getMockBuilder(Context::class)->disableOriginalConstructor()->getMock();
 
         $task = new GroupTask('group', []);

test/src/Task/ScriptManagerTest.php

@@ -22,20 +22,18 @@ public function testConstructorReturnsScriptManagerInstance()
         $this->assertInstanceOf($classname, $scriptManager);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testThrowsExceptionIfTaskCollectionEmpty()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $scriptManager = new ScriptManager(new TaskCollection());
         $scriptManager->getTasks("");
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testThrowsExceptionIfTaskDontExists()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $taskCollection = new TaskCollection();
         $taskCollection->set('testTask', new Task('testTask'));