From f3ac4498df52d8cf6c1932eadcb6806cd1da4365 Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Mon, 12 Feb 2024 08:48:44 +0100
Subject: [PATCH] refactor(php): use self::markTestIncomplete instead of
 instance calls (#17824)

It's reported by phpstan as `Dynamic call to static method PHPUnit\Framework\Assert::markTestIncomplete().`.

The method is static, therefore it should not be called from instance context.
---
 .../resources/php-nextgen/api_test.mustache   |  2 +-
 .../resources/php-nextgen/model_test.mustache |  4 +-
 .../php-slim4-server/api_test.mustache        |  2 +-
 .../php-slim4-server/model_test.mustache      |  6 +--
 .../src/main/resources/php/api_test.mustache  |  2 +-
 .../main/resources/php/model_test.mustache    |  4 +-
 .../php-nextgen/tests/Api/AuthApiTest.php     |  2 +-
 .../php-nextgen/tests/Api/BodyApiTest.php     | 14 +++----
 .../php-nextgen/tests/Api/FormApiTest.php     |  4 +-
 .../php-nextgen/tests/Api/HeaderApiTest.php   |  2 +-
 .../php-nextgen/tests/Api/PathApiTest.php     |  2 +-
 .../php-nextgen/tests/Api/QueryApiTest.php    | 16 ++++----
 .../php-nextgen/tests/Model/BirdTest.php      |  6 +--
 .../php-nextgen/tests/Model/CategoryTest.php  |  6 +--
 .../php-nextgen/tests/Model/DataQueryTest.php |  8 ++--
 .../tests/Model/DefaultValueTest.php          | 18 ++++-----
 .../tests/Model/NumberPropertiesOnlyTest.php  |  8 ++--
 .../php-nextgen/tests/Model/PetTest.php       | 14 +++----
 .../php-nextgen/tests/Model/QueryTest.php     |  6 +--
 .../tests/Model/StringEnumRefTest.php         |  2 +-
 .../php-nextgen/tests/Model/TagTest.php       |  6 +--
 ...rueObjectAllOfQueryObjectParameterTest.php | 10 ++---
 ...rueArrayStringQueryObjectParameterTest.php |  4 +-
 .../tests/Api/AnotherFakeApiTest.php          |  2 +-
 .../tests/Api/DefaultApiTest.php              |  2 +-
 .../tests/Api/FakeApiTest.php                 | 34 ++++++++---------
 .../tests/Api/FakeClassnameTags123ApiTest.php |  2 +-
 .../tests/Api/PetApiTest.php                  | 18 ++++-----
 .../tests/Api/StoreApiTest.php                |  8 ++--
 .../tests/Api/UserApiTest.php                 | 16 ++++----
 .../Model/AdditionalPropertiesClassTest.php   |  6 +--
 .../tests/Model/AllOfWithSingleRefTest.php    |  6 +--
 .../tests/Model/AnimalTest.php                |  6 +--
 .../tests/Model/ApiResponseTest.php           |  8 ++--
 .../Model/ArrayOfArrayOfNumberOnlyTest.php    |  4 +-
 .../tests/Model/ArrayOfNumberOnlyTest.php     |  4 +-
 .../tests/Model/ArrayTestTest.php             |  8 ++--
 .../tests/Model/CapitalizationTest.php        | 14 +++----
 .../tests/Model/CatAllOfTest.php              |  4 +-
 .../OpenAPIClient-php/tests/Model/CatTest.php |  4 +-
 .../tests/Model/CategoryTest.php              |  6 +--
 .../tests/Model/ChildWithNullableTest.php     |  4 +-
 .../tests/Model/ClassModelTest.php            |  4 +-
 .../tests/Model/ClientTest.php                |  4 +-
 .../tests/Model/DeprecatedObjectTest.php      |  4 +-
 .../tests/Model/DogAllOfTest.php              |  4 +-
 .../OpenAPIClient-php/tests/Model/DogTest.php |  4 +-
 .../tests/Model/EnumArraysTest.php            |  6 +--
 .../tests/Model/EnumClassTest.php             |  2 +-
 .../tests/Model/EnumTestTest.php              | 18 ++++-----
 .../FakeBigDecimalMap200ResponseTest.php      |  6 +--
 .../tests/Model/FileSchemaTestClassTest.php   |  6 +--
 .../tests/Model/FileTest.php                  |  4 +-
 .../tests/Model/FooGetDefaultResponseTest.php |  4 +-
 .../OpenAPIClient-php/tests/Model/FooTest.php |  4 +-
 .../tests/Model/FormatTestTest.php            | 34 ++++++++---------
 .../tests/Model/HasOnlyReadOnlyTest.php       |  6 +--
 .../tests/Model/HealthCheckResultTest.php     |  4 +-
 .../tests/Model/MapTestTest.php               | 10 ++---
 ...ertiesAndAdditionalPropertiesClassTest.php |  8 ++--
 .../tests/Model/Model200ResponseTest.php      |  6 +--
 .../tests/Model/ModelListTest.php             |  4 +-
 .../tests/Model/ModelReturnTest.php           |  4 +-
 .../tests/Model/NameTest.php                  | 10 ++---
 .../tests/Model/NullableClassTest.php         | 26 ++++++-------
 .../tests/Model/NumberOnlyTest.php            |  4 +-
 .../Model/ObjectWithDeprecatedFieldsTest.php  | 10 ++---
 .../tests/Model/OrderTest.php                 | 14 +++----
 .../tests/Model/OuterCompositeTest.php        |  8 ++--
 .../tests/Model/OuterEnumDefaultValueTest.php |  2 +-
 .../OuterEnumIntegerDefaultValueTest.php      |  2 +-
 .../tests/Model/OuterEnumIntegerTest.php      |  2 +-
 .../tests/Model/OuterEnumTest.php             |  2 +-
 .../Model/OuterObjectWithEnumPropertyTest.php |  4 +-
 .../tests/Model/ParentWithNullableTest.php    |  6 +--
 .../OpenAPIClient-php/tests/Model/PetTest.php | 14 +++----
 .../tests/Model/ReadOnlyFirstTest.php         |  6 +--
 .../tests/Model/SingleRefTypeTest.php         |  2 +-
 .../tests/Model/SpecialModelNameTest.php      |  4 +-
 .../OpenAPIClient-php/tests/Model/TagTest.php |  6 +--
 ...reeformAdditionalPropertiesRequestTest.php |  4 +-
 .../tests/Model/UserTest.php                  | 18 ++++-----
 .../test/Api/AnotherFakeApiTest.php           |  2 +-
 .../test/Api/DefaultApiTest.php               |  2 +-
 .../test/Api/FakeApiTest.php                  | 34 ++++++++---------
 .../test/Api/FakeClassnameTags123ApiTest.php  |  2 +-
 .../OpenAPIClient-php/test/Api/PetApiTest.php | 18 ++++-----
 .../test/Api/StoreApiTest.php                 |  8 ++--
 .../test/Api/UserApiTest.php                  | 16 ++++----
 .../Model/AdditionalPropertiesClassTest.php   |  6 +--
 .../test/Model/AllOfWithSingleRefTest.php     |  6 +--
 .../test/Model/AnimalTest.php                 |  6 +--
 .../test/Model/ApiResponseTest.php            |  8 ++--
 .../Model/ArrayOfArrayOfNumberOnlyTest.php    |  4 +-
 .../test/Model/ArrayOfNumberOnlyTest.php      |  4 +-
 .../test/Model/ArrayTestTest.php              |  8 ++--
 .../test/Model/CapitalizationTest.php         | 14 +++----
 .../OpenAPIClient-php/test/Model/CatTest.php  |  4 +-
 .../test/Model/CategoryTest.php               |  6 +--
 .../test/Model/ClassModelTest.php             |  4 +-
 .../test/Model/ClientTest.php                 |  4 +-
 .../test/Model/DeprecatedObjectTest.php       |  4 +-
 .../OpenAPIClient-php/test/Model/DogTest.php  |  4 +-
 .../test/Model/EnumArraysTest.php             |  6 +--
 .../test/Model/EnumClassTest.php              |  2 +-
 .../test/Model/EnumTestTest.php               | 18 ++++-----
 .../FakeBigDecimalMap200ResponseTest.php      |  6 +--
 .../test/Model/FileSchemaTestClassTest.php    |  6 +--
 .../OpenAPIClient-php/test/Model/FileTest.php |  4 +-
 .../test/Model/FooGetDefaultResponseTest.php  |  4 +-
 .../OpenAPIClient-php/test/Model/FooTest.php  |  4 +-
 .../test/Model/FormatTestTest.php             | 34 ++++++++---------
 .../test/Model/HasOnlyReadOnlyTest.php        |  6 +--
 .../test/Model/HealthCheckResultTest.php      |  4 +-
 .../test/Model/MapTestTest.php                | 10 ++---
 ...ertiesAndAdditionalPropertiesClassTest.php |  8 ++--
 .../test/Model/Model200ResponseTest.php       |  6 +--
 .../test/Model/ModelListTest.php              |  4 +-
 .../test/Model/ModelReturnTest.php            |  4 +-
 .../OpenAPIClient-php/test/Model/NameTest.php | 10 ++---
 .../test/Model/NullableClassTest.php          | 26 ++++++-------
 .../test/Model/NumberOnlyTest.php             |  4 +-
 .../Model/ObjectWithDeprecatedFieldsTest.php  | 10 ++---
 .../test/Model/OrderTest.php                  | 14 +++----
 .../test/Model/OuterCompositeTest.php         |  8 ++--
 .../test/Model/OuterEnumDefaultValueTest.php  |  2 +-
 .../OuterEnumIntegerDefaultValueTest.php      |  2 +-
 .../test/Model/OuterEnumIntegerTest.php       |  2 +-
 .../test/Model/OuterEnumTest.php              |  2 +-
 .../Model/OuterObjectWithEnumPropertyTest.php |  4 +-
 .../OpenAPIClient-php/test/Model/PetTest.php  | 14 +++----
 .../test/Model/PropertyNameMappingTest.php    | 10 ++---
 .../test/Model/ReadOnlyFirstTest.php          |  6 +--
 .../test/Model/SingleRefTypeTest.php          |  2 +-
 .../test/Model/SpecialModelNameTest.php       |  4 +-
 .../OpenAPIClient-php/test/Model/TagTest.php  |  6 +--
 ...reeformAdditionalPropertiesRequestTest.php |  4 +-
 .../OpenAPIClient-php/test/Model/UserTest.php | 18 ++++-----
 .../psr-18/test/Api/AnotherFakeApiTest.php    |  2 +-
 .../php/psr-18/test/Api/DefaultApiTest.php    |  2 +-
 .../php/psr-18/test/Api/FakeApiTest.php       | 38 +++++++++----------
 .../test/Api/FakeClassnameTags123ApiTest.php  |  2 +-
 .../php/psr-18/test/Api/PetApiTest.php        | 18 ++++-----
 .../php/psr-18/test/Api/StoreApiTest.php      |  8 ++--
 .../php/psr-18/test/Api/UserApiTest.php       | 16 ++++----
 .../Model/AdditionalPropertiesClassTest.php   |  6 +--
 .../test/Model/AllOfWithSingleRefTest.php     |  6 +--
 .../php/psr-18/test/Model/AnimalTest.php      |  6 +--
 .../php/psr-18/test/Model/ApiResponseTest.php |  8 ++--
 .../Model/ArrayOfArrayOfNumberOnlyTest.php    |  4 +-
 .../test/Model/ArrayOfNumberOnlyTest.php      |  4 +-
 .../php/psr-18/test/Model/ArrayTestTest.php   |  8 ++--
 .../psr-18/test/Model/CapitalizationTest.php  | 14 +++----
 .../php/psr-18/test/Model/CatTest.php         |  4 +-
 .../php/psr-18/test/Model/CategoryTest.php    |  6 +--
 .../php/psr-18/test/Model/ClassModelTest.php  |  4 +-
 .../php/psr-18/test/Model/ClientTest.php      |  4 +-
 .../test/Model/DeprecatedObjectTest.php       |  4 +-
 .../php/psr-18/test/Model/DogTest.php         |  4 +-
 .../php/psr-18/test/Model/EnumArraysTest.php  |  6 +--
 .../php/psr-18/test/Model/EnumClassTest.php   |  2 +-
 .../php/psr-18/test/Model/EnumTestTest.php    | 18 ++++-----
 .../FakeBigDecimalMap200ResponseTest.php      |  6 +--
 .../test/Model/FileSchemaTestClassTest.php    |  6 +--
 .../php/psr-18/test/Model/FileTest.php        |  4 +-
 .../test/Model/FooGetDefaultResponseTest.php  |  4 +-
 .../php/psr-18/test/Model/FooTest.php         |  4 +-
 .../php/psr-18/test/Model/FormatTestTest.php  | 34 ++++++++---------
 .../psr-18/test/Model/HasOnlyReadOnlyTest.php |  6 +--
 .../test/Model/HealthCheckResultTest.php      |  4 +-
 .../php/psr-18/test/Model/MapTestTest.php     | 10 ++---
 ...ertiesAndAdditionalPropertiesClassTest.php |  8 ++--
 .../test/Model/Model200ResponseTest.php       |  6 +--
 .../php/psr-18/test/Model/ModelListTest.php   |  4 +-
 .../php/psr-18/test/Model/ModelReturnTest.php |  4 +-
 .../php/psr-18/test/Model/NameTest.php        | 10 ++---
 .../psr-18/test/Model/NullableClassTest.php   | 26 ++++++-------
 .../php/psr-18/test/Model/NumberOnlyTest.php  |  4 +-
 .../Model/ObjectWithDeprecatedFieldsTest.php  | 10 ++---
 .../php/psr-18/test/Model/OrderTest.php       | 14 +++----
 .../psr-18/test/Model/OuterCompositeTest.php  |  8 ++--
 .../test/Model/OuterEnumDefaultValueTest.php  |  2 +-
 .../OuterEnumIntegerDefaultValueTest.php      |  2 +-
 .../test/Model/OuterEnumIntegerTest.php       |  2 +-
 .../php/psr-18/test/Model/OuterEnumTest.php   |  2 +-
 .../Model/OuterObjectWithEnumPropertyTest.php |  4 +-
 .../php/psr-18/test/Model/PetTest.php         | 14 +++----
 .../test/Model/PropertyNameMappingTest.php    | 10 ++---
 .../psr-18/test/Model/ReadOnlyFirstTest.php   |  6 +--
 .../psr-18/test/Model/SingleRefTypeTest.php   |  2 +-
 .../test/Model/SpecialModelNameTest.php       |  4 +-
 .../php/psr-18/test/Model/TagTest.php         |  6 +--
 ...reeformAdditionalPropertiesRequestTest.php |  4 +-
 .../php/psr-18/test/Model/UserTest.php        | 18 ++++-----
 .../php-slim4/tests/Api/PetApiTest.php        | 16 ++++----
 .../php-slim4/tests/Api/StoreApiTest.php      |  8 ++--
 .../php-slim4/tests/Api/UserApiTest.php       | 16 ++++----
 .../php-slim4/tests/Model/ApiResponseTest.php |  8 ++--
 .../php-slim4/tests/Model/CategoryTest.php    |  6 +--
 .../php-slim4/tests/Model/OrderTest.php       | 14 +++----
 .../php-slim4/tests/Model/PetTest.php         | 14 +++----
 .../php-slim4/tests/Model/TagTest.php         |  6 +--
 .../php-slim4/tests/Model/UserTest.php        | 18 ++++-----
 203 files changed, 790 insertions(+), 790 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache
index 27fdfebf8f1f..f7c4012624f2 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/api_test.mustache
@@ -70,7 +70,7 @@ use PHPUnit\Framework\TestCase;
     public function test{{vendorExtensions.x-test-operation-id}}()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
     {{/operation}}
 }
