Skip to content

Use ArrayNodeDefinition::acceptAndWrap #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: 5.5.x
Choose a base branch
from
Draft

Use ArrayNodeDefinition::acceptAndWrap #921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 40 additions & 80 deletions src/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
$this->addResolveTargetDocumentsSection($rootNode);
$this->addTypesSection($rootNode);

$rootNode

Check failure on line 42 in src/DependencyInjection/Configuration.php

View workflow job for this annotation

GitHub Actions / static-analysis / PHPStan (PHP: 8.4) 

Ignored error pattern #^Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition\:\:children\(\)\.$# (method.notFound) in path /home/runner/work/DoctrineMongoDBBundle/DoctrineMongoDBBundle/src/DependencyInjection/Configuration.php is expected to occur 2 times, but occurred only 1 time.
->children()
->scalarNode('proxy_namespace')->defaultValue('MongoDBODMProxies')->end()
->scalarNode('proxy_dir')->defaultValue('%kernel.cache_dir%/doctrine/odm/mongodb/Proxies')->end()
Expand All @@ -53,40 +53,22 @@
->scalarNode('auto_generate_proxy_classes')
->defaultValue(ODMConfiguration::AUTOGENERATE_EVAL)
->beforeNormalization()
->always(static function ($v) {
if ($v === false) {
return ODMConfiguration::AUTOGENERATE_EVAL;
}

if ($v === true) {
return ODMConfiguration::AUTOGENERATE_FILE_NOT_EXISTS;
}

return $v;
})
->ifTrue()->then(static fn ($v) => ODMConfiguration::AUTOGENERATE_FILE_NOT_EXISTS)
->ifFalse()->then(static fn ($v) => ODMConfiguration::AUTOGENERATE_NEVER)
->end()
->end()
->scalarNode('hydrator_namespace')->defaultValue('Hydrators')->end()
->scalarNode('hydrator_dir')->defaultValue('%kernel.cache_dir%/doctrine/odm/mongodb/Hydrators')->end()
->scalarNode('auto_generate_hydrator_classes')
->defaultValue(ODMConfiguration::AUTOGENERATE_NEVER)
->beforeNormalization()
->always(static function ($v) {
if ($v === false) {
return ODMConfiguration::AUTOGENERATE_NEVER;
}

if ($v === true) {
return ODMConfiguration::AUTOGENERATE_ALWAYS;
}

return $v;
})
->ifTrue()->then(static fn ($v) => ODMConfiguration::AUTOGENERATE_ALWAYS)
->ifFalse()->then(static fn ($v) => ODMConfiguration::AUTOGENERATE_NEVER)
->end()
->end()
->scalarNode('persistent_collection_namespace')->defaultValue('PersistentCollections')->end()
->scalarNode('persistent_collection_dir')->defaultValue('%kernel.cache_dir%/doctrine/odm/mongodb/PersistentCollections')->end()
->scalarNode('auto_generate_persistent_collection_classes')->defaultValue(ODMConfiguration::AUTOGENERATE_NEVER)->end()
->integerNode('auto_generate_persistent_collection_classes')->defaultValue(ODMConfiguration::AUTOGENERATE_NEVER)->end()
->scalarNode('default_document_manager')->end()
->scalarNode('default_connection')->end()
->scalarNode('default_database')->defaultValue('default')->end()
Expand Down Expand Up @@ -149,20 +131,15 @@
->useAttributeAsKey('name')
->prototype('array')
->fixXmlConfig('parameter')
->beforeNormalization()
->ifString()
->then(static function ($v) {
return ['class' => $v];
})
->end()
->acceptAndWrap(['string'], 'class')
->beforeNormalization()
// The content of the XML node is returned as the "value" key so we need to rename it
->ifTrue(static function ($v): bool {
return is_array($v) && isset($v['value']);
})
->ifArray()
->then(static function ($v) {
$v['class'] = $v['value'];
unset($v['value']);
if (isset($v['value']) && ! isset($v['class'])) {
$v['class'] = $v['value'];
unset($v['value']);
}

return $v;
})
Expand All @@ -175,13 +152,15 @@
->useAttributeAsKey('name')
->prototype('variable')
->beforeNormalization()
// Detect JSON object and array syntax (for XML)
->ifTrue(static function ($v): bool {
return is_string($v) && (preg_match('/\[.*\]/', $v) || preg_match('/\{.*\}/', $v));
})
// Decode objects to associative arrays for consistency with YAML
->ifString()
->then(static function ($v) {
return json_decode($v, true);
// Detect JSON object and array syntax (for XML)
// Decode objects to associative arrays for consistency with YAML
if (is_string($v) && (preg_match('/\[.*\]/', $v) || preg_match('/\{.*\}/', $v))) {
return json_decode($v, true);
}

return $v;
})
->end()
->end()
Expand All @@ -191,12 +170,7 @@
->end()
->arrayNode('metadata_cache_driver')
->addDefaultsIfNotSet()
->beforeNormalization()
->ifString()
->then(static function ($v) {
return ['type' => $v];
})
->end()
->acceptAndWrap(['string'], 'type')
->children()
->scalarNode('type')->defaultValue('array')->end()
->scalarNode('class')->end()
Expand All @@ -214,12 +188,7 @@
->arrayNode('mappings')
->useAttributeAsKey('name')
->prototype('array')
->beforeNormalization()
->ifString()
->then(static function ($v) {
return ['type' => $v];
})
->end()
->acceptAndWrap(['string'], 'type')
->treatNullLike([])
->treatFalseLike(['mapping' => false])
->performNoDeepMerging()
Expand Down Expand Up @@ -276,17 +245,18 @@
->performNoDeepMerging()
->prototype('array')
->beforeNormalization()
// Handle readPreferenceTag XML nodes
->ifTrue(static function ($v): bool {
return isset($v['readPreferenceTag']);
})
->ifArray()
->then(static function ($v) {
// Equivalent of fixXmlConfig() for inner node
if (isset($v['readPreferenceTag']['name'])) {
$v['readPreferenceTag'] = [$v['readPreferenceTag']];
return [$v['readPreferenceTag']];
}

if (isset($v['readPreferenceTag'])) {
return $v['readPreferenceTag'];
}

return $v['readPreferenceTag'];
return $v;
})
->end()
->useAttributeAsKey('name')
Expand Down Expand Up @@ -323,11 +293,11 @@
->integerNode('wTimeoutMS')->end()
->end()
->validate()
->ifTrue(static function ($v): bool {
return count($v['readPreferenceTags']) === 0;
})
->ifArray()
->then(static function ($v) {
unset($v['readPreferenceTags']);
if (! $v['readPreferenceTags']) {
unset($v['readPreferenceTags']);
}

return $v;
})
Expand Down Expand Up @@ -399,16 +369,12 @@
->arrayNode('encryptedFieldsMap')
->useAttributeAsKey('name', false)
->beforeNormalization()
->always(static function ($v) {
// Create a PHP array representation of the Extended BSON that is later
// converted to JSON string to create a BSON document from this JSON.
// This lets the DI dumper transform the parameters in the string and dump it.
if (is_string($v)) {
return json_decode($v, true, 512, JSON_THROW_ON_ERROR);
}

return $v;
})->end()
->ifString()
// Create a PHP array representation of the Extended BSON that is later
// converted to JSON string to create a BSON document from this JSON.
// This lets the DI dumper transform the parameters in the string and dump it.
->then(static fn ($v) => json_decode($v, true, 512, JSON_THROW_ON_ERROR))
->end()
->prototype('array')
->children()
->arrayNode('fields')
Expand Down Expand Up @@ -440,10 +406,7 @@
->booleanNode('mongocryptdBypassSpawn')->end()
->scalarNode('mongocryptdSpawnPath')->end()
->arrayNode('mongocryptdSpawnArgs')
->beforeNormalization()
->ifString()
->then(static fn ($v) => [$v])
->end()
->acceptAndWrap(['string'])
->prototype('scalar')->cannotBeEmpty()->end()
->end()
->scalarNode('cryptSharedLibPath')->end()
Expand Down Expand Up @@ -511,16 +474,13 @@
*/
private function addTypesSection(ArrayNodeDefinition $rootNode): void
{
$rootNode

Check failure on line 477 in src/DependencyInjection/Configuration.php

View workflow job for this annotation

GitHub Actions / static-analysis / PHPStan (PHP: 8.4) 

Call to an undefined method Symfony\Component\Config\Definition\Builder\NodeDefinition::acceptAndWrap().
->fixXmlConfig('type')
->children()
->arrayNode('types')
->useAttributeAsKey('name')
->prototype('array')
->beforeNormalization()
->ifString()
->then(static fn ($v) => ['class' => $v])
->end()
->acceptAndWrap(['string'], 'class')
->children()
->scalarNode('class')->isRequired()->end()
->end()
Expand Down
Loading