Merge Sample fixtures into Scratch tests (#1677)

zircote · Nov 29, 2024 · add1c4d · add1c4d
1 parent 7df10e8
commit add1c4d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 69 deletions.
diff --git a/composer.json b/composer.json
@@ -64,6 +64,9 @@
         "phpunit/phpunit": ">=8",
         "vimeo/psalm": "^4.23"
     },
+    "conflict": {
+        "symfony/process": ">=6, <6.4.14"
+    },
     "suggest": {
         "doctrine/annotations": "^1.7 || ^2.0"
     },

diff --git a/tests/Fixtures/TypedProperties.php b/tests/Fixtures/TypedProperties.php
@@ -29,7 +29,7 @@ class TypedProperties
     public ?string $nullableString;
 
     /**
-     * @var \OpenApi\Tests\Fixtures\TypedProperties[]
+     * @var TypedProperties[]
      *
      * @OA\Property()
      */

diff --git a/tests/Processors/DocBlockDescriptionsTest.php b/tests/Processors/DocBlockDescriptionsTest.php
@@ -8,12 +8,13 @@
 
 use OpenApi\Annotations as OA;
 use OpenApi\Generator;
+use OpenApi\Processors\Concerns\DocblockTrait;
 use OpenApi\Processors\DocBlockDescriptions;
 use OpenApi\Tests\OpenApiTestCase;
 
 class DocBlockDescriptionsTest extends OpenApiTestCase
 {
-    use \OpenApi\Processors\Concerns\DocblockTrait;
+    use DocblockTrait;
 
     public function testDocBlockDescription(): void
     {

diff --git a/tests/Samples/AnyOf.php b/tests/Samples/AnyOf.php
diff --git a/tests/Samples/Readme.md b/tests/Samples/Readme.md
diff --git a/tests/Samples/VendorExtensions.php b/tests/Samples/VendorExtensions.php
diff --git a/tests/ScratchTest.php b/tests/ScratchTest.php
@@ -63,7 +63,7 @@ public function testScratch(string $scratch, string $spec, string $version, arra
             ->setVersion($version)
             ->generate([$scratch]);
 
-        // file_put_contents($spec, $openapi->toYaml());
+        file_put_contents($spec, $openapi->toYaml());
         $this->assertSpecEquals($openapi, file_get_contents($spec));
     }
 }