Merge pull request #199 from ruden/master

Change name of folder ua_UA on uk_UA

src/Faker/Provider/ru_RU/Internet.php

@@ -4,8 +4,22 @@ namespace Faker\Provider\ru_RU;
 
 class Internet extends \Faker\Provider\Internet
 {
+    protected static $freeEmailDomain = array('yandex.ru', 'ya.ru', 'narod.ru', 'gmail.com', 'mail.ru', 'list.ru', 'bk.ru', 'inbox.ru', 'rambler.ru', 'hotmail.com');
     protected static $tld = array('com', 'com', 'net', 'org', 'ru', 'ru', 'ru', 'ru');
 
+    /**
+     * Converts Russian characters to their ASCII representation
+     *
+     * @return string
+     */
+    private static function toAscii($string)
+    {
+        $from = array('А', 'Б', 'В', 'Г', 'Д', 'Е', 'Ё', 'Ж', 'З', 'И', 'Й', 'К', 'Л', 'М', 'Н', 'О', 'П', 'Р', 'С', 'Т', 'У', 'Ф', 'Х', 'Ц', 'Ч', 'Ш', 'Щ', 'Ъ', 'Ы', 'Ь', 'Э', 'Ю', 'Я', 'а', 'б', 'в', 'г', 'д', 'е', 'ё', 'ж', 'з', 'и', 'й', 'к', 'л', 'м', 'н', 'о', 'п', 'р', 'с', 'т', 'у', 'ф', 'х', 'ц', 'ч', 'ш', 'щ', 'ъ', 'ы', 'ь', 'э', 'ю', 'я');
+        $to   = array('a', 'b', 'v', 'g', 'd', 'e', 'e', 'gh', 'z', 'i', 'y', 'k', 'l', 'm', 'n', 'o', 'p', 'r', 's', 't', 'u', 'f', 'h', 'c', 'ch', 'sh', 'sch', '', 'y', '', 'e', 'yu', 'ya', 'a', 'b', 'v', 'g', 'd', 'e', 'e', 'gh', 'z', 'i', 'y', 'k', 'l', 'm', 'n', 'o', 'p', 'r', 's', 't', 'u', 'f', 'h', 'c', 'ch', 'sh', 'sch', '', 'y', '', 'e', 'yu', 'ya');
+
+        return str_replace($from, $to, $string);
+    }
+
     /**
      * @example 'jdoe'
      */
@@ -13,7 +27,7 @@ class Internet extends \Faker\Provider\Internet
     {
         $format = static::randomElement(static::$userNameFormats);
 
-        return static::bothify($this->generator->parse($format));
+        return static::toLower(static::toAscii(static::bothify($this->generator->parse($format))));
     }
 
     /**
@@ -24,8 +38,8 @@ class Internet extends \Faker\Provider\Internet
         $company = $this->generator->format('company');
         $companyElements = explode(' ', $company);
         $company = $companyElements[0];
-        $company = preg_replace('/,/u', '', $company);
+        $company = preg_replace('/\W/u', '', $company);
 
-        return $company;
+        return static::toLower(static::toAscii($company));
     }
 }

src/Faker/Provider/uk_UA/Address.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\ua_UA;
+namespace Faker\Provider\uk_UA;
 
 class Address extends \Faker\Provider\Address
 {

src/Faker/Provider/uk_UA/Company.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\ua_UA;
+namespace Faker\Provider\uk_UA;
 
 class Company extends \Faker\Provider\Company
 {

src/Faker/Provider/uk_UA/Internet.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\ua_UA;
+namespace Faker\Provider\uk_UA;
 
 class Internet extends \Faker\Provider\Internet
 {

src/Faker/Provider/uk_UA/Person.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\ua_UA;
+namespace Faker\Provider\uk_UA;
 
 class Person extends \Faker\Provider\Person
 {

src/Faker/Provider/uk_UA/PhoneNumber.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\ua_UA;
+namespace Faker\Provider\uk_UA;
 
 class PhoneNumber extends \Faker\Provider\PhoneNumber
 {

src/Faker/Provider/uk_UA/Transliteration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Faker\Provider\ua_UA;
+namespace Faker\Provider\uk_UA;
 
 /**
  * Cyrillic to latin transliteration util