OpenApi: moved to contributte/openapi

composer.json

@@ -23,6 +23,7 @@
     "ext-json": "*",
     "contributte/psr7-http-message": "^0.9.0 || ^0.10.0",
     "contributte/middlewares": "^0.11.0",
+    "contributte/openapi": "^0.1.0",
     "doctrine/annotations": "^1.14.3",
     "koriym/attributes": "^1.0.5",
     "nette/utils": "^4.0.0"

phpstan.neon

@@ -45,8 +45,6 @@ parameters:
 		- message: '#.+(int|string|string\>)\|false.+#'
 		  path: %currentWorkingDirectory%/src/OpenApi/SchemaDefinition/Entity/EntityAdapter.php
 
-		- '#Property Apitte\\OpenApi\\Schema\\(\w+)::\$(\w+) is never read, only written.#'
-
 		# This should not happen because null is returned on error
 		- '#Method Apitte\\Core\\Utils\\Helpers::slashless\(\) should return string but returns string\|null\.#'
 

src/OpenApi/DI/OpenApiPlugin.php

@@ -12,8 +12,8 @@
 use Apitte\OpenApi\SchemaDefinition\JsonDefinition;
 use Apitte\OpenApi\SchemaDefinition\NeonDefinition;
 use Apitte\OpenApi\SchemaDefinition\YamlDefinition;
-use Apitte\OpenApi\Tracy\SwaggerUIPanel;
 use Contributte\DI\Helper\ExtensionDefinitionsHelper;
+use Contributte\OpenApi\Tracy\SwaggerPanel;
 use Nette\DI\Definitions\Definition;
 use Nette\DI\Definitions\Statement;
 use Nette\PhpGenerator\ClassType;
@@ -93,8 +93,9 @@ public function loadPluginConfiguration(): void
 		}
 
 		$builder->addDefinition($this->prefix('swaggerUi.panel'))
-			->setFactory(SwaggerUIPanel::class)
+			->setFactory(SwaggerPanel::class)
 			->addSetup('setUrl', [$config->swaggerUi->url])
+			->addSetup('?->setSpecCallback(fn() => ?)', ['@self', new Statement('@' . $this->prefix('schemaBuilder') . '::build')])
 			->addSetup('setExpansion', [$config->swaggerUi->expansion])
 			->addSetup('setFilter', [$config->swaggerUi->filter])
 			->addSetup('setTitle', [$config->swaggerUi->title])
@@ -129,7 +130,7 @@ protected function getConfigSchema(): Schema
 			'files' => Expect::arrayOf('string'),
 			'swaggerUi' => Expect::structure([
 				'url' => Expect::string()->nullable(),
-				'expansion' => Expect::anyOf(...SwaggerUIPanel::EXPANSIONS)->default(SwaggerUIPanel::EXPANSION_LIST),
+				'expansion' => Expect::anyOf(...SwaggerPanel::EXPANSIONS)->default(SwaggerPanel::EXPANSION_LIST),
 				'filter' => Expect::bool(true),
 				'title' => Expect::string('OpenAPI'),
 				'panel' => Expect::bool(false),

src/OpenApi/ISchemaBuilder.php

@@ -2,7 +2,7 @@
 
 namespace Apitte\OpenApi;
 
-use Apitte\OpenApi\Schema\OpenApi;
+use Contributte\OpenApi\Schema\OpenApi;
 
 interface ISchemaBuilder
 {