Upgrade PHPUnit

deployphp · Jan 2, 2018 · eda9243 · eda9243
1 parent 4b2c9fe
commit eda9243
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/composer.json b/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": {

diff --git a/composer.lock b/composer.lock
diff --git a/test/src/DeployerTest.php b/test/src/DeployerTest.php
@@ -53,10 +53,11 @@ public function testCollections($collection)
     }
 
     /**
-     * @expectedException \InvalidArgumentException
      */
     public function testCollectionsE()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->deployer->some_collection;
     }
 
@@ -107,11 +108,12 @@ public function testAddDefault()
     }
 
     /**
-     * @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']);
     }

diff --git a/test/src/Host/HostSelectorTest.php b/test/src/Host/HostSelectorTest.php
@@ -21,10 +21,11 @@ public function testCanBeCreatedFromEmptyHostCollection()
     }
 
     /**
-     * @expectedException Exception
      */
     public function testThrowExceptionIfStageOrHostnameNotFound()
     {
+        $this->expectException(\Exception::class);
+
         $hostSelector = new HostSelector(new HostCollection());
         $hostSelector->getHosts('ThisHostDoNotExists');
     }
@@ -76,10 +77,11 @@ public function testReturnCorrectSizeOfHostsArray()
     }
 
     /**
-     * @expectedException Exception
      */
     public function testShouldThrowExceptionIfHostNameOrStageNotFound()
     {
+        $this->expectException(\Exception::class);
+
         $host = new Host('app');
         $hostCollection = new HostCollection();
         $hostCollection->set('app', $host);

diff --git a/test/src/Initiaizer/InitializerTest.php b/test/src/Initiaizer/InitializerTest.php
@@ -70,11 +70,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');
     }
 

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

diff --git a/test/src/Task/ScriptManagerTest.php b/test/src/Task/ScriptManagerTest.php
@@ -23,19 +23,21 @@ public function testConstructorReturnsScriptManagerInstance()
     }
 
     /**
-     * @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'));