diff --git a/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache b/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache
index c6755c3c85bd..fa9d12564694 100644
--- a/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-nextgen/model_test.mustache
@@ -67,7 +67,7 @@ class {{classname}}Test extends TestCase
     public function test{{classname}}()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 {{#vars}}
 
@@ -77,7 +77,7 @@ class {{classname}}Test extends TestCase
     public function testProperty{{nameInCamelCase}}()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 {{/vars}}
 }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
index fb17fbe2f67e..5e9277f4c9c0 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/api_test.mustache
@@ -62,7 +62,7 @@ class {{userClassname}}Test extends TestCase
      */
     public function test{{operationIdCamelCase}}()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "{{operationId}}" method has not been implemented yet.'
         );
     }
diff --git a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
index 218a941c3460..c45cba105a72 100644
--- a/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php-slim4-server/model_test.mustache
@@ -65,7 +65,7 @@ class {{classname}}Test extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "{{classname}}" model has not been implemented yet.'
         );
     }
@@ -76,7 +76,7 @@ class {{classname}}Test extends TestCase
      */
     public function testProperty{{nameInCamelCase}}()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "{{name}}" property in "{{classname}}" model has not been implemented yet.'
         );
     }
@@ -92,4 +92,4 @@ class {{classname}}Test extends TestCase
         $this->assertIsArray($schemaArr);
     }
 }
