Skip to content

Commit efd5ac2

Browse files
nolanpronolanpro
committed
Update error handler to use Throwable
1 parent f2c1f28 commit efd5ac2

21 files changed

Lines changed: 4354 additions & 8 deletions

‎.phpunit.result.cache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":1,"defects":{"Tests\\Feature\\Api\\NotificationsTest::testGetNotification":3},"times":{"Tests\\Feature\\AboutTest::testIndexRoute":0.699,"Tests\\Feature\\Admin\\DashboardTest::testIndexRoute":0.664,"Tests\\Feature\\Admin\\GroupTest::testIndexRoute":0.352,"Tests\\Feature\\Admin\\GroupTest::testEditRoute":0.376,"Tests\\Feature\\Admin\\UserTest::testIndexRoute":0.349,"Tests\\Feature\\Admin\\UserTest::testEditRoute":0.562,"Tests\\Feature\\Admin\\UserTest::testCanSeeAditionalInformationInEditRoute":0.55,"Tests\\Feature\\Admin\\UserTest::testCannotSeeAditionalInformationInProfileRoute":0.588,"Tests\\Feature\\Api\\BoundaryEventsTest::testSignalBoundaryEvent":0.994,"Tests\\Feature\\Api\\BoundaryEventsTest::testCycleTimerBoundaryEvent":1.181,"Tests\\Feature\\Api\\BoundaryEventsTest::testErrorBoundaryEventScriptTask":0.924,"Tests\\Feature\\Api\\BoundaryEventsTest::testErrorBoundaryEventCallActivity":0.887,"Tests\\Feature\\Api\\BoundaryEventsTest::testCycleTimerBoundaryEventCallActivity":1.392,"Tests\\Feature\\Api\\BoundaryEventsTest::testSignalBoundaryEventCallActivity":0.973,"Tests\\Feature\\Api\\BoundaryEventsTest::testCycleTimerBoundaryEventNonInterrupting":1.12,"Tests\\Feature\\Api\\BoundaryEventsTest::testErrorBoundaryEventScriptTaskNonInterrupting":0.772,"Tests\\Feature\\Api\\BoundaryEventsTest::testErrorBoundaryEventCallActivityNonInterrupting":0.776,"Tests\\Feature\\Api\\BoundaryEventsTest::testCycleTimerBoundaryEventCallActivityNonInterrupting":1.272,"Tests\\Feature\\Api\\BoundaryEventsTest::testSignalBoundaryEventCallActivityNonInterrupting":0.816,"Tests\\Feature\\Api\\BoundaryEventsTest::testConcurrentBoundaryEventCallActivityNonInterrupting":1.704,"Tests\\Feature\\Api\\BoundaryEventsTest::testTimerBoundaryEventMultiInstance":1.383,"Tests\\Feature\\Api\\CallActivityMultilevelTest::testCallActivity":8.576,"Tests\\Feature\\Api\\CallActivityTest::testCallActivity":1.082,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityFiles":1.508,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityWithUpdateInProgress":1.519,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityValidation":0.822,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityValidationToWebEntryStartEvent":0.806,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityValidationToNonStartEventElement":0.841,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityValidationToDeletedElement":0.795,"Tests\\Feature\\Api\\CallActivityTest::testProcessLoop":0.937,"Tests\\Feature\\Api\\CallActivityTest::testCallActivityWithError":1.261,"Tests\\Feature\\Api\\ChangePasswordTest::testUserPasswordChangeWithInvalidPassword":0.34,"Tests\\Feature\\Api\\ChangePasswordTest::testUserChangePasswordMustSetFlagToFalse":0.368,"Tests\\Feature\\Api\\ChangePasswordTest::testUserChangePasswordWithoutSendingPasswordMustKeepFlagInTrue":0.332,"Tests\\Feature\\Api\\CommentTest::testGetCommentListAdministrator":4.273,"Tests\\Feature\\Api\\CommentTest::testGetCommentListNoAdministrator":4.383,"Tests\\Feature\\Api\\CommentTest::testGetCommentByType":8.765,"Tests\\Feature\\Api\\CommentTest::testNotCreatedForParameterRequired":0.393,"Tests\\Feature\\Api\\CommentTest::testCreateComment":1.242,"Tests\\Feature\\Api\\CommentTest::testGetComment":1.663,"Tests\\Feature\\Api\\CommentTest::testDeleteComment":1.629,"Tests\\Feature\\Api\\CommentTest::testDeleteCommentNotExist":1.327,"Tests\\Feature\\Api\\ConditionalStartEventTest::testConditionalEventMustTriggeredWhenActive":0.34,"Tests\\Feature\\Api\\ConditionalStartEventTest::testConditionalEventMustNotTriggeredWhenInactive":0.316,"Tests\\Feature\\Api\\ConvertBPMNTest::testConvertSubProcess":1.036,"Tests\\Feature\\Api\\ConvertBPMNTest::testConvertSendTask":0.907,"Tests\\Feature\\Api\\CssOverrideTest::testEmptyParameters":0.34,"Tests\\Feature\\Api\\CssOverrideTest::testWrongKeys":0.457,"Tests\\Feature\\Api\\CssOverrideTest::testResetCss":2.685,"Tests\\Feature\\Api\\DocumentationTest::testGenerateSwaggerDocument":0.759,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_create_an_environment_variable":0.299,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_store_values_as_encrypted":0.285,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_have_validation_errors_on_name_uniqueness_during_create":0.296,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_not_allow_whitespace_in_variable_name":0.29,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_successfully_return_an_environment_variable":0.345,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_have_validation_errors_on_name_uniqueness_during_update":0.299,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_successfully_update_an_environment_variable":0.298,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_return_paginated_environment_variables_during_index":0.366,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_return_filtered_environment_variables":0.335,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_should_successfully_remove_environment_variable":0.297,"Tests\\Feature\\Api\\EnvironmentVariablesTest::it_value_does_not_change_if_value_is_null":0.34,"Tests\\Feature\\Api\\FilesTest::testListFiles":0.53,"Tests\\Feature\\Api\\FilesTest::testGetFile":0.523,"Tests\\Feature\\Api\\FilesTest::testCreateFile":0.557,"Tests\\Feature\\Api\\FilesTest::testUpdateFile":0.49,"Tests\\Feature\\Api\\FilesTest::testDestroyFile":0.51,"Tests\\Feature\\Api\\FilesTest::testUserWithoutPermission":0.673,"Tests\\Feature\\Api\\GlobalSignalsTest::testGlobalSignalsWithCollaboration":1.485,"Tests\\Feature\\Api\\GlobalSignalsTest::testGlobalStartSignalWithoutCollaboration":1.661,"Tests\\Feature\\Api\\GlobalSignalsTest::testProcessWithUndefinedSignals":0.649,"Tests\\Feature\\Api\\GroupMembersTest::testGetGroupMemberList":0.584,"Tests\\Feature\\Api\\GroupMembersTest::testNotCreatedForParameterRequired":0.308,"Tests\\Feature\\Api\\GroupMembersTest::testCreateGroupMembershipForUser":0.553,"Tests\\Feature\\Api\\GroupMembersTest::testCreateGroupMembershipForGroup":0.311,"Tests\\Feature\\Api\\GroupMembersTest::testGetGroupMember":0.487,"Tests\\Feature\\Api\\GroupMembersTest::testDeleteGroupMember":0.516,"Tests\\Feature\\Api\\GroupMembersTest::testDeleteGroupMemberNotExist":0.567,"Tests\\Feature\\Api\\GroupMembersTest::testMembersAllGroupAvailable":0.55,"Tests\\Feature\\Api\\GroupMembersTest::testMembersOnlyGroupAvailable":0.546,"Tests\\Feature\\Api\\GroupMembersTest::testMembersAllUsersAvailable":3.098,"Tests\\Feature\\Api\\GroupMembersTest::testMembersOnlyUsersAvailable":3.631,"Tests\\Feature\\Api\\GroupsTest::testNotCreatedForParameterRequired":0.358,"Tests\\Feature\\Api\\GroupsTest::testCreateGroup":0.346,"Tests\\Feature\\Api\\GroupsTest::testNotCreateGroupWithGroupnameExists":0.371,"Tests\\Feature\\Api\\GroupsTest::testListGroup":0.383,"Tests\\Feature\\Api\\GroupsTest::testGroupListDates":0.36,"Tests\\Feature\\Api\\GroupsTest::testListGroupWithQueryParameter":0.388,"Tests\\Feature\\Api\\GroupsTest::testGetGroup":0.388,"Tests\\Feature\\Api\\GroupsTest::testUpdateGroupParametersRequired":0.389,"Tests\\Feature\\Api\\GroupsTest::testUpdateGroup":0.393,"Tests\\Feature\\Api\\GroupsTest::testUpdateGroupTitleExists":0.37,"Tests\\Feature\\Api\\GroupsTest::testDeleteGroup":0.398,"Tests\\Feature\\Api\\GroupsTest::testDeleteGroupNotExist":0.531,"Tests\\Feature\\Api\\IntermediateTimerEventTest::testRegisterIntermediateTimerEvents":1.115,"Tests\\Feature\\Api\\IntermediateTimerEventTest::testScheduleIntermediateTimerEvent":1.104,"Tests\\Feature\\Api\\IntermediateTimerEventTest::testConnectedTimerEvents":3.576,"Tests\\Feature\\Api\\IntermediateTimerEventTest::testScheduleIntermediateTimerEventWithMustacheSyntax":1.526,"Tests\\Feature\\Api\\ManualTaskTest::testUploadRequestFile":1.08,"Tests\\Feature\\Api\\NotificationsTest::testCreateNotification":0.382,"Tests\\Feature\\Api\\NotificationsTest::testListNotification":0.409,"Tests\\Feature\\Api\\NotificationsTest::testNotificationListDates":0.478,"Tests\\Feature\\Api\\NotificationsTest::testGetNotification":0.438}}

