Removed external constants from classes, making code more testable

emulator/emulator.php

@@ -37,7 +37,7 @@
 
 echo '* Reading configuration file ' . basename($configFileName) . '...' . PHP_EOL;
 
-$confLoader = new Loader();
+$confLoader = new Loader(EMU_PATH);
 
 try {
     $configuration = $confLoader->loadFromFile($configFileName);

src/Configuration/Configuration.php

@@ -7,14 +7,25 @@
 */
 class Configuration extends DefaultConfiguration
 {
+
+  /**
+  * @var string The directory in which every file is located
+  */
+  private $directory;
+
+  function __construct($directory)
+  {
+    $this->directory = $directory . DIRECTORY_SEPARATOR;
+  }
+
   /**
   * Checks if the dataLocation provided is valid (i.e. files exist)
   */
   public function onDataLocationSet($dataLocation)
   {
     if(is_array($dataLocation)) {
       $dataLocation = array_map(function($path) { 
-        return EMU_PATH . DIRECTORY_SEPARATOR . $path; 
+        return $this->directory . $path; 
       }, $dataLocation);
 
       foreach($dataLocation as $location) {        
@@ -24,7 +35,7 @@ public function onDataLocationSet($dataLocation)
       }
 
     }else {
-      $dataLocation = EMU_PATH . DIRECTORY_SEPARATOR . $dataLocation;
+      $dataLocation = $this->directory . $dataLocation;
 
       if(!file_exists($dataLocation)) {
         throw new \Exception('Could not find file ' . $dataLocation);

src/Configuration/Loader.php

@@ -12,7 +12,17 @@ class Loader
     ];
 
     private $missingOptions = [];
-
+
+    /**
+    * @var string The directory in which every file is located
+    */
+    private $directory;
+
+    function __construct($directory = null)
+    {
+      $this->directory = (null == $directory) ? __DIR__ : $directory;
+    }
+
     /**
     * Loads a JSON file with settings
     *
@@ -38,7 +48,7 @@ public function loadFromFile($filePath)
     */
     public function loadFromArray(array $configOptions)
     {
-      $configuration = new Configuration();
+      $configuration = new Configuration($this->directory);
 
       foreach($configOptions as $key => $val) {
         $configuration->set($key, $val);

tests/testing.json

@@ -1,5 +1,6 @@
 {
   "data": "yes",
   "dataLocation": ["tests\\testfile.txt"],
-  "loadOnce": false
+  "loadOnce": false,
+  "sourceType": "file"
 }