-{{/model}}{{/models}}
\ No newline at end of file
+{{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/php/api_test.mustache b/modules/openapi-generator/src/main/resources/php/api_test.mustache
index 86a534a64f58..0fc99231c148 100644
--- a/modules/openapi-generator/src/main/resources/php/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php/api_test.mustache
@@ -72,7 +72,7 @@ use PHPUnit\Framework\TestCase;
     public function test{{vendorExtensions.x-test-operation-id}}()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
     {{/operation}}
 }
diff --git a/modules/openapi-generator/src/main/resources/php/model_test.mustache b/modules/openapi-generator/src/main/resources/php/model_test.mustache
index e9b07433988a..f515ce28899e 100644
--- a/modules/openapi-generator/src/main/resources/php/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/php/model_test.mustache
@@ -69,7 +69,7 @@ class {{classname}}Test extends TestCase
     public function test{{classname}}()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 {{#vars}}
 
@@ -79,7 +79,7 @@ class {{classname}}Test extends TestCase
     public function testProperty{{nameInCamelCase}}()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 {{/vars}}
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Api/AuthApiTest.php b/samples/client/echo_api/php-nextgen/tests/Api/AuthApiTest.php
index fee328d51e59..e699f0c08ceb 100644
--- a/samples/client/echo_api/php-nextgen/tests/Api/AuthApiTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Api/AuthApiTest.php
@@ -81,6 +81,6 @@ class AuthApiTest extends TestCase
     public function testTestAuthHttpBasic()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Api/BodyApiTest.php b/samples/client/echo_api/php-nextgen/tests/Api/BodyApiTest.php
index 24b4ef0f3941..8c91c94c380c 100644
--- a/samples/client/echo_api/php-nextgen/tests/Api/BodyApiTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Api/BodyApiTest.php
@@ -81,7 +81,7 @@ class BodyApiTest extends TestCase
     public function testTestBinaryGif()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -93,7 +93,7 @@ class BodyApiTest extends TestCase
     public function testTestBodyApplicationOctetstreamBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -105,7 +105,7 @@ class BodyApiTest extends TestCase
     public function testTestBodyMultipartFormdataArrayOfBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -117,7 +117,7 @@ class BodyApiTest extends TestCase
     public function testTestEchoBodyFreeFormObjectResponseString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -129,7 +129,7 @@ class BodyApiTest extends TestCase
     public function testTestEchoBodyPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -141,7 +141,7 @@ class BodyApiTest extends TestCase
     public function testTestEchoBodyPetResponseString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -153,6 +153,6 @@ class BodyApiTest extends TestCase
     public function testTestEchoBodyTagResponseString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Api/FormApiTest.php b/samples/client/echo_api/php-nextgen/tests/Api/FormApiTest.php
index daa305ab02f6..a5443fde5fc5 100644
--- a/samples/client/echo_api/php-nextgen/tests/Api/FormApiTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Api/FormApiTest.php
@@ -81,7 +81,7 @@ class FormApiTest extends TestCase
     public function testTestFormIntegerBooleanString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -93,6 +93,6 @@ class FormApiTest extends TestCase
     public function testTestFormOneof()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Api/HeaderApiTest.php b/samples/client/echo_api/php-nextgen/tests/Api/HeaderApiTest.php
index 21e1c88b7b06..99851ce00b82 100644
--- a/samples/client/echo_api/php-nextgen/tests/Api/HeaderApiTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Api/HeaderApiTest.php
@@ -81,6 +81,6 @@ class HeaderApiTest extends TestCase
     public function testTestHeaderIntegerBooleanString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Api/PathApiTest.php b/samples/client/echo_api/php-nextgen/tests/Api/PathApiTest.php
index d01f470f01f4..d4043ae9f5bf 100644
--- a/samples/client/echo_api/php-nextgen/tests/Api/PathApiTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Api/PathApiTest.php
@@ -81,6 +81,6 @@ class PathApiTest extends TestCase
     public function testTestsPathStringPathStringIntegerPathInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Api/QueryApiTest.php b/samples/client/echo_api/php-nextgen/tests/Api/QueryApiTest.php
index b066dfc199d2..caee658915d6 100644
--- a/samples/client/echo_api/php-nextgen/tests/Api/QueryApiTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Api/QueryApiTest.php
@@ -81,7 +81,7 @@ class QueryApiTest extends TestCase
     public function testTestEnumRefString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -93,7 +93,7 @@ class QueryApiTest extends TestCase
     public function testTestQueryDatetimeDateString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -105,7 +105,7 @@ class QueryApiTest extends TestCase
     public function testTestQueryIntegerBooleanString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -117,7 +117,7 @@ class QueryApiTest extends TestCase
     public function testTestQueryStyleDeepObjectExplodeTrueObject()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -129,7 +129,7 @@ class QueryApiTest extends TestCase
     public function testTestQueryStyleDeepObjectExplodeTrueObjectAllOf()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -141,7 +141,7 @@ class QueryApiTest extends TestCase
     public function testTestQueryStyleFormExplodeTrueArrayString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -153,7 +153,7 @@ class QueryApiTest extends TestCase
     public function testTestQueryStyleFormExplodeTrueObject()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -165,6 +165,6 @@ class QueryApiTest extends TestCase
     public function testTestQueryStyleFormExplodeTrueObjectAllOf()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/BirdTest.php b/samples/client/echo_api/php-nextgen/tests/Model/BirdTest.php
index ef424f438add..b2a684f90d73 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/BirdTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/BirdTest.php
@@ -77,7 +77,7 @@ class BirdTest extends TestCase
     public function testBird()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class BirdTest extends TestCase
     public function testPropertySize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,6 +95,6 @@ class BirdTest extends TestCase
     public function testPropertyColor()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/CategoryTest.php b/samples/client/echo_api/php-nextgen/tests/Model/CategoryTest.php
index c643cb2b36c5..edfa0b8b1580 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/CategoryTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/CategoryTest.php
@@ -77,7 +77,7 @@ class CategoryTest extends TestCase
     public function testCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class CategoryTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,6 +95,6 @@ class CategoryTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/DataQueryTest.php b/samples/client/echo_api/php-nextgen/tests/Model/DataQueryTest.php
index 43cdd5c7a90e..68cf3d2b0a19 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/DataQueryTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/DataQueryTest.php
@@ -77,7 +77,7 @@ class DataQueryTest extends TestCase
     public function testDataQuery()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class DataQueryTest extends TestCase
     public function testPropertySuffix()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,7 +95,7 @@ class DataQueryTest extends TestCase
     public function testPropertyText()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,6 +104,6 @@ class DataQueryTest extends TestCase
     public function testPropertyDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/DefaultValueTest.php b/samples/client/echo_api/php-nextgen/tests/Model/DefaultValueTest.php
index 5d1bb1676492..9c37428edded 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/DefaultValueTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/DefaultValueTest.php
@@ -77,7 +77,7 @@ class DefaultValueTest extends TestCase
     public function testDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayStringEnumRefDefault()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,7 +95,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayStringEnumDefault()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayStringDefault()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -113,7 +113,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayIntegerDefault()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -122,7 +122,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -131,7 +131,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayStringNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class DefaultValueTest extends TestCase
     public function testPropertyArrayStringExtensionNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -149,6 +149,6 @@ class DefaultValueTest extends TestCase
     public function testPropertyStringNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/NumberPropertiesOnlyTest.php b/samples/client/echo_api/php-nextgen/tests/Model/NumberPropertiesOnlyTest.php
index f1de2cd6cfd0..13b2f2b0d6f0 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/NumberPropertiesOnlyTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/NumberPropertiesOnlyTest.php
@@ -77,7 +77,7 @@ class NumberPropertiesOnlyTest extends TestCase
     public function testNumberPropertiesOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class NumberPropertiesOnlyTest extends TestCase
     public function testPropertyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,7 +95,7 @@ class NumberPropertiesOnlyTest extends TestCase
     public function testPropertyFloat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,6 +104,6 @@ class NumberPropertiesOnlyTest extends TestCase
     public function testPropertyDouble()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/PetTest.php b/samples/client/echo_api/php-nextgen/tests/Model/PetTest.php
index 1b11ec08fdc2..f7ff28534f5f 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/PetTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/PetTest.php
@@ -77,7 +77,7 @@ class PetTest extends TestCase
     public function testPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class PetTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,7 +95,7 @@ class PetTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class PetTest extends TestCase
     public function testPropertyCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -113,7 +113,7 @@ class PetTest extends TestCase
     public function testPropertyPhotoUrls()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -122,7 +122,7 @@ class PetTest extends TestCase
     public function testPropertyTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -131,6 +131,6 @@ class PetTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/QueryTest.php b/samples/client/echo_api/php-nextgen/tests/Model/QueryTest.php
index e984a7919ffd..a01c98c40a3a 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/QueryTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/QueryTest.php
@@ -77,7 +77,7 @@ class QueryTest extends TestCase
     public function testQuery()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class QueryTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,6 +95,6 @@ class QueryTest extends TestCase
     public function testPropertyOutcomes()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/StringEnumRefTest.php b/samples/client/echo_api/php-nextgen/tests/Model/StringEnumRefTest.php
index f48e712c2dd6..64bde9a7817b 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/StringEnumRefTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/StringEnumRefTest.php
@@ -77,6 +77,6 @@ class StringEnumRefTest extends TestCase
     public function testStringEnumRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/TagTest.php b/samples/client/echo_api/php-nextgen/tests/Model/TagTest.php
index 2f1c1315bb60..0e9a9cbca7e5 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/TagTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/TagTest.php
@@ -77,7 +77,7 @@ class TagTest extends TestCase
     public function testTag()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class TagTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,6 +95,6 @@ class TagTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.php b/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.php
index 08e837c50b69..04f2508bdda5 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest.php
@@ -77,7 +77,7 @@ class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest ext
     public function testTestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,7 +86,7 @@ class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest ext
     public function testPropertySize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -95,7 +95,7 @@ class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest ext
     public function testPropertyColor()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest ext
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -113,6 +113,6 @@ class TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameterTest ext
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.php b/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.php
index 81783415f44b..aea9a6b2729f 100644
--- a/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.php
+++ b/samples/client/echo_api/php-nextgen/tests/Model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest.php
@@ -77,7 +77,7 @@ class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest extends T
     public function testTestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -86,6 +86,6 @@ class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameterTest extends T
     public function testPropertyValues()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/AnotherFakeApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/AnotherFakeApiTest.php
index aa389681e2f9..28b50fbc881a 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/AnotherFakeApiTest.php
@@ -80,6 +80,6 @@ class AnotherFakeApiTest extends TestCase
     public function testCall123TestSpecialTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/DefaultApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/DefaultApiTest.php
index 95b6ce115a97..22055cbfa2bb 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/DefaultApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/DefaultApiTest.php
@@ -80,6 +80,6 @@ class DefaultApiTest extends TestCase
     public function testFooGet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeApiTest.php
index 06dc6c4a2a25..c3d64e288e3e 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeApiTest.php
@@ -80,7 +80,7 @@ class FakeApiTest extends TestCase
     public function testFakeHealthGet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class FakeApiTest extends TestCase
     public function testFakeHttpSignatureTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterBooleanSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterCompositeSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterNumberSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterStringSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class FakeApiTest extends TestCase
     public function testFakePropertyEnumIntegerSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,7 +164,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -176,7 +176,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithFileSchema()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -188,7 +188,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithQueryParams()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -200,7 +200,7 @@ class FakeApiTest extends TestCase
     public function testTestClientModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -212,7 +212,7 @@ class FakeApiTest extends TestCase
     public function testTestEndpointParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -224,7 +224,7 @@ class FakeApiTest extends TestCase
     public function testTestEnumParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -236,7 +236,7 @@ class FakeApiTest extends TestCase
     public function testTestGroupParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -248,7 +248,7 @@ class FakeApiTest extends TestCase
     public function testTestInlineAdditionalProperties()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -260,7 +260,7 @@ class FakeApiTest extends TestCase
     public function testTestJsonFormData()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -272,6 +272,6 @@ class FakeApiTest extends TestCase
     public function testTestQueryParameterCollectionFormat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeClassnameTags123ApiTest.php
index a57805c30c3a..3641ef963928 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/FakeClassnameTags123ApiTest.php
@@ -80,6 +80,6 @@ class FakeClassnameTags123ApiTest extends TestCase
     public function testTestClassname()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/PetApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/PetApiTest.php
index cf3a9555798d..3904a5bec157 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/PetApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/PetApiTest.php
@@ -80,7 +80,7 @@ class PetApiTest extends TestCase
     public function testAddPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class PetApiTest extends TestCase
     public function testDeletePet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class PetApiTest extends TestCase
     public function testFindPetsByStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class PetApiTest extends TestCase
     public function testFindPetsByTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class PetApiTest extends TestCase
     public function testGetPetById()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class PetApiTest extends TestCase
     public function testUpdatePet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class PetApiTest extends TestCase
     public function testUpdatePetWithForm()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,7 +164,7 @@ class PetApiTest extends TestCase
     public function testUploadFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -176,6 +176,6 @@ class PetApiTest extends TestCase
     public function testUploadFileWithRequiredFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/StoreApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/StoreApiTest.php
index 6d9548c31d3f..fa068a3b9fee 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/StoreApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/StoreApiTest.php
@@ -80,7 +80,7 @@ class StoreApiTest extends TestCase
     public function testDeleteOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class StoreApiTest extends TestCase
     public function testGetInventory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class StoreApiTest extends TestCase
     public function testGetOrderById()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,6 +116,6 @@ class StoreApiTest extends TestCase
     public function testPlaceOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/UserApiTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/UserApiTest.php
index 30e5374a4686..e254dcdf448d 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/UserApiTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Api/UserApiTest.php
@@ -80,7 +80,7 @@ class UserApiTest extends TestCase
     public function testCreateUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class UserApiTest extends TestCase
     public function testCreateUsersWithArrayInput()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class UserApiTest extends TestCase
     public function testCreateUsersWithListInput()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class UserApiTest extends TestCase
     public function testDeleteUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class UserApiTest extends TestCase
     public function testGetUserByName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class UserApiTest extends TestCase
     public function testLoginUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class UserApiTest extends TestCase
     public function testLogoutUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,6 +164,6 @@ class UserApiTest extends TestCase
     public function testUpdateUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AdditionalPropertiesClassTest.php
index b7b0fe2ec34d..8600863e689b 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AdditionalPropertiesClassTest.php
@@ -76,7 +76,7 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testAdditionalPropertiesClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testPropertyMapProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testPropertyMapOfMapProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AllOfWithSingleRefTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AllOfWithSingleRefTest.php
index 18797e369d46..a2dbb3cedab6 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AllOfWithSingleRefTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AllOfWithSingleRefTest.php
@@ -76,7 +76,7 @@ class AllOfWithSingleRefTest extends TestCase
     public function testAllOfWithSingleRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AllOfWithSingleRefTest extends TestCase
     public function testPropertyUsername()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AllOfWithSingleRefTest extends TestCase
     public function testPropertySingleRefType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AnimalTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AnimalTest.php
index f55479d6c913..51074899465e 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AnimalTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/AnimalTest.php
@@ -76,7 +76,7 @@ class AnimalTest extends TestCase
     public function testAnimal()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AnimalTest extends TestCase
     public function testPropertyClassName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AnimalTest extends TestCase
     public function testPropertyColor()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ApiResponseTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ApiResponseTest.php
index 8b5b98a97133..df818ed37d56 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ApiResponseTest.php
@@ -76,7 +76,7 @@ class ApiResponseTest extends TestCase
     public function testApiResponse()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ApiResponseTest extends TestCase
     public function testPropertyCode()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ApiResponseTest extends TestCase
     public function testPropertyType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class ApiResponseTest extends TestCase
     public function testPropertyMessage()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfArrayOfNumberOnlyTest.php
index e23f1877e997..b418c13c31c8 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -76,7 +76,7 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     public function testArrayOfArrayOfNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     public function testPropertyArrayArrayNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfNumberOnlyTest.php
index d1cb06ae7cb1..5b1b5041ba48 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayOfNumberOnlyTest.php
@@ -76,7 +76,7 @@ class ArrayOfNumberOnlyTest extends TestCase
     public function testArrayOfNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ArrayOfNumberOnlyTest extends TestCase
     public function testPropertyArrayNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayTestTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayTestTest.php
index d1b71c185fcd..917ad473de1f 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ArrayTestTest.php
@@ -76,7 +76,7 @@ class ArrayTestTest extends TestCase
     public function testArrayTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayOfString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayArrayOfInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayArrayOfModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CapitalizationTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CapitalizationTest.php
index 2e706696fbfa..9c9d3e98ea5d 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CapitalizationTest.php
@@ -76,7 +76,7 @@ class CapitalizationTest extends TestCase
     public function testCapitalization()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class CapitalizationTest extends TestCase
     public function testPropertySmallCamel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyCapitalCamel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class CapitalizationTest extends TestCase
     public function testPropertySmallSnake()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyCapitalSnake()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyScaEthFlowPoints()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class CapitalizationTest extends TestCase
     public function testPropertyAttName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatAllOfTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatAllOfTest.php
index 9332a0a425c1..6b0a62c8d6f7 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatAllOfTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatAllOfTest.php
@@ -76,7 +76,7 @@ class CatAllOfTest extends TestCase
     public function testCatAllOf()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class CatAllOfTest extends TestCase
     public function testPropertyDeclawed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatTest.php
index 350bc7195929..9490c7c649ac 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CatTest.php
@@ -76,7 +76,7 @@ class CatTest extends TestCase
     public function testCat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class CatTest extends TestCase
     public function testPropertyDeclawed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CategoryTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CategoryTest.php
index c0bfb9c664d0..cc2f56210e6d 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CategoryTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/CategoryTest.php
@@ -76,7 +76,7 @@ class CategoryTest extends TestCase
     public function testCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class CategoryTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class CategoryTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ChildWithNullableTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ChildWithNullableTest.php
index ec5f69960a56..cc7f41dafdc3 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ChildWithNullableTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ChildWithNullableTest.php
@@ -76,7 +76,7 @@ class ChildWithNullableTest extends TestCase
     public function testChildWithNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ChildWithNullableTest extends TestCase
     public function testPropertyOtherProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClassModelTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClassModelTest.php
index a9c3176a2766..87993f868d19 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClassModelTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClassModelTest.php
@@ -76,7 +76,7 @@ class ClassModelTest extends TestCase
     public function testClassModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ClassModelTest extends TestCase
     public function testPropertyClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClientTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClientTest.php
index 7198f55c5f3c..0e502c5580b0 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClientTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ClientTest.php
@@ -76,7 +76,7 @@ class ClientTest extends TestCase
     public function testClient()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ClientTest extends TestCase
     public function testPropertyClient()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DeprecatedObjectTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DeprecatedObjectTest.php
index c4dff7e5b45c..252ecd9937d9 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DeprecatedObjectTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DeprecatedObjectTest.php
@@ -76,7 +76,7 @@ class DeprecatedObjectTest extends TestCase
     public function testDeprecatedObject()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DeprecatedObjectTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogAllOfTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogAllOfTest.php
index 585754ad28bd..a82687a0e0bb 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogAllOfTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogAllOfTest.php
@@ -76,7 +76,7 @@ class DogAllOfTest extends TestCase
     public function testDogAllOf()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DogAllOfTest extends TestCase
     public function testPropertyBreed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogTest.php
index cfffcf41c2c7..31f896ba4cb7 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/DogTest.php
@@ -76,7 +76,7 @@ class DogTest extends TestCase
     public function testDog()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DogTest extends TestCase
     public function testPropertyBreed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumArraysTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumArraysTest.php
index 22fe1426fa31..14d7c2371d57 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumArraysTest.php
@@ -76,7 +76,7 @@ class EnumArraysTest extends TestCase
     public function testEnumArrays()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class EnumArraysTest extends TestCase
     public function testPropertyJustSymbol()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class EnumArraysTest extends TestCase
     public function testPropertyArrayEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumClassTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumClassTest.php
index 4470c2f3d935..ec0b73cd58e6 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumClassTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumClassTest.php
@@ -76,6 +76,6 @@ class EnumClassTest extends TestCase
     public function testEnumClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumTestTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumTestTest.php
index dc4ca05aa43c..959b31e7e2ee 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumTestTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/EnumTestTest.php
@@ -76,7 +76,7 @@ class EnumTestTest extends TestCase
     public function testEnumTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumStringRequired()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,6 +148,6 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumIntegerDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FakeBigDecimalMap200ResponseTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FakeBigDecimalMap200ResponseTest.php
index 0ee699506642..38f5914d87bd 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FakeBigDecimalMap200ResponseTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FakeBigDecimalMap200ResponseTest.php
@@ -76,7 +76,7 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testFakeBigDecimalMap200Response()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testPropertySomeId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testPropertySomeMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileSchemaTestClassTest.php
index 6ed637d682f5..07e9436fbdd1 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileSchemaTestClassTest.php
@@ -76,7 +76,7 @@ class FileSchemaTestClassTest extends TestCase
     public function testFileSchemaTestClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FileSchemaTestClassTest extends TestCase
     public function testPropertyFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class FileSchemaTestClassTest extends TestCase
     public function testPropertyFiles()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileTest.php
index 516b5c00ab26..c31df21534d4 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FileTest.php
@@ -76,7 +76,7 @@ class FileTest extends TestCase
     public function testFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FileTest extends TestCase
     public function testPropertySourceUri()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooGetDefaultResponseTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooGetDefaultResponseTest.php
index 395b2e00e226..6d5eb697d19f 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooGetDefaultResponseTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooGetDefaultResponseTest.php
@@ -76,7 +76,7 @@ class FooGetDefaultResponseTest extends TestCase
     public function testFooGetDefaultResponse()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FooGetDefaultResponseTest extends TestCase
     public function testPropertyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooTest.php
index 6a50205e0b4d..33516bb899b1 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FooTest.php
@@ -76,7 +76,7 @@ class FooTest extends TestCase
     public function testFoo()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FooTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FormatTestTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FormatTestTest.php
index 3be6a893dea0..f59c10764b1b 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FormatTestTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/FormatTestTest.php
@@ -76,7 +76,7 @@ class FormatTestTest extends TestCase
     public function testFormatTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInt32()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInt64()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class FormatTestTest extends TestCase
     public function testPropertyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class FormatTestTest extends TestCase
     public function testPropertyFloat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDouble()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDecimal()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,7 +148,7 @@ class FormatTestTest extends TestCase
     public function testPropertyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -157,7 +157,7 @@ class FormatTestTest extends TestCase
     public function testPropertyByte()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -166,7 +166,7 @@ class FormatTestTest extends TestCase
     public function testPropertyBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -175,7 +175,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -184,7 +184,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDateTime()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -193,7 +193,7 @@ class FormatTestTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -202,7 +202,7 @@ class FormatTestTest extends TestCase
     public function testPropertyPassword()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -211,7 +211,7 @@ class FormatTestTest extends TestCase
     public function testPropertyPatternWithDigits()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -220,6 +220,6 @@ class FormatTestTest extends TestCase
     public function testPropertyPatternWithDigitsAndDelimiter()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HasOnlyReadOnlyTest.php
index d44dc7820e70..6113754ebf4b 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HasOnlyReadOnlyTest.php
@@ -76,7 +76,7 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testHasOnlyReadOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testPropertyFoo()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HealthCheckResultTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HealthCheckResultTest.php
index a5ea7c57b9b6..dc037b28dd68 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HealthCheckResultTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/HealthCheckResultTest.php
@@ -76,7 +76,7 @@ class HealthCheckResultTest extends TestCase
     public function testHealthCheckResult()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class HealthCheckResultTest extends TestCase
     public function testPropertyNullableMessage()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MapTestTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MapTestTest.php
index 6f35bd3521eb..14996c5ff6d5 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MapTestTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MapTestTest.php
@@ -76,7 +76,7 @@ class MapTestTest extends TestCase
     public function testMapTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class MapTestTest extends TestCase
     public function testPropertyMapMapOfString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class MapTestTest extends TestCase
     public function testPropertyMapOfEnumString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class MapTestTest extends TestCase
     public function testPropertyDirectMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class MapTestTest extends TestCase
     public function testPropertyIndirectMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 8614a1ce61b5..91ec0f64a11f 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testMixedPropertiesAndAdditionalPropertiesClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyDateTime()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/Model200ResponseTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/Model200ResponseTest.php
index 8fbe8088d622..6f4f0c9cf81a 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/Model200ResponseTest.php
@@ -76,7 +76,7 @@ class Model200ResponseTest extends TestCase
     public function testModel200Response()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class Model200ResponseTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class Model200ResponseTest extends TestCase
     public function testPropertyClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelListTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelListTest.php
index 51c776e42540..3f3431ab6529 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelListTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelListTest.php
@@ -76,7 +76,7 @@ class ModelListTest extends TestCase
     public function testModelList()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ModelListTest extends TestCase
     public function testProperty123List()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelReturnTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelReturnTest.php
index cc2c25d3058d..5dc9d1722888 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ModelReturnTest.php
@@ -76,7 +76,7 @@ class ModelReturnTest extends TestCase
     public function testModelReturn()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ModelReturnTest extends TestCase
     public function testPropertyReturn()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NameTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NameTest.php
index de677b540c41..3c4c8e3f4c20 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NameTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NameTest.php
@@ -76,7 +76,7 @@ class NameTest extends TestCase
     public function testName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class NameTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class NameTest extends TestCase
     public function testPropertySnakeCase()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class NameTest extends TestCase
     public function testPropertyProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class NameTest extends TestCase
     public function testProperty123Number()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NullableClassTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NullableClassTest.php
index c3f7b5a06db9..772c46ba6b1d 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NullableClassTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NullableClassTest.php
@@ -76,7 +76,7 @@ class NullableClassTest extends TestCase
     public function testNullableClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class NullableClassTest extends TestCase
     public function testPropertyIntegerProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class NullableClassTest extends TestCase
     public function testPropertyNumberProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class NullableClassTest extends TestCase
     public function testPropertyBooleanProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class NullableClassTest extends TestCase
     public function testPropertyStringProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class NullableClassTest extends TestCase
     public function testPropertyDateProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class NullableClassTest extends TestCase
     public function testPropertyDatetimeProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,7 +148,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayAndItemsNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -157,7 +157,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayItemsNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -166,7 +166,7 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -175,7 +175,7 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectAndItemsNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -184,6 +184,6 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectItemsNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NumberOnlyTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NumberOnlyTest.php
index 121c8200de9c..c90e23b3400f 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/NumberOnlyTest.php
@@ -76,7 +76,7 @@ class NumberOnlyTest extends TestCase
     public function testNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class NumberOnlyTest extends TestCase
     public function testPropertyJustNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ObjectWithDeprecatedFieldsTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ObjectWithDeprecatedFieldsTest.php
index 660bf0cd3ea1..7dcf5a7d2ef2 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ObjectWithDeprecatedFieldsTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ObjectWithDeprecatedFieldsTest.php
@@ -76,7 +76,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testObjectWithDeprecatedFields()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyDeprecatedRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyBars()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OrderTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OrderTest.php
index e915b10f704d..ade3771edd8f 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OrderTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OrderTest.php
@@ -76,7 +76,7 @@ class OrderTest extends TestCase
     public function testOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class OrderTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class OrderTest extends TestCase
     public function testPropertyPetId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class OrderTest extends TestCase
     public function testPropertyQuantity()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class OrderTest extends TestCase
     public function testPropertyShipDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class OrderTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class OrderTest extends TestCase
     public function testPropertyComplete()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterCompositeTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterCompositeTest.php
index 84c19286d001..f4a12d081e2d 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterCompositeTest.php
@@ -76,7 +76,7 @@ class OuterCompositeTest extends TestCase
     public function testOuterComposite()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyBoolean()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumDefaultValueTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumDefaultValueTest.php
index 32793922e36c..0d9f103ee4a1 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumDefaultValueTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumDefaultValueTest.php
@@ -76,6 +76,6 @@ class OuterEnumDefaultValueTest extends TestCase
     public function testOuterEnumDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerDefaultValueTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerDefaultValueTest.php
index 8a1703e9c5bf..afb4e53cb20b 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerDefaultValueTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerDefaultValueTest.php
@@ -76,6 +76,6 @@ class OuterEnumIntegerDefaultValueTest extends TestCase
     public function testOuterEnumIntegerDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerTest.php
index b4998077a14e..982589b799bc 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumIntegerTest.php
@@ -76,6 +76,6 @@ class OuterEnumIntegerTest extends TestCase
     public function testOuterEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumTest.php
index 9a271dfea21f..710938a06d79 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterEnumTest.php
@@ -76,6 +76,6 @@ class OuterEnumTest extends TestCase
     public function testOuterEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterObjectWithEnumPropertyTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterObjectWithEnumPropertyTest.php
index b77c929321a7..f5502efedc60 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterObjectWithEnumPropertyTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/OuterObjectWithEnumPropertyTest.php
@@ -76,7 +76,7 @@ class OuterObjectWithEnumPropertyTest extends TestCase
     public function testOuterObjectWithEnumProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class OuterObjectWithEnumPropertyTest extends TestCase
     public function testPropertyValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ParentWithNullableTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ParentWithNullableTest.php
index 05f491afca8b..58cd2b129c8a 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ParentWithNullableTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ParentWithNullableTest.php
@@ -76,7 +76,7 @@ class ParentWithNullableTest extends TestCase
     public function testParentWithNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ParentWithNullableTest extends TestCase
     public function testPropertyType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class ParentWithNullableTest extends TestCase
     public function testPropertyNullableProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/PetTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/PetTest.php
index f733a25c05f0..25552be7d2d0 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/PetTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/PetTest.php
@@ -76,7 +76,7 @@ class PetTest extends TestCase
     public function testPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class PetTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class PetTest extends TestCase
     public function testPropertyCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class PetTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class PetTest extends TestCase
     public function testPropertyPhotoUrls()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class PetTest extends TestCase
     public function testPropertyTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class PetTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ReadOnlyFirstTest.php
index e1d50d45c9c6..89ac4f07f2ec 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/ReadOnlyFirstTest.php
@@ -76,7 +76,7 @@ class ReadOnlyFirstTest extends TestCase
     public function testReadOnlyFirst()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ReadOnlyFirstTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class ReadOnlyFirstTest extends TestCase
     public function testPropertyBaz()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SingleRefTypeTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SingleRefTypeTest.php
index 4e5efc0da983..e54a378304f6 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SingleRefTypeTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SingleRefTypeTest.php
@@ -76,6 +76,6 @@ class SingleRefTypeTest extends TestCase
     public function testSingleRefType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SpecialModelNameTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SpecialModelNameTest.php
index 17e4776821e8..c3430e143df1 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/SpecialModelNameTest.php
@@ -76,7 +76,7 @@ class SpecialModelNameTest extends TestCase
     public function testSpecialModelName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class SpecialModelNameTest extends TestCase
     public function testPropertySpecialPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TagTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TagTest.php
index cbe18cb62546..4c381d289597 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TagTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TagTest.php
@@ -76,7 +76,7 @@ class TagTest extends TestCase
     public function testTag()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class TagTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class TagTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
index 90919a0a12b4..2ba0bd1daf0c 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
@@ -76,7 +76,7 @@ class TestInlineFreeformAdditionalPropertiesRequestTest extends TestCase
     public function testTestInlineFreeformAdditionalPropertiesRequest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class TestInlineFreeformAdditionalPropertiesRequestTest extends TestCase
     public function testPropertySomeProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/UserTest.php b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/UserTest.php
index e2f524cf5963..9dda2395fdd9 100644
--- a/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/UserTest.php
+++ b/samples/client/petstore/php-nextgen/OpenAPIClient-php/tests/Model/UserTest.php
@@ -76,7 +76,7 @@ class UserTest extends TestCase
     public function testUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class UserTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class UserTest extends TestCase
     public function testPropertyUsername()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class UserTest extends TestCase
     public function testPropertyFirstName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class UserTest extends TestCase
     public function testPropertyLastName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class UserTest extends TestCase
     public function testPropertyEmail()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class UserTest extends TestCase
     public function testPropertyPassword()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class UserTest extends TestCase
     public function testPropertyPhone()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,6 +148,6 @@ class UserTest extends TestCase
     public function testPropertyUserStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
index 6cee51858834..15f07c38c7ad 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/AnotherFakeApiTest.php
@@ -80,6 +80,6 @@ class AnotherFakeApiTest extends TestCase
     public function testCall123TestSpecialTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
index 44ca443399ee..8bd61e48e055 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/DefaultApiTest.php
@@ -80,6 +80,6 @@ class DefaultApiTest extends TestCase
     public function testFooGet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
index 953145478b6d..11951a3a552f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeApiTest.php
@@ -80,7 +80,7 @@ class FakeApiTest extends TestCase
     public function testFakeHealthGet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class FakeApiTest extends TestCase
     public function testFakeHttpSignatureTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterBooleanSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterCompositeSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterNumberSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterStringSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class FakeApiTest extends TestCase
     public function testFakePropertyEnumIntegerSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,7 +164,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -176,7 +176,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithFileSchema()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -188,7 +188,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithQueryParams()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -200,7 +200,7 @@ class FakeApiTest extends TestCase
     public function testTestClientModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -212,7 +212,7 @@ class FakeApiTest extends TestCase
     public function testTestEndpointParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -224,7 +224,7 @@ class FakeApiTest extends TestCase
     public function testTestEnumParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -236,7 +236,7 @@ class FakeApiTest extends TestCase
     public function testTestGroupParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -248,7 +248,7 @@ class FakeApiTest extends TestCase
     public function testTestInlineAdditionalProperties()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -260,7 +260,7 @@ class FakeApiTest extends TestCase
     public function testTestJsonFormData()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -272,6 +272,6 @@ class FakeApiTest extends TestCase
     public function testTestQueryParameterCollectionFormat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
index 6ea65e4d6ea3..d99c19cb845b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/FakeClassnameTags123ApiTest.php
@@ -80,6 +80,6 @@ class FakeClassnameTags123ApiTest extends TestCase
     public function testTestClassname()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
index 06d61a51b725..3466c1d21741 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/PetApiTest.php
@@ -80,7 +80,7 @@ class PetApiTest extends TestCase
     public function testAddPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class PetApiTest extends TestCase
     public function testDeletePet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class PetApiTest extends TestCase
     public function testFindPetsByStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class PetApiTest extends TestCase
     public function testFindPetsByTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class PetApiTest extends TestCase
     public function testGetPetById()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class PetApiTest extends TestCase
     public function testUpdatePet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class PetApiTest extends TestCase
     public function testUpdatePetWithForm()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,7 +164,7 @@ class PetApiTest extends TestCase
     public function testUploadFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -176,6 +176,6 @@ class PetApiTest extends TestCase
     public function testUploadFileWithRequiredFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
index cf2e8b9d1efd..5fd0bd8c0908 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/StoreApiTest.php
@@ -80,7 +80,7 @@ class StoreApiTest extends TestCase
     public function testDeleteOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class StoreApiTest extends TestCase
     public function testGetInventory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class StoreApiTest extends TestCase
     public function testGetOrderById()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,6 +116,6 @@ class StoreApiTest extends TestCase
     public function testPlaceOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
index 43c14fe8483a..ecea69378a82 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Api/UserApiTest.php
@@ -80,7 +80,7 @@ class UserApiTest extends TestCase
     public function testCreateUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class UserApiTest extends TestCase
     public function testCreateUsersWithArrayInput()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class UserApiTest extends TestCase
     public function testCreateUsersWithListInput()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class UserApiTest extends TestCase
     public function testDeleteUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class UserApiTest extends TestCase
     public function testGetUserByName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class UserApiTest extends TestCase
     public function testLoginUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class UserApiTest extends TestCase
     public function testLogoutUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,6 +164,6 @@ class UserApiTest extends TestCase
     public function testUpdateUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
index 3f6c73586338..5b2fc51309b2 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AdditionalPropertiesClassTest.php
@@ -76,7 +76,7 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testAdditionalPropertiesClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testPropertyMapProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testPropertyMapOfMapProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AllOfWithSingleRefTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AllOfWithSingleRefTest.php
index ed452159ebfb..6eeeb7fa71d9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AllOfWithSingleRefTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AllOfWithSingleRefTest.php
@@ -76,7 +76,7 @@ class AllOfWithSingleRefTest extends TestCase
     public function testAllOfWithSingleRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AllOfWithSingleRefTest extends TestCase
     public function testPropertyUsername()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AllOfWithSingleRefTest extends TestCase
     public function testPropertySingleRefType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
index fc2d788fb6ce..4040a5a5f221 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/AnimalTest.php
@@ -76,7 +76,7 @@ class AnimalTest extends TestCase
     public function testAnimal()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AnimalTest extends TestCase
     public function testPropertyClassName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AnimalTest extends TestCase
     public function testPropertyColor()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
index 71ffed816181..3bdad8846d07 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ApiResponseTest.php
@@ -76,7 +76,7 @@ class ApiResponseTest extends TestCase
     public function testApiResponse()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ApiResponseTest extends TestCase
     public function testPropertyCode()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ApiResponseTest extends TestCase
     public function testPropertyType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class ApiResponseTest extends TestCase
     public function testPropertyMessage()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index ff497f4ee5fb..7ce7afd41e92 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -76,7 +76,7 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     public function testArrayOfArrayOfNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     public function testPropertyArrayArrayNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
index 244c3ba6c134..bf326be7eb35 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayOfNumberOnlyTest.php
@@ -76,7 +76,7 @@ class ArrayOfNumberOnlyTest extends TestCase
     public function testArrayOfNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ArrayOfNumberOnlyTest extends TestCase
     public function testPropertyArrayNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
index ced0c6680797..8871cd0fc405 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ArrayTestTest.php
@@ -76,7 +76,7 @@ class ArrayTestTest extends TestCase
     public function testArrayTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayOfString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayArrayOfInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayArrayOfModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
index f96199903781..601ef2e260c4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CapitalizationTest.php
@@ -76,7 +76,7 @@ class CapitalizationTest extends TestCase
     public function testCapitalization()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class CapitalizationTest extends TestCase
     public function testPropertySmallCamel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyCapitalCamel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class CapitalizationTest extends TestCase
     public function testPropertySmallSnake()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyCapitalSnake()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyScaEthFlowPoints()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class CapitalizationTest extends TestCase
     public function testPropertyAttName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
index 000182efc6ce..bf7e9e5e14f4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CatTest.php
@@ -76,7 +76,7 @@ class CatTest extends TestCase
     public function testCat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class CatTest extends TestCase
     public function testPropertyDeclawed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
index 1ae2588a2677..d9fd9d5fc007 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/CategoryTest.php
@@ -76,7 +76,7 @@ class CategoryTest extends TestCase
     public function testCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class CategoryTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class CategoryTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
index 9258531c897e..d35f207a07d0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClassModelTest.php
@@ -76,7 +76,7 @@ class ClassModelTest extends TestCase
     public function testClassModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ClassModelTest extends TestCase
     public function testPropertyClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
index a975446ae465..5693b81eafcd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ClientTest.php
@@ -76,7 +76,7 @@ class ClientTest extends TestCase
     public function testClient()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ClientTest extends TestCase
     public function testPropertyClient()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DeprecatedObjectTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DeprecatedObjectTest.php
index e958e2586141..900cac8c2cbb 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DeprecatedObjectTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DeprecatedObjectTest.php
@@ -76,7 +76,7 @@ class DeprecatedObjectTest extends TestCase
     public function testDeprecatedObject()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DeprecatedObjectTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
index 154ec0782306..79e3e8a98f84 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/DogTest.php
@@ -76,7 +76,7 @@ class DogTest extends TestCase
     public function testDog()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DogTest extends TestCase
     public function testPropertyBreed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
index 144730c7f15e..dc3d33741e11 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumArraysTest.php
@@ -76,7 +76,7 @@ class EnumArraysTest extends TestCase
     public function testEnumArrays()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class EnumArraysTest extends TestCase
     public function testPropertyJustSymbol()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class EnumArraysTest extends TestCase
     public function testPropertyArrayEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
index 10b045d0ef18..a1ca2e7d284b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumClassTest.php
@@ -76,6 +76,6 @@ class EnumClassTest extends TestCase
     public function testEnumClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
index 5df99d7540d2..6303bf4f06b4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/EnumTestTest.php
@@ -76,7 +76,7 @@ class EnumTestTest extends TestCase
     public function testEnumTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumStringRequired()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,6 +148,6 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumIntegerDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FakeBigDecimalMap200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FakeBigDecimalMap200ResponseTest.php
index c3b6a2563baa..63439f46a9d0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FakeBigDecimalMap200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FakeBigDecimalMap200ResponseTest.php
@@ -76,7 +76,7 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testFakeBigDecimalMap200Response()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testPropertySomeId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testPropertySomeMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
index 8a0e5a835695..3c49e3a65c7c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileSchemaTestClassTest.php
@@ -76,7 +76,7 @@ class FileSchemaTestClassTest extends TestCase
     public function testFileSchemaTestClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FileSchemaTestClassTest extends TestCase
     public function testPropertyFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class FileSchemaTestClassTest extends TestCase
     public function testPropertyFiles()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
index 6c7460efbcc6..64b29dcd6b10 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FileTest.php
@@ -76,7 +76,7 @@ class FileTest extends TestCase
     public function testFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FileTest extends TestCase
     public function testPropertySourceUri()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooGetDefaultResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooGetDefaultResponseTest.php
index ec9536c8a6dd..a1f689961a3d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooGetDefaultResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooGetDefaultResponseTest.php
@@ -76,7 +76,7 @@ class FooGetDefaultResponseTest extends TestCase
     public function testFooGetDefaultResponse()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FooGetDefaultResponseTest extends TestCase
     public function testPropertyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
index f357e0672775..7c0a87e384e4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FooTest.php
@@ -76,7 +76,7 @@ class FooTest extends TestCase
     public function testFoo()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FooTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
index 7d43c0d165d6..79893a6083a0 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/FormatTestTest.php
@@ -76,7 +76,7 @@ class FormatTestTest extends TestCase
     public function testFormatTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInt32()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInt64()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class FormatTestTest extends TestCase
     public function testPropertyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class FormatTestTest extends TestCase
     public function testPropertyFloat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDouble()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDecimal()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,7 +148,7 @@ class FormatTestTest extends TestCase
     public function testPropertyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -157,7 +157,7 @@ class FormatTestTest extends TestCase
     public function testPropertyByte()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -166,7 +166,7 @@ class FormatTestTest extends TestCase
     public function testPropertyBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -175,7 +175,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -184,7 +184,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDateTime()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -193,7 +193,7 @@ class FormatTestTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -202,7 +202,7 @@ class FormatTestTest extends TestCase
     public function testPropertyPassword()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -211,7 +211,7 @@ class FormatTestTest extends TestCase
     public function testPropertyPatternWithDigits()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -220,6 +220,6 @@ class FormatTestTest extends TestCase
     public function testPropertyPatternWithDigitsAndDelimiter()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
index 42f3977270b4..4858b0bb0666 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HasOnlyReadOnlyTest.php
@@ -76,7 +76,7 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testHasOnlyReadOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testPropertyFoo()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
index 55ae06c184de..97c97742b1de 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/HealthCheckResultTest.php
@@ -76,7 +76,7 @@ class HealthCheckResultTest extends TestCase
     public function testHealthCheckResult()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class HealthCheckResultTest extends TestCase
     public function testPropertyNullableMessage()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
index 1a23c759733e..4b079dce7524 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MapTestTest.php
@@ -76,7 +76,7 @@ class MapTestTest extends TestCase
     public function testMapTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class MapTestTest extends TestCase
     public function testPropertyMapMapOfString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class MapTestTest extends TestCase
     public function testPropertyMapOfEnumString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class MapTestTest extends TestCase
     public function testPropertyDirectMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class MapTestTest extends TestCase
     public function testPropertyIndirectMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 842e1271c3c8..595060801c85 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testMixedPropertiesAndAdditionalPropertiesClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyDateTime()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
index d6d5f0c62a72..99b32582a0be 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/Model200ResponseTest.php
@@ -76,7 +76,7 @@ class Model200ResponseTest extends TestCase
     public function testModel200Response()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class Model200ResponseTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class Model200ResponseTest extends TestCase
     public function testPropertyClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
index fed517cfe111..2bdd4595bd02 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelListTest.php
@@ -76,7 +76,7 @@ class ModelListTest extends TestCase
     public function testModelList()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ModelListTest extends TestCase
     public function testProperty123List()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
index aa50dc1e1389..f9390a7ba96c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ModelReturnTest.php
@@ -76,7 +76,7 @@ class ModelReturnTest extends TestCase
     public function testModelReturn()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ModelReturnTest extends TestCase
     public function testPropertyReturn()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
index 857c84bae00e..0c2fa5f8babf 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NameTest.php
@@ -76,7 +76,7 @@ class NameTest extends TestCase
     public function testName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class NameTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class NameTest extends TestCase
     public function testPropertySnakeCase()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class NameTest extends TestCase
     public function testPropertyProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class NameTest extends TestCase
     public function testProperty123Number()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
index 0f6a26a1a25f..98a85272da06 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NullableClassTest.php
@@ -76,7 +76,7 @@ class NullableClassTest extends TestCase
     public function testNullableClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class NullableClassTest extends TestCase
     public function testPropertyIntegerProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class NullableClassTest extends TestCase
     public function testPropertyNumberProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class NullableClassTest extends TestCase
     public function testPropertyBooleanProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class NullableClassTest extends TestCase
     public function testPropertyStringProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class NullableClassTest extends TestCase
     public function testPropertyDateProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class NullableClassTest extends TestCase
     public function testPropertyDatetimeProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,7 +148,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayAndItemsNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -157,7 +157,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayItemsNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -166,7 +166,7 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -175,7 +175,7 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectAndItemsNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -184,6 +184,6 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectItemsNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
index 44a972197dab..85aab557c32b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/NumberOnlyTest.php
@@ -76,7 +76,7 @@ class NumberOnlyTest extends TestCase
     public function testNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class NumberOnlyTest extends TestCase
     public function testPropertyJustNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ObjectWithDeprecatedFieldsTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ObjectWithDeprecatedFieldsTest.php
index d890e8e7c7d3..e7bde9e82271 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ObjectWithDeprecatedFieldsTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ObjectWithDeprecatedFieldsTest.php
@@ -76,7 +76,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testObjectWithDeprecatedFields()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyDeprecatedRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyBars()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
index deee1790826d..ed14957b5c0d 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OrderTest.php
@@ -76,7 +76,7 @@ class OrderTest extends TestCase
     public function testOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class OrderTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class OrderTest extends TestCase
     public function testPropertyPetId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class OrderTest extends TestCase
     public function testPropertyQuantity()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class OrderTest extends TestCase
     public function testPropertyShipDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class OrderTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class OrderTest extends TestCase
     public function testPropertyComplete()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
index fe406c33f9aa..23abf10c0eb4 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterCompositeTest.php
@@ -76,7 +76,7 @@ class OuterCompositeTest extends TestCase
     public function testOuterComposite()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyBoolean()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
index 7e4008ee3e62..003d79f5fbbd 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumDefaultValueTest.php
@@ -76,6 +76,6 @@ class OuterEnumDefaultValueTest extends TestCase
     public function testOuterEnumDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
index 4749175262c9..f7ddfb27575f 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerDefaultValueTest.php
@@ -76,6 +76,6 @@ class OuterEnumIntegerDefaultValueTest extends TestCase
     public function testOuterEnumIntegerDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
index 9e5d201f9579..cab5d97d1531 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumIntegerTest.php
@@ -76,6 +76,6 @@ class OuterEnumIntegerTest extends TestCase
     public function testOuterEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
index fd0e95158007..9c74db356630 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterEnumTest.php
@@ -76,6 +76,6 @@ class OuterEnumTest extends TestCase
     public function testOuterEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php
index e00c4a1781d0..d6a8ff6408e6 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php
@@ -76,7 +76,7 @@ class OuterObjectWithEnumPropertyTest extends TestCase
     public function testOuterObjectWithEnumProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class OuterObjectWithEnumPropertyTest extends TestCase
     public function testPropertyValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
index f19f26d014c1..d76e6fc4cf96 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PetTest.php
@@ -76,7 +76,7 @@ class PetTest extends TestCase
     public function testPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class PetTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class PetTest extends TestCase
     public function testPropertyCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class PetTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class PetTest extends TestCase
     public function testPropertyPhotoUrls()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class PetTest extends TestCase
     public function testPropertyTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class PetTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PropertyNameMappingTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PropertyNameMappingTest.php
index 58bcc7ad43e4..9f0037ad763c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/PropertyNameMappingTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/PropertyNameMappingTest.php
@@ -76,7 +76,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyNameMapping()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyHttpDebugOperation()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyUnderscoreType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyTypeWithUnderscore()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
index e9ca89bc41ae..f1f87f9cf10c 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/ReadOnlyFirstTest.php
@@ -76,7 +76,7 @@ class ReadOnlyFirstTest extends TestCase
     public function testReadOnlyFirst()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ReadOnlyFirstTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class ReadOnlyFirstTest extends TestCase
     public function testPropertyBaz()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SingleRefTypeTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SingleRefTypeTest.php
index 6d2b5953da14..1cf69fb05cf9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SingleRefTypeTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SingleRefTypeTest.php
@@ -76,6 +76,6 @@ class SingleRefTypeTest extends TestCase
     public function testSingleRefType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
index 589e5af215cf..fe191e59d086 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/SpecialModelNameTest.php
@@ -76,7 +76,7 @@ class SpecialModelNameTest extends TestCase
     public function testSpecialModelName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class SpecialModelNameTest extends TestCase
     public function testPropertySpecialPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
index 74baa57984c5..423b446011a1 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TagTest.php
@@ -76,7 +76,7 @@ class TagTest extends TestCase
     public function testTag()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class TagTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class TagTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
index ce35b026ba97..43059adc83ec 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
@@ -76,7 +76,7 @@ class TestInlineFreeformAdditionalPropertiesRequestTest extends TestCase
     public function testTestInlineFreeformAdditionalPropertiesRequest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class TestInlineFreeformAdditionalPropertiesRequestTest extends TestCase
     public function testPropertySomeProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
index fcc62b674cff..f972a7db31c9 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/UserTest.php
@@ -76,7 +76,7 @@ class UserTest extends TestCase
     public function testUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class UserTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class UserTest extends TestCase
     public function testPropertyUsername()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class UserTest extends TestCase
     public function testPropertyFirstName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class UserTest extends TestCase
     public function testPropertyLastName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class UserTest extends TestCase
     public function testPropertyEmail()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class UserTest extends TestCase
     public function testPropertyPassword()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class UserTest extends TestCase
     public function testPropertyPhone()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,6 +148,6 @@ class UserTest extends TestCase
     public function testPropertyUserStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/AnotherFakeApiTest.php b/samples/client/petstore/php/psr-18/test/Api/AnotherFakeApiTest.php
index 04f3e324e4bf..eb638f8ee6a2 100644
--- a/samples/client/petstore/php/psr-18/test/Api/AnotherFakeApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/AnotherFakeApiTest.php
@@ -80,6 +80,6 @@ class AnotherFakeApiTest extends TestCase
     public function testCall123TestSpecialTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/DefaultApiTest.php b/samples/client/petstore/php/psr-18/test/Api/DefaultApiTest.php
index 7e51715c6a1a..cbcb57a46b74 100644
--- a/samples/client/petstore/php/psr-18/test/Api/DefaultApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/DefaultApiTest.php
@@ -80,6 +80,6 @@ class DefaultApiTest extends TestCase
     public function testFooGet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/FakeApiTest.php b/samples/client/petstore/php/psr-18/test/Api/FakeApiTest.php
index 6884b7c96f4d..2c1552967dfc 100644
--- a/samples/client/petstore/php/psr-18/test/Api/FakeApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/FakeApiTest.php
@@ -80,7 +80,7 @@ class FakeApiTest extends TestCase
     public function testFakeBigDecimalMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class FakeApiTest extends TestCase
     public function testFakeHealthGet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class FakeApiTest extends TestCase
     public function testFakeHttpSignatureTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterBooleanSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterCompositeSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterNumberSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class FakeApiTest extends TestCase
     public function testFakeOuterStringSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,7 +164,7 @@ class FakeApiTest extends TestCase
     public function testFakePropertyEnumIntegerSerialize()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -176,7 +176,7 @@ class FakeApiTest extends TestCase
     public function testGetParameterNameMapping()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -188,7 +188,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -200,7 +200,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithFileSchema()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -212,7 +212,7 @@ class FakeApiTest extends TestCase
     public function testTestBodyWithQueryParams()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -224,7 +224,7 @@ class FakeApiTest extends TestCase
     public function testTestClientModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -236,7 +236,7 @@ class FakeApiTest extends TestCase
     public function testTestEndpointParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -248,7 +248,7 @@ class FakeApiTest extends TestCase
     public function testTestEnumParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -260,7 +260,7 @@ class FakeApiTest extends TestCase
     public function testTestGroupParameters()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -272,7 +272,7 @@ class FakeApiTest extends TestCase
     public function testTestInlineAdditionalProperties()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -284,7 +284,7 @@ class FakeApiTest extends TestCase
     public function testTestJsonFormData()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -296,6 +296,6 @@ class FakeApiTest extends TestCase
     public function testTestQueryParameterCollectionFormat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/FakeClassnameTags123ApiTest.php b/samples/client/petstore/php/psr-18/test/Api/FakeClassnameTags123ApiTest.php
index ff43532b495b..a2cdce2f6eba 100644
--- a/samples/client/petstore/php/psr-18/test/Api/FakeClassnameTags123ApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/FakeClassnameTags123ApiTest.php
@@ -80,6 +80,6 @@ class FakeClassnameTags123ApiTest extends TestCase
     public function testTestClassname()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/PetApiTest.php b/samples/client/petstore/php/psr-18/test/Api/PetApiTest.php
index c2d2cd2d7ba1..9e449b563be6 100644
--- a/samples/client/petstore/php/psr-18/test/Api/PetApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/PetApiTest.php
@@ -80,7 +80,7 @@ class PetApiTest extends TestCase
     public function testAddPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class PetApiTest extends TestCase
     public function testDeletePet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class PetApiTest extends TestCase
     public function testFindPetsByStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class PetApiTest extends TestCase
     public function testFindPetsByTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class PetApiTest extends TestCase
     public function testGetPetById()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class PetApiTest extends TestCase
     public function testUpdatePet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class PetApiTest extends TestCase
     public function testUpdatePetWithForm()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,7 +164,7 @@ class PetApiTest extends TestCase
     public function testUploadFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -176,6 +176,6 @@ class PetApiTest extends TestCase
     public function testUploadFileWithRequiredFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/StoreApiTest.php b/samples/client/petstore/php/psr-18/test/Api/StoreApiTest.php
index 5fe79e56275e..d2d83940ef27 100644
--- a/samples/client/petstore/php/psr-18/test/Api/StoreApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/StoreApiTest.php
@@ -80,7 +80,7 @@ class StoreApiTest extends TestCase
     public function testDeleteOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class StoreApiTest extends TestCase
     public function testGetInventory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class StoreApiTest extends TestCase
     public function testGetOrderById()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,6 +116,6 @@ class StoreApiTest extends TestCase
     public function testPlaceOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Api/UserApiTest.php b/samples/client/petstore/php/psr-18/test/Api/UserApiTest.php
index e28d19f705da..cb45027ed4aa 100644
--- a/samples/client/petstore/php/psr-18/test/Api/UserApiTest.php
+++ b/samples/client/petstore/php/psr-18/test/Api/UserApiTest.php
@@ -80,7 +80,7 @@ class UserApiTest extends TestCase
     public function testCreateUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -92,7 +92,7 @@ class UserApiTest extends TestCase
     public function testCreateUsersWithArrayInput()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -104,7 +104,7 @@ class UserApiTest extends TestCase
     public function testCreateUsersWithListInput()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -116,7 +116,7 @@ class UserApiTest extends TestCase
     public function testDeleteUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -128,7 +128,7 @@ class UserApiTest extends TestCase
     public function testGetUserByName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -140,7 +140,7 @@ class UserApiTest extends TestCase
     public function testLoginUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -152,7 +152,7 @@ class UserApiTest extends TestCase
     public function testLogoutUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -164,6 +164,6 @@ class UserApiTest extends TestCase
     public function testUpdateUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/AdditionalPropertiesClassTest.php b/samples/client/petstore/php/psr-18/test/Model/AdditionalPropertiesClassTest.php
index 444bff6cac66..287808971e41 100644
--- a/samples/client/petstore/php/psr-18/test/Model/AdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/AdditionalPropertiesClassTest.php
@@ -76,7 +76,7 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testAdditionalPropertiesClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testPropertyMapProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AdditionalPropertiesClassTest extends TestCase
     public function testPropertyMapOfMapProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/AllOfWithSingleRefTest.php b/samples/client/petstore/php/psr-18/test/Model/AllOfWithSingleRefTest.php
index ed452159ebfb..6eeeb7fa71d9 100644
--- a/samples/client/petstore/php/psr-18/test/Model/AllOfWithSingleRefTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/AllOfWithSingleRefTest.php
@@ -76,7 +76,7 @@ class AllOfWithSingleRefTest extends TestCase
     public function testAllOfWithSingleRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AllOfWithSingleRefTest extends TestCase
     public function testPropertyUsername()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AllOfWithSingleRefTest extends TestCase
     public function testPropertySingleRefType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/AnimalTest.php b/samples/client/petstore/php/psr-18/test/Model/AnimalTest.php
index ae22931948d3..bc3710a28824 100644
--- a/samples/client/petstore/php/psr-18/test/Model/AnimalTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/AnimalTest.php
@@ -76,7 +76,7 @@ class AnimalTest extends TestCase
     public function testAnimal()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class AnimalTest extends TestCase
     public function testPropertyClassName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class AnimalTest extends TestCase
     public function testPropertyColor()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ApiResponseTest.php b/samples/client/petstore/php/psr-18/test/Model/ApiResponseTest.php
index 8754f3f2cfdc..3e8b301e397d 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ApiResponseTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ApiResponseTest.php
@@ -76,7 +76,7 @@ class ApiResponseTest extends TestCase
     public function testApiResponse()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ApiResponseTest extends TestCase
     public function testPropertyCode()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ApiResponseTest extends TestCase
     public function testPropertyType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class ApiResponseTest extends TestCase
     public function testPropertyMessage()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ArrayOfArrayOfNumberOnlyTest.php b/samples/client/petstore/php/psr-18/test/Model/ArrayOfArrayOfNumberOnlyTest.php
index f218486ef9e2..3f534fc3dca0 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ArrayOfArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ArrayOfArrayOfNumberOnlyTest.php
@@ -76,7 +76,7 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     public function testArrayOfArrayOfNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ArrayOfArrayOfNumberOnlyTest extends TestCase
     public function testPropertyArrayArrayNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ArrayOfNumberOnlyTest.php b/samples/client/petstore/php/psr-18/test/Model/ArrayOfNumberOnlyTest.php
index 9c1a9731c770..0a6c7d2c1649 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ArrayOfNumberOnlyTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ArrayOfNumberOnlyTest.php
@@ -76,7 +76,7 @@ class ArrayOfNumberOnlyTest extends TestCase
     public function testArrayOfNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ArrayOfNumberOnlyTest extends TestCase
     public function testPropertyArrayNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ArrayTestTest.php b/samples/client/petstore/php/psr-18/test/Model/ArrayTestTest.php
index 96c88251e4f7..fc366d625e2a 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ArrayTestTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ArrayTestTest.php
@@ -76,7 +76,7 @@ class ArrayTestTest extends TestCase
     public function testArrayTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayOfString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayArrayOfInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class ArrayTestTest extends TestCase
     public function testPropertyArrayArrayOfModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/CapitalizationTest.php b/samples/client/petstore/php/psr-18/test/Model/CapitalizationTest.php
index 4b24190e76af..62d10d5099bc 100644
--- a/samples/client/petstore/php/psr-18/test/Model/CapitalizationTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/CapitalizationTest.php
@@ -76,7 +76,7 @@ class CapitalizationTest extends TestCase
     public function testCapitalization()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class CapitalizationTest extends TestCase
     public function testPropertySmallCamel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyCapitalCamel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class CapitalizationTest extends TestCase
     public function testPropertySmallSnake()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyCapitalSnake()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class CapitalizationTest extends TestCase
     public function testPropertyScaEthFlowPoints()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class CapitalizationTest extends TestCase
     public function testPropertyAttName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/CatTest.php b/samples/client/petstore/php/psr-18/test/Model/CatTest.php
index f352cbdabe9d..29ce99288d88 100644
--- a/samples/client/petstore/php/psr-18/test/Model/CatTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/CatTest.php
@@ -76,7 +76,7 @@ class CatTest extends TestCase
     public function testCat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class CatTest extends TestCase
     public function testPropertyDeclawed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/CategoryTest.php b/samples/client/petstore/php/psr-18/test/Model/CategoryTest.php
index 1b6925f35932..fad932a31981 100644
--- a/samples/client/petstore/php/psr-18/test/Model/CategoryTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/CategoryTest.php
@@ -76,7 +76,7 @@ class CategoryTest extends TestCase
     public function testCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class CategoryTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class CategoryTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ClassModelTest.php b/samples/client/petstore/php/psr-18/test/Model/ClassModelTest.php
index e843f7791554..2b59c4f09b02 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ClassModelTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ClassModelTest.php
@@ -76,7 +76,7 @@ class ClassModelTest extends TestCase
     public function testClassModel()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ClassModelTest extends TestCase
     public function testPropertyClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ClientTest.php b/samples/client/petstore/php/psr-18/test/Model/ClientTest.php
index f95ede2e6ae1..acba1853268b 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ClientTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ClientTest.php
@@ -76,7 +76,7 @@ class ClientTest extends TestCase
     public function testClient()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ClientTest extends TestCase
     public function testPropertyClient()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/DeprecatedObjectTest.php b/samples/client/petstore/php/psr-18/test/Model/DeprecatedObjectTest.php
index d50561b862f3..a780bdf3d800 100644
--- a/samples/client/petstore/php/psr-18/test/Model/DeprecatedObjectTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/DeprecatedObjectTest.php
@@ -76,7 +76,7 @@ class DeprecatedObjectTest extends TestCase
     public function testDeprecatedObject()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DeprecatedObjectTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/DogTest.php b/samples/client/petstore/php/psr-18/test/Model/DogTest.php
index fa202c7bca5d..41e2d8ebdad4 100644
--- a/samples/client/petstore/php/psr-18/test/Model/DogTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/DogTest.php
@@ -76,7 +76,7 @@ class DogTest extends TestCase
     public function testDog()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class DogTest extends TestCase
     public function testPropertyBreed()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/EnumArraysTest.php b/samples/client/petstore/php/psr-18/test/Model/EnumArraysTest.php
index f1e3ec08c5b9..aa99f21b5952 100644
--- a/samples/client/petstore/php/psr-18/test/Model/EnumArraysTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/EnumArraysTest.php
@@ -76,7 +76,7 @@ class EnumArraysTest extends TestCase
     public function testEnumArrays()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class EnumArraysTest extends TestCase
     public function testPropertyJustSymbol()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class EnumArraysTest extends TestCase
     public function testPropertyArrayEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/EnumClassTest.php b/samples/client/petstore/php/psr-18/test/Model/EnumClassTest.php
index d0fa5b429e0a..9a63b11e5346 100644
--- a/samples/client/petstore/php/psr-18/test/Model/EnumClassTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/EnumClassTest.php
@@ -76,6 +76,6 @@ class EnumClassTest extends TestCase
     public function testEnumClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/EnumTestTest.php b/samples/client/petstore/php/psr-18/test/Model/EnumTestTest.php
index 11184fd7b7de..853e73b67ac4 100644
--- a/samples/client/petstore/php/psr-18/test/Model/EnumTestTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/EnumTestTest.php
@@ -76,7 +76,7 @@ class EnumTestTest extends TestCase
     public function testEnumTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumStringRequired()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class EnumTestTest extends TestCase
     public function testPropertyEnumNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,6 +148,6 @@ class EnumTestTest extends TestCase
     public function testPropertyOuterEnumIntegerDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/FakeBigDecimalMap200ResponseTest.php b/samples/client/petstore/php/psr-18/test/Model/FakeBigDecimalMap200ResponseTest.php
index c3b6a2563baa..63439f46a9d0 100644
--- a/samples/client/petstore/php/psr-18/test/Model/FakeBigDecimalMap200ResponseTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/FakeBigDecimalMap200ResponseTest.php
@@ -76,7 +76,7 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testFakeBigDecimalMap200Response()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testPropertySomeId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class FakeBigDecimalMap200ResponseTest extends TestCase
     public function testPropertySomeMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/FileSchemaTestClassTest.php b/samples/client/petstore/php/psr-18/test/Model/FileSchemaTestClassTest.php
index 3edb986cc2bd..4351f64b3578 100644
--- a/samples/client/petstore/php/psr-18/test/Model/FileSchemaTestClassTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/FileSchemaTestClassTest.php
@@ -76,7 +76,7 @@ class FileSchemaTestClassTest extends TestCase
     public function testFileSchemaTestClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FileSchemaTestClassTest extends TestCase
     public function testPropertyFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class FileSchemaTestClassTest extends TestCase
     public function testPropertyFiles()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/FileTest.php b/samples/client/petstore/php/psr-18/test/Model/FileTest.php
index 4c069fb1dbfd..eb8ca4f2d106 100644
--- a/samples/client/petstore/php/psr-18/test/Model/FileTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/FileTest.php
@@ -76,7 +76,7 @@ class FileTest extends TestCase
     public function testFile()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FileTest extends TestCase
     public function testPropertySourceUri()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/FooGetDefaultResponseTest.php b/samples/client/petstore/php/psr-18/test/Model/FooGetDefaultResponseTest.php
index c0d10bf1f27f..f76c720e4a55 100644
--- a/samples/client/petstore/php/psr-18/test/Model/FooGetDefaultResponseTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/FooGetDefaultResponseTest.php
@@ -76,7 +76,7 @@ class FooGetDefaultResponseTest extends TestCase
     public function testFooGetDefaultResponse()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FooGetDefaultResponseTest extends TestCase
     public function testPropertyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/FooTest.php b/samples/client/petstore/php/psr-18/test/Model/FooTest.php
index d7c49ad509d2..b2a6c807ab17 100644
--- a/samples/client/petstore/php/psr-18/test/Model/FooTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/FooTest.php
@@ -76,7 +76,7 @@ class FooTest extends TestCase
     public function testFoo()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class FooTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/FormatTestTest.php b/samples/client/petstore/php/psr-18/test/Model/FormatTestTest.php
index b6ffd5b9ef10..296a4aaa9537 100644
--- a/samples/client/petstore/php/psr-18/test/Model/FormatTestTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/FormatTestTest.php
@@ -76,7 +76,7 @@ class FormatTestTest extends TestCase
     public function testFormatTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInt32()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class FormatTestTest extends TestCase
     public function testPropertyInt64()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class FormatTestTest extends TestCase
     public function testPropertyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class FormatTestTest extends TestCase
     public function testPropertyFloat()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDouble()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDecimal()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,7 +148,7 @@ class FormatTestTest extends TestCase
     public function testPropertyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -157,7 +157,7 @@ class FormatTestTest extends TestCase
     public function testPropertyByte()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -166,7 +166,7 @@ class FormatTestTest extends TestCase
     public function testPropertyBinary()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -175,7 +175,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -184,7 +184,7 @@ class FormatTestTest extends TestCase
     public function testPropertyDateTime()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -193,7 +193,7 @@ class FormatTestTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -202,7 +202,7 @@ class FormatTestTest extends TestCase
     public function testPropertyPassword()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -211,7 +211,7 @@ class FormatTestTest extends TestCase
     public function testPropertyPatternWithDigits()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -220,6 +220,6 @@ class FormatTestTest extends TestCase
     public function testPropertyPatternWithDigitsAndDelimiter()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/HasOnlyReadOnlyTest.php b/samples/client/petstore/php/psr-18/test/Model/HasOnlyReadOnlyTest.php
index 38e4a5353f43..c08dc5609c77 100644
--- a/samples/client/petstore/php/psr-18/test/Model/HasOnlyReadOnlyTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/HasOnlyReadOnlyTest.php
@@ -76,7 +76,7 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testHasOnlyReadOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class HasOnlyReadOnlyTest extends TestCase
     public function testPropertyFoo()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/HealthCheckResultTest.php b/samples/client/petstore/php/psr-18/test/Model/HealthCheckResultTest.php
index d98e45b46bdc..930fe240ed8a 100644
--- a/samples/client/petstore/php/psr-18/test/Model/HealthCheckResultTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/HealthCheckResultTest.php
@@ -76,7 +76,7 @@ class HealthCheckResultTest extends TestCase
     public function testHealthCheckResult()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class HealthCheckResultTest extends TestCase
     public function testPropertyNullableMessage()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/MapTestTest.php b/samples/client/petstore/php/psr-18/test/Model/MapTestTest.php
index 75d14ca692dc..c15b0fd42872 100644
--- a/samples/client/petstore/php/psr-18/test/Model/MapTestTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/MapTestTest.php
@@ -76,7 +76,7 @@ class MapTestTest extends TestCase
     public function testMapTest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class MapTestTest extends TestCase
     public function testPropertyMapMapOfString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class MapTestTest extends TestCase
     public function testPropertyMapOfEnumString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class MapTestTest extends TestCase
     public function testPropertyDirectMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class MapTestTest extends TestCase
     public function testPropertyIndirectMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php b/samples/client/petstore/php/psr-18/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
index 9f52ae0e12b0..6663f28c6dfe 100644
--- a/samples/client/petstore/php/psr-18/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/MixedPropertiesAndAdditionalPropertiesClassTest.php
@@ -76,7 +76,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testMixedPropertiesAndAdditionalPropertiesClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyDateTime()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class MixedPropertiesAndAdditionalPropertiesClassTest extends TestCase
     public function testPropertyMap()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/Model200ResponseTest.php b/samples/client/petstore/php/psr-18/test/Model/Model200ResponseTest.php
index 7af8e0a83144..ab2dd5ae1aa9 100644
--- a/samples/client/petstore/php/psr-18/test/Model/Model200ResponseTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/Model200ResponseTest.php
@@ -76,7 +76,7 @@ class Model200ResponseTest extends TestCase
     public function testModel200Response()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class Model200ResponseTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class Model200ResponseTest extends TestCase
     public function testPropertyClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ModelListTest.php b/samples/client/petstore/php/psr-18/test/Model/ModelListTest.php
index 92dd87610527..0abf86225faa 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ModelListTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ModelListTest.php
@@ -76,7 +76,7 @@ class ModelListTest extends TestCase
     public function testModelList()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ModelListTest extends TestCase
     public function testProperty123List()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ModelReturnTest.php b/samples/client/petstore/php/psr-18/test/Model/ModelReturnTest.php
index 365ab68ec21f..b1c010fe76b8 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ModelReturnTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ModelReturnTest.php
@@ -76,7 +76,7 @@ class ModelReturnTest extends TestCase
     public function testModelReturn()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class ModelReturnTest extends TestCase
     public function testPropertyReturn()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/NameTest.php b/samples/client/petstore/php/psr-18/test/Model/NameTest.php
index 48098e5146a5..1b503949370c 100644
--- a/samples/client/petstore/php/psr-18/test/Model/NameTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/NameTest.php
@@ -76,7 +76,7 @@ class NameTest extends TestCase
     public function testName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class NameTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class NameTest extends TestCase
     public function testPropertySnakeCase()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class NameTest extends TestCase
     public function testPropertyProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class NameTest extends TestCase
     public function testProperty123Number()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/NullableClassTest.php b/samples/client/petstore/php/psr-18/test/Model/NullableClassTest.php
index 4b5fb452aae1..176ac7e1259a 100644
--- a/samples/client/petstore/php/psr-18/test/Model/NullableClassTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/NullableClassTest.php
@@ -76,7 +76,7 @@ class NullableClassTest extends TestCase
     public function testNullableClass()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class NullableClassTest extends TestCase
     public function testPropertyIntegerProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class NullableClassTest extends TestCase
     public function testPropertyNumberProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class NullableClassTest extends TestCase
     public function testPropertyBooleanProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class NullableClassTest extends TestCase
     public function testPropertyStringProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class NullableClassTest extends TestCase
     public function testPropertyDateProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class NullableClassTest extends TestCase
     public function testPropertyDatetimeProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,7 +148,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayAndItemsNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -157,7 +157,7 @@ class NullableClassTest extends TestCase
     public function testPropertyArrayItemsNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -166,7 +166,7 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -175,7 +175,7 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectAndItemsNullableProp()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -184,6 +184,6 @@ class NullableClassTest extends TestCase
     public function testPropertyObjectItemsNullable()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/NumberOnlyTest.php b/samples/client/petstore/php/psr-18/test/Model/NumberOnlyTest.php
index 53b5ddfbc22b..47b21b7f5a72 100644
--- a/samples/client/petstore/php/psr-18/test/Model/NumberOnlyTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/NumberOnlyTest.php
@@ -76,7 +76,7 @@ class NumberOnlyTest extends TestCase
     public function testNumberOnly()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class NumberOnlyTest extends TestCase
     public function testPropertyJustNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ObjectWithDeprecatedFieldsTest.php b/samples/client/petstore/php/psr-18/test/Model/ObjectWithDeprecatedFieldsTest.php
index fb22b699154a..6676fce1e840 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ObjectWithDeprecatedFieldsTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ObjectWithDeprecatedFieldsTest.php
@@ -76,7 +76,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testObjectWithDeprecatedFields()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyUuid()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyDeprecatedRef()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class ObjectWithDeprecatedFieldsTest extends TestCase
     public function testPropertyBars()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OrderTest.php b/samples/client/petstore/php/psr-18/test/Model/OrderTest.php
index 989079cf600b..7b462a84240d 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OrderTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OrderTest.php
@@ -76,7 +76,7 @@ class OrderTest extends TestCase
     public function testOrder()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class OrderTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class OrderTest extends TestCase
     public function testPropertyPetId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class OrderTest extends TestCase
     public function testPropertyQuantity()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class OrderTest extends TestCase
     public function testPropertyShipDate()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class OrderTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class OrderTest extends TestCase
     public function testPropertyComplete()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OuterCompositeTest.php b/samples/client/petstore/php/psr-18/test/Model/OuterCompositeTest.php
index 1a85306b957e..1ba7ddfd532e 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OuterCompositeTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OuterCompositeTest.php
@@ -76,7 +76,7 @@ class OuterCompositeTest extends TestCase
     public function testOuterComposite()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyNumber()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyString()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,6 +103,6 @@ class OuterCompositeTest extends TestCase
     public function testPropertyMyBoolean()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OuterEnumDefaultValueTest.php b/samples/client/petstore/php/psr-18/test/Model/OuterEnumDefaultValueTest.php
index a483d1a8acaf..8d49246a231e 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OuterEnumDefaultValueTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OuterEnumDefaultValueTest.php
@@ -76,6 +76,6 @@ class OuterEnumDefaultValueTest extends TestCase
     public function testOuterEnumDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerDefaultValueTest.php b/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerDefaultValueTest.php
index 24fdc0abd5f1..ccfe76e7e360 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerDefaultValueTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerDefaultValueTest.php
@@ -76,6 +76,6 @@ class OuterEnumIntegerDefaultValueTest extends TestCase
     public function testOuterEnumIntegerDefaultValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerTest.php b/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerTest.php
index 21f1b805399f..41a52eaf7ccc 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OuterEnumIntegerTest.php
@@ -76,6 +76,6 @@ class OuterEnumIntegerTest extends TestCase
     public function testOuterEnumInteger()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OuterEnumTest.php b/samples/client/petstore/php/psr-18/test/Model/OuterEnumTest.php
index 1aac0edc58de..92161a25ec0c 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OuterEnumTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OuterEnumTest.php
@@ -76,6 +76,6 @@ class OuterEnumTest extends TestCase
     public function testOuterEnum()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/OuterObjectWithEnumPropertyTest.php b/samples/client/petstore/php/psr-18/test/Model/OuterObjectWithEnumPropertyTest.php
index e7fb1de841c8..830121ff2f33 100644
--- a/samples/client/petstore/php/psr-18/test/Model/OuterObjectWithEnumPropertyTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/OuterObjectWithEnumPropertyTest.php
@@ -76,7 +76,7 @@ class OuterObjectWithEnumPropertyTest extends TestCase
     public function testOuterObjectWithEnumProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class OuterObjectWithEnumPropertyTest extends TestCase
     public function testPropertyValue()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/PetTest.php b/samples/client/petstore/php/psr-18/test/Model/PetTest.php
index 42f7b31188b2..5ebf4bf5c559 100644
--- a/samples/client/petstore/php/psr-18/test/Model/PetTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/PetTest.php
@@ -76,7 +76,7 @@ class PetTest extends TestCase
     public function testPet()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class PetTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class PetTest extends TestCase
     public function testPropertyCategory()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class PetTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class PetTest extends TestCase
     public function testPropertyPhotoUrls()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class PetTest extends TestCase
     public function testPropertyTags()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,6 +130,6 @@ class PetTest extends TestCase
     public function testPropertyStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/PropertyNameMappingTest.php b/samples/client/petstore/php/psr-18/test/Model/PropertyNameMappingTest.php
index 58bcc7ad43e4..9f0037ad763c 100644
--- a/samples/client/petstore/php/psr-18/test/Model/PropertyNameMappingTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/PropertyNameMappingTest.php
@@ -76,7 +76,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyNameMapping()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyHttpDebugOperation()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyUnderscoreType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,6 +112,6 @@ class PropertyNameMappingTest extends TestCase
     public function testPropertyTypeWithUnderscore()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/ReadOnlyFirstTest.php b/samples/client/petstore/php/psr-18/test/Model/ReadOnlyFirstTest.php
index 5c7251f883f0..712317972ce5 100644
--- a/samples/client/petstore/php/psr-18/test/Model/ReadOnlyFirstTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/ReadOnlyFirstTest.php
@@ -76,7 +76,7 @@ class ReadOnlyFirstTest extends TestCase
     public function testReadOnlyFirst()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class ReadOnlyFirstTest extends TestCase
     public function testPropertyBar()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class ReadOnlyFirstTest extends TestCase
     public function testPropertyBaz()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/SingleRefTypeTest.php b/samples/client/petstore/php/psr-18/test/Model/SingleRefTypeTest.php
index 6c818589a473..2a7ad6b5bd9f 100644
--- a/samples/client/petstore/php/psr-18/test/Model/SingleRefTypeTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/SingleRefTypeTest.php
@@ -76,6 +76,6 @@ class SingleRefTypeTest extends TestCase
     public function testSingleRefType()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/SpecialModelNameTest.php b/samples/client/petstore/php/psr-18/test/Model/SpecialModelNameTest.php
index d899299fa70d..6a71585f7f9c 100644
--- a/samples/client/petstore/php/psr-18/test/Model/SpecialModelNameTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/SpecialModelNameTest.php
@@ -76,7 +76,7 @@ class SpecialModelNameTest extends TestCase
     public function testSpecialModelName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class SpecialModelNameTest extends TestCase
     public function testPropertySpecialPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/TagTest.php b/samples/client/petstore/php/psr-18/test/Model/TagTest.php
index c556931a9af9..a3cf97687a92 100644
--- a/samples/client/petstore/php/psr-18/test/Model/TagTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/TagTest.php
@@ -76,7 +76,7 @@ class TagTest extends TestCase
     public function testTag()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class TagTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,6 +94,6 @@ class TagTest extends TestCase
     public function testPropertyName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php b/samples/client/petstore/php/psr-18/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
index ce35b026ba97..43059adc83ec 100644
--- a/samples/client/petstore/php/psr-18/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/TestInlineFreeformAdditionalPropertiesRequestTest.php
@@ -76,7 +76,7 @@ class TestInlineFreeformAdditionalPropertiesRequestTest extends TestCase
     public function testTestInlineFreeformAdditionalPropertiesRequest()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,6 +85,6 @@ class TestInlineFreeformAdditionalPropertiesRequestTest extends TestCase
     public function testPropertySomeProperty()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/client/petstore/php/psr-18/test/Model/UserTest.php b/samples/client/petstore/php/psr-18/test/Model/UserTest.php
index ba51b0607232..3ddf40d669db 100644
--- a/samples/client/petstore/php/psr-18/test/Model/UserTest.php
+++ b/samples/client/petstore/php/psr-18/test/Model/UserTest.php
@@ -76,7 +76,7 @@ class UserTest extends TestCase
     public function testUser()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -85,7 +85,7 @@ class UserTest extends TestCase
     public function testPropertyId()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -94,7 +94,7 @@ class UserTest extends TestCase
     public function testPropertyUsername()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -103,7 +103,7 @@ class UserTest extends TestCase
     public function testPropertyFirstName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -112,7 +112,7 @@ class UserTest extends TestCase
     public function testPropertyLastName()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -121,7 +121,7 @@ class UserTest extends TestCase
     public function testPropertyEmail()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -130,7 +130,7 @@ class UserTest extends TestCase
     public function testPropertyPassword()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -139,7 +139,7 @@ class UserTest extends TestCase
     public function testPropertyPhone()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 
     /**
@@ -148,6 +148,6 @@ class UserTest extends TestCase
     public function testPropertyUserStatus()
     {
         // TODO: implement
-        $this->markTestIncomplete('Not implemented');
+        self::markTestIncomplete('Not implemented');
     }
 }
diff --git a/samples/server/petstore/php-slim4/tests/Api/PetApiTest.php b/samples/server/petstore/php-slim4/tests/Api/PetApiTest.php
index 57f84475b105..6d7909b7e951 100644
--- a/samples/server/petstore/php-slim4/tests/Api/PetApiTest.php
+++ b/samples/server/petstore/php-slim4/tests/Api/PetApiTest.php
@@ -74,7 +74,7 @@ class PetApiTest extends TestCase
      */
     public function testAddPet()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "addPet" method has not been implemented yet.'
         );
     }
@@ -88,7 +88,7 @@ class PetApiTest extends TestCase
      */
     public function testDeletePet()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "deletePet" method has not been implemented yet.'
         );
     }
