From c7b007c704c2d351a0eac4e41da0e1f7ecb54d73 Mon Sep 17 00:00:00 2001 From: netkas Date: Thu, 19 Sep 2024 14:17:16 -0400 Subject: [PATCH] Refactor project constants handling in NccCompiler --- src/ncc/Classes/NccExtension/NccCompiler.php | 10 ++++++++-- src/ncc/Managers/ProjectManager.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ncc/Classes/NccExtension/NccCompiler.php b/src/ncc/Classes/NccExtension/NccCompiler.php index c079ddc..ea18d14 100644 --- a/src/ncc/Classes/NccExtension/NccCompiler.php +++ b/src/ncc/Classes/NccExtension/NccCompiler.php @@ -333,8 +333,7 @@ $metadata->addOptions($this->project_manager->getProjectConfiguration()->getBuild()->getOptions($build_configuration)); $metadata->addOptions($this->project_manager->getProjectConfiguration()->getProject()->getOptions()); - $metadata->addConstants($this->project_manager->getRuntimeConstants($build_configuration)); - $metadata->addConstants($this->project_manager->getRuntimeConstants()); + $metadata->addConstants($this->project_manager->getConstants($build_configuration)); $metadata->setUpdateSource($this->project_manager->getProjectConfiguration()->getProject()->getUpdateSource()); $metadata->setMainExecutionPolicy($this->project_manager->getProjectConfiguration()->getBuild()->getMain()); $metadata->setInstaller($this->project_manager->getProjectConfiguration()->getInstaller()); @@ -352,6 +351,13 @@ $metadata->removeOption(BuildConfigurationOptions::STATIC_DEPENDENCIES->value); } + $compiled_constants = []; + foreach($this->project_manager->getConstants() as $constant => $value) + { + $compiled_constants[$constant] = ConstantCompiler::compileConstants($this->project_manager->getProjectConfiguration(), $value); + } + + $metadata->addConstants($compiled_constants); /** @noinspection UnusedFunctionResultInspection */ $package_writer->setMetadata($metadata); diff --git a/src/ncc/Managers/ProjectManager.php b/src/ncc/Managers/ProjectManager.php index 58c2b82..5f09005 100644 --- a/src/ncc/Managers/ProjectManager.php +++ b/src/ncc/Managers/ProjectManager.php @@ -327,7 +327,7 @@ * @param string $build_configuration * @return array */ - public function getRuntimeConstants(string $build_configuration=BuildConfigurationValues::DEFAULT->value): array + public function getConstants(string $build_configuration=BuildConfigurationValues::DEFAULT->value): array { $configuration = $this->project_configuration->getBuild()->getBuildConfiguration($build_configuration); return array_merge($configuration->getDefineConstants(), $this->project_configuration->getBuild()->getDefineConstants());