Merge branch 'release-2.0.1'

classes/Config.php

@@ -135,7 +135,6 @@ class Config
     {
         $this->applyOptions($options);
         $this->getEnv();
-        $this->validateOptions();
     }
 
     /**
@@ -216,6 +215,7 @@ class Config
         if (is_file($file)) {
             $options = Yaml::parse(file_get_contents($file));
             self::$instance = new self($options);
+            self::$instance->validateOptions();
         } else {
             throw new Exception("Can't find config file at ".$file);
         }

classes/streams/YoutubeChunkStream.php

@@ -60,11 +60,11 @@ class YoutubeChunkStream implements StreamInterface
     /**
      * Closes the stream and any underlying resources.
      *
-     * @return mixed
+     * @return void
      */
     public function close()
     {
-        return $this->response->getBody()->close();
+        $this->response->getBody()->close();
     }
 
     /**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "alltube",
   "description": "HTML GUI for youtube-dl",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Pierre Rudloff",
   "bugs": "https://github.com/Rudloff/alltube/issues",
   "dependencies": {

tests/ConfigTest.php

@@ -41,6 +41,20 @@ class ConfigTest extends BaseTest
         $this->assertConfig($config);
     }
 
+    /**
+     * Test the getInstance function.
+     *
+     * @return void
+     */
+    public function testGetInstanceFromScratch()
+    {
+        Config::destroyInstance();
+
+        $config = Config::getInstance();
+        $this->assertEquals($config->convert, false);
+        $this->assertConfig($config);
+    }
+
     /**
      * Assert that a Config object is correctly instantiated.
      *