diff --git a/classes/Config.php b/classes/Config.php index 1e8e9a1..e302bf7 100644 --- a/classes/Config.php +++ b/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); } diff --git a/classes/streams/YoutubeChunkStream.php b/classes/streams/YoutubeChunkStream.php index 25c3ea8..09f80dc 100644 --- a/classes/streams/YoutubeChunkStream.php +++ b/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(); } /** diff --git a/package.json b/package.json index 0e1760e..a792473 100644 --- a/package.json +++ b/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": { diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 6480521..7304ed0 100644 --- a/tests/ConfigTest.php +++ b/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. *