From 933ea641cce2a3d53373ebbdc5c7b28431092d65 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Wed, 23 Sep 2015 05:45:55 +1000 Subject: [PATCH] Adds failed jobs table (from docs) Allow closures to be passed to Form|ListController Tidy up server detail payload --- modules/backend/behaviors/FormController.php | 2 +- modules/backend/behaviors/ListController.php | 2 +- modules/system/classes/UpdateManager.php | 3 +-- .../2015_10_01_000018_Db_FailedJobs.php | 24 +++++++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php index f110ef308..48906da73 100644 --- a/modules/backend/behaviors/FormController.php +++ b/modules/backend/behaviors/FormController.php @@ -693,7 +693,7 @@ class FormController extends ControllerBehavior if (!is_a($widget->getController(), $calledClass)) { return; } - $callback($widget, $widget->model, $widget->getContext()); + call_user_func_array($callback, [$widget, $widget->model, $widget->getContext()]); }); } diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php index 34830a1b1..54315e998 100644 --- a/modules/backend/behaviors/ListController.php +++ b/modules/backend/behaviors/ListController.php @@ -411,7 +411,7 @@ class ListController extends ControllerBehavior if (!is_a($widget->getController(), $calledClass)) { return; } - $callback($widget, $widget->model); + call_user_func_array($callback, [$widget, $widget->model]); }); } } diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php index 99b631bff..2da60e101 100644 --- a/modules/system/classes/UpdateManager.php +++ b/modules/system/classes/UpdateManager.php @@ -836,8 +836,7 @@ class UpdateManager */ protected function applyHttpAttributes($http, $postData) { - $postData['url'] = base64_encode(URL::to('/')); - $postData['server'] = base64_encode(serialize(['php' => PHP_VERSION])); + $postData['server'] = base64_encode(serialize(['php' => PHP_VERSION, 'url' => URL::to('/')])); if (Config::get('cms.edgeUpdates', false)) { $postData['edge'] = 1; } diff --git a/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php new file mode 100644 index 000000000..5a5ac906d --- /dev/null +++ b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php @@ -0,0 +1,24 @@ +engine = 'InnoDB'; + $table->increments('id'); + $table->text('connection'); + $table->text('queue'); + $table->text('payload'); + $table->timestamp('failed_at'); + }); + } + + public function down() + { + Schema::dropIfExists('failed_jobs'); + } +}