Remove support for LOTGD_CONFIG environment variable.

Author: austenmc

README.md

@@ -58,7 +58,7 @@ Some technical notes:
 ### Configuration
 The crate is responsible for configuring the game, which is done through
 a configuration file, in the YAML format. The path to the configuration file is
-specified by the environment variable `LOTGD_CONFIG`.
+`config/lotgd.yml`.
 
 Here's the format of the config file:
 

config/test.yml

@@ -1,7 +1,4 @@
 <phpunit bootstrap="bootstrap/bootstrap.php">
-    <php>
-        <env name="LOTGD_CONFIG" value="./config/test.yml" />
-    </php>
     <testsuites>
         <testsuite name="All">
             <directory>tests</directory>

phpunit.xml

@@ -51,7 +51,7 @@ public function getGame(string $cwd = null): Game
         $composer = $this->createComposerManager($cwd);
         $this->libraryConfigurationManager = $this->createLibraryConfigurationManager($composer);
 
-        $config = $this->createConfiguration();
+        $config = $this->createConfiguration($cwd);
         $logger = $this->createLogger($config, "lotgd");
 
         $pdo = $this->connectToDatabase($config);
@@ -94,16 +94,18 @@ protected function createComposerManager(string $cwd = null): ComposerManager
     }
 
     /**
-     * Returns a configuration object reading from the file located at the path stored in LOTGD_CONFIG.
+     * Returns a configuration object reading from the file located at the path stored in $cwd/config/lotgd.yml.
      * @return \LotGD\Core\Configuration
      * @throws InvalidConfigurationException
      */
-    protected function createConfiguration(): Configuration
+    protected function createConfiguration(string $cwd = null): Configuration
     {
-        $configFilePath = getenv('LOTGD_CONFIG');
+        if ($cwd == null) {
+            $cwd = getcwd();
+        }
 
         if (empty($configFilePath)) {
-            $configFilePath = implode(DIRECTORY_SEPARATOR, [getcwd(), "config", "lotgd.yml"]);
+            $configFilePath = implode(DIRECTORY_SEPARATOR, [$cwd, "config", "lotgd.yml"]);
         }
 
         if ($configFilePath === false || strlen($configFilePath) == 0 || is_file($configFilePath) === false) {

src/Bootstrap.php

@@ -62,7 +62,7 @@ public function setUp()
         $logger  = new Logger('test');
         $logger->pushHandler(new NullHandler());
 
-        $this->g = new Game(new Configuration(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . getenv('LOTGD_CONFIG')), $logger, $this->getEntityManager());
+        $this->g = new Game(new Configuration(implode(DIRECTORY_SEPARATOR, [__DIR__, '..', 'config', 'lotgd.yml'])), $logger, $this->getEntityManager());
     }
 
     public function testGetCharacterException()

tests/GameTest.php

@@ -31,7 +31,7 @@ abstract class ModelTestCase extends \PHPUnit_Extensions_Database_TestCase
     final public function getConnection(): \PHPUnit_Extensions_Database_DB_DefaultDatabaseConnection
     {
         if ($this->connection === null) {
-            $configFilePath = getcwd() . DIRECTORY_SEPARATOR . getenv('LOTGD_CONFIG');
+            $configFilePath = implode(DIRECTORY_SEPARATOR, [getcwd(), 'config', 'lotgd.yml']);
             if ($configFilePath === false || strlen($configFilePath) == 0 || is_file($configFilePath) === false) {
                 throw new InvalidConfigurationException("Invalid or missing configuration file: '{$configFilePath}'.");
             }