From d379956437ae10a9733190ec372f218efb0b65bd Mon Sep 17 00:00:00 2001 From: netkas Date: Sat, 14 Sep 2024 08:44:06 -0400 Subject: [PATCH] Convert ComponentDecodeOptions constants to enum cases --- src/ncc/Classes/Runtime.php | 2 +- src/ncc/Enums/Options/ComponentDecodeOptions.php | 4 ++-- src/ncc/Managers/PackageManager.php | 2 +- src/ncc/Objects/Package/Component.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ncc/Classes/Runtime.php b/src/ncc/Classes/Runtime.php index 2460c83..e14cda4 100644 --- a/src/ncc/Classes/Runtime.php +++ b/src/ncc/Classes/Runtime.php @@ -481,7 +481,7 @@ return match (Resolver::componentType($acquired_file)) { PackageDirectory::RESOURCES->value => self::$imported_packages[$package]->getResource(Resolver::componentName($acquired_file))->getData(), - PackageDirectory::COMPONENTS->value => self::$imported_packages[$package]->getComponent(Resolver::componentName($acquired_file))->getData([ComponentDecodeOptions::AS_FILE]), + PackageDirectory::COMPONENTS->value => self::$imported_packages[$package]->getComponent(Resolver::componentName($acquired_file))->getData([ComponentDecodeOptions::AS_FILE->value]), default => throw new IOException(sprintf('Unable to acquire file "%s" from package "%s" because it is not a resource or component', $path, $package)), }; } diff --git a/src/ncc/Enums/Options/ComponentDecodeOptions.php b/src/ncc/Enums/Options/ComponentDecodeOptions.php index 0a5a217..ca7afba 100644 --- a/src/ncc/Enums/Options/ComponentDecodeOptions.php +++ b/src/ncc/Enums/Options/ComponentDecodeOptions.php @@ -22,7 +22,7 @@ namespace ncc\Enums\Options; - final class ComponentDecodeOptions + enum ComponentDecodeOptions : string { - public const AS_FILE = 'as_file'; + case AS_FILE = 'as_file'; } \ No newline at end of file diff --git a/src/ncc/Managers/PackageManager.php b/src/ncc/Managers/PackageManager.php index 0f037f0..b25cb76 100644 --- a/src/ncc/Managers/PackageManager.php +++ b/src/ncc/Managers/PackageManager.php @@ -672,7 +672,7 @@ IO::fwrite( $bin_path . DIRECTORY_SEPARATOR . $component_name, - $package_reader->getComponent($component_name)->getData([ComponentDecodeOptions::AS_FILE]), 0755 + $package_reader->getComponent($component_name)->getData([ComponentDecodeOptions::AS_FILE->value]), 0755 ); //Console::inlineProgressBar(++$current_step, $total_steps); diff --git a/src/ncc/Objects/Package/Component.php b/src/ncc/Objects/Package/Component.php index cc2e6a0..3a41d7a 100644 --- a/src/ncc/Objects/Package/Component.php +++ b/src/ncc/Objects/Package/Component.php @@ -177,7 +177,7 @@ { try { - if(in_array(ComponentDecodeOptions::AS_FILE, $options, true)) + if(in_array(ComponentDecodeOptions::AS_FILE->value, $options, true)) { return (new Standard())->prettyPrintFile(AstWalker::decodeRecursive(base64_decode($this->data))); } @@ -197,7 +197,7 @@ { try { - if(in_array(ComponentDecodeOptions::AS_FILE, $options, true)) + if(in_array(ComponentDecodeOptions::AS_FILE->value, $options, true)) { return (new Standard())->prettyPrintFile(AstWalker::decodeRecursive(ZiProto::decode($this->data))); }