diff --git a/classes/Config.php b/classes/Config.php index 8cca186..a003624 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -38,11 +38,14 @@ Class Config */ private function __construct() { - $yaml = Yaml::parse(__DIR__.'/../config.yml'); - if (isset($yaml) && is_array($yaml)) { - foreach ($yaml as $param=>$value) { - if (isset($this->$param)) { - $this->$param = $value; + $yamlfile = __DIR__.'/../config.yml'; + if (is_file($yamlfile)) { + $yaml = Yaml::parse(file_get_contents($yamlfile)); + if (isset($yaml) && is_array($yaml)) { + foreach ($yaml as $param=>$value) { + if (isset($this->$param)) { + $this->$param = $value; + } } } } diff --git a/composer.json b/composer.json index 359ee66..86888ad 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "type": "project", "require": { "smarty/smarty": "~3.1", - "rg3/youtube-dl": "2015.12.06", + "rg3/youtube-dl": "2015.12.29", "slim/slim": "~2.6.2", "slim/views": "~0.1.3", "rudloff/smarty-plugin-noscheme": "~0.1.0", @@ -28,11 +28,11 @@ "type": "package", "package": { "name": "rg3/youtube-dl", - "version": "2015.12.06", + "version": "2015.12.29", "source": { "url": "https://github.com/rg3/youtube-dl.git", "type": "git", - "reference": "2015.12.06" + "reference": "2015.12.29" } } }, diff --git a/composer.lock b/composer.lock index 516e8e3..d47734f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c7b053d687208446a7f7456623d6e888", - "content-hash": "2ed45cb5e9f8cb491d41f4272a543c5c", + "hash": "4ab91a81eeb4af64b1c2385f00c96135", + "content-hash": "e9a52d9ff3660f110122e1ab8b784bba", "packages": [ { "name": "ffmpeg/ffmpeg", @@ -199,11 +199,11 @@ }, { "name": "rg3/youtube-dl", - "version": "2015.12.06", + "version": "2015.12.29", "source": { "type": "git", "url": "https://github.com/rg3/youtube-dl.git", - "reference": "2015.12.06" + "reference": "2015.12.29" }, "type": "library" }, @@ -344,16 +344,16 @@ }, { "name": "smarty/smarty", - "version": "v3.1.27", + "version": "v3.1.29", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2" + "reference": "35480f10e7ce9b0fdaf23d3799d7b79463919b1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2", - "reference": "4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/35480f10e7ce9b0fdaf23d3799d7b79463919b1e", + "reference": "35480f10e7ce9b0fdaf23d3799d7b79463919b1e", "shasum": "" }, "require": { @@ -395,20 +395,20 @@ "keywords": [ "templating" ], - "time": "2015-06-18 00:55:59" + "time": "2015-12-21 01:57:06" }, { "name": "symfony/yaml", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002" + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", - "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691", + "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691", "shasum": "" }, "require": { @@ -444,27 +444,30 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-11-30 12:36:17" + "time": "2015-12-26 13:39:53" } ], "packages-dev": [ { "name": "symfony/polyfill-mbstring", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", - "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25", + "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "suggest": { + "ext-mbstring": "For best performance" + }, "type": "library", "extra": { "branch-alias": { @@ -502,20 +505,20 @@ "portable", "shim" ], - "time": "2015-11-04 20:28:58" + "time": "2015-11-20 09:19:13" }, { "name": "symfony/var-dumper", - "version": "v3.0.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "737e07704cca83f9dd0af926d45ce27eedc25657" + "reference": "87db8700deb12ba2b65e858f656a1f885530bcb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/737e07704cca83f9dd0af926d45ce27eedc25657", - "reference": "737e07704cca83f9dd0af926d45ce27eedc25657", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/87db8700deb12ba2b65e858f656a1f885530bcb0", + "reference": "87db8700deb12ba2b65e858f656a1f885530bcb0", "shasum": "" }, "require": { @@ -565,7 +568,7 @@ "debug", "dump" ], - "time": "2015-11-18 13:48:51" + "time": "2015-12-05 11:13:14" } ], "aliases": [], diff --git a/composer.phar b/composer.phar index c136a25..d8ea524 100755 Binary files a/composer.phar and b/composer.phar differ diff --git a/package.json b/package.json index 426d694..80ad990 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,17 @@ { "name": "alltube", - "version": "0.4.3", + "version": "0.4.4", + "license": "GPL-3.0", "dependencies": { "grunt": "~0.4.5", "grunt-cli": "~0.1.13", - "grunt-contrib-cssmin": "~0.10.0", - "grunt-contrib-uglify": "~0.6.0", + "grunt-contrib-cssmin": "~0.14.0", + "grunt-contrib-uglify": "~0.11.0", "grunt-contrib-watch": "~0.6.1", "grunt-phpcs": "~0.4.0", "grunt-phpunit": "~0.3.6", - "grunt-contrib-compress": "~0.13.0", - "bower": "~1.6.3" + "grunt-contrib-compress": "~0.14.0", + "bower": "~1.7.1" }, "engines": { "node": "~0.10.29"