diff --git a/.gitignore b/.gitignore index 8b7ef35..323a337 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vendor composer.lock +/.phpunit.result.cache diff --git a/.travis.yml b/.travis.yml index e828992..f7f687d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,5 @@ matrix: env: ILLUMINATE_VERSION=5.8.* - php: 7.2 env: ILLUMINATE_VERSION=5.8.* + - php: 7.2 + env: ILLUMINATE_VERSION=^6.0 diff --git a/LICENSE.md b/LICENSE.md index 0987856..dad058a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # The MIT License (MIT) -Copyright (c) 2018 Marcus Olsson +Copyright (c) 2019 Marcus Olsson > Permission is hereby granted, free of charge, to any person obtaining a copy > of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 3b4de94..f8b2685 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![zxcvbn](https://user-images.githubusercontent.com/907114/41193108-747d9b50-6c08-11e8-8f9c-57874f52fa9b.png) -A simple implementation of zxcvbn for Laravel 5. This package allows you to access "zxcvbn-related" data on a passphrase in the application and also to use zxcvbn as a standard validator. +A simple implementation of zxcvbn for Laravel. This package allows you to access "zxcvbn-related" data on a passphrase in the application and also to use zxcvbn as a standard validator. Uses [Zxcvbn-PHP](https://github.com/mkopinsky/zxcvbn-php) by [@mkopinsky](https://github.com/mkopinsky) (originally by [@bjeavons](https://github.com/bjeavons)), which in turn is inspired by [zxcvbn](https://github.com/dropbox/zxcvbn) by [@dropbox](https://github.com/dropbox). @@ -20,14 +20,6 @@ Via Composer $ composer require olssonm/l5-zxcvbn ``` -Add the package to your providers array (will be added automatically in Laravel 5.5+): - -```php -'providers' => [ - Olssonm\Zxcvbn\ZxcvbnServiceProvider::class, -] -``` - If you wish to have the ability to use `Zxcvbn` via dependency injection, or just have a quick way to access the class – add an alias to the facades: ```php @@ -156,7 +148,7 @@ $ phpunit The MIT License (MIT). Please see the [License File](LICENSE.md) for more information. -© 2018 [Marcus Olsson](https://marcusolsson.me). +© 2019 [Marcus Olsson](https://marcusolsson.me). [ico-version]: https://img.shields.io/packagist/v/olssonm/l5-zxcvbn.svg?style=flat-square diff --git a/composer.json b/composer.json index 07144fb..f9e8bdc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "olssonm/l5-zxcvbn", - "description": "Implementation of the zxcvbn project by @dropbox for Laravel 5. Uses zxcvbn-php by @bjeavons.", + "name": "olssonm/laravel-zxcvbn", + "description": "Implementation of the zxcvbn project by @dropbox for Laravel. Uses zxcvbn-php by @bjeavons.", "keywords": [ "olssonm", "zxcvbn", @@ -10,7 +10,7 @@ "validation", "laravel" ], - "homepage": "https://github.com/olssonm/l5-zxcvbn", + "homepage": "https://github.com/olssonm/laravel-zxcvbn", "license": "MIT", "authors": [ { @@ -20,13 +20,13 @@ } ], "require": { - "php" : ">=7.1.3", - "illuminate/support": "^5.8", + "php" : "^7.1", + "illuminate/support": ">=5.8 || ^6.0", "mkopinsky/zxcvbn-php": "^4.4" }, "require-dev": { - "phpunit/phpunit" : "~7.0", - "orchestra/testbench": "^3.8.0" + "phpunit/phpunit": "^7.5 || ^8.0", + "orchestra/testbench": ">=3.4.0" }, "autoload": { "psr-4": {