From d96ca92d1764b54ab1f1adc284e48d913fc60eb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2019 05:27:15 +0000 Subject: [PATCH 1/2] Bump symfony/http-foundation from 4.1.4 to 4.4.1 Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.1.4 to 4.4.1. - [Release notes](https://github.com/symfony/http-foundation/releases) - [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/http-foundation/compare/v4.1.4...v4.4.1) Signed-off-by: dependabot[bot] --- composer.lock | 196 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 168 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 03ecfcf66..d628509be 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "1c83afecf8a566439811bd8da82f233c", @@ -455,6 +455,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -525,6 +526,16 @@ "sly/notification-pusher": "2.*" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Davibennun\\LaravelPushNotification\\LaravelPushNotificationServiceProvider" + ], + "aliases": { + "PushNotification": "Davibennun\\LaravelPushNotification\\Facades\\PushNotification" + } + } + }, "autoload": { "psr-0": { "Davibennun\\LaravelPushNotification": "src/" @@ -1603,7 +1614,7 @@ "time": "2018-05-29T14:19:03+00:00" }, { - "name": "jeremeamia/SuperClosure", + "name": "jeremeamia/superclosure", "version": "2.4.0", "source": { "type": "git", @@ -2633,6 +2644,9 @@ } }, "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], "authors": [ { "name": "Sebastián Grignoli", @@ -3788,30 +3802,31 @@ }, { "name": "symfony/http-foundation", - "version": "v4.1.4", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345" + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3a5c91e133b220bb882b3cd773ba91bf39989345", - "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/mime": "^4.3|^5.0", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "~3.4|~4.0" + "symfony/expression-language": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -3838,7 +3853,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-08-27T17:47:02+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/http-kernel", @@ -3927,6 +3942,68 @@ "homepage": "https://symfony.com", "time": "2018-08-28T06:17:42+00:00" }, + { + "name": "symfony/mime", + "version": "v4.4.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/mime.git", + "reference": "010cc488e56cafe5f7494dea70aea93100c234df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mime/zipball/010cc488e56cafe5f7494dea70aea93100c234df", + "reference": "010cc488e56cafe5f7494dea70aea93100c234df", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" + }, + "conflict": { + "symfony/mailer": "<4.4" + }, + "require-dev": { + "egulias/email-validator": "^2.1.10", + "symfony/dependency-injection": "^3.4|^4.1|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Mime\\": "" + }, + "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": "A library to manipulate MIME messages", + "homepage": "https://symfony.com", + "keywords": [ + "mime", + "mime-type" + ], + "time": "2019-11-30T08:27:26+00:00" + }, { "name": "symfony/options-resolver", "version": "v4.1.4", @@ -4040,17 +4117,79 @@ "time": "2018-08-06T14:22:27+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "name": "symfony/polyfill-intl-idn", + "version": "v1.13.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.9" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.13-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "time": "2019-11-27T13:56:44+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.13.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -4062,7 +4201,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -4096,7 +4235,7 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/polyfill-php56", @@ -4835,22 +4974,22 @@ "shasum": "" }, "require": { - "illuminate/auth": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", - "illuminate/contracts": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", - "illuminate/http": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", - "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", + "illuminate/auth": "^5.1|^6", + "illuminate/contracts": "^5.1|^6", + "illuminate/http": "^5.1|^6", + "illuminate/support": "^5.1|^6", "lcobucci/jwt": "^3.2", "namshi/jose": "^7.0", - "nesbot/carbon": "^1.0", - "php": "^5.5.9 || ^7.0" + "nesbot/carbon": "^1.0|^2.0", + "php": "^5.5.9|^7.0" }, "require-dev": { - "cartalyst/sentinel": "2.0.*", - "illuminate/console": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", - "illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", - "illuminate/routing": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*", + "cartalyst/sentinel": "^2|^3", + "illuminate/console": "^5.1|^6", + "illuminate/database": "^5.1|^6", + "illuminate/routing": "^5.1|^6", "mockery/mockery": ">=0.9.9", - "phpunit/phpunit": "~4.8 || ~6.0" + "phpunit/phpunit": "~4.8|~6.0" }, "type": "library", "extra": { @@ -5116,6 +5255,7 @@ "laravel", "pdf" ], + "abandoned": "barryvdh/laravel-dompdf", "time": "2015-03-20T13:30:34+00:00" }, { From df7bc56fa1ca8200a6e427ffe8da615a59b2ffbf Mon Sep 17 00:00:00 2001 From: Bhanu Date: Tue, 3 Dec 2019 05:27:49 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- app/Api/routes.php | 1 + app/Http/Controllers/Admin/helpdesk/AgentController.php | 1 + app/Http/Controllers/Admin/helpdesk/BanlistController.php | 1 - app/Http/Controllers/Admin/helpdesk/DepartmentController.php | 1 - app/Http/Controllers/Admin/helpdesk/PriorityController.php | 2 -- app/Http/Controllers/Admin/helpdesk/SettingsController.php | 2 +- .../Controllers/Agent/helpdesk/Filter/FilterController.php | 3 --- .../Controllers/Agent/helpdesk/Filter/FilterControllerOld.php | 1 - app/Http/Controllers/Agent/helpdesk/TicketController.php | 1 - app/Http/Controllers/Client/helpdesk/FormController.php | 2 -- app/Http/Controllers/Common/ApiSettings.php | 1 - app/Http/Controllers/HomeController.php | 2 -- app/Http/Controllers/Installer/helpdesk/InstallController.php | 1 - 13 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/Api/routes.php b/app/Api/routes.php index 6f275710d..2f7fec584 100644 --- a/app/Api/routes.php +++ b/app/Api/routes.php @@ -1,4 +1,5 @@ delete(); throw new \Exception($error); + return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully')); } catch (\Exception $e) { return redirect('agents')->with('fails', $error); diff --git a/app/Http/Controllers/Admin/helpdesk/BanlistController.php b/app/Http/Controllers/Admin/helpdesk/BanlistController.php index 890a89775..3767dc0dd 100644 --- a/app/Http/Controllers/Admin/helpdesk/BanlistController.php +++ b/app/Http/Controllers/Admin/helpdesk/BanlistController.php @@ -8,7 +8,6 @@ use App\Http\Controllers\Controller; use App\Http\Requests\helpdesk\BanlistRequest; use App\Http\Requests\helpdesk\BanRequest; // model -use App\Model\helpdesk\Email\Banlist; use App\User; //classes use Exception; diff --git a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php index 5f7fef3f1..c007966d9 100644 --- a/app/Http/Controllers/Admin/helpdesk/DepartmentController.php +++ b/app/Http/Controllers/Admin/helpdesk/DepartmentController.php @@ -14,7 +14,6 @@ use App\Model\helpdesk\Agent\Groups; use App\Model\helpdesk\Agent\Teams; use App\Model\helpdesk\Email\Emails; use App\Model\helpdesk\Email\Template; -use App\Model\helpdesk\Manage\Help_topic; use App\Model\helpdesk\Manage\Sla_plan; use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Ticket\Tickets; diff --git a/app/Http/Controllers/Admin/helpdesk/PriorityController.php b/app/Http/Controllers/Admin/helpdesk/PriorityController.php index 7e0b39289..b1fb5ba2b 100644 --- a/app/Http/Controllers/Admin/helpdesk/PriorityController.php +++ b/app/Http/Controllers/Admin/helpdesk/PriorityController.php @@ -14,12 +14,10 @@ use App\Model\helpdesk\Manage\Help_topic; use App\Model\helpdesk\Settings\CommonSettings; use App\Model\helpdesk\Settings\Email; use App\Model\helpdesk\Ticket\Ticket_Priority; -use Auth; use DB; use Exception; // classes use Illuminate\Http\Request; -use Illuminate\support\Collection; use Lang; /** diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 57245851a..37ef7d771 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -1081,7 +1081,7 @@ class SettingsController extends Controller $result = 'failed'; $system_check = CommonSettings::select('status')->where('option_name', '=', 'dummy_data_installation')->first(); if ($system_check->status == 1 || $system_check->status == '1') { - $result = Self::cleanDatabase(); + $result = self::cleanDatabase(); } return response()->json(compact('result')); diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index fc9c1ed24..f0120a0fa 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -10,10 +10,8 @@ use App\Http\Requests; use App\Model\helpdesk\Agent\Department; //models use App\Model\helpdesk\Filters\Filter; -use App\Model\helpdesk\Filters\Label; use App\Model\helpdesk\Manage\Help_topic; use App\Model\helpdesk\Ticket\Ticket_Priority; -use App\Model\helpdesk\Ticket\Ticket_Status; use App\Model\helpdesk\Ticket\Tickets; use App\Model\helpdesk\Ticket\TicketStatusType; use App\User; @@ -21,7 +19,6 @@ use App\User; use Auth; use DB; use Illuminate\Http\Request; -use UTC; /** * ----------------------------------------------------------------------------- diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php index 030340453..171ed0a8e 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Agent\helpdesk\Filter; use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Controller; use App\Model\helpdesk\Filters\Filter; -use App\Model\helpdesk\Filters\Label; use App\Model\helpdesk\Ticket\Tickets; use Auth; use DB; diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 110196443..636532d17 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -27,7 +27,6 @@ use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Ticket\Ticket_attachments; use App\Model\helpdesk\Ticket\Ticket_Collaborator; use App\Model\helpdesk\Ticket\Ticket_Form_Data; -use App\Model\helpdesk\Ticket\Ticket_Priority; use App\Model\helpdesk\Ticket\Ticket_source; use App\Model\helpdesk\Ticket\Ticket_Status; use App\Model\helpdesk\Ticket\Ticket_Thread; diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 4b48a341d..6caf641ac 100644 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -7,7 +7,6 @@ use App\Http\Controllers\Agent\helpdesk\TicketWorkflowController; use App\Http\Controllers\Controller; // requests use App\Http\Requests\helpdesk\ClientRequest; -use App\Model\helpdesk\Agent\Department; // models use App\Model\helpdesk\Form\Fields; use App\Model\helpdesk\Manage\Help_topic; @@ -26,7 +25,6 @@ use Exception; use Form; use GeoIP; use Illuminate\Http\Request; -use Input; use Lang; use Redirect; diff --git a/app/Http/Controllers/Common/ApiSettings.php b/app/Http/Controllers/Common/ApiSettings.php index a069c196d..28864252e 100644 --- a/app/Http/Controllers/Common/ApiSettings.php +++ b/app/Http/Controllers/Common/ApiSettings.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Common; use App\Http\Controllers\Controller; use App\Model\Api\ApiSetting; -use App\Model\helpdesk\Ticket\Ticket_Thread; use App\Model\helpdesk\Ticket\Tickets; use DB; use Exception; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4fc1d2883..24f2c57a8 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,8 +2,6 @@ namespace App\Http\Controllers; -use App\Model\helpdesk\Ticket\Tickets; - class HomeController extends Controller { /* diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index 484992fce..6f5d03835 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -14,7 +14,6 @@ use App\User; use Artisan; // classes use Cache; -use Config; use DB; use Exception; use File;