@@ -102,7 +102,7 @@ class PetApiTest extends TestCase
      */
     public function testFindPetsByStatus()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "findPetsByStatus" method has not been implemented yet.'
         );
     }
@@ -116,7 +116,7 @@ class PetApiTest extends TestCase
      */
     public function testFindPetsByTags()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "findPetsByTags" method has not been implemented yet.'
         );
     }
@@ -130,7 +130,7 @@ class PetApiTest extends TestCase
      */
     public function testGetPetById()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "getPetById" method has not been implemented yet.'
         );
     }
@@ -144,7 +144,7 @@ class PetApiTest extends TestCase
      */
     public function testUpdatePet()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "updatePet" method has not been implemented yet.'
         );
     }
@@ -158,7 +158,7 @@ class PetApiTest extends TestCase
      */
     public function testUpdatePetWithForm()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "updatePetWithForm" method has not been implemented yet.'
         );
     }
@@ -172,7 +172,7 @@ class PetApiTest extends TestCase
      */
     public function testUploadFile()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "uploadFile" method has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Api/StoreApiTest.php b/samples/server/petstore/php-slim4/tests/Api/StoreApiTest.php
index 6bbf53f33a4f..10d9a2a8b89c 100644
--- a/samples/server/petstore/php-slim4/tests/Api/StoreApiTest.php
+++ b/samples/server/petstore/php-slim4/tests/Api/StoreApiTest.php
@@ -74,7 +74,7 @@ class StoreApiTest extends TestCase
      */
     public function testDeleteOrder()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "deleteOrder" method has not been implemented yet.'
         );
     }
