diff --git a/src/Command/Config/ExportContentTypeCommand.php b/src/Command/Config/ExportContentTypeCommand.php index 8e7434713..732d4699e 100644 --- a/src/Command/Config/ExportContentTypeCommand.php +++ b/src/Command/Config/ExportContentTypeCommand.php @@ -128,7 +128,6 @@ protected function interact(InputInterface $input, OutputInterface $output) } $input->setOption('optional-config', $optionalConfig); - if (!$input->getOption('remove-uuid')) { $removeUuid = $this->getIo()->confirm( $this->trans('commands.config.export.content.type.questions.remove-uuid'), @@ -167,5 +166,4 @@ protected function execute(InputInterface $input, OutputInterface $output) ] ); } - } diff --git a/src/Command/Shared/ExportTrait.php b/src/Command/Shared/ExportTrait.php index 2d74e1a4c..ede1384fb 100644 --- a/src/Command/Shared/ExportTrait.php +++ b/src/Command/Shared/ExportTrait.php @@ -127,14 +127,15 @@ protected function fetchDependencies($config, $type = 'config') return null; } - protected function resolveDependencies($dependencies, $optional = false) + protected function resolveDependencies($dependencies, $optional = false, $uuid = false, $hash = false) { foreach ($dependencies as $dependency) { if (!array_key_exists($dependency, $this->configExport)) { $this->configExport[$dependency] = [ - 'data' => $this->getConfiguration($dependency), + 'data' => $this->getConfiguration($dependency, $uuid, $hash), 'optional' => $optional ]; + if ($dependencies = $this->fetchDependencies($this->configExport[$dependency], 'config')) { $this->resolveDependencies($dependencies, $optional); }