Ability to force environments in CLI, HTTP, etc.

Core.php

@@ -30,8 +30,8 @@ public function __construct($envName, array $dbConfig) {
 	/**
 	 * Handle the current request.
 	 */
-	public function handleRequest($doEnvCheck = TRUE) {
-		if ($doEnvCheck && $this->getEnvironmentName() == "testing") {
+	public function handleRequest() {
+		if (defined("USEBB_UNIT_TESTS")) {
 			return;
 		}
 

System/Context/AbstractContext.php

@@ -136,4 +136,16 @@ public function handleException(\Exception $e) {
 			"exception" => $e
 		));
 	}
+
+	/**
+	 * Get the forced environment name.
+	 * 
+	 * Any environment name returned here will override the one passed to
+	 * UseBB\Core::__construct.
+	 * 
+	 * \returns Environment name
+	 */
+	public function getForcedEnvironmentName() {
+		return NULL;
+	}
 }

System/Context/CLI.php

@@ -29,6 +29,7 @@ public function handleRequest() {
 						break;
 				}
 			}
+			echo "Done.\n";
 		}
 	}
 
@@ -95,4 +96,21 @@ public function handleException(\Exception $e) {
 		printf("Exception '%s' at %s:%d.\n%s\n", 
 			$name, $e->getFile(), $e->getLine(), $e->getMessage());
 	}
+
+	/**
+	 * Get the forced environment name.
+	 * 
+	 * Any environment name returned here will override the one passed to
+	 * UseBB\Core::__construct.
+	 * 
+	 * \returns Environment name
+	 */
+	public function getForcedEnvironmentName() {
+		$opts = getopt("", array("env::"));
+		if (is_array($opts) && isset($opts["env"])) {
+			return $opts["env"];
+		}
+
+		return NULL;
+	}
 }

System/ServiceRegistry.php

@@ -40,8 +40,13 @@ class ServiceRegistry {
 	public function __construct($envName, array $dbConfig) {
 		if (defined("USEBB_UNIT_TESTS")) {
 			$envName = "testing";
-		} elseif (!in_array($envName, array("production", "development"))) {
-			throw new \InvalidArgumentException("Unknown environment name.");
+		} elseif (($forced = $this->getForcedEnvironmentName()) !== NULL) {
+			$envName = $forced;
+		}
+
+		if (!in_array($envName, array("production", "development", "testing"))) {
+			throw new \InvalidArgumentException(
+				"Unknown environment name '" . $envName . "'.");
 		}
 
 		if (!isset($dbConfig[$envName]) || !is_array($dbConfig[$envName])) {
@@ -61,6 +66,10 @@ public function getEnvironmentName() {
 		return $this->envName;
 	}
 
+	private function getForcedEnvironmentName() {
+		return $this->get("context")->getForcedEnvironmentName();
+	}
+
 	/**
 	 * Explicitly set a service to a given instance.
 	 *