diff --git a/Changelog b/Changelog index d8bed88f7..c290ac7e2 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-03-02 DariusIII + * Chg: Add new php-tmdb library * Chg: Add PHP 7.1 to travis tests * Chg: Update mysql-ddl.sql 2017-02-27 DariusIII diff --git a/composer.json b/composer.json index ca97a5d6c..33b9b94da 100755 --- a/composer.json +++ b/composer.json @@ -99,6 +99,7 @@ "kbjr/Git.php": "dev-master", "moinax/tvdb": "~1.0", "phpmailer/phpmailer": "~5.2", + "php-tmdb/api": "~2.1", "exeu/apai-io": "~2.0", "smarty/smarty": "~3.1", "bower-asset/animate.css": "~3.5.1", diff --git a/composer.lock b/composer.lock index 76fffed3a..317493fad 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": "9a482b591aeb9b874586450a283baf65", - "content-hash": "42283d310038131e7867ac51e8611a45", + "hash": "82c17fc1b73855586679f48e75f8604d", + "content-hash": "8b4f2cb0fa2ff568748824ed57672fc2", "packages": [ { "name": "b3rs3rk/steamfront", @@ -1545,17 +1545,17 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "437c0c33217953b3b75e5080b73554da5f76b179" + "reference": "2297b43ad7c07a6b70a54c19e3fdd27ddd266d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/437c0c33217953b3b75e5080b73554da5f76b179", - "reference": "437c0c33217953b3b75e5080b73554da5f76b179", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2297b43ad7c07a6b70a54c19e3fdd27ddd266d0b", + "reference": "2297b43ad7c07a6b70a54c19e3fdd27ddd266d0b", "shasum": "" }, "require": { "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.3.1", + "guzzlehttp/psr7": "^1.4", "php": ">=5.5" }, "require-dev": { @@ -1602,7 +1602,7 @@ "rest", "web service" ], - "time": "2017-02-23 20:32:34" + "time": "2017-02-28 22:51:22" }, { "name": "guzzlehttp/promises", @@ -1657,16 +1657,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "04a6d1a00ea5da0727ee94309a9f0d3dbaecb569" + "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/04a6d1a00ea5da0727ee94309a9f0d3dbaecb569", - "reference": "04a6d1a00ea5da0727ee94309a9f0d3dbaecb569", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/0d6c7ca039329247e4f0f8f8f6506810e8248855", + "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855", "shasum": "" }, "require": { @@ -1718,7 +1718,7 @@ "uri", "url" ], - "time": "2017-02-21 01:20:32" + "time": "2017-02-27 10:51:17" }, { "name": "james-heinrich/getid3", @@ -1815,6 +1815,84 @@ }, "time": "2015-03-31 14:10:29" }, + { + "name": "kevinrob/guzzle-cache-middleware", + "version": "v1.5.2", + "source": { + "type": "git", + "url": "https://github.com/Kevinrob/guzzle-cache-middleware.git", + "reference": "2893fff87ef9f7f2c669957f5e446beea48d7a1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/2893fff87ef9f7f2c669957f5e446beea48d7a1d", + "reference": "2893fff87ef9f7f2c669957f5e446beea48d7a1d", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "cache/array-adapter": "^0.4", + "doctrine/cache": "^1.0", + "guzzlehttp/guzzle": "^6.0", + "illuminate/cache": "^5.0", + "league/flysystem": "^1.0", + "phpunit/phpunit": "^4.0 || ^5.0", + "psr/cache": "^1.0" + }, + "suggest": { + "doctrine/cache": "This library have a lot of ready-to-use cache storage (to be use with Kevinrob\\GuzzleCache\\Storage\\DoctrineCacheStorage)", + "guzzlehttp/guzzle": "For using this library. It was created for Guzzle6. (but you can use it with any PSR-7 HTTP Client)", + "laravel/framework": "To be use with Kevinrob\\GuzzleCache\\Storage\\LaravelCacheStorage", + "league/flysystem": "To be use with Kevinrob\\GuzzleCache\\Storage\\FlysystemStorage", + "psr/cache": "To be use with Kevinrob\\GuzzleCache\\Storage\\Psr6CacheStorage" + }, + "type": "library", + "autoload": { + "psr-4": { + "Kevinrob\\GuzzleCache\\": [ + "src/", + "tests/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kevin Robatel", + "email": "kevinrob2@gmail.com", + "homepage": "https://github.com/Kevinrob" + } + ], + "description": "A HTTP/1.1 Cache for Guzzle 6. It's a simple Middleware to be added in the HandlerStack. (RFC 7234)", + "homepage": "https://github.com/Kevinrob/guzzle-cache-middleware", + "keywords": [ + "Etag", + "Flysystem", + "Guzzle", + "cache", + "cache-control", + "doctrine", + "expiration", + "guzzle6", + "handler", + "http", + "http 1.1", + "middleware", + "performance", + "php", + "promise", + "psr6", + "psr7", + "rfc7234", + "validation" + ], + "time": "2017-01-16 07:02:13" + }, { "name": "moinax/tvdb", "version": "v1.0.6", @@ -1855,6 +1933,74 @@ ], "time": "2016-10-25 08:14:27" }, + { + "name": "php-tmdb/api", + "version": "2.1.8", + "source": { + "type": "git", + "url": "https://github.com/php-tmdb/api.git", + "reference": "5aae08086a17301b78aa26fd59bd6c10910cd5f6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-tmdb/api/zipball/5aae08086a17301b78aa26fd59bd6c10910cd5f6", + "reference": "5aae08086a17301b78aa26fd59bd6c10910cd5f6", + "shasum": "" + }, + "require": { + "doctrine/cache": "^1.6", + "ext-curl": "*", + "guzzlehttp/guzzle": "~6.0", + "kevinrob/guzzle-cache-middleware": "^1.2", + "php": ">=5.6.0", + "psr/log": "~1.0", + "rtheunissen/guzzle-log-middleware": "^0.4.0", + "symfony/event-dispatcher": ">=2.4,<4", + "symfony/options-resolver": ">=2.6,<4" + }, + "require-dev": { + "monolog/monolog": ">=1.11.0", + "phpunit/phpunit": ">=5.7,<6" + }, + "suggest": { + "monolog/monolog": "Required if you want to make use of logging features." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "Tmdb\\": "lib/Tmdb" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Roterman", + "email": "michael@wtfz.net", + "homepage": "http://wtfz.net" + } + ], + "description": "PHP wrapper for TMDB (TheMovieDatabase) API v3. Supports two types of approaches, one modelled with repositories, models and factories. And the other by simple array access to RAW data from The Movie Database.", + "homepage": "https://github.com/wtfzdotnet/php-tmdb-api", + "keywords": [ + "api", + "movie", + "php", + "tmdb", + "tv", + "tv show", + "tvdb", + "wrapper" + ], + "time": "2017-02-28 23:30:08" + }, { "name": "phpmailer/phpmailer", "version": "v5.2.22", @@ -1965,18 +2111,65 @@ ], "time": "2016-08-06 14:39:51" }, + { + "name": "psr/log", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2016-10-10 12:19:37" + }, { "name": "roave/security-advisories", "version": "dev-master", "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "411283676149d8b8e8ee53ec621d84099e548090" + "reference": "07acc8c9c8d55bd2f1f161acc5aa164b571e4e8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/411283676149d8b8e8ee53ec621d84099e548090", - "reference": "411283676149d8b8e8ee53ec621d84099e548090", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/07acc8c9c8d55bd2f1f161acc5aa164b571e4e8e", + "reference": "07acc8c9c8d55bd2f1f161acc5aa164b571e4e8e", "shasum": "" }, "conflict": { @@ -2051,7 +2244,7 @@ "thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2", "twig/twig": "<1.20", - "typo3/cms": ">=6.2,<6.2.30|>=8,<8.4.1|>=7,<7.6.13", + "typo3/cms": ">=6.2,<6.2.30|>=8,<8.6.1|>=7,<7.6.16", "typo3/flow": ">=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5|>=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "willdurand/js-translation-bundle": "<2.1.1", @@ -2097,7 +2290,60 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2017-02-08 16:26:47" + "time": "2017-02-28 15:07:27" + }, + { + "name": "rtheunissen/guzzle-log-middleware", + "version": "v0.4.0", + "source": { + "type": "git", + "url": "https://github.com/rtheunissen/guzzle-log-middleware.git", + "reference": "7b6f2884b623091e58276500f38499f238d7d4e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rtheunissen/guzzle-log-middleware/zipball/7b6f2884b623091e58276500f38499f238d7d4e2", + "reference": "7b6f2884b623091e58276500f38499f238d7d4e2", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~6.0", + "php": ">=5.5", + "psr/log": "~1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "~4.6" + }, + "suggest": { + "monolog/monolog": "Recommended PSR-3 logger" + }, + "type": "library", + "autoload": { + "psr-4": { + "Concat\\Http\\Middleware\\": "src/", + "Concat\\Http\\Middleware\\Test\\": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rudi Theunissen", + "email": "rudolf.theunissen@gmail.com" + } + ], + "description": "Guzzle middleware to log requests and responses", + "keywords": [ + "Guzzle", + "http", + "log", + "middleware", + "psr7" + ], + "time": "2015-06-16 06:35:18" }, { "name": "smarty/smarty", @@ -2152,6 +2398,120 @@ ], "time": "2016-12-14 21:57:25" }, + { + "name": "symfony/event-dispatcher", + "version": "v3.2.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6", + "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2017-01-02 20:32:22" + }, + { + "name": "symfony/options-resolver", + "version": "v3.2.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "855429e3e9014b9dafee2a667de304c3aaa86fe6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/855429e3e9014b9dafee2a667de304c3aaa86fe6", + "reference": "855429e3e9014b9dafee2a667de304c3aaa86fe6", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony OptionsResolver Component", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2017-01-02 20:32:22" + }, { "name": "unionofrad/lithium", "version": "1.2.x-dev", diff --git a/misc/testing/Dev/test_tmdb.php b/misc/testing/Dev/test_tmdb.php new file mode 100644 index 000000000..e69de29bb