From 718c6ff8d859a8966c6b698535bd71c9b93b509f Mon Sep 17 00:00:00 2001 From: netkas Date: Sat, 14 Sep 2024 00:31:43 -0400 Subject: [PATCH] Convert FileDescriptor constants to enum cases --- src/ncc/Classes/Runtime.php | 2 +- src/ncc/Enums/FileDescriptor.php | 14 +++++++------- src/ncc/Managers/PackageManager.php | 12 ++++++------ src/ncc/Objects/PackageLock/PackageEntry.php | 8 ++++---- src/ncc/Objects/PackageLock/VersionEntry.php | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ncc/Classes/Runtime.php b/src/ncc/Classes/Runtime.php index f112f6a..2460c83 100644 --- a/src/ncc/Classes/Runtime.php +++ b/src/ncc/Classes/Runtime.php @@ -99,7 +99,7 @@ if(is_string(self::$imported_packages[$package])) { - $metadata_path = self::$imported_packages[$package] . DIRECTORY_SEPARATOR . FileDescriptor::METADATA; + $metadata_path = self::$imported_packages[$package] . DIRECTORY_SEPARATOR . FileDescriptor::METADATA->value; if(!is_file($metadata_path)) { diff --git a/src/ncc/Enums/FileDescriptor.php b/src/ncc/Enums/FileDescriptor.php index 325c76d..1a50df3 100644 --- a/src/ncc/Enums/FileDescriptor.php +++ b/src/ncc/Enums/FileDescriptor.php @@ -22,17 +22,17 @@ namespace ncc\Enums; - final class FileDescriptor + enum FileDescriptor : string { - public const ASSEMBLY = 'ASSEMBLY'; + case ASSEMBLY = 'ASSEMBLY'; - public const METADATA = 'METADATA'; + case METADATA = 'METADATA'; - public const INSTALLER = 'INSTALLER'; + case INSTALLER = 'INSTALLER'; - public const CLASS_MAP = 'CLASS_MAP'; + case CLASS_MAP = 'CLASS_MAP'; - public const UPDATE = 'UPDATE'; + case UPDATE = 'UPDATE'; - public const SHADOW_PACKAGE = 'SHADOW_PKG'; + case SHADOW_PACKAGE = 'SHADOW_PKG'; } \ No newline at end of file diff --git a/src/ncc/Managers/PackageManager.php b/src/ncc/Managers/PackageManager.php index a1fd5e7..db489f6 100644 --- a/src/ncc/Managers/PackageManager.php +++ b/src/ncc/Managers/PackageManager.php @@ -726,7 +726,7 @@ if($package_reader->getInstaller() !== null) { $progress_bar->setMiscText('installer'); - IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::INSTALLER, ZiProto::encode($package_reader->getInstaller()?->toArray(true))); + IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::INSTALLER->value, ZiProto::encode($package_reader->getInstaller()?->toArray(true))); } //Console::inlineProgressBar(++$current_step, $total_steps); $progress_bar->increaseValue(1, true); @@ -734,23 +734,23 @@ if(count($class_map) > 0) { $progress_bar->setMiscText('class map'); - IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::CLASS_MAP, ZiProto::encode($class_map)); + IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::CLASS_MAP->value, ZiProto::encode($class_map)); } //Console::inlineProgressBar(++$current_step, $total_steps); $progress_bar->increaseValue(1, true); - IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::ASSEMBLY, ZiProto::encode($package_reader->getAssembly()->toArray(true))); - IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::METADATA, ZiProto::encode($package_reader->getMetadata()->toArray(true))); + IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::ASSEMBLY->value, ZiProto::encode($package_reader->getAssembly()->toArray(true))); + IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::METADATA->value, ZiProto::encode($package_reader->getMetadata()->toArray(true))); if($package_reader->getMetadata()->getUpdateSource() !== null) { - IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::UPDATE, ZiProto::encode($package_reader->getMetadata()->getUpdateSource()?->toArray(true))); + IO::fwrite($package_path . DIRECTORY_SEPARATOR . FileDescriptor::UPDATE->value, ZiProto::encode($package_reader->getMetadata()->getUpdateSource()?->toArray(true))); } //Console::inlineProgressBar(++$current_step, $total_steps); $progress_bar->increaseValue(1, true); $progress_bar->setMiscText('creating shadowcopy', true); - $package_reader->saveCopy($package_path . DIRECTORY_SEPARATOR . FileDescriptor::SHADOW_PACKAGE); + $package_reader->saveCopy($package_path . DIRECTORY_SEPARATOR . FileDescriptor::SHADOW_PACKAGE->value); //Console::inlineProgressBar(++$current_step, $total_steps); $progress_bar->setMiscText('done', true); diff --git a/src/ncc/Objects/PackageLock/PackageEntry.php b/src/ncc/Objects/PackageLock/PackageEntry.php index 4335824..d0a3e85 100644 --- a/src/ncc/Objects/PackageLock/PackageEntry.php +++ b/src/ncc/Objects/PackageLock/PackageEntry.php @@ -356,7 +356,7 @@ */ public function getAssembly(string $version=Versions::LATEST->value): Assembly { - $assembly_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::ASSEMBLY; + $assembly_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::ASSEMBLY->value; if(!is_file($assembly_path)) { throw new IOException(sprintf('Assembly file for package %s version %s does not exist (Expected %s)', $this->name, $version, $assembly_path)); @@ -377,7 +377,7 @@ */ public function getMetadata(string $version=Versions::LATEST->value): Metadata { - $metadata_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::METADATA; + $metadata_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::METADATA->value; if(!is_file($metadata_path)) { throw new IOException(sprintf('Metadata file for package %s version %s does not exist (Expected %s)', $this->name, $version, $metadata_path)); @@ -396,7 +396,7 @@ */ public function getInstaller(string $version=Versions::LATEST->value): ?Installer { - $installer_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::INSTALLER; + $installer_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::INSTALLER->value; if(!is_file($installer_path)) { return null; @@ -415,7 +415,7 @@ */ public function getClassMap(string $version=Versions::LATEST->value): array { - $class_map_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::CLASS_MAP; + $class_map_path = $this->getPath($version) . DIRECTORY_SEPARATOR . FileDescriptor::CLASS_MAP->value; if(!is_file($class_map_path)) { return []; diff --git a/src/ncc/Objects/PackageLock/VersionEntry.php b/src/ncc/Objects/PackageLock/VersionEntry.php index d678dbb..191b311 100644 --- a/src/ncc/Objects/PackageLock/VersionEntry.php +++ b/src/ncc/Objects/PackageLock/VersionEntry.php @@ -231,7 +231,7 @@ */ public function getShadowPackagePath(string $package_name): string { - return $this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::SHADOW_PACKAGE; + return $this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::SHADOW_PACKAGE->value; } /** @@ -241,17 +241,17 @@ */ public function isBroken(string $package_name): bool { - if(!is_file($this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::SHADOW_PACKAGE)) + if(!is_file($this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::SHADOW_PACKAGE->value)) { return true; } - if(!is_file($this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::ASSEMBLY)) + if(!is_file($this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::ASSEMBLY->value)) { return true; } - if(!is_file($this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::METADATA)) + if(!is_file($this->getPath($package_name) . DIRECTORY_SEPARATOR . FileDescriptor::METADATA->value)) { return true; }