diff --git a/.travis.yml b/.travis.yml index d0c8ebad5e22..24bfe040f4cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: # these providers require referencing git commit's which cause Travis to fail # - sed -i '/mollie/d' composer.json # - sed -i '/2checkout/d' composer.json - - travis_retry composer install --no-interaction --no-dev + - travis_retry composer install --no-interaction before_script: # copy configuration files diff --git a/app/Providers/TelescopeServiceProvider.php b/app/Providers/TelescopeServiceProvider.php deleted file mode 100644 index 6d66c38d3f38..000000000000 --- a/app/Providers/TelescopeServiceProvider.php +++ /dev/null @@ -1,70 +0,0 @@ -hideSensitiveRequestDetails(); - - Telescope::filter(function (IncomingEntry $entry) { - if ($this->app->isLocal()) { - return true; - } - - return $entry->isReportableException() || - $entry->isFailedJob() || - $entry->isScheduledTask() || - $entry->hasMonitoredTag(); - }); - } - - /** - * Prevent sensitive request details from being logged by Telescope. - * - * @return void - */ - protected function hideSensitiveRequestDetails() - { - if ($this->app->isLocal()) { - return; - } - - Telescope::hideRequestParameters(['_token']); - - Telescope::hideRequestHeaders([ - 'cookie', - 'x-csrf-token', - 'x-xsrf-token', - ]); - } - - /** - * Register the Telescope gate. - * - * This gate determines who can access Telescope in non-local environments. - * - * @return void - */ - protected function gate() - { - Gate::define('viewTelescope', function ($user) { - return in_array($user->email, [ - // - ]); - }); - } -} diff --git a/composer.json b/composer.json index 34593f7859b6..2f67149e438c 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,6 @@ "filp/whoops": "^2.0", "fzaninotto/faker": "^1.4", "laravel/dusk": "^4.0", - "laravel/telescope": "^1.0", "mockery/mockery": "^1.0", "nunomaduro/collision": "^2.0", "phpunit/phpunit": "^7.0" diff --git a/composer.lock b/composer.lock index 8b9434045be4..6daa572a3b3e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d4f2d6f303624c7b8f7c4ba3ce72099f", + "content-hash": "b41a1819d57b9ee31cec2012cc37704f", "packages": [ { "name": "asgrim/ofxparser", @@ -4259,69 +4259,6 @@ ], "time": "2019-01-10T14:22:35+00:00" }, - { - "name": "laravel/telescope", - "version": "v1.0.10", - "source": { - "type": "git", - "url": "https://github.com/laravel/telescope.git", - "reference": "4962a3c3a5da71756dd01dad2ea86e55fbb86df8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/4962a3c3a5da71756dd01dad2ea86e55fbb86df8", - "reference": "4962a3c3a5da71756dd01dad2ea86e55fbb86df8", - "shasum": "" - }, - "require": { - "ext-json": "*", - "laravel/framework": "~5.7.7", - "moontoast/math": "^1.1", - "php": "^7.1.3", - "symfony/var-dumper": "^4.1" - }, - "require-dev": { - "nunomaduro/larastan": "^0.3.7", - "orchestra/testbench": "~3.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Laravel\\Telescope\\TelescopeServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Laravel\\Telescope\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - }, - { - "name": "Mohamed Said", - "email": "mohamed@laravel.com" - } - ], - "description": "An elegant debug assistant for the Laravel framework.", - "keywords": [ - "debugging", - "laravel", - "monitoring" - ], - "time": "2018-12-09T16:34:14+00:00" - }, { "name": "maximebf/debugbar", "version": "v1.15.0", @@ -4448,55 +4385,6 @@ ], "time": "2018-10-02T21:52:37+00:00" }, - { - "name": "moontoast/math", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/ramsey/moontoast-math.git", - "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ramsey/moontoast-math/zipball/c2792a25df5cad4ff3d760dd37078fc5b6fccc79", - "reference": "c2792a25df5cad4ff3d760dd37078fc5b6fccc79", - "shasum": "" - }, - "require": { - "ext-bcmath": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "^0.9.0", - "phpunit/phpunit": "^4.7|>=5.0 <5.4", - "satooshi/php-coveralls": "^0.6.1", - "squizlabs/php_codesniffer": "^2.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Moontoast\\Math\\": "src/Moontoast/Math/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" - } - ], - "description": "A mathematics library, providing functionality for large numbers", - "homepage": "https://github.com/ramsey/moontoast-math", - "keywords": [ - "bcmath", - "math" - ], - "time": "2017-02-16T16:54:46+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.8.1", diff --git a/config/app.php b/config/app.php index 8771ef78ef32..a6deae9f9a10 100644 --- a/config/app.php +++ b/config/app.php @@ -176,7 +176,6 @@ return [ App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, - App\Providers\TelescopeServiceProvider::class, App\Providers\RouteServiceProvider::class, App\Providers\ComposerServiceProvider::class,