diff --git a/.dockerignore b/.dockerignore new file mode 120000 index 0000000..3e4e48b --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.gitignore \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..74e03bb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM php:apache +RUN apt-get update +RUN apt-get install -y libicu-dev xz-utils git zlib1g-dev python npm nodejs-legacy +RUN docker-php-ext-install mbstring +RUN docker-php-ext-install intl +RUN docker-php-ext-install zip +RUN npm install -g bower grunt-cli +RUN a2enmod rewrite +COPY php.ini /usr/local/etc/php/ +COPY . /var/www/html/ +RUN curl -sS https://getcomposer.org/installer | php +RUN php composer.phar install +RUN npm install +RUN bower --allow-root install +RUN grunt diff --git a/Gruntfile.js b/Gruntfile.js index ef153d9..9998185 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -51,7 +51,7 @@ module.exports = function (grunt) { options: { archive: 'alltube-release.zip' }, - src: ['*.php', '!config.yml', 'dist/**', 'fonts/**', '.htaccess', 'img/**', 'js/**', 'LICENSE', 'README.md', 'robots.txt', 'sitemap.xml', 'templates/**', 'templates_c/', 'vendor/**', 'classes/**', 'controllers/**', 'bower_components/**'] + src: ['*.php', '!config.yml', 'dist/**', 'fonts/**', '.htaccess', 'img/**', 'js/**', 'LICENSE', 'README.md', 'robots.txt', 'sitemap.xml', 'templates/**', 'templates_c/', 'vendor/**', 'classes/**', 'controllers/**', 'bower_components/**', '!vendor/ffmpeg/**', '!vendor/bin/ffmpeg'] } } } diff --git a/composer.json b/composer.json index bd22e94..359ee66 100644 --- a/composer.json +++ b/composer.json @@ -6,15 +6,15 @@ "type": "project", "require": { "smarty/smarty": "~3.1", - "rg3/youtube-dl": "~2015.11.13", + "rg3/youtube-dl": "2015.12.06", "slim/slim": "~2.6.2", "slim/views": "~0.1.3", "rudloff/smarty-plugin-noscheme": "~0.1.0", - "symfony/yaml": "~2.7.6", + "symfony/yaml": "~3.0.0", "ffmpeg/ffmpeg": "~2.8.2" }, "require-dev": { - "symfony/var-dumper": "~2.7.6" + "symfony/var-dumper": "~3.0.0" }, "extra": { "paas": { @@ -28,11 +28,11 @@ "type": "package", "package": { "name": "rg3/youtube-dl", - "version": "2015.11.13", + "version": "2015.12.06", "source": { "url": "https://github.com/rg3/youtube-dl.git", "type": "git", - "reference": "2015.11.13" + "reference": "2015.12.06" } } }, diff --git a/composer.lock b/composer.lock index 57950e6..516e8e3 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": "a4d07c0b568b699f11966a06bb02c01a", - "content-hash": "d44f2b04ee42d003e6c04dbde30106c5", + "hash": "c7b053d687208446a7f7456623d6e888", + "content-hash": "2ed45cb5e9f8cb491d41f4272a543c5c", "packages": [ { "name": "ffmpeg/ffmpeg", @@ -199,11 +199,11 @@ }, { "name": "rg3/youtube-dl", - "version": "2015.11.13", + "version": "2015.12.06", "source": { "type": "git", "url": "https://github.com/rg3/youtube-dl.git", - "reference": "2015.11.13" + "reference": "2015.12.06" }, "type": "library" }, @@ -399,31 +399,34 @@ }, { "name": "symfony/yaml", - "version": "v2.7.6", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" + "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", + "reference": "177a015cb0e19ff4a49e0e2e2c5fc1c1bee07002", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -441,26 +444,86 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-30 12:36:17" } ], "packages-dev": [ { - "name": "symfony/var-dumper", - "version": "v2.7.6", + "name": "symfony/polyfill-mbstring", + "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "eb033050050916b6bfa51be71009ef67b16046c9" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eb033050050916b6bfa51be71009ef67b16046c9", - "reference": "eb033050050916b6bfa51be71009ef67b16046c9", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, + { + "name": "symfony/var-dumper", + "version": "v3.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "737e07704cca83f9dd0af926d45ce27eedc25657" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/737e07704cca83f9dd0af926d45ce27eedc25657", + "reference": "737e07704cca83f9dd0af926d45ce27eedc25657", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "twig/twig": "~1.20|~2.0" }, "suggest": { "ext-symfony_debug": "" @@ -468,7 +531,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -477,7 +540,10 @@ ], "psr-4": { "Symfony\\Component\\VarDumper\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -499,7 +565,7 @@ "debug", "dump" ], - "time": "2015-10-25 17:17:38" + "time": "2015-11-18 13:48:51" } ], "aliases": [], diff --git a/composer.phar b/composer.phar new file mode 100755 index 0000000..c136a25 Binary files /dev/null and b/composer.phar differ diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 4f70726..de3a8c3 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -191,7 +191,7 @@ class FrontController $app->redirect($video['url']); } catch (\Exception $e) { $app->response->headers->set('Content-Type', 'text/plain'); - echo $e->getMessage(); + echo $e->getMessage().PHP_EOL; } } } diff --git a/package.json b/package.json index 21fdae7..426d694 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alltube", - "version": "0.4.2", + "version": "0.4.3", "dependencies": { "grunt": "~0.4.5", "grunt-cli": "~0.1.13", diff --git a/php.ini b/php.ini new file mode 100644 index 0000000..c3d7967 --- /dev/null +++ b/php.ini @@ -0,0 +1 @@ +date.timezone = UTC