@@ -88,7 +88,7 @@ class StoreApiTest extends TestCase
      */
     public function testGetInventory()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "getInventory" method has not been implemented yet.'
         );
     }
@@ -102,7 +102,7 @@ class StoreApiTest extends TestCase
      */
     public function testGetOrderById()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "getOrderById" method has not been implemented yet.'
         );
     }
@@ -116,7 +116,7 @@ class StoreApiTest extends TestCase
      */
     public function testPlaceOrder()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "placeOrder" method has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Api/UserApiTest.php b/samples/server/petstore/php-slim4/tests/Api/UserApiTest.php
index 2b22f5a59f50..84d7b6433fb9 100644
--- a/samples/server/petstore/php-slim4/tests/Api/UserApiTest.php
+++ b/samples/server/petstore/php-slim4/tests/Api/UserApiTest.php
@@ -74,7 +74,7 @@ class UserApiTest extends TestCase
      */
     public function testCreateUser()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "createUser" method has not been implemented yet.'
         );
     }
@@ -88,7 +88,7 @@ class UserApiTest extends TestCase
      */
     public function testCreateUsersWithArrayInput()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "createUsersWithArrayInput" method has not been implemented yet.'
         );
     }
@@ -102,7 +102,7 @@ class UserApiTest extends TestCase
      */
     public function testCreateUsersWithListInput()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "createUsersWithListInput" method has not been implemented yet.'
         );
     }
