Allow using multiple command options

And clean up the command options code a bit

Author: aude

maintenance/importEntities.php

@@ -52,14 +52,16 @@ public function execute() {
 		$this->importOptions = $this->extractOptions();
 
 		try {
-			$importMode = $this->getImportMode();
-			$entityIdListBuilder = $this->newEntityIdListBuilder( $importMode );
+			foreach ( $this->importOptions as $importMode => $input ) {
+				$this->output( "Importing $importMode\n" );
 
-			$input = $this->getInputForMode( $importMode );
-			$ids = $entityIdListBuilder->getEntityIds( $input );
+				$entityIdListBuilder = $this->newEntityIdListBuilder( $importMode );
 
-			$entityImporter = $this->newEntityImporter();
-			$entityImporter->importEntities( $ids );
+				$ids = $entityIdListBuilder->getEntityIds( $input );
+
+				$entityImporter = $this->newEntityImporter();
+				$entityImporter->importEntities( $ids );
+			}
 		}
 		catch ( Exception $ex ) {
 			$this->error( $ex->getMessage() );
@@ -93,7 +95,9 @@ private function extractOptions() {
 		$options = [];
 
 		foreach ( $this->getValidOptions() as $optionName ) {
-			$options[$optionName] = $this->getOption( $optionName );
+			if ( $this->hasOption( $optionName ) ) {
+				$options[$optionName] = $this->getOptionValue( $optionName );
+			}
 		}
 
 		if ( empty( $options ) ) {
@@ -104,28 +108,14 @@ private function extractOptions() {
 	}
 
 	/**
-	 * @return string
-	 * @throws RuntimeException
-	 */
-	private function getImportMode() {
-		foreach ( $this->getValidOptions() as $option ) {
-			if ( $this->importOptions->hasOption( $option ) ) {
-				return $option;
-			}
-		}
-
-		throw new RuntimeException( 'No valid import option was provided' );
-	}
-
-	/**
-	 * @param string $mode
+	 * @param string $optionName
 	 * @return mixed
 	 */
-	private function getInputForMode( $mode ) {
-		if ( $mode === 'all-properties' ) {
+	private function getOptionValue( $optionName ) {
+		if ( $optionName === 'all-properties' ) {
 			return 'all-properties';
 		} else {
-			return $this->importOptions->getOption( $mode );
+			return $this->getOption( $optionName );
 		}
 	}
 

src/Console/ImportOptions.php

@@ -2,9 +2,10 @@
 
 namespace Wikibase\Import\Console;
 
-use Maintenance;
+use ArrayIterator;
+use IteratorAggregate;
 
-class ImportOptions {
+class ImportOptions implements IteratorAggregate {
 
 	/**
 	 * @var array
@@ -44,4 +45,11 @@ public function getOption( $name ) {
 		return $this->options[$name];
 	}
 
+	/**
+	 * @return ArrayIterator
+	 */
+	public function getIterator() {
+		return new ArrayIterator( $this->options );
+	}
+
 }