OpenApiPlugin: drop definition helper from contributte/di

contributte · Dec 15, 2023 · cb464d4 · cb464d4
1 parent 3e5066e
commit cb464d4
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/OpenApi/DI/OpenApiPlugin.php b/src/OpenApi/DI/OpenApiPlugin.php
@@ -12,9 +12,7 @@
 use Apitte\OpenApi\SchemaDefinition\JsonDefinition;
 use Apitte\OpenApi\SchemaDefinition\NeonDefinition;
 use Apitte\OpenApi\SchemaDefinition\YamlDefinition;
-use Contributte\DI\Helper\ExtensionDefinitionsHelper;
 use Contributte\OpenApi\Tracy\SwaggerPanel;
-use Nette\DI\Definitions\Definition;
 use Nette\DI\Definitions\Statement;
 use Nette\PhpGenerator\ClassType;
 use Nette\Schema\Expect;
@@ -40,7 +38,6 @@ public function loadPluginConfiguration(): void
  $builder = $this->getContainerBuilder();
  $global = $this->compiler->getExtension()->getConfig();
  $config = $this->config;
- $definitionHelper = new ExtensionDefinitionsHelper($this->compiler->getExtension()->getCompiler());
 
  $builder->addDefinition($this->prefix('entityAdapter'))
  ->setFactory(EntityAdapter::class);
@@ -73,14 +70,11 @@ public function loadPluginConfiguration(): void
  $schemaBuilder->addSetup('addDefinition', [new ArrayDefinition($config->definition)]);
  } else {
  foreach ($config->definitions as $definitionName => $definitionConfig) {
- $definitionPrefix = $this->prefix('definition.' . $definitionName);
- $definition = $definitionHelper->getDefinitionFromConfig($definitionConfig, $definitionPrefix);
+ $definitionDef = $builder->addDefinition($this->prefix('definition.' . $definitionName))
+ ->setFactory($definitionConfig)
+ ->setAutowired(false);
 
- if ($definition instanceof Definition) {
- $definition->setAutowired(false);
- }
-
- $schemaBuilder->addSetup('addDefinition', [$definition]);
+ $schemaBuilder->addSetup('addDefinition', [$definitionDef]);
  }
  }
 
@@ -125,7 +119,7 @@ public function afterPluginCompile(ClassType $class): void
  protected function getConfigSchema(): Schema
  {
  return Expect::structure([
- 'definitions' => Expect::arrayOf(Expect::type('string|array|' . Statement::class)),
+ 'definitions' => Expect::arrayOf(Expect::anyOf(Expect::string(), Expect::type(Statement::class))),
  'definition' => Expect::array(),
  'files' => Expect::arrayOf('string'),
  'swaggerUi' => Expect::structure([