@@ -116,7 +116,7 @@ class UserApiTest extends TestCase
      */
     public function testDeleteUser()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "deleteUser" method has not been implemented yet.'
         );
     }
@@ -130,7 +130,7 @@ class UserApiTest extends TestCase
      */
     public function testGetUserByName()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "getUserByName" method has not been implemented yet.'
         );
     }
@@ -144,7 +144,7 @@ class UserApiTest extends TestCase
      */
     public function testLoginUser()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "loginUser" method has not been implemented yet.'
         );
     }
@@ -158,7 +158,7 @@ class UserApiTest extends TestCase
      */
     public function testLogoutUser()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "logoutUser" method has not been implemented yet.'
         );
     }
@@ -172,7 +172,7 @@ class UserApiTest extends TestCase
      */
     public function testUpdateUser()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "updateUser" method has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Model/ApiResponseTest.php b/samples/server/petstore/php-slim4/tests/Model/ApiResponseTest.php
index 512c9d55aecd..20534f17a0cf 100644
--- a/samples/server/petstore/php-slim4/tests/Model/ApiResponseTest.php
+++ b/samples/server/petstore/php-slim4/tests/Model/ApiResponseTest.php
@@ -77,7 +77,7 @@ class ApiResponseTest extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "ApiResponse" model has not been implemented yet.'
         );
     }
