Merge pull request #4 from olssonm/dev

Laravel 5.4 update.
This commit is contained in:
Marcus Olsson 2017-01-29 17:13:04 +01:00 committed by GitHub
commit 9979f4cf48
4 changed files with 8 additions and 8 deletions

View File

@ -7,4 +7,4 @@ before_script:
- travis_retry composer self-update - travis_retry composer self-update
- travis_retry composer install --prefer-dist --no-interaction - travis_retry composer install --prefer-dist --no-interaction
script: phpunit script: composer test

View File

@ -1,6 +1,6 @@
# The MIT License (MIT) # The MIT License (MIT)
Copyright (c) 2016 Marcus Olsson <hello@marcusolsson.me> Copyright (c) 2017 Marcus Olsson <contact@marcusolsson.me>
> Permission is hereby granted, free of charge, to any person obtaining a copy > Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal > of this software and associated documentation files (the "Software"), to deal

View File

@ -150,7 +150,7 @@ $ phpunit
The MIT License (MIT). Please see [License File](LICENSE.md) for more information. The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
© 2016 [Marcus Olsson](https://marcusolsson.me). © 2017 [Marcus Olsson](https://marcusolsson.me).
[ico-version]: https://img.shields.io/packagist/v/olssonm/l5-zxcvbn.svg?style=flat-square [ico-version]: https://img.shields.io/packagist/v/olssonm/l5-zxcvbn.svg?style=flat-square
[ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square

View File

@ -15,18 +15,18 @@
"authors": [ "authors": [
{ {
"name": "Marcus Olsson", "name": "Marcus Olsson",
"email": "hello@marcusolsson.me", "email": "contact@marcusolsson.me",
"homepage": "https://marcusolsson.me" "homepage": "https://marcusolsson.me"
} }
], ],
"require": { "require": {
"php" : ">=5.3.0", "php" : ">=5.6.0",
"illuminate/support": "~5.3", "illuminate/support": "~5.3.28|~5.4",
"bjeavons/zxcvbn-php": "^0.3" "bjeavons/zxcvbn-php": "^0.3"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit" : "4.*", "phpunit/phpunit" : "5.7.*",
"orchestra/testbench": "~3.3" "orchestra/testbench": "~3.4"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {