Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
lilHermit committed Mar 6, 2017
1 parent 6dd7479 commit 2b580b0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/Validation/Validator.php
Expand Up @@ -57,7 +57,7 @@ class Validator implements ArrayAccess, IteratorAggregate, Countable
*
* @var array
*/
private static $_defaultProviders = [];
protected static $_defaultProviders = [];

/**
* Contains the validation messages associated with checking the presence
Expand Down
14 changes: 7 additions & 7 deletions tests/TestCase/Validation/ValidatorTest.php
Expand Up @@ -1887,11 +1887,11 @@ protected function assertProxyMethod($validator, $method, $extra = null, $pass =
*/
public function testAddingDefaultProvider()
{
$validator = new Validator;
$validator = new Validator();
$this->assertEmpty($validator->providers(), 'Providers should be empty');

Validator::addDefaultProvider('test-provider', '\MyNameSpace\Validation\MyProvider');
$validator = new Validator;
Validator::addDefaultProvider('test-provider', 'MyNameSpace\Validation\MyProvider');
$validator = new Validator();
$this->assertEquals($validator->providers(), ['test-provider'], 'Default provider `test-provider` is missing');
}

Expand All @@ -1902,13 +1902,13 @@ public function testAddingDefaultProvider()
*/
public function testGetDefaultProvider()
{
Validator::addDefaultProvider('test-provider', '\MyNameSpace\Validation\MyProvider');
$this->assertEquals(Validator::getDefaultProvider('test-provider'), '\MyNameSpace\Validation\MyProvider', 'Default provider `test-provider` is missing');
Validator::addDefaultProvider('test-provider', 'MyNameSpace\Validation\MyProvider');
$this->assertEquals(Validator::getDefaultProvider('test-provider'), 'MyNameSpace\Validation\MyProvider', 'Default provider `test-provider` is missing');

$this->assertNull(Validator::getDefaultProvider('invalid-provider'), 'Default provider (`invalid-provider`) should be missing');
$this->assertNull(Validator::getDefaultProvider(null), 'Default provider (null) should be missing');
Validator::addDefaultProvider('test-provider2', '\MyNameSpace\Validation\MySecondProvider');

Validator::addDefaultProvider('test-provider2', 'MyNameSpace\Validation\MySecondProvider');
$this->assertEquals(Validator::getDefaultProviders(), ['test-provider', 'test-provider2'], 'Default providers incorrect');
}
}

0 comments on commit 2b580b0

Please sign in to comment.