@@ -87,7 +87,7 @@ class ApiResponseTest extends TestCase
      */
     public function testPropertyCode()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "code" property in "ApiResponse" model has not been implemented yet.'
         );
     }
@@ -97,7 +97,7 @@ class ApiResponseTest extends TestCase
      */
     public function testPropertyType()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "type" property in "ApiResponse" model has not been implemented yet.'
         );
     }
@@ -107,7 +107,7 @@ class ApiResponseTest extends TestCase
      */
     public function testPropertyMessage()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "message" property in "ApiResponse" model has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Model/CategoryTest.php b/samples/server/petstore/php-slim4/tests/Model/CategoryTest.php
index c97b1ce83394..558e3b094c7a 100644
--- a/samples/server/petstore/php-slim4/tests/Model/CategoryTest.php
+++ b/samples/server/petstore/php-slim4/tests/Model/CategoryTest.php
@@ -77,7 +77,7 @@ class CategoryTest extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "Category" model has not been implemented yet.'
         );
     }
@@ -87,7 +87,7 @@ class CategoryTest extends TestCase
      */
     public function testPropertyId()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "id" property in "Category" model has not been implemented yet.'
         );
     }
@@ -97,7 +97,7 @@ class CategoryTest extends TestCase
      */
     public function testPropertyName()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "name" property in "Category" model has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Model/OrderTest.php b/samples/server/petstore/php-slim4/tests/Model/OrderTest.php
