diff --git a/.gitignore b/.gitignore index e446ed0..9948f05 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ composer.lock vendor coverage .idea +.phpunit.result.cache \ No newline at end of file diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index df16b68..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,19 +0,0 @@ -filter: - excluded_paths: [tests/*] - -checks: - php: - remove_extra_empty_lines: true - remove_php_closing_tag: true - remove_trailing_whitespace: true - fix_use_statements: - remove_unused: true - preserve_multiple: false - preserve_blanklines: true - order_alphabetically: true - fix_php_opening_tag: true - fix_linefeed: true - fix_line_ending: true - fix_identation_4spaces: true - fix_doc_comments: true - diff --git a/.styleci.yml b/.styleci.yml deleted file mode 100644 index f4d3cbc..0000000 --- a/.styleci.yml +++ /dev/null @@ -1,4 +0,0 @@ -preset: laravel - -disabled: - - single_class_element_per_statement diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c193af9..0000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: php - -php: - - 7.2 - - 7.3 - - 7.4 - - 8.0 - - nightly - -env: - matrix: - - COMPOSER_FLAGS="--prefer-lowest" - - COMPOSER_FLAGS="" - -before_script: - - phpenv config-rm xdebug.ini - - travis_retry composer self-update - - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source - -script: - - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover - -after_script: - - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover diff --git a/README.md b/README.md index c8bc56c..2aa5238 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Laravel Dump Server [![Latest Version on Packagist](https://img.shields.io/packagist/v/beyondcode/laravel-dump-server.svg?style=flat-square)](https://packagist.org/packages/beyondcode/laravel-dump-server) -[![Quality Score](https://img.shields.io/scrutinizer/g/beyondcode/laravel-dump-server.svg?style=flat-square)](https://scrutinizer-ci.com/g/beyondcode/laravel-dump-server) [![Total Downloads](https://img.shields.io/packagist/dt/beyondcode/laravel-dump-server.svg?style=flat-square)](https://packagist.org/packages/beyondcode/laravel-dump-server) Bringing the [Symfony Var-Dump Server](https://symfony.com/doc/current/components/var_dumper.html#the-dump-server) to Laravel. @@ -20,9 +19,17 @@ composer require --dev beyondcode/laravel-dump-server You can find the documentation on the [Beyond Code website](https://beyondco.de/docs/laravel-dump-server/installation). -### Changelog +## Looking for `dump` on steroids? Check out Laravel Herd! +Herd logo -Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently. + +Herd Pro gives you a powerful interface to help you watch and collect your debug information. + +All of your application's `dump()` and `dd()` calls will be beautifully formatted and can be filtered from Herd's separate Dump window. + +Just keep using `dump()` as usual – Herd will take care of the rest. + +[herd.laravel.com](https://herd.laravel.com) ## Contributing @@ -40,4 +47,3 @@ If you discover any security related issues, please email marcel@beyondco.de ins ## License The MIT License (MIT). Please see [License File](LICENSE.md) for more information. - diff --git a/composer.json b/composer.json index 633ecf6..d9351d2 100644 --- a/composer.json +++ b/composer.json @@ -15,16 +15,19 @@ "role": "Developer" } ], + "conflict": { + "spatie/laravel-ray": "*" + }, "require": { "php": ">=7.2.5", - "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "symfony/var-dumper": "^5.0|^6.0" + "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "symfony/var-dumper": "^5.0|^6.0|^7.0" }, "require-dev": { "larapack/dd": "^1.0", - "phpunit/phpunit": "^7.0|^9.3" + "phpunit/phpunit": "^7.0|^9.3|^10.5" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 1eef57c..a3dba0c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,16 +14,5 @@ tests - - - src/ - - - - - - - - - + diff --git a/src/Dumper.php b/src/Dumper.php index 4e6ab7b..5e6dfeb 100755 --- a/src/Dumper.php +++ b/src/Dumper.php @@ -22,7 +22,7 @@ class Dumper * @param \Symfony\Component\VarDumper\Server\Connection|null $connection * @return void */ - public function __construct(Connection $connection = null) + public function __construct(?Connection $connection = null) { $this->connection = $connection; } diff --git a/src/RequestContextProvider.php b/src/RequestContextProvider.php index 115a72a..dc165f8 100644 --- a/src/RequestContextProvider.php +++ b/src/RequestContextProvider.php @@ -28,7 +28,7 @@ class RequestContextProvider implements ContextProviderInterface * @param \Illuminate\Http\Request|null $currentRequest * @return void */ - public function __construct(Request $currentRequest = null) + public function __construct(?Request $currentRequest = null) { $this->currentRequest = $currentRequest; $this->cloner = new VarCloner;