From 474011ec0b427555cf75e57b4adcee5be45a447c Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 3 Oct 2018 12:23:21 +0200 Subject: [PATCH 1/5] Update mockery/mockery to version 1.2.0 --- Changelog | 2 ++ composer.lock | 85 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 31 deletions(-) diff --git a/Changelog b/Changelog index 7da2400dc2..64a4eb7320 100755 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2018-10-03 DariusIII + * Chg: Update mockery/mockery to version 1.2.0 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 diff --git a/composer.lock b/composer.lock index feba2f8b95..aaccec3a92 100644 --- a/composer.lock +++ b/composer.lock @@ -321,7 +321,8 @@ "Gemfile.lock", "*.md" ] - } + }, + "time": "2016-06-06T17:37:52+00:00" }, { "name": "bower-asset/autosize", @@ -350,7 +351,8 @@ "form", "textarea", "ui" - ] + ], + "time": "2017-05-19T15:36:30+00:00" }, { "name": "bower-asset/bootstrap", @@ -399,7 +401,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-3.x", @@ -448,7 +451,8 @@ "mobile-first", "responsive", "web" - ] + ], + "time": "2016-07-25T15:51:55+00:00" }, { "name": "bower-asset/bootstrap-datepicker", @@ -477,7 +481,8 @@ }, "license": [ "Apache-2.0" - ] + ], + "time": "2016-08-05T09:50:13+00:00" }, { "name": "bower-asset/bootstrap-hover-dropdown", @@ -507,7 +512,8 @@ "dropdowns", "hover", "twitter" - ] + ], + "time": "2015-12-01T23:35:57+00:00" }, { "name": "bower-asset/bootstrap-progressbar", @@ -541,7 +547,8 @@ }, "license": [ "MIT" - ] + ], + "time": "2015-05-15T18:56:17+00:00" }, { "name": "bower-asset/bootswatch", @@ -672,7 +679,8 @@ "modal", "popup", "ui" - ] + ], + "time": "2016-05-10T22:21:33+00:00" }, { "name": "bower-asset/datatables", @@ -787,7 +795,8 @@ "tests", "examples" ] - } + }, + "time": "2015-01-26T21:19:01+00:00" }, { "name": "bower-asset/flexboxgrid", @@ -823,7 +832,8 @@ "css", "flexbox", "grid" - ] + ], + "time": "2016-08-14T16:43:18+00:00" }, { "name": "bower-asset/font-awesome", @@ -868,7 +878,8 @@ "src", "build.xml" ] - } + }, + "time": "2015-07-20T20:04:00+00:00" }, { "name": "bower-asset/icheck", @@ -918,7 +929,8 @@ "replacement", "skins", "ui" - ] + ], + "time": "2014-03-03T17:36:28+00:00" }, { "name": "bower-asset/jquery", @@ -981,7 +993,8 @@ "javascript", "jquery", "library" - ] + ], + "time": "2016-05-20T17:24:43+00:00" }, { "name": "bower-asset/jquery-3.2.x", @@ -1048,7 +1061,8 @@ "scroll", "scrolltop", "scrolltotop" - ] + ], + "time": "2017-08-31T15:51:29+00:00" }, { "name": "bower-asset/jquery-migrate-1.4.x", @@ -1067,7 +1081,8 @@ "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", @@ -1086,7 +1101,8 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "jquery-migrate.js" - } + }, + "time": "2016-06-10T14:28:59+00:00" }, { "name": "bower-asset/jquery.nicescroll", @@ -1116,7 +1132,8 @@ "demo", "package.json" ] - } + }, + "time": "2016-03-01T20:38:24+00:00" }, { "name": "bower-asset/material-design-iconic-font", @@ -1155,7 +1172,8 @@ "font", "icons", "material" - ] + ], + "time": "2015-11-08T04:50:28+00:00" }, { "name": "bower-asset/materialize", @@ -1214,7 +1232,8 @@ "responsive", "sass", "ux" - ] + ], + "time": "2017-04-15T01:39:28+00:00" }, { "name": "bower-asset/pace", @@ -1260,7 +1279,8 @@ "progress", "progress", "spinner" - ] + ], + "time": "2014-11-06T16:31:34+00:00" }, { "name": "bower-asset/pnotify", @@ -1312,7 +1332,8 @@ "license": [ "Apache-2.0" ], - "description": "JavaScript notification plugin." + "description": "JavaScript notification plugin.", + "time": "2017-07-31T21:50:29+00:00" }, { "name": "bower-asset/respond", @@ -1336,7 +1357,8 @@ "test" ] }, - "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)" + "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" }, { "name": "bower-asset/responsive-tables-js", @@ -1366,7 +1388,8 @@ "jquery", "responsive", "table" - ] + ], + "time": "2015-10-08T14:18:04+00:00" }, { "name": "bower-asset/select2", @@ -1434,7 +1457,8 @@ "scrolling", "slimscroll", "ui" - ] + ], + "time": "2016-06-11T09:19:14+00:00" }, { "name": "bower-asset/tinymce-dist", @@ -9000,16 +9024,16 @@ }, { "name": "mockery/mockery", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" + "reference": "100633629bf76d57430b86b7098cd6beb996a35a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", - "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", + "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a", + "reference": "100633629bf76d57430b86b7098cd6beb996a35a", "shasum": "" }, "require": { @@ -9018,8 +9042,7 @@ "php": ">=5.6.0" }, "require-dev": { - "phpdocumentor/phpdocumentor": "^2.9", - "phpunit/phpunit": "~5.7.10|~6.5" + "phpunit/phpunit": "~5.7.10|~6.5|~7.0" }, "type": "library", "extra": { @@ -9062,7 +9085,7 @@ "test double", "testing" ], - "time": "2018-05-08T08:54:48+00:00" + "time": "2018-10-02T21:52:37+00:00" }, { "name": "moontoast/math", From fb8991682469260660660460cedb848de00138f2 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 3 Oct 2018 14:23:17 +0200 Subject: [PATCH 2/5] Increase number of pages listed on each side of pagers current page --- Changelog | 1 + resources/views/themes/Gentele/books.tpl | 4 ++-- resources/views/themes/Gentele/browse.tpl | 4 ++-- resources/views/themes/Gentele/browsegroup.tpl | 4 ++-- resources/views/themes/Gentele/console.tpl | 4 ++-- resources/views/themes/Gentele/forum.tpl | 4 ++-- resources/views/themes/Gentele/games.tpl | 4 ++-- resources/views/themes/Gentele/movies.tpl | 4 ++-- resources/views/themes/Gentele/multi-operations.tpl | 2 +- resources/views/themes/Gentele/music.tpl | 4 ++-- resources/views/themes/Gentele/search.tpl | 4 ++-- resources/views/themes/Gentele/viewxxxfull.tpl | 2 +- resources/views/themes/Gentele/xxx.tpl | 4 ++-- resources/views/themes/admin/anidb-list.tpl | 4 ++-- resources/views/themes/admin/book-list.tpl | 4 ++-- resources/views/themes/admin/category_regexes-list.tpl | 4 ++-- resources/views/themes/admin/collection_regexes-list.tpl | 4 ++-- resources/views/themes/admin/comments-list.tpl | 2 +- resources/views/themes/admin/console-list.tpl | 4 ++-- resources/views/themes/admin/failrel-list.tpl | 4 ++-- resources/views/themes/admin/game-list.tpl | 2 +- resources/views/themes/admin/group-list.tpl | 4 ++-- resources/views/themes/admin/movie-list.tpl | 2 +- resources/views/themes/admin/music-list.tpl | 4 ++-- resources/views/themes/admin/predb.tpl | 4 ++-- resources/views/themes/admin/preview-list.tpl | 4 ++-- resources/views/themes/admin/release-list.tpl | 4 ++-- resources/views/themes/admin/release_naming_regexes-list.tpl | 4 ++-- resources/views/themes/admin/sharing.tpl | 4 ++-- resources/views/themes/admin/show-list.tpl | 4 ++-- resources/views/themes/admin/user-list.tpl | 2 +- 31 files changed, 55 insertions(+), 54 deletions(-) diff --git a/Changelog b/Changelog index 64a4eb7320..c9344dd7d5 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-03 DariusIII + * Chg: Increase number of pages listed on each side of pagers current page * Chg: Update mockery/mockery to version 1.2.0 2018-10-02 DariusIII * Fix: Fix wrong link to tvdb banners diff --git a/resources/views/themes/Gentele/books.tpl b/resources/views/themes/Gentele/books.tpl index e4752a6d8d..a512b967de 100755 --- a/resources/views/themes/Gentele/books.tpl +++ b/resources/views/themes/Gentele/books.tpl @@ -55,7 +55,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}

