Skip to content

Commit cb464d4

Browse files
committed
OpenApiPlugin: drop definition helper from contributte/di
1 parent 3e5066e commit cb464d4

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/OpenApi/DI/OpenApiPlugin.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
use Apitte\OpenApi\SchemaDefinition\JsonDefinition;
1313
use Apitte\OpenApi\SchemaDefinition\NeonDefinition;
1414
use Apitte\OpenApi\SchemaDefinition\YamlDefinition;
15-
use Contributte\DI\Helper\ExtensionDefinitionsHelper;
1615
use Contributte\OpenApi\Tracy\SwaggerPanel;
17-
use Nette\DI\Definitions\Definition;
1816
use Nette\DI\Definitions\Statement;
1917
use Nette\PhpGenerator\ClassType;
2018
use Nette\Schema\Expect;
@@ -40,7 +38,6 @@ public function loadPluginConfiguration(): void
4038
$builder = $this->getContainerBuilder();
4139
$global = $this->compiler->getExtension()->getConfig();
4240
$config = $this->config;
43-
$definitionHelper = new ExtensionDefinitionsHelper($this->compiler->getExtension()->getCompiler());
4441

4542
$builder->addDefinition($this->prefix('entityAdapter'))
4643
->setFactory(EntityAdapter::class);
@@ -73,14 +70,11 @@ public function loadPluginConfiguration(): void
7370
$schemaBuilder->addSetup('addDefinition', [new ArrayDefinition($config->definition)]);
7471
} else {
7572
foreach ($config->definitions as $definitionName => $definitionConfig) {
76-
$definitionPrefix = $this->prefix('definition.' . $definitionName);
77-
$definition = $definitionHelper->getDefinitionFromConfig($definitionConfig, $definitionPrefix);
73+
$definitionDef = $builder->addDefinition($this->prefix('definition.' . $definitionName))
74+
->setFactory($definitionConfig)
75+
->setAutowired(false);
7876

79-
if ($definition instanceof Definition) {
80-
$definition->setAutowired(false);
81-
}
82-
83-
$schemaBuilder->addSetup('addDefinition', [$definition]);
77+
$schemaBuilder->addSetup('addDefinition', [$definitionDef]);
8478
}
8579
}
8680

@@ -125,7 +119,7 @@ public function afterPluginCompile(ClassType $class): void
125119
protected function getConfigSchema(): Schema
126120
{
127121
return Expect::structure([
128-
'definitions' => Expect::arrayOf(Expect::type('string|array|' . Statement::class)),
122+
'definitions' => Expect::arrayOf(Expect::anyOf(Expect::string(), Expect::type(Statement::class))),
129123
'definition' => Expect::array(),
130124
'files' => Expect::arrayOf('string'),
131125
'swaggerUi' => Expect::structure([

0 commit comments

Comments
 (0)