Skip to content

Commit 2217da4

Browse files
author
Lucas Pons
authored
Merge pull request #2 from Soapbox/change/update-to-laravel-7
Update to laravel 7
2 parents 41b455a + 75caad9 commit 2217da4

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ script:
1313
after_script:
1414
- mkdir -p build/logs
1515
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
16-
- php vendor/bin/coveralls -v
16+
- vendor/bin/php-coveralls --exclude-no-stmt -v

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=7.2",
14-
"illuminate/support": "^6.0",
15-
"illuminate/database": "^6.0",
16-
"illuminate/validation": "^6.0"
13+
"php": "^7.2.5",
14+
"illuminate/support": "^7.0",
15+
"illuminate/database": "^7.0",
16+
"illuminate/validation": "^7.0"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^6.0 || ^7.0 ||^8.0",
20-
"mockery/mockery": "^0.9.9",
21-
"squizlabs/php_codesniffer": "^2.8",
22-
"satooshi/php-coveralls": "^1.0"
19+
"phpunit/phpunit": "^8.0",
20+
"mockery/mockery": "^1.2.1",
21+
"squizlabs/php_codesniffer": "^3.1",
22+
"php-coveralls/php-coveralls": "^2.4"
2323
},
2424
"autoload": {
2525
"psr-4": {

src/Contracts/Validatable.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Jaspaul\EloquentModelValidation\Contracts;
44

5-
use Illuminate\Contracts\Support\MessageProvider;
5+
use Illuminate\Contracts\Support\MessageBag;
66

77
interface Validatable
88
{
@@ -23,11 +23,11 @@ public function isValid() : bool;
2323
public function isInvalid() : bool;
2424

2525
/**
26-
* Returns a Message Provider containing the errors for the model validation.
26+
* Returns a Message Bag containing the errors for the model validation.
2727
*
28-
* @return \Illuminate\Contracts\Support\MessageProvider
28+
* @return \Illuminate\Contracts\Support\MessageBag
2929
*/
30-
public function getErrors() : MessageProvider;
30+
public function getErrors() : MessageBag;
3131

3232
/**
3333
* Returns the reasons why the validator failed.

src/Traits/Validates.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
use Illuminate\Validation\Factory;
66
use Illuminate\Container\Container;
7+
use Illuminate\Contracts\Support\MessageBag;
78
use Illuminate\Contracts\Validation\Validator;
89
use Illuminate\Validation\ValidationException;
9-
use Illuminate\Contracts\Support\MessageProvider;
1010

1111
trait Validates
1212
{
@@ -97,11 +97,11 @@ public function validate()
9797
}
9898

9999
/**
100-
* Returns a Message Provider containing the errors for the model validation.
100+
* Returns a Message Bag containing the errors for the model validation.
101101
*
102-
* @return \Illuminate\Contracts\Support\MessageProvider
102+
* @return \Illuminate\Contracts\Support\MessageBag
103103
*/
104-
public function getErrors() : MessageProvider
104+
public function getErrors() : MessageBag
105105
{
106106
return $this->getValidator()->getMessageBag();
107107
}

tests/TestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ abstract class TestCase extends Base
1717
protected function setUpMockery()
1818
{
1919
Mockery::getConfiguration()->allowMockingNonExistentMethods(false);
20-
Mockery::getConfiguration()->allowMockingMethodsUnnecessarily(false);
2120
}
2221

2322
/**

0 commit comments

Comments
 (0)