‎ProcessMaker/Exception/Handler.php‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace ProcessMaker\Exception;
44

5-
use Exception;
65
use Illuminate\Auth\AuthenticationException;
76
use Illuminate\Database\Eloquent\ModelNotFoundException;
87
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -12,6 +11,7 @@
1211
use Illuminate\Support\Facades\App;
1312
use Illuminate\Support\Facades\Route as RouteFacade;
1413
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
14+
use Throwable;
1515

1616
/**
1717
* Our general exception handler
@@ -34,10 +34,12 @@ class Handler extends ExceptionHandler
3434

3535
/**
3636
* Report our exception. If in testing with verbosity, it will also dump exception information to the console
37-
* @param Exception $exception
38-
* @throws Exception
37+
*
38+
* @param Throwable $exception
39+
*
40+
* @throws Throwable
3941
*/
40-
public function report(Exception $exception)
42+
public function report(Throwable $exception)
4143
{
4244
if (App::environment() == 'testing' && env('TESTING_VERBOSE')) {
4345
// If we're verbose, we should print ALL Exceptions to the screen
@@ -52,10 +54,10 @@ public function report(Exception $exception)
5254
* Render an exception into an HTTP response.
5355
*
5456
* @param \Illuminate\Http\Request $request
55-
* @param \Exception $exception
57+
* @param \Throwable $exception
5658
* @return \Illuminate\Http\Response
5759
*/
58-
public function render($request, Exception $exception)
60+
public function render($request, Throwable $exception)
5961
{
6062
$prefix = '';
6163
$route = $request->route();
@@ -118,10 +120,10 @@ protected function unauthenticated($request, AuthenticationException $exception)
118120
* Convert the given exception to an array.
119121
* @note This is overridding Laravel's default exception handler in order to handle binary data in message
120122
*
121-
* @param \Exception $e
123+
* @param \Throwable $e
122124
* @return array
123125
*/
124-
protected function convertExceptionToArray(Exception $e)
126+
protected function convertExceptionToArray(Throwable $e)
125127
{
126128
return config('app.debug') ? [
127129
'message' => utf8_encode($e->getMessage()),

‎config/datasources.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?php
2+
3+
return [
4+
'log_timing' => env('DATASOURCES_LOG_TIMING', false),
5+
];

‎config/savedsearch.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Saved Search Count
8+
|--------------------------------------------------------------------------
9+
|
10+
| This setting determines whether Saved Searches should be counted whenever
11+
| a workflow action occurs or a Collection record is changed. Disabling
12+
| removes counts from the sidebar and disables recount queue jobs.
13+
|
14+
*/
15+
16+
'count' => env('SAVED_SEARCH_COUNT', true),
17+
18+
];

‎pre-commit‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/nolan/src/processmaker4.2/.pre-commit

0 commit comments

Comments
 (0)