1
0
mirror of https://github.com/fzaninotto/Faker.git synced 2025-03-22 16:29:55 +01:00

Fix UTF-8 bug

Closes #79
This commit is contained in:
Francois Zaninotto 2013-01-01 16:02:18 +01:00
parent a3ae3c9a43
commit f4ea726207
3 changed files with 8 additions and 4 deletions

View File

@ -2,6 +2,8 @@
namespace Faker\Guesser;
use \Faker\Provider\Base;
class Name
{
protected $generator;
@ -13,7 +15,7 @@ class Name
public function guessFormat($name)
{
$name = static::toLower($name);
$name = Base::toLower($name);
$generator = $this->generator;
if (preg_match('/^is[_A-Z]/', $name)) {
return function() use ($generator) { return $generator->boolean; };

View File

@ -2,6 +2,8 @@
namespace Faker\ORM\Propel;
use \Faker\Provider\Base;
/**
* Service class for populating a table through a Propel ActiveRecord class.
*/
@ -78,7 +80,7 @@ class EntityPopulator
protected function isColumnBehavior($columnMap)
{
foreach ($columnMap->getTable()->getBehaviors() as $name => $params) {
$columnName = static::toLower($columnMap->getName());
$columnName = Base::toLower($columnMap->getName());
switch ($name) {
case 'nested_set':
$columnNames = array($params['left_column'], $params['right_column'], $params['level_column']);

View File

@ -143,7 +143,7 @@ class Base
*/
public static function toLower($string = '')
{
return extension_loaded('mbstring') ? mb_strtolower($string) : strtolower($string);
return extension_loaded('mbstring') ? mb_strtolower($string, 'UTF-8') : strtolower($string);
}
/**
@ -154,6 +154,6 @@ class Base
*/
public static function toUpper($string = '')
{
return extension_loaded('mbstring') ? mb_strtoupper($string) : strtoupper($string);
return extension_loaded('mbstring') ? mb_strtoupper($string, 'UTF-8') : strtoupper($string);
}
}