Update phpunit and allow php8

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

.travis.yml

@@ -13,6 +13,7 @@ matrix:
     - php: 7.2
     - php: 7.3
     - php: 7.4
+    - php: 8.0
     - php: nightly
   allow_failures:
     - php: nightly

composer.json

@@ -33,13 +33,13 @@
         }
     },
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.2.5|^8.0",
         "guzzlehttp/guzzle": "^7.0",
         "guzzlehttp/uri-template": "0.2",
         "justinrainbow/json-schema": "^5.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
+        "phpunit/phpunit": "^8.0",
         "psr/log": "^1.0",
         "php-coveralls/php-coveralls": "^2.0",
         "friendsofphp/php-cs-fixer": "^2.13",

tests/unit/BlockStorage/v2/Models/QuotaSetTest.php

@@ -12,7 +12,7 @@ class QuotaSetTest extends TestCase
     /** @var QuotaSet */
     private $quotaSet;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/unit/BlockStorage/v2/Models/SnapshotTest.php

@@ -12,7 +12,7 @@ class SnapshotTest extends TestCase
     /** @var Snapshot */
     private $snapshot;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/unit/BlockStorage/v2/Models/VolumeTest.php

@@ -12,7 +12,7 @@ class VolumeTest extends TestCase
     /** @var Volume */
     private $volume;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -48,7 +48,7 @@ public function test_it_retrieves()
 
         $volumeImageMetadata = $this->volume->volumeImageMetadata;
 
-        $this->assertInternalType('array', $volumeImageMetadata);
+        self::assertIsArray($volumeImageMetadata);
         $this->assertEquals($volumeImageMetadata['os_distro'], 'ubuntu');
         $this->assertEquals($volumeImageMetadata['os_version'], 'xenial');
         $this->assertEquals($volumeImageMetadata['hypervisor_type'], 'qemu');

tests/unit/BlockStorage/v2/Models/VolumeTypeTest.php

@@ -12,7 +12,7 @@ class VolumeTypeTest extends TestCase
     /** @var VolumeType */
     private $volumeType;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/unit/BlockStorage/v2/ServiceTest.php

@@ -16,7 +16,7 @@ class ServiceTest extends TestCase
     /** @var Service */
     private $service;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/unit/Common/Api/OperationTest.php

@@ -10,7 +10,7 @@ class OperationTest extends \PHPUnit\Framework\TestCase
 {
     private $operation;
 
-    public function setUp()
+    public function setUp(): void
     {
         $def = (new ComputeV2Api())->postServer();
 
@@ -37,32 +37,26 @@ public function test_it_validates_params()
         ]));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_exceptions_are_propagated()
     {
+		$this->expectException(\Exception::class);
         $this->assertFalse($this->operation->validate([
             'name'     => true,
             'imageId'  => 'bar',
             'flavorId' => 'baz',
         ]));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_an_exception_is_thrown_when_user_does_not_provide_required_options()
     {
+		$this->expectException(\Exception::class);
         $this->operation->validate([]);
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_when_user_provides_undefined_options()
     {
         $userData = ['name' => 'new_server', 'undefined_opt' => 'bah'];
+		$this->expectException(\Exception::class);
 
         $this->operation->validate($userData);
     }

tests/unit/Common/Api/OperatorTraitTest.php

@@ -20,7 +20,7 @@ class OperatorTraitTest extends TestCase
 
     private $def;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -74,19 +74,15 @@ public function test_it_wraps_sequential_ops_in_promise_when_async_is_appended_t
         $promise->wait();
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_it_throws_exception_when_async_is_called_on_a_non_existent_method()
     {
+		$this->expectException(\RuntimeException::class);
         $this->operator->fooAsync();
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_undefined_methods_result_in_error()
     {
+		$this->expectException(\Exception::class);
         $this->operator->foo();
     }
 

tests/unit/Common/Api/ParameterTest.php

@@ -11,21 +11,19 @@ class ParameterTest extends \PHPUnit\Framework\TestCase
     private $data;
     private $api;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->api = new ComputeV2Api();
 
         $this->data = $this->api->postServer()['params']['name'] + ['name' => 'name'];
         $this->param = new Parameter($this->data);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function test_exception_is_thrown_for_invalid_locations()
     {
         $data = $this->data;
         $data['location'] = 'foo';
+		$this->expectException(\RuntimeException::class);
         new Parameter($data);
     }
 
@@ -82,25 +80,21 @@ public function test_it_should_return_true_when_required_attributes_are_provided
         $this->assertTrue($this->param->validate('TestName'));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_when_values_do_not_match_their_definition_types()
     {
         $data = $this->api->postServer()['params']['networks'] + ['name' => 'networks'];
         $param = new Parameter($data);
+		$this->expectException(\Exception::class);
 
         $param->validate('a_network!'); // should be an array
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_it_throws_exception_when_deeply_nested_values_have_wrong_types()
     {
         $data = $this->api->postServer()['params']['networks'] + ['name' => 'networks'];
-
         $param = new Parameter($data);
+		$this->expectException(\Exception::class);
+
         $param->validate(['name' => false]); // value should be a string, not bool
     }
 
@@ -134,15 +128,13 @@ public function test_it_passes_validation_when_array_values_pass()
         $this->assertTrue($param->validate($userVals));
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_an_exception_is_thrown_when_an_undefined_property_is_provided()
     {
         $params = ['type' => 'object', 'properties' => ['foo' => ['type' => 'string']]];
         $userVals = ['bar' => 'baz'];
-
         $param = new Parameter($params);
+		$this->expectException(\Exception::class);
+
         $param->validate($userVals);
     }
 
@@ -187,15 +179,13 @@ public function test_it_gets_prefixed_name()
         $this->assertEquals('foo-metadata', $property->getPrefixedName());
     }
 
-    /**
-     * @expectedException \Exception
-     */
     public function test_exception_is_thrown_when_value_is_not_in_enum_list()
     {
         $data = $this->data;
         $data['enum'] = ['foo'];
-
         $param = new Parameter($data);
+		$this->expectException(\Exception::class);
+
         $param->validate('blah');
     }
 }