Skip to content

Commit 9979f4c

Browse files
authored
Merge pull request #4 from olssonm/dev
Laravel 5.4 update.
2 parents 0b5586d + c27a896 commit 9979f4c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ before_script:
77
- travis_retry composer self-update
88
- travis_retry composer install --prefer-dist --no-interaction
99

10-
script: phpunit
10+
script: composer test

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The MIT License (MIT)
22

3-
Copyright (c) 2016 Marcus Olsson <hello@marcusolsson.me>
3+
Copyright (c) 2017 Marcus Olsson <contact@marcusolsson.me>
44

55
> Permission is hereby granted, free of charge, to any person obtaining a copy
66
> of this software and associated documentation files (the "Software"), to deal

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ $ phpunit
150150

151151
The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
152152

153-
© 2016 [Marcus Olsson](https://marcusolsson.me).
153+
© 2017 [Marcus Olsson](https://marcusolsson.me).
154154

155155
[ico-version]: https://img.shields.io/packagist/v/olssonm/l5-zxcvbn.svg?style=flat-square
156156
[ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
"authors": [
1616
{
1717
"name": "Marcus Olsson",
18-
"email": "hello@marcusolsson.me",
18+
"email": "contact@marcusolsson.me",
1919
"homepage": "https://marcusolsson.me"
2020
}
2121
],
2222
"require": {
23-
"php" : ">=5.3.0",
24-
"illuminate/support": "~5.3",
23+
"php" : ">=5.6.0",
24+
"illuminate/support": "~5.3.28|~5.4",
2525
"bjeavons/zxcvbn-php": "^0.3"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit" : "4.*",
29-
"orchestra/testbench": "~3.3"
28+
"phpunit/phpunit" : "5.7.*",
29+
"orchestra/testbench": "~3.4"
3030
},
3131
"autoload": {
3232
"psr-4": {

0 commit comments

Comments
 (0)