Fix merge conflicts

Author: DerManoMann

docs/examples/processors/schema-query-parameter/scan.php

@@ -23,13 +23,7 @@
 };
 
 $openapi = (new Generator())
-<<<<<<< HEAD
-    ->withProcessorPipeline(function (Pipeline $pipeline) use ($insertMatch) {
-        $pipeline->insert(new SchemaQueryParameter(), $insertMatch);
-    })
-=======
     ->withProcessorPipeline(fn (Pipeline $pipeline) => $pipeline->insert(new SchemaQueryParameter(), $insertMatch))
->>>>>>> 09610b2 (Add `Schema::hasType()` to encapsulate `string|array` duality of schema type (#1936))
     ->generate([__DIR__ . '/app']);
 // file_put_contents(__DIR__ . '/schema-query-parameter.yaml', $openapi->toYaml());
 echo $openapi->toYaml();

src/Annotations/Schema.php

@@ -515,21 +515,18 @@ public function isNullable(): bool
     }
 
     /**
-<<<<<<< HEAD
-     * @inheritdoc
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-=======
      * Check if the given type is valid for this schema.
      */
     public function hasType(string $type): bool
     {
         return in_array($type, (array) $this->type, true);
     }
 
-    public function jsonSerialize(): \stdClass
->>>>>>> 09610b2 (Add `Schema::hasType()` to encapsulate `string|array` duality of schema type (#1936))
+    /**
+     * @inheritdoc
+     */
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         $data = parent::jsonSerialize();
 

tests/Annotations/AttachableTest.php

@@ -33,15 +33,7 @@ public function testCustomAttachableImplementationsAreAttached(): void
             ->setTypeResolver($this->getTypeResolver())
             ->addAlias('oaf', 'OpenApi\Tests\Fixtures\Annotations')
             ->addNamespace('OpenApi\Tests\Fixtures\Annotations\\')
-<<<<<<< HEAD
-            ->withProcessorPipeline(function (Pipeline $processor) {
-                $processor->remove(null, function ($pipe) {
-                    return !$pipe instanceof CleanUnusedComponents;
-                });
-            })
-=======
             ->withProcessorPipeline(fn (Pipeline $processor) => $processor->remove(null, fn ($pipe) => !$pipe instanceof CleanUnusedComponents))
->>>>>>> 09610b2 (Add `Schema::hasType()` to encapsulate `string|array` duality of schema type (#1936))
             ->generate($this->fixtures(['UsingCustomAttachables.php']), $analysis);
 
         $schemas = $analysis->getAnnotationsOfType(OA\Schema::class, true);

tests/PipelineTest.php

@@ -71,13 +71,7 @@ public function testRemoveMatcher()
         $pipeline->add($this->pipe('d'));
         $this->assertEquals('cd', $pipeline->process(''));
 
-<<<<<<< HEAD
-        $pipeline->remove(null, function ($pipe) use ($pipec) {
-            return $pipe !== $pipec;
-        });
-=======
         $pipeline->remove(null, fn ($pipe) => $pipe !== $pipec);
->>>>>>> 09610b2 (Add `Schema::hasType()` to encapsulate `string|array` duality of schema type (#1936))
         $this->assertEquals('d', $pipeline->process(''));
     }
 
@@ -101,13 +95,7 @@ public function testInsertMatcher()
         $pipeline->add($this->pipe('z'));
         $this->assertEquals('xz', $pipeline->process(''));
 
-<<<<<<< HEAD
-        $pipeline->insert($this->pipe('y'), function ($pipes) {
-            return 1;
-        });
-=======
         $pipeline->insert($this->pipe('y'), fn ($pipes) => 1);
->>>>>>> 09610b2 (Add `Schema::hasType()` to encapsulate `string|array` duality of schema type (#1936))
         $this->assertEquals('xyz', $pipeline->process(''));
     }