@@ -219,7 +219,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/Gentele/browse.tpl b/resources/views/themes/Gentele/browse.tpl index 3d40676083..a69595dad2 100755 --- a/resources/views/themes/Gentele/browse.tpl +++ b/resources/views/themes/Gentele/browse.tpl @@ -71,7 +71,7 @@ {if count($results) > 0}
- {$results->links()} + {$results->onEachSide(5)->links()}
{/if} @@ -231,7 +231,7 @@ {if count($results) > 0}
- {$results->links()} + {$results->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/Gentele/browsegroup.tpl b/resources/views/themes/Gentele/browsegroup.tpl index 1a3c2c4dfa..1d91cde54f 100755 --- a/resources/views/themes/Gentele/browsegroup.tpl +++ b/resources/views/themes/Gentele/browsegroup.tpl @@ -16,7 +16,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
@@ -41,7 +41,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/Gentele/console.tpl b/resources/views/themes/Gentele/console.tpl index 713ebb8f89..bcae2e0418 100755 --- a/resources/views/themes/Gentele/console.tpl +++ b/resources/views/themes/Gentele/console.tpl @@ -49,7 +49,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
@@ -233,7 +233,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/Gentele/forum.tpl b/resources/views/themes/Gentele/forum.tpl index 51020b2e03..7c9e21a0a0 100755 --- a/resources/views/themes/Gentele/forum.tpl +++ b/resources/views/themes/Gentele/forum.tpl @@ -2,7 +2,7 @@

{if $title !=''}{$title}{else}Forum{/if}

{if count($results) > 0}
- {$results->links()} + {$results->onEachSide(5)->links()}
@@ -82,7 +82,7 @@
Top

- {$results->links()} + {$results->onEachSide(5)->links()}
{/if}
- {$results->links()} + {$results->onEachSide(5)->links()}
@@ -259,7 +259,7 @@ {if count($results) > 0}
- {$results->links()} + {$results->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/Gentele/movies.tpl b/resources/views/themes/Gentele/movies.tpl index 1f0c505434..467b71b747 100755 --- a/resources/views/themes/Gentele/movies.tpl +++ b/resources/views/themes/Gentele/movies.tpl @@ -54,7 +54,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}

@@ -398,7 +398,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/Gentele/multi-operations.tpl b/resources/views/themes/Gentele/multi-operations.tpl index 3e2e705919..028f161608 100755 --- a/resources/views/themes/Gentele/multi-operations.tpl +++ b/resources/views/themes/Gentele/multi-operations.tpl @@ -1,5 +1,5 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
With Selected:
- {$results->links()} + {$results->onEachSide(5)->links()}

@@ -213,7 +213,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/Gentele/search.tpl b/resources/views/themes/Gentele/search.tpl index 51dc3f9885..e5008ab17e 100755 --- a/resources/views/themes/Gentele/search.tpl +++ b/resources/views/themes/Gentele/search.tpl @@ -196,7 +196,7 @@ {if count($results) > 0}
- {$results->links()} + {$results->onEachSide(5)->links()}
{/if} @@ -430,7 +430,7 @@ {if count($results) > 0}
- {$results->links()} + {$results->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/Gentele/viewxxxfull.tpl b/resources/views/themes/Gentele/viewxxxfull.tpl index c7c466746e..dd3e014391 100755 --- a/resources/views/themes/Gentele/viewxxxfull.tpl +++ b/resources/views/themes/Gentele/viewxxxfull.tpl @@ -218,7 +218,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/Gentele/xxx.tpl b/resources/views/themes/Gentele/xxx.tpl index 83eeeb15d3..b3414306a8 100755 --- a/resources/views/themes/Gentele/xxx.tpl +++ b/resources/views/themes/Gentele/xxx.tpl @@ -54,7 +54,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}

@@ -442,7 +442,7 @@
- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/admin/anidb-list.tpl b/resources/views/themes/admin/anidb-list.tpl index 09292c2c1e..097378f3cd 100644 --- a/resources/views/themes/admin/anidb-list.tpl +++ b/resources/views/themes/admin/anidb-list.tpl @@ -14,7 +14,7 @@ - {$anidblist->links()} + {$anidblist->onEachSide(5)->links()}

@@ -45,7 +45,7 @@
- {$anidblist->links()} + {$anidblist->onEachSide(5)->links()} {else}

No AniDB episodes available.

{/if} diff --git a/resources/views/themes/admin/book-list.tpl b/resources/views/themes/admin/book-list.tpl index d2a3301b37..92fcf74245 100644 --- a/resources/views/themes/admin/book-list.tpl +++ b/resources/views/themes/admin/book-list.tpl @@ -4,7 +4,7 @@ {if $booklist} {if $booklist->count() > 0}
- {$booklist->links()} + {$booklist->onEachSide(5)->links()}
{/if}
@@ -30,7 +30,7 @@
{if $booklist->count() > 0}
- {$booklist->links()} + {$booklist->onEachSide(5)->links()}
{/if} {else} diff --git a/resources/views/themes/admin/category_regexes-list.tpl b/resources/views/themes/admin/category_regexes-list.tpl index 393b01fa0a..46eaa4da48 100644 --- a/resources/views/themes/admin/category_regexes-list.tpl +++ b/resources/views/themes/admin/category_regexes-list.tpl @@ -13,7 +13,7 @@ {if $regex} -
{$regex->links()}
+
{$regex->onEachSide(5)->links()}
@@ -49,6 +49,6 @@ {/foreach}
id
-
{$regex->links()}
+
{$regex->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/admin/collection_regexes-list.tpl b/resources/views/themes/admin/collection_regexes-list.tpl index bff5615523..2ccac6cad7 100644 --- a/resources/views/themes/admin/collection_regexes-list.tpl +++ b/resources/views/themes/admin/collection_regexes-list.tpl @@ -11,7 +11,7 @@ {if $regex} -
{$regex->links()}
+
{$regex->onEachSide(5)->links()}
@@ -45,6 +45,6 @@ {/foreach}
id
-
{$regex->links()}
+
{$regex->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/admin/comments-list.tpl b/resources/views/themes/admin/comments-list.tpl index 063d6a72e2..ad36eb740d 100644 --- a/resources/views/themes/admin/comments-list.tpl +++ b/resources/views/themes/admin/comments-list.tpl @@ -1,7 +1,7 @@

{$title}

{if $commentslist} - {$commentslist->links()} + {$commentslist->onEachSide(5)->links()} diff --git a/resources/views/themes/admin/console-list.tpl b/resources/views/themes/admin/console-list.tpl index 46a1e93897..ac564eb592 100644 --- a/resources/views/themes/admin/console-list.tpl +++ b/resources/views/themes/admin/console-list.tpl @@ -2,7 +2,7 @@
{if $consolelist} - {$consolelist->links()} + {$consolelist->onEachSide(5)->links()}
user
@@ -24,7 +24,7 @@

- {$consolelist->links()} + {$consolelist->onEachSide(5)->links()} {else}

No games available.

{/if} diff --git a/resources/views/themes/admin/failrel-list.tpl b/resources/views/themes/admin/failrel-list.tpl index a1e2a846c2..23bedaf871 100644 --- a/resources/views/themes/admin/failrel-list.tpl +++ b/resources/views/themes/admin/failrel-list.tpl @@ -2,7 +2,7 @@

{$title}

{if $releaselist} - {$releaselist->links()} + {$releaselist->onEachSide(5)->links()} @@ -35,7 +35,7 @@

- {$releaselist->links()} + {$releaselist->onEachSide(5)->links()} {else}

No releases available.

{/if} diff --git a/resources/views/themes/admin/game-list.tpl b/resources/views/themes/admin/game-list.tpl index 8c0f37d4ba..cb3e56126e 100644 --- a/resources/views/themes/admin/game-list.tpl +++ b/resources/views/themes/admin/game-list.tpl @@ -1,7 +1,7 @@ - {$results->links()} + {$results->onEachSide(5)->links()} @@ -101,6 +101,6 @@
Date

- {$results->links()} + {$results->onEachSide(5)->links()}
diff --git a/resources/views/themes/admin/preview-list.tpl b/resources/views/themes/admin/preview-list.tpl index 60c9ff8c39..3bbc3f8275 100644 --- a/resources/views/themes/admin/preview-list.tpl +++ b/resources/views/themes/admin/preview-list.tpl @@ -18,7 +18,7 @@

{if $releaselist} - {$releaselist->links()} + {$releaselist->onEachSide(5)->links()} @@ -38,7 +38,7 @@

- {$releaselist->links()} + {$releaselist->onEachSide(5)->links()} {else}

No results.

{/if} diff --git a/resources/views/themes/admin/release-list.tpl b/resources/views/themes/admin/release-list.tpl index 6877e07837..fe5c7ac332 100644 --- a/resources/views/themes/admin/release-list.tpl +++ b/resources/views/themes/admin/release-list.tpl @@ -2,7 +2,7 @@

{$title}

{if $releaselist} - {$releaselist->links()} + {$releaselist->onEachSide(5)->links()} @@ -33,7 +33,7 @@

- {$releaselist->links()} + {$releaselist->onEachSide(5)->links()} {else}

No releases available.

{/if} diff --git a/resources/views/themes/admin/release_naming_regexes-list.tpl b/resources/views/themes/admin/release_naming_regexes-list.tpl index 0e9cae9b96..4134a75285 100644 --- a/resources/views/themes/admin/release_naming_regexes-list.tpl +++ b/resources/views/themes/admin/release_naming_regexes-list.tpl @@ -11,7 +11,7 @@ {if isset($regex)} -
{$regex->links()}
+
{$regex->onEachSide(5)->links()}
@@ -46,6 +46,6 @@ {/foreach}
id
-
{$regex->links()}
+
{$regex->onEachSide(5)->links()}
{/if} diff --git a/resources/views/themes/admin/sharing.tpl b/resources/views/themes/admin/sharing.tpl index 35d05ad73a..9cded5600f 100644 --- a/resources/views/themes/admin/sharing.tpl +++ b/resources/views/themes/admin/sharing.tpl @@ -190,7 +190,7 @@ {if $sites}
These are the remote websites we have seen so far:
- {$sites->links()} + {$sites->onEachSide(5)->links()}
@@ -231,7 +231,7 @@ {/foreach} - {$sites->links()} + {$sites->onEachSide(5)->links()} {else}

No remote sites found in your database.

{/if} diff --git a/resources/views/themes/admin/show-list.tpl b/resources/views/themes/admin/show-list.tpl index 57ebcbc0ee..c48eb611bc 100755 --- a/resources/views/themes/admin/show-list.tpl +++ b/resources/views/themes/admin/show-list.tpl @@ -10,7 +10,7 @@
- {$tvshowlist->links()} + {$tvshowlist->onEachSide(5)->links()}

No TV Shows available.

{/if} - \ No newline at end of file + diff --git a/resources/views/themes/admin/user-list.tpl b/resources/views/themes/admin/user-list.tpl index 9aa76bf264..79ec73561f 100644 --- a/resources/views/themes/admin/user-list.tpl +++ b/resources/views/themes/admin/user-list.tpl @@ -24,7 +24,7 @@ - {$userlist->links()} + {$userlist->onEachSide(5)->links()}

From 68ac1baec692f1537fd1c70306d1db43941d6501 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 3 Oct 2018 14:52:40 +0200 Subject: [PATCH 3/5] Update exception handling in ProcessAdditional class and related scripts --- .../processing/post/ProcessAdditional.php | 4 +-- .../post/ProcessAdditionalException.php | 26 ------------------- Changelog | 1 + .../multiprocessing/.do_not_run/switch.php | 8 ++---- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100755 Blacklight/processing/post/ProcessAdditionalException.php diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index 373224b055..67eccfef2c 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -529,7 +529,6 @@ public function __destruct() * @param string $groupID * @param string $guidChar * - * @throws \Blacklight\processing\post\ProcessAdditionalException * @throws \Exception */ public function start($groupID = '', $guidChar = ''): void @@ -563,7 +562,6 @@ public function start($groupID = '', $guidChar = ''): void * @param string $groupID * @throws \RuntimeException * @throws \Exception - * @throws \Blacklight\processing\post\ProcessAdditionalException */ protected function _setMainTempPath(&$guidChar, &$groupID = ''): void { @@ -592,7 +590,7 @@ protected function _setMainTempPath(&$guidChar, &$groupID = ''): void } if (! is_dir($this->_mainTmpPath)) { - throw new ProcessAdditionalException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')'); + throw new \RuntimeException('Could not create the tmpunrar folder ('.$this->_mainTmpPath.')'); } $this->_clearMainTmpPath(); diff --git a/Blacklight/processing/post/ProcessAdditionalException.php b/Blacklight/processing/post/ProcessAdditionalException.php deleted file mode 100755 index de4eacb7fc..0000000000 --- a/Blacklight/processing/post/ProcessAdditionalException.php +++ /dev/null @@ -1,26 +0,0 @@ -. - * @author niel - * @copyright 2015 nZEDb - */ - -namespace Blacklight\processing\post; - -class ProcessAdditionalException extends \Exception -{ -} diff --git a/Changelog b/Changelog index c9344dd7d5..c851e49d71 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-03 DariusIII + * Chg: Update exception handling in ProcessAdditional class and related scripts * Chg: Increase number of pages listed on each side of pagers current page * Chg: Update mockery/mockery to version 1.2.0 2018-10-02 DariusIII diff --git a/misc/update/multiprocessing/.do_not_run/switch.php b/misc/update/multiprocessing/.do_not_run/switch.php index c4d81387d1..c86704465d 100644 --- a/misc/update/multiprocessing/.do_not_run/switch.php +++ b/misc/update/multiprocessing/.do_not_run/switch.php @@ -315,9 +315,7 @@ // Post process the releases. try { (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp]))->start($options[2]); - } catch (\Blacklight\processing\post\ProcessAdditionalException $e) { - echo $e->getMessage(); - } catch (Exception $e) { + } catch (\Throwable $e) { echo $e->getMessage(); } try { @@ -350,9 +348,7 @@ } else { try { (new ProcessAdditional(['Echo' => true, 'NNTP' => $nntp]))->start('', $options[2]); - } catch (\Blacklight\processing\post\ProcessAdditionalException $e) { - echo $e->getMessage(); - } catch (Exception $e) { + } catch (\Throwable $e) { echo $e->getMessage(); } } From 8fba27ec0e5995bc18a3b26acc2434ebffe88b91 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 3 Oct 2018 15:06:05 +0200 Subject: [PATCH 4/5] Remove stray whitespace in X-DNZB-NFO header sent on nzb download. Fixes issue #735 --- Changelog | 1 + app/Http/Controllers/GetNzbController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index c851e49d71..94dca0fc1c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-03 DariusIII + * Fix: Remove stray whitespace in X-DNZB-NFO header sent on nzb download. Fixes issue #735 * Chg: Update exception handling in ProcessAdditional class and related scripts * Chg: Increase number of pages listed on each side of pagers current page * Chg: Update mockery/mockery to version 1.2.0 diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php index 2c9dccbe3d..c14c5d3d24 100644 --- a/app/Http/Controllers/GetNzbController.php +++ b/app/Http/Controllers/GetNzbController.php @@ -133,7 +133,7 @@ public function getNzb(Request $request) } if ((int) $relData['nfostatus'] === 1) { - $headers += ['X-DNZB-NFO ' => url('/').'/nfo/'.$request->input('id')]; + $headers += ['X-DNZB-NFO' => url('/').'/nfo/'.$request->input('id')]; } $headers += ['X-DNZB-RCode' => '200', From d92f467ac431e2681c4ab0c1fa72000d378ad31d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 3 Oct 2018 15:07:15 +0200 Subject: [PATCH 5/5] Update symfony components to their latest versions --- Changelog | 1 + composer.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Changelog b/Changelog index 94dca0fc1c..212abe350c 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-10-03 DariusIII + * Chg: Update symfony components to their latest versions * Fix: Remove stray whitespace in X-DNZB-NFO header sent on nzb download. Fixes issue #735 * Chg: Update exception handling in ProcessAdditional class and related scripts * Chg: Increase number of pages listed on each side of pagers current page diff --git a/composer.lock b/composer.lock index aaccec3a92..7ea6e0826f 100644 --- a/composer.lock +++ b/composer.lock @@ -7245,16 +7245,16 @@ }, { "name": "symfony/property-access", - "version": "v3.4.16", + "version": "v3.4.17", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "35e277fabd77d42b747d017dc31f4b7fab5158fc" + "reference": "a62b882330f24b43f4409e50a0692aa433947460" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/35e277fabd77d42b747d017dc31f4b7fab5158fc", - "reference": "35e277fabd77d42b747d017dc31f4b7fab5158fc", + "url": "https://api.github.com/repos/symfony/property-access/zipball/a62b882330f24b43f4409e50a0692aa433947460", + "reference": "a62b882330f24b43f4409e50a0692aa433947460", "shasum": "" }, "require": { @@ -7309,11 +7309,11 @@ "property path", "reflection" ], - "time": "2018-09-08T13:15:14+00:00" + "time": "2018-10-02T12:28:39+00:00" }, { "name": "symfony/property-info", - "version": "v3.4.16", + "version": "v3.4.17", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", @@ -7466,16 +7466,16 @@ }, { "name": "symfony/serializer", - "version": "v3.4.16", + "version": "v3.4.17", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "6fd29b89c3c185ba90e27292b204d6e905cd5198" + "reference": "8bc00ef47a428bfebc4641f29d158e7c56137fcb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/6fd29b89c3c185ba90e27292b204d6e905cd5198", - "reference": "6fd29b89c3c185ba90e27292b204d6e905cd5198", + "url": "https://api.github.com/repos/symfony/serializer/zipball/8bc00ef47a428bfebc4641f29d158e7c56137fcb", + "reference": "8bc00ef47a428bfebc4641f29d158e7c56137fcb", "shasum": "" }, "require": { @@ -7541,7 +7541,7 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2018-09-21T12:47:54+00:00" + "time": "2018-10-02T12:28:39+00:00" }, { "name": "symfony/translation",