Fix two more tests

Author: pjcdawkins

tests/Model/EnvironmentTest.php

@@ -2,9 +2,10 @@
 
 namespace Platformsh\Client\Tests\Model;
 
+use PHPUnit\Framework\TestCase;
 use Platformsh\Client\Model\Environment;
 
-class EnvironmentTest extends \PHPUnit_Framework_TestCase
+class EnvironmentTest extends TestCase
 {
     public function testGetSshUrl()
     {
@@ -91,7 +92,7 @@ public function testGetSshUrl()
                 try {
                     $environment->getSshUrl($case['app'], $case['instance']);
                 } catch (\InvalidArgumentException $e) {
-                    $this->assertContains('SSH URL not found for instance', $e->getMessage(), "case $i");
+                    $this->assertStringContainsString('SSH URL not found for instance', $e->getMessage(), "case $i");
                 }
                 continue;
             }

tests/ResourceTest.php

@@ -2,13 +2,15 @@
 
 namespace Platformsh\Client\Tests;
 
-class ResourceTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ResourceTest extends TestCase
 {
 
     /** @var array */
     protected $properties;
 
-    /** @var \Platformsh\Client\Model\Resource */
+    /** @var \Platformsh\Client\Model\ApiResourceBase */
     protected $resource;
 
     public function setUp()
@@ -30,7 +32,7 @@ public function setUp()
               ],
             ],
           ];
-        $this->resource = new MockResource($data, null, null, true);
+        $this->resource = new MockApiResource($data, 'https://api.example.com', null, true);
     }
 
     /**
@@ -49,7 +51,7 @@ public function testGetProperty()
     {
         $this->assertEquals('test-id', $this->resource['id']);
         $this->assertEquals('test name', $this->resource->getProperty('name'));
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->expectException('\InvalidArgumentException');
         $this->resource->getProperty('nonexistent');
     }
 
@@ -69,7 +71,7 @@ public function testGetLink()
     {
         $this->assertNotEmpty($this->resource->getLink('self'));
         $this->assertNotEmpty($this->resource->getLink('#operate'));
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->expectException('\InvalidArgumentException');
         $this->resource->getLink('nonexistent');
     }
 
@@ -79,17 +81,17 @@ public function testGetLink()
     public function testRequiredPropertiesBlockCreation()
     {
         $mockClient = new MockClient();
-        $this->setExpectedException('\InvalidArgumentException');
-        MockResource::create([], '', $mockClient);
+        $this->expectException('\InvalidArgumentException');
+        MockApiResource::create([], '', $mockClient);
     }
 
     /**
      * Test updating resource validation.
      */
     public function testInvalidPropertiesBlockUpdate()
     {
-        $resource = new MockResource([]);
-        $this->setExpectedException('\InvalidArgumentException');
+        $resource = new MockApiResource([]);
+        $this->expectException('\InvalidArgumentException');
         $resource->update(['testProperty' => 2]);
     }
 }