genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release-0.4.4'

Browse source
This commit is contained in:
Pierre Rudloff 2016-01-01 20:00:57 +01:00
commit bb73035301
5 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

13
classes/Config.php
View file

@ -38,11 +38,14 @@ Class Config
*/ */
private function __construct() private function __construct()
{ {
$yaml = Yaml::parse(__DIR__.'/../config.yml'); $yamlfile = __DIR__.'/../config.yml';
if (isset($yaml) && is_array($yaml)) { if (is_file($yamlfile)) {
foreach ($yaml as $param=>$value) { $yaml = Yaml::parse(file_get_contents($yamlfile));
if (isset($this->$param)) { if (isset($yaml) && is_array($yaml)) {
$this->$param = $value; foreach ($yaml as $param=>$value) {
if (isset($this->$param)) {
$this->$param = $value;
}
} }
} }
} }

6
composer.json
View file

@ -6,7 +6,7 @@
"type": "project", "type": "project",
"require": { "require": {
"smarty/smarty": "~3.1", "smarty/smarty": "~3.1",
"rg3/youtube-dl": "2015.12.06", "rg3/youtube-dl": "2015.12.29",
"slim/slim": "~2.6.2", "slim/slim": "~2.6.2",
"slim/views": "~0.1.3", "slim/views": "~0.1.3",
"rudloff/smarty-plugin-noscheme": "~0.1.0", "rudloff/smarty-plugin-noscheme": "~0.1.0",
@ -28,11 +28,11 @@
"type": "package", "type": "package",
"package": { "package": {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2015.12.06", "version": "2015.12.29",
"source": { "source": {
"url": "https://github.com/rg3/youtube-dl.git", "url": "https://github.com/rg3/youtube-dl.git",
"type": "git", "type": "git",
"reference": "2015.12.06" "reference": "2015.12.29"
} }
} }
}, },

51
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "c7b053d687208446a7f7456623d6e888", "hash": "4ab91a81eeb4af64b1c2385f00c96135",
"content-hash": "2ed45cb5e9f8cb491d41f4272a543c5c", "content-hash": "e9a52d9ff3660f110122e1ab8b784bba",
"packages": [ "packages": [
{ {
"name": "ffmpeg/ffmpeg", "name": "ffmpeg/ffmpeg",
@ -199,11 +199,11 @@
}, },
{ {
"name": "rg3/youtube-dl", "name": "rg3/youtube-dl",
"version": "2015.12.06", "version": "2015.12.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/rg3/youtube-dl.git", "url": "https://github.com/rg3/youtube-dl.git",
"reference": "2015.12.06" "reference": "2015.12.29"
}, },
"type": "library" "type": "library"
}, },
@ -344,16 +344,16 @@
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",
"version": "v3.1.27", "version": "v3.1.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/smarty-php/smarty.git", "url": "https://github.com/smarty-php/smarty.git",
"reference": "4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2" "reference": "35480f10e7ce9b0fdaf23d3799d7b79463919b1e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/smarty-php/smarty/zipball/4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2", "url": "https://api.github.com/repos/smarty-php/smarty/zipball/35480f10e7ce9b0fdaf23d3799d7b79463919b1e",
"reference": "4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2", "reference": "35480f10e7ce9b0fdaf23d3799d7b79463919b1e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -395,20 +395,20 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2015-06-18 00:55:59" "time": "2015-12-21 01:57:06"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.0.0", "version": "v3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002" "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691",
"reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -444,27 +444,30 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2015-11-30 12:36:17" "time": "2015-12-26 13:39:53"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.0.0", "version": "v1.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "0b6a8940385311a24e060ec1fe35680e17c74497" "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
"reference": "0b6a8940385311a24e060ec1fe35680e17c74497", "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"suggest": {
"ext-mbstring": "For best performance"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -502,20 +505,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2015-11-04 20:28:58" "time": "2015-11-20 09:19:13"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v3.0.0", "version": "v3.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "737e07704cca83f9dd0af926d45ce27eedc25657" "reference": "87db8700deb12ba2b65e858f656a1f885530bcb0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/737e07704cca83f9dd0af926d45ce27eedc25657", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/87db8700deb12ba2b65e858f656a1f885530bcb0",
"reference": "737e07704cca83f9dd0af926d45ce27eedc25657", "reference": "87db8700deb12ba2b65e858f656a1f885530bcb0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -565,7 +568,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2015-11-18 13:48:51" "time": "2015-12-05 11:13:14"
} }
], ],
"aliases": [], "aliases": [],

BIN
composer.phar
View file

Binary file not shown.

11
package.json
View file

@ -1,16 +1,17 @@
{ {
"name": "alltube", "name": "alltube",
"version": "0.4.3", "version": "0.4.4",
"license": "GPL-3.0",
"dependencies": { "dependencies": {
"grunt": "~0.4.5", "grunt": "~0.4.5",
"grunt-cli": "~0.1.13", "grunt-cli": "~0.1.13",
"grunt-contrib-cssmin": "~0.10.0", "grunt-contrib-cssmin": "~0.14.0",
"grunt-contrib-uglify": "~0.6.0", "grunt-contrib-uglify": "~0.11.0",
"grunt-contrib-watch": "~0.6.1", "grunt-contrib-watch": "~0.6.1",
"grunt-phpcs": "~0.4.0", "grunt-phpcs": "~0.4.0",
"grunt-phpunit": "~0.3.6", "grunt-phpunit": "~0.3.6",
"grunt-contrib-compress": "~0.13.0", "grunt-contrib-compress": "~0.14.0",
"bower": "~1.6.3" "bower": "~1.7.1"
}, },
"engines": { "engines": {
"node": "~0.10.29" "node": "~0.10.29"