options: add Parser

Author: PeratX

src/iTXTech/SimpleFramework/Console/Option/CommandLine.php

@@ -59,7 +59,7 @@ public function getOptionValue($option, ?string $defaultValue = null) : ?string{
 		if(is_string($option)){
 			$option = $this->resolveOption($option);
 		}
-		if($option == null){
+		if($option === null){
 			return null;
 		}
 
@@ -83,7 +83,7 @@ public function getOptionValues($option){
 
 		foreach($this->options as $processedOption){
 			if($processedOption === $option){
-				array_merge($values, $processedOption->getValues());
+				$values = array_merge($values, $processedOption->getValues());
 			}
 		}
 
@@ -134,7 +134,7 @@ public function addArg(string $arg){
 	 *
 	 * @param Option $opt
 	 */
-	protected function addOption(Option $opt){
+	public function addOption(Option $opt){
 		$this->options[] = $opt;
 	}
 

src/iTXTech/SimpleFramework/Console/Option/OptionGroup.php

@@ -55,7 +55,7 @@ public function getOptions() : array{
 	 *
 	 * @return bool
 	 */
-	public function setSelected(Option $option) : bool{
+	public function setSelected(?Option $option) : bool{
 		if($option == null){
 			// reset the option previously selected
 			$this->selected = null;

src/iTXTech/SimpleFramework/Console/Option/Options.php

@@ -45,7 +45,7 @@ class Options{
 	 */
 	public function addOptionGroup(OptionGroup $group){
 		if($group->isRequired()){
-			$this->requiredOpts[] = $group;
+			$this->requiredOpts[spl_object_hash($group)] = $group;
 		}
 		foreach($group->getOptions() as $option){
 			$option->setRequired(false);
@@ -101,14 +101,8 @@ public function addOption(Option $opt){
 
 		// if the option is required add it to the required list
 		if($opt->isRequired()){
-			if(in_array($key, $this->requiredOpts)){
-				foreach($this->requiredOpts as $k => $opt){
-					if($k === $key){
-						unset($this->requiredOpts[$k]);
-					}
-				}
-			}
-			$this->requiredOpts[] = $key;
+			unset($this->requiredOpts[$key]);
+			$this->requiredOpts[$key] = $key;
 		}
 
 		$this->shortOpts[$key] = $opt;
@@ -141,14 +135,14 @@ public function getRequiredOptions() : array{
 	 *
 	 * @return Option
 	 */
-	public function getOption(string $opt) : Option{
+	public function getOption(string $opt) : ?Option{
 		$opt = Util::stripLeadingHyphens($opt);
 
 		if(isset($this->shortOpts[$opt])){
 			return $this->shortOpts[$opt];
 		}
 
-		return $this->longOpts[$opt];
+		return $this->longOpts[$opt] ?? null;
 	}
 
 	/**
@@ -158,7 +152,7 @@ public function getOption(string $opt) : Option{
 	 *
 	 * @return string[]
 	 */
-	public function getMatchingOptions(string $opt) : string{
+	public function getMatchingOptions(string $opt) : array{
 		$opt = Util::stripLeadingHyphens($opt);
 
 		$matchingOpts = [];