From 08514637b8bea75c69829c755521e33892700c67 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 2 Oct 2018 23:23:07 +0200 Subject: [PATCH 1/2] Update laravel/framework to version 5.7.7 and imdbphp/imdbphp to version 6.0.4 --- Changelog | 1 + composer.lock | 154 +++++++++++++++++++++++++++++++------------------- 2 files changed, 97 insertions(+), 58 deletions(-) diff --git a/Changelog b/Changelog index 022ffe65c4..4c47553686 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-02 DariusIII + * Chg: Update laravel/framework to version 5.7.7 and imdbphp/imdbphp to version 6.0.4 * Chg: Update branches and their handling, remove restriction for updating non dev branches 2018-10-01 DariusIII * Chg: Make cache persistent diff --git a/composer.lock b/composer.lock index fcf0e3b2a2..feba2f8b95 100644 --- a/composer.lock +++ b/composer.lock @@ -321,8 +321,7 @@ "Gemfile.lock", "*.md" ] - }, - "time": "2016-06-06T17:37:52+00:00" + } }, { "name": "bower-asset/autosize", @@ -351,8 +350,7 @@ "form", "textarea", "ui" - ], - "time": "2017-05-19T15:36:30+00:00" + ] }, { "name": "bower-asset/bootstrap", @@ -401,8 +399,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-3.x", @@ -451,8 +448,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/bootstrap-datepicker", @@ -481,8 +477,7 @@ }, "license": [ "Apache-2.0" - ], - "time": "2016-08-05T09:50:13+00:00" + ] }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -512,8 +507,7 @@ "dropdowns", "hover", "twitter" - ], - "time": "2015-12-01T23:35:57+00:00" + ] }, { "name": "bower-asset/bootstrap-progressbar", @@ -547,8 +541,7 @@ }, "license": [ "MIT" - ], - "time": "2015-05-15T18:56:17+00:00" + ] }, { "name": "bower-asset/bootswatch", @@ -679,8 +672,7 @@ "modal", "popup", "ui" - ], - "time": "2016-05-10T22:21:33+00:00" + ] }, { "name": "bower-asset/datatables", @@ -795,8 +787,7 @@ "tests", "examples" ] - }, - "time": "2015-01-26T21:19:01+00:00" + } }, { "name": "bower-asset/flexboxgrid", @@ -832,8 +823,7 @@ "css", "flexbox", "grid" - ], - "time": "2016-08-14T16:43:18+00:00" + ] }, { "name": "bower-asset/font-awesome", @@ -878,8 +868,7 @@ "src", "build.xml" ] - }, - "time": "2015-07-20T20:04:00+00:00" + } }, { "name": "bower-asset/icheck", @@ -929,8 +918,7 @@ "replacement", "skins", "ui" - ], - "time": "2014-03-03T17:36:28+00:00" + ] }, { "name": "bower-asset/jquery", @@ -993,8 +981,7 @@ "javascript", "jquery", "library" - ], - "time": "2016-05-20T17:24:43+00:00" + ] }, { "name": "bower-asset/jquery-3.2.x", @@ -1061,8 +1048,7 @@ "scroll", "scrolltop", "scrolltotop" - ], - "time": "2017-08-31T15:51:29+00:00" + ] }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1081,8 +1067,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-04-15T06:38:34+00:00" + } }, { "name": "bower-asset/jquery-migrate-3.0.x", @@ -1101,8 +1086,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - }, - "time": "2016-06-10T14:28:59+00:00" + } }, { "name": "bower-asset/jquery.nicescroll", @@ -1132,8 +1116,7 @@ "demo", "package.json" ] - }, - "time": "2016-03-01T20:38:24+00:00" + } }, { "name": "bower-asset/material-design-iconic-font", @@ -1172,8 +1155,7 @@ "font", "icons", "material" - ], - "time": "2015-11-08T04:50:28+00:00" + ] }, { "name": "bower-asset/materialize", @@ -1232,8 +1214,7 @@ "responsive", "sass", "ux" - ], - "time": "2017-04-15T01:39:28+00:00" + ] }, { "name": "bower-asset/pace", @@ -1279,8 +1260,7 @@ "progress", "progress", "spinner" - ], - "time": "2014-11-06T16:31:34+00:00" + ] }, { "name": "bower-asset/pnotify", @@ -1332,8 +1312,7 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin.", - "time": "2017-07-31T21:50:29+00:00" + "description": "JavaScript notification plugin." }, { "name": "bower-asset/respond", @@ -1357,8 +1336,7 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)", - "time": "2013-12-19T04:44:31+00:00" + "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" }, { "name": "bower-asset/responsive-tables-js", @@ -1388,8 +1366,7 @@ "jquery", "responsive", "table" - ], - "time": "2015-10-08T14:18:04+00:00" + ] }, { "name": "bower-asset/select2", @@ -1457,8 +1434,7 @@ "scrolling", "slimscroll", "ui" - ], - "time": "2016-06-11T09:19:14+00:00" + ] }, { "name": "bower-asset/tinymce-dist", @@ -3182,16 +3158,16 @@ }, { "name": "imdbphp/imdbphp", - "version": "v6.0.3", + "version": "v6.0.4", "source": { "type": "git", "url": "https://github.com/tboothman/imdbphp.git", - "reference": "ce0cd847eaff39594f01f1f2ce28c4fea7b31f92" + "reference": "858bba387482a349f5d91c8d555e23307900b998" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tboothman/imdbphp/zipball/ce0cd847eaff39594f01f1f2ce28c4fea7b31f92", - "reference": "ce0cd847eaff39594f01f1f2ce28c4fea7b31f92", + "url": "https://api.github.com/repos/tboothman/imdbphp/zipball/858bba387482a349f5d91c8d555e23307900b998", + "reference": "858bba387482a349f5d91c8d555e23307900b998", "shasum": "" }, "require": { @@ -3218,7 +3194,7 @@ "GPL-2.0-or-later" ], "description": "Library for retrieving film and tv information from IMDb", - "time": "2018-08-18T22:29:04+00:00" + "time": "2018-10-02T15:19:37+00:00" }, { "name": "intervention/image", @@ -3795,16 +3771,16 @@ }, { "name": "laravel/framework", - "version": "v5.7.6", + "version": "v5.7.7", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "93e761bb5367166ce98ba908d5eb0edd6be76792" + "reference": "0438455128c0850b5872c7f3c11b7ccdbbfcba3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/93e761bb5367166ce98ba908d5eb0edd6be76792", - "reference": "93e761bb5367166ce98ba908d5eb0edd6be76792", + "url": "https://api.github.com/repos/laravel/framework/zipball/0438455128c0850b5872c7f3c11b7ccdbbfcba3e", + "reference": "0438455128c0850b5872c7f3c11b7ccdbbfcba3e", "shasum": "" }, "require": { @@ -3816,6 +3792,7 @@ "league/flysystem": "^1.0.8", "monolog/monolog": "^1.12", "nesbot/carbon": "^1.26.3", + "opis/closure": "^3.1", "php": "^7.1.3", "psr/container": "^1.0", "psr/simple-cache": "^1.0", @@ -3932,7 +3909,7 @@ "framework", "laravel" ], - "time": "2018-09-25T14:29:00+00:00" + "time": "2018-10-02T14:12:00+00:00" }, { "name": "laravel/scout", @@ -4799,6 +4776,67 @@ }, "time": "2016-10-30T19:06:19+00:00" }, + { + "name": "opis/closure", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/opis/closure.git", + "reference": "d3209e46ad6c69a969b705df0738fd0dbe26ef9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opis/closure/zipball/d3209e46ad6c69a969b705df0738fd0dbe26ef9e", + "reference": "d3209e46ad6c69a969b705df0738fd0dbe26ef9e", + "shasum": "" + }, + "require": { + "php": "^5.4 || ^7.0" + }, + "require-dev": { + "jeremeamia/superclosure": "^2.0", + "phpunit/phpunit": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Opis\\Closure\\": "src/" + }, + "files": [ + "functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + }, + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" + } + ], + "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", + "homepage": "https://opis.io/closure", + "keywords": [ + "anonymous functions", + "closure", + "function", + "serializable", + "serialization", + "serialize" + ], + "time": "2018-10-02T13:36:53+00:00" + }, { "name": "paragonie/random_compat", "version": "v9.99.99", From 34292b175c5720d5e37649bcd68a12b9a566a73d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 2 Oct 2018 23:23:52 +0200 Subject: [PATCH 2/2] Fix wrong link to tvdb banners --- Blacklight/processing/tv/TVDB.php | 2 +- Changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Blacklight/processing/tv/TVDB.php b/Blacklight/processing/tv/TVDB.php index ec70542d3b..862f807f75 100755 --- a/Blacklight/processing/tv/TVDB.php +++ b/Blacklight/processing/tv/TVDB.php @@ -13,7 +13,7 @@ */ class TVDB extends TV { - private const TVDB_IMAGES_URL = 'https://www.thetvdb.com/banners/'; + private const TVDB_IMAGES_URL = 'https://www.thetvdb.com/banners'; private const TVDB_API_KEY = '31740C28BAC74DEF'; private const MATCH_PROBABILITY = 75; diff --git a/Changelog b/Changelog index 4c47553686..7da2400dc2 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-02 DariusIII + * Fix: Fix wrong link to tvdb banners * Chg: Update laravel/framework to version 5.7.7 and imdbphp/imdbphp to version 6.0.4 * Chg: Update branches and their handling, remove restriction for updating non dev branches 2018-10-01 DariusIII