Update deps + use ::class for UsesClass

marcelthole · Jul 23, 2024 · 576dd23 · 576dd23
1 parent e8b7526
commit 576dd23
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
   "require-dev": {
     "doctrine/coding-standard": "^12.0.0",
     "infection/infection": "^0.29.6",
-    "phpstan/phpstan": "^1.10.58",
-    "phpstan/phpstan-phpunit": "^1.3.15",
+    "phpstan/phpstan": "^1.11.0",
+    "phpstan/phpstan-phpunit": "^1.4.0",
     "phpunit/phpunit": "^10.1 || ^11.0",
     "roave/security-advisories": "dev-master"
   },

diff --git a/tests/Console/Command/MergeCommandTest.php b/tests/Console/Command/MergeCommandTest.php
@@ -27,8 +27,8 @@
 use const PHP_EOL;
 
 #[CoversClass(MergeCommand::class)]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\SpecificationFile')]
+#[UsesClass(File::class)]
+#[UsesClass(SpecificationFile::class)]
 class MergeCommandTest extends TestCase
 {
     #[DataProvider('invalidArgumentsDataProvider')]

diff --git a/tests/FileHandling/FileTest.php b/tests/FileHandling/FileTest.php
@@ -16,7 +16,7 @@
 use function str_replace;
 
 #[CoversClass(File::class)]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\Exception\IOException')]
+#[UsesClass(IOException::class)]
 class FileTest extends TestCase
 {
     #[DataProvider('fileExtensionProvider')]

diff --git a/tests/FileHandling/SpecificationFileTest.php b/tests/FileHandling/SpecificationFileTest.php
@@ -12,7 +12,7 @@
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(SpecificationFile::class)]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
+#[UsesClass(File::class)]
 class SpecificationFileTest extends TestCase
 {
     public function testGetter(): void

diff --git a/tests/Merge/ComponentsMergerTest.php b/tests/Merge/ComponentsMergerTest.php
@@ -5,6 +5,7 @@
 namespace Merge;
 
 use Mthole\OpenApiMerge\Merge\ComponentsMerger;
+use Mthole\OpenApiMerge\Util\Json;
 use openapiphp\openapi\spec\Components;
 use openapiphp\openapi\spec\OpenApi;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -13,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(ComponentsMerger::class)]
-#[UsesClass('\Mthole\OpenApiMerge\Util\Json')]
+#[UsesClass(Json::class)]
 class ComponentsMergerTest extends TestCase
 {
     #[DataProvider('mergeDataProvider')]

diff --git a/tests/Merge/PathMergerTest.php b/tests/Merge/PathMergerTest.php
@@ -5,6 +5,7 @@
 namespace Mthole\OpenApiMerge\Tests\Merge;
 
 use Mthole\OpenApiMerge\Merge\PathMerger;
+use Mthole\OpenApiMerge\Util\Json;
 use openapiphp\openapi\spec\OpenApi;
 use openapiphp\openapi\spec\PathItem;
 use openapiphp\openapi\spec\Paths;
@@ -16,7 +17,7 @@
 use function array_keys;
 
 #[CoversClass(PathMerger::class)]
-#[UsesClass('\Mthole\OpenApiMerge\Util\Json')]
+#[UsesClass(Json::class)]
 class PathMergerTest extends TestCase
 {
     public function testMergeDidNotChangeOriginals(): void

diff --git a/tests/Merge/ReferenceNormalizerTest.php b/tests/Merge/ReferenceNormalizerTest.php
@@ -4,10 +4,13 @@
 
 namespace Mthole\OpenApiMerge\Tests\Merge;
 
+use Mthole\OpenApiMerge\FileHandling\Exception\IOException;
 use Mthole\OpenApiMerge\FileHandling\File;
+use Mthole\OpenApiMerge\FileHandling\SpecificationFile;
 use Mthole\OpenApiMerge\Merge\ReferenceNormalizer;
 use Mthole\OpenApiMerge\Merge\ReferenceResolverResult;
 use Mthole\OpenApiMerge\Reader\FileReader;
+use Mthole\OpenApiMerge\Reader\OpenApiReaderWrapper;
 use openapiphp\openapi\Writer;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
@@ -18,11 +21,11 @@
 
 #[CoversClass(ReferenceNormalizer::class)]
 #[CoversClass(ReferenceResolverResult::class)]
-#[UsesClass('\Mthole\OpenApiMerge\Reader\FileReader')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\SpecificationFile')]
-#[UsesClass('\Mthole\OpenApiMerge\Reader\OpenApiReaderWrapper')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\Exception\IOException')]
+#[UsesClass(FileReader::class)]
+#[UsesClass(File::class)]
+#[UsesClass(SpecificationFile::class)]
+#[UsesClass(OpenApiReaderWrapper::class)]
+#[UsesClass(IOException::class)]
 class ReferenceNormalizerTest extends TestCase
 {
     public function testReadFileWithResolvedReference(): void

diff --git a/tests/Merge/SecurityPathMergerTest.php b/tests/Merge/SecurityPathMergerTest.php
@@ -5,14 +5,15 @@
 namespace Merge;
 
 use Mthole\OpenApiMerge\Merge\SecurityPathMerger;
+use Mthole\OpenApiMerge\Util\Json;
 use openapiphp\openapi\spec\OpenApi;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(SecurityPathMerger::class)]
-#[UsesClass('\Mthole\OpenApiMerge\Util\Json')]
+#[UsesClass(Json::class)]
 class SecurityPathMergerTest extends TestCase
 {
     #[DataProvider('mergeDataProvider')]

diff --git a/tests/OpenApiMergeTest.php b/tests/OpenApiMergeTest.php
@@ -5,12 +5,15 @@
 namespace Mthole\OpenApiMerge\Tests;
 
 use Mthole\OpenApiMerge\FileHandling\File;
+use Mthole\OpenApiMerge\FileHandling\SpecificationFile;
 use Mthole\OpenApiMerge\Merge\ComponentsMerger;
 use Mthole\OpenApiMerge\Merge\PathMerger;
 use Mthole\OpenApiMerge\Merge\ReferenceNormalizer;
 use Mthole\OpenApiMerge\Merge\ReferenceResolverResult;
 use Mthole\OpenApiMerge\OpenApiMerge;
 use Mthole\OpenApiMerge\Reader\FileReader;
+use Mthole\OpenApiMerge\Reader\OpenApiReaderWrapper;
+use Mthole\OpenApiMerge\Util\Json;
 use openapiphp\openapi\spec\Components;
 use openapiphp\openapi\spec\OpenApi;
 use PHPUnit\Framework\Attributes\CoversClass;
@@ -21,14 +24,14 @@
 use function assert;
 
 #[CoversClass(OpenApiMerge::class)]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\SpecificationFile')]
-#[UsesClass('\Mthole\OpenApiMerge\Reader\FileReader')]
-#[UsesClass('\Mthole\OpenApiMerge\Merge\PathMerger')]
-#[UsesClass('\Mthole\OpenApiMerge\Reader\OpenApiReaderWrapper')]
-#[UsesClass('\Mthole\OpenApiMerge\Merge\ReferenceResolverResult')]
-#[UsesClass('\Mthole\OpenApiMerge\Merge\ComponentsMerger')]
-#[UsesClass('\Mthole\OpenApiMerge\Util\Json')]
+#[UsesClass(File::class)]
+#[UsesClass(SpecificationFile::class)]
+#[UsesClass(FileReader::class)]
+#[UsesClass(PathMerger::class)]
+#[UsesClass(OpenApiReaderWrapper::class)]
+#[UsesClass(ReferenceResolverResult::class)]
+#[UsesClass(ComponentsMerger::class)]
+#[UsesClass(Json::class)]
 class OpenApiMergeTest extends TestCase
 {
     public function testMergePaths(): void

diff --git a/tests/Reader/FileReaderTest.php b/tests/Reader/FileReaderTest.php
@@ -7,6 +7,7 @@
 use Generator;
 use InvalidArgumentException;
 use Mthole\OpenApiMerge\FileHandling\File;
+use Mthole\OpenApiMerge\FileHandling\SpecificationFile;
 use Mthole\OpenApiMerge\Reader\Exception\InvalidFileTypeException;
 use Mthole\OpenApiMerge\Reader\FileReader;
 use Mthole\OpenApiMerge\Reader\OpenApiReaderWrapper;
@@ -17,10 +18,10 @@
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(FileReader::class)]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\SpecificationFile')]
-#[UsesClass('\Mthole\OpenApiMerge\Reader\Exception\InvalidFileTypeException')]
-#[UsesClass('\Mthole\OpenApiMerge\Reader\OpenApiReaderWrapper')]
+#[UsesClass(File::class)]
+#[UsesClass(SpecificationFile::class)]
+#[UsesClass(InvalidFileTypeException::class)]
+#[UsesClass(OpenApiReaderWrapper::class)]
 class FileReaderTest extends TestCase
 {
     #[DataProvider('validFilesDataProvider')]

diff --git a/tests/Writer/DefinitionWriterTest.php b/tests/Writer/DefinitionWriterTest.php
@@ -16,9 +16,9 @@
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(DefinitionWriter::class)]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
-#[UsesClass('\Mthole\OpenApiMerge\FileHandling\SpecificationFile')]
-#[UsesClass('\Mthole\OpenApiMerge\Writer\Exception\InvalidFileTypeException')]
+#[UsesClass(File::class)]
+#[UsesClass(SpecificationFile::class)]
+#[UsesClass(InvalidFileTypeException::class)]
 class DefinitionWriterTest extends TestCase
 {
     #[DataProvider('validSpecificationFiles')]