Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
gocanto committed Mar 1, 2017
2 parents 8a958ae + 7426d95 commit 04faf89
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
],
"require": {
"php" : "~5.6|~7.0",
"illuminate/support": "5.3.*"
"illuminate/support": "5.4.*"
},
"require-dev": {
"phpunit/phpunit" : "~4.0||~5.0",
"orchestra/testbench": "~3.0"
"phpunit/phpunit" : "~5.7",
"orchestra/testbench": "3.*"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion tests/ManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function test_validate_valid_place_passing_a_bad_address()
];

$data = [
'address' => 'I am from Venezuela'
'address' => 'thi is not valid'
];

$v = $this->app['validator']->make($data, $rules);
Expand Down

0 comments on commit 04faf89

Please sign in to comment.