index 552653291935..9003833b6307 100644
--- a/samples/server/petstore/php-slim4/tests/Model/OrderTest.php
+++ b/samples/server/petstore/php-slim4/tests/Model/OrderTest.php
@@ -77,7 +77,7 @@ class OrderTest extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "Order" model has not been implemented yet.'
         );
     }
@@ -87,7 +87,7 @@ class OrderTest extends TestCase
      */
     public function testPropertyId()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "id" property in "Order" model has not been implemented yet.'
         );
     }
@@ -97,7 +97,7 @@ class OrderTest extends TestCase
      */
     public function testPropertyPetId()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "petId" property in "Order" model has not been implemented yet.'
         );
     }
@@ -107,7 +107,7 @@ class OrderTest extends TestCase
      */
     public function testPropertyQuantity()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "quantity" property in "Order" model has not been implemented yet.'
         );
     }
@@ -117,7 +117,7 @@ class OrderTest extends TestCase
      */
     public function testPropertyShipDate()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "shipDate" property in "Order" model has not been implemented yet.'
         );
     }
@@ -127,7 +127,7 @@ class OrderTest extends TestCase
      */
     public function testPropertyStatus()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "status" property in "Order" model has not been implemented yet.'
         );
     }
@@ -137,7 +137,7 @@ class OrderTest extends TestCase
      */
     public function testPropertyComplete()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "complete" property in "Order" model has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Model/PetTest.php b/samples/server/petstore/php-slim4/tests/Model/PetTest.php
index c7fcbb8251a5..839423bfcc7a 100644
--- a/samples/server/petstore/php-slim4/tests/Model/PetTest.php
+++ b/samples/server/petstore/php-slim4/tests/Model/PetTest.php
@@ -77,7 +77,7 @@ class PetTest extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "Pet" model has not been implemented yet.'
         );
     }
@@ -87,7 +87,7 @@ class PetTest extends TestCase
      */
     public function testPropertyId()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "id" property in "Pet" model has not been implemented yet.'
         );
     }
@@ -97,7 +97,7 @@ class PetTest extends TestCase
      */
     public function testPropertyCategory()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "category" property in "Pet" model has not been implemented yet.'
         );
     }
@@ -107,7 +107,7 @@ class PetTest extends TestCase
      */
     public function testPropertyName()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "name" property in "Pet" model has not been implemented yet.'
         );
     }
@@ -117,7 +117,7 @@ class PetTest extends TestCase
      */
     public function testPropertyPhotoUrls()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "photoUrls" property in "Pet" model has not been implemented yet.'
         );
     }
@@ -127,7 +127,7 @@ class PetTest extends TestCase
      */
     public function testPropertyTags()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "tags" property in "Pet" model has not been implemented yet.'
         );
     }
@@ -137,7 +137,7 @@ class PetTest extends TestCase
      */
     public function testPropertyStatus()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "status" property in "Pet" model has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Model/TagTest.php b/samples/server/petstore/php-slim4/tests/Model/TagTest.php
index a5b8e1355c49..880a4436baa9 100644
--- a/samples/server/petstore/php-slim4/tests/Model/TagTest.php
+++ b/samples/server/petstore/php-slim4/tests/Model/TagTest.php
@@ -77,7 +77,7 @@ class TagTest extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "Tag" model has not been implemented yet.'
         );
     }
@@ -87,7 +87,7 @@ class TagTest extends TestCase
      */
     public function testPropertyId()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "id" property in "Tag" model has not been implemented yet.'
         );
     }
@@ -97,7 +97,7 @@ class TagTest extends TestCase
      */
     public function testPropertyName()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "name" property in "Tag" model has not been implemented yet.'
         );
     }
diff --git a/samples/server/petstore/php-slim4/tests/Model/UserTest.php b/samples/server/petstore/php-slim4/tests/Model/UserTest.php
index 3146ca6f62e2..606a0bd29b45 100644
--- a/samples/server/petstore/php-slim4/tests/Model/UserTest.php
+++ b/samples/server/petstore/php-slim4/tests/Model/UserTest.php
@@ -77,7 +77,7 @@ class UserTest extends TestCase
             class_exists($namespacedClassname),
             sprintf('Assertion failed that "%s" class exists', $namespacedClassname)
         );
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "User" model has not been implemented yet.'
         );
     }
@@ -87,7 +87,7 @@ class UserTest extends TestCase
      */
     public function testPropertyId()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "id" property in "User" model has not been implemented yet.'
         );
     }
@@ -97,7 +97,7 @@ class UserTest extends TestCase
      */
     public function testPropertyUsername()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "username" property in "User" model has not been implemented yet.'
         );
     }
@@ -107,7 +107,7 @@ class UserTest extends TestCase
      */
     public function testPropertyFirstName()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "firstName" property in "User" model has not been implemented yet.'
         );
     }
@@ -117,7 +117,7 @@ class UserTest extends TestCase
      */
     public function testPropertyLastName()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "lastName" property in "User" model has not been implemented yet.'
         );
     }
@@ -127,7 +127,7 @@ class UserTest extends TestCase
      */
     public function testPropertyEmail()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "email" property in "User" model has not been implemented yet.'
         );
     }
@@ -137,7 +137,7 @@ class UserTest extends TestCase
      */
     public function testPropertyPassword()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "password" property in "User" model has not been implemented yet.'
         );
     }
@@ -147,7 +147,7 @@ class UserTest extends TestCase
      */
     public function testPropertyPhone()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "phone" property in "User" model has not been implemented yet.'
         );
     }
@@ -157,7 +157,7 @@ class UserTest extends TestCase
      */
     public function testPropertyUserStatus()
     {
-        $this->markTestIncomplete(
+        self::markTestIncomplete(
             'Test of "userStatus" property in "User" model has not been implemented yet.'
         );
     }