LiittleCookie/valitron
1
0
Fork 0
mirror of https://github.com/vlucas/valitron.git synced 2025-12-30 23:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

missing language file now raises InvalidArgumentException

Browse Source
This commit is contained in:
Marcos Neves 2013-08-19 12:31:11 -03:00
parent 367ec9a7c7
commit f793bb7555
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Valitron/Validator.php
View File

@ -1,6 +1,8 @@
<?php <?php
namespace Valitron; namespace Valitron;
use InvalidArgumentException;
/** /**
* Validation Class * Validation Class
* *
@ -45,7 +47,12 @@ class Validator
$langDir = $langDir ?: static::langDir(); $langDir = $langDir ?: static::langDir();
// Load language file in directory // Load language file in directory
static::$_ruleMessages = include rtrim($langDir, '/') . '/' . $lang . '.php'; $langFile = rtrim($langDir, '/') . '/' . $lang . '.php';
if ( stream_resolve_include_path($langFile) ) {
static::$_ruleMessages = include $langFile;
} else {
throw new InvalidArgumentException("fail to load language file '$langFile'");
}
} }
/** /**

11
tests/Valitron/StaticLangTest.php → tests/Valitron/LangTest.php
View File

@ -1,7 +1,7 @@
<?php <?php
use Valitron\Validator; use Valitron\Validator;
class StaticLangTest extends BaseTestCase class LangTest extends BaseTestCase
{ {
protected function getLangDir() protected function getLangDir()
{ {
@ -41,4 +41,13 @@ class StaticLangTest extends BaseTestCase
$validator = new Validator(array()); $validator = new Validator(array());
$this->assertEquals(realpath($this->getLangDir()), realpath(Validator::langDir())); $this->assertEquals(realpath($this->getLangDir()), realpath(Validator::langDir()));
} }
/**
* @expectedException InvalidArgumentException
* @expectedExceptionMessage fail to load language file '/this/dir/does/not/exists/en.php'
*/
public function testLangException()
{
new Validator(array(), array(), 'en', '/this/dir/does/not/exists');
}
} }