setExpectedException is deleted in PHPUnit 7.4

OpenAPITools · Nov 19, 2018 · 15e00ae · 15e00ae
1 parent b3495ec
commit 15e00ae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/AsyncTest.php
@@ -62,10 +62,11 @@ public function testAsyncRequestWithHttpInfo()
         $this->assertInstanceOf(Pet::class, $pet);
     }
 
+    /**
+     * @expectedException \OpenAPI\Client\ApiException
+     */
     public function testAsyncThrowingException()
     {
-        $this->setExpectedException(ApiException::class);
-
         $promise = $this->api->getPetByIdAsync(0);
         $promise->wait();
     }
@@ -76,10 +77,11 @@ public function testAsyncApiExceptionWithoutWaitIsNotThrown()
         sleep(1);
     }
 
+    /**
+     * @expectedException \OpenAPI\Client\ApiException
+     */
     public function testAsyncHttpInfoThrowingException()
     {
-        $this->setExpectedException(ApiException::class);
-
         $promise = $this->api->getPetByIdAsyncWithHttpInfo(0);
         $promise->wait();
     }

diff --git a/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php b/samples/openapi3/client/petstore/php/OpenAPIClient-php/tests/OuterEnumTest.php
@@ -19,10 +19,12 @@ public function testDeserialize()
         $this->assertEquals('placed', $result);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid value for enum
+     */
     public function testDeserializeInvalidValue()
     {
-        $this->setExpectedException(\InvalidArgumentException::class, 'Invalid value for enum');
-
         ObjectSerializer::deserialize(
             "lkjfalgkdfjg",
             OuterEnum::class
@@ -79,10 +81,12 @@ public function testSanitizeNested()
         $this->assertEquals('approved', $result->outerEnum);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid value for enum
+     */
     public function testSanitizeNestedInvalidValue()
     {
-        $this->setExpectedException(\InvalidArgumentException::class, 'Invalid value for enum');
-
         $input = new EnumTest([
             'enum_string' => 'UPPER',
             'enum_integer' => -1,