FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch '5.2' · JavaDevl/framework@06edabe · GitHub

Repository navigation

Commit 06edabe

Browse files
committed
Merge branch '5.2'
2 parents e7ff364 + cf37191 commit 06edabe

8 files changed

Lines changed: 96 additions & 61 deletions

File tree

‎src/Illuminate/Auth/Console/ClearResetsCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
class ClearResetsCommand extends Command
88
{
99
/**
10-
* The console command name.
10+
* The name and signature of the console command.
1111
*
1212
* @var string
1313
*/
14-
protected $name = 'auth:clear-resets';
14+
protected $signature = 'auth:clear-resets {name? : The name of the password broker}';
1515

1616
/**
1717
* The console command description.
@@ -27,7 +27,7 @@ class ClearResetsCommand extends Command
2727
*/
2828
public function fire()
2929
{
30-
$this->laravel['auth.password.tokens']->deleteExpired();
30+
$this->laravel['auth.password']->broker($this->argument('name'))->getRepository()->deleteExpired();
3131

3232
$this->info('Expired reset tokens cleared!');
3333
}

‎src/Illuminate/Auth/Passwords/PasswordBroker.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public function getUser(array $credentials)
246246
*
247247
* @return \Illuminate\Auth\Passwords\TokenRepositoryInterface
248248
*/
249-
protected function getRepository()
249+
public function getRepository()
250250
{
251251
return $this->tokens;
252252
}

‎src/Illuminate/Auth/SessionGuard.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
use RuntimeException;
66
use Illuminate\Support\Str;
7+
use Illuminate\Http\Response;
78
use Illuminate\Contracts\Events\Dispatcher;
89
use Illuminate\Contracts\Auth\UserProvider;
910
use Illuminate\Contracts\Auth\StatefulGuard;
1011
use Symfony\Component\HttpFoundation\Request;
11-
use Symfony\Component\HttpFoundation\Response;
1212
use Illuminate\Contracts\Auth\SupportsBasicAuth;
1313
use Illuminate\Contracts\Cookie\QueueingFactory as CookieJar;
1414
use Symfony\Component\HttpFoundation\Session\SessionInterface;

‎src/Illuminate/Foundation/Application.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,8 @@ public function registerCoreContainerAliases()
10291029
'app' => ['Illuminate\Foundation\Application', 'Illuminate\Contracts\Container\Container', 'Illuminate\Contracts\Foundation\Application'],
10301030
'auth' => ['Illuminate\Auth\AuthManager', 'Illuminate\Contracts\Auth\Factory'],
10311031
'auth.driver' => ['Illuminate\Contracts\Auth\Guard'],
1032-
'auth.password.tokens' => ['Illuminate\Auth\Passwords\TokenRepositoryInterface'],
1032+
'auth.password' => ['Illuminate\Contracts\Auth\PasswordBrokerFactory'],
1033+
'auth.password.broker' => ['Illuminate\Contracts\Auth\PasswordBroker'],
10331034
'blade.compiler' => ['Illuminate\View\Compilers\BladeCompiler'],
10341035
'cache' => ['Illuminate\Cache\CacheManager', 'Illuminate\Contracts\Cache\Factory'],
10351036
'cache.store' => ['Illuminate\Cache\Repository', 'Illuminate\Contracts\Cache\Repository'],

‎src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Auth\Console\MakeAuthCommand;
88
use Illuminate\Foundation\Console\UpCommand;
99
use Illuminate\Foundation\Console\DownCommand;
10+
use Illuminate\Auth\Console\ClearResetsCommand;
1011
use Illuminate\Foundation\Console\ServeCommand;
1112
use Illuminate\Cache\Console\CacheTableCommand;
1213
use Illuminate\Queue\Console\FailedTableCommand;
@@ -54,6 +55,7 @@ class ArtisanServiceProvider extends ServiceProvider
5455
*/
5556
protected $commands = [
5657
'ClearCompiled' => 'command.clear-compiled',
58+
'ClearResets' => 'command.auth.resets.clear',
5759
'ConfigCache' => 'command.config.cache',
5860
'ConfigClear' => 'command.config.clear',
5961
'Down' => 'command.down',
@@ -176,6 +178,18 @@ protected function registerClearCompiledCommand()
176178
});
177179
}
178180

181+
/**
182+
* Register the command.
183+
*
184+
* @return void
185+
*/
186+
protected function registerClearResetsCommand()
187+
{
188+
$this->app->singleton('command.auth.resets.clear', function () {
189+
return new ClearResetsCommand;
190+
});
191+
}
192+
179193
/**
180194
* Register the command.
181195
*

‎src/Illuminate/Queue/Console/ListenCommand.php‎

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

33
namespace Illuminate\Queue\Console;
44

5-
use InvalidArgumentException;
65
use Illuminate\Queue\Listener;
76
use Illuminate\Console\Command;
87
use Symfony\Component\Console\Input\InputOption;
@@ -64,12 +63,6 @@ public function fire()
6463

6564
$timeout = $this->input->getOption('timeout');
6665

67-
if ($timeout <= $this->input->getOption('sleep')) {
68-
throw new InvalidArgumentException(
69-
"Job timeout must be greater than 'sleep' option value."
70-
);
71-
}
72-
7366
// We need to get the right queue for the connection which is set in the queue
7467
// configuration file for the application. We will pull it based on the set
7568
// connection being run for the queue operation currently being executed.

‎src/Illuminate/Support/Pluralizer.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ class Pluralizer
2424
'fish',
2525
'gold',
2626
'information',
27+
'knowledge',
28+
'love',
29+
'rain',
2730
'money',
2831
'moose',
2932
'offspring',

‎src/Illuminate/Support/Str.php‎

Lines changed: 72 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ public static function ucfirst($string)
400400
*
401401
* Note: Adapted from Stringy\Stringy.
402402
*
403-
* @see https://github.com/danielstjules/Stringy/blob/2.1.0/LICENSE.txt
403+
* @see https://github.com/danielstjules/Stringy/blob/2.2.0/LICENSE.txt
404404
*
405405
* @return array
406406
*/
@@ -413,84 +413,108 @@ protected static function charsArray()
413413
}
414414

415415
return $charsArray = [
416-
'a' => ['à', 'á', 'ả', 'ã', 'ạ', 'ă', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'â', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ā', 'ą', 'å', 'α', 'ά', 'ἀ', 'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'а', 'أ'],
417-
'b' => ['б', 'β', 'Ъ', 'Ь', 'ب'],
416+
'0' => ['°', '₀'],
417+
'1' => ['¹', '₁'],
418+
'2' => ['²', '₂'],
419+
'3' => ['³', '₃'],
420+
'4' => ['⁴', '₄'],
421+
'5' => ['⁵', '₅'],
422+
'6' => ['⁶', '₆'],
423+
'7' => ['⁷', '₇'],
424+
'8' => ['⁸', '₈'],
425+
'9' => ['⁹', '₉'],
426+
'a' => ['à', 'á', 'ả', 'ã', 'ạ', 'ă', 'ắ', 'ằ', 'ẳ', 'ẵ', 'ặ', 'â', 'ấ', 'ầ', 'ẩ', 'ẫ', 'ậ', 'ā', 'ą', 'å', 'α', 'ά', 'ἀ', 'ἁ', 'ἂ', 'ἃ', 'ἄ', 'ἅ', 'ἆ', 'ἇ', 'ᾀ', 'ᾁ', 'ᾂ', 'ᾃ', 'ᾄ', 'ᾅ', 'ᾆ', 'ᾇ', 'ὰ', 'ά', 'ᾰ', 'ᾱ', 'ᾲ', 'ᾳ', 'ᾴ', 'ᾶ', 'ᾷ', 'а', 'أ', 'အ', 'ာ', 'ါ', 'ǻ', 'ǎ', 'ª', 'ა', 'अ'],
427+
'b' => ['б', 'β', 'Ъ', 'Ь', 'ب', 'ဗ', 'ბ'],
418428
'c' => ['ç', 'ć', 'č', 'ĉ', 'ċ'],
419-
'd' => ['ď', 'ð', 'đ', 'ƌ', 'ȡ', 'ɖ', 'ɗ', 'ᵭ', 'ᶁ', 'ᶑ', 'д', 'δ', 'د', 'ض'],
420-
'e' => ['é', 'è', 'ẻ', 'ẽ', 'ẹ', 'ê', 'ế', 'ề', 'ể', 'ễ', 'ệ', 'ë', 'ē', 'ę', 'ě', 'ĕ', 'ė', 'ε', 'έ', 'ἐ', 'ἑ', 'ἒ', 'ἓ', 'ἔ', 'ἕ', 'ὲ', 'έ', 'е', 'ё', 'э', 'є', 'ə'],
421-
'f' => ['ф', 'φ', 'ف'],
422-
'g' => ['ĝ', 'ğ', 'ġ', 'ģ', 'г', 'ґ', 'γ', 'ج'],
423-
'h' => ['ĥ', 'ħ', 'η', 'ή', 'ح', 'ه'],
424-
'i' => ['í', 'ì', 'ỉ', 'ĩ', 'ị', 'î', 'ï', 'ī', 'ĭ', 'į', 'ı', 'ι', 'ί', 'ϊ', 'ΐ', 'ἰ', 'ἱ', 'ἲ', 'ἳ', 'ἴ', 'ἵ', 'ἶ', 'ἷ', 'ὶ', 'ί', 'ῐ', 'ῑ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'і', 'ї', 'и'],
425-
'j' => ['ĵ', 'ј', 'Ј'],
426-
'k' => ['ķ', 'ĸ', 'к', 'κ', 'Ķ', 'ق', 'ك'],
427-
'l' => ['ł', 'ľ', 'ĺ', 'ļ', 'ŀ', 'л', 'λ', 'ل'],
428-
'm' => ['м', 'μ', 'م'],
429-
'n' => ['ñ', 'ń', 'ň', 'ņ', 'ʼn', 'ŋ', 'ν', 'н', 'ن'],
430-
'o' => ['ó', 'ò', 'ỏ', 'õ', 'ọ', 'ô', 'ố', 'ồ', 'ổ', 'ỗ', 'ộ', 'ơ', 'ớ', 'ờ', 'ở', 'ỡ', 'ợ', 'ø', 'ō', 'ő', 'ŏ', 'ο', 'ὀ', 'ὁ', 'ὂ', 'ὃ', 'ὄ', 'ὅ', 'ὸ', 'ό', 'о', 'و', 'θ'],
431-
'p' => ['п', 'π'],
432-
'r' => ['ŕ', 'ř', 'ŗ', 'р', 'ρ', 'ر'],
433-
's' => ['ś', 'š', 'ş', 'с', 'σ', 'ș', 'ς', 'س', 'ص'],
434-
't' => ['ť', 'ţ', 'т', 'τ', 'ț', 'ت', 'ط'],
435-
'u' => ['ú', 'ù', 'ủ', 'ũ', 'ụ', 'ư', 'ứ', 'ừ', 'ử', 'ữ', 'ự', 'û', 'ū', 'ů', 'ű', 'ŭ', 'ų', 'µ', 'у'],
436-
'v' => ['в'],
437-
'w' => ['ŵ', 'ω', 'ώ'],
438-
'x' => ['χ'],
439-
'y' => ['ý', 'ỳ', 'ỷ', 'ỹ', 'ỵ', 'ÿ', 'ŷ', 'й', 'ы', 'υ', 'ϋ', 'ύ', 'ΰ', 'ي'],
440-
'z' => ['ź', 'ž', 'ż', 'з', 'ζ', 'ز'],
441-
'aa' => ['ع'],
442-
'ae' => ['ä', 'æ'],
443-
'ch' => ['ч'],
429+
'd' => ['ď', 'ð', 'đ', 'ƌ', 'ȡ', 'ɖ', 'ɗ', 'ᵭ', 'ᶁ', 'ᶑ', 'д', 'δ', 'د', 'ض', 'ဍ', 'ဒ', 'დ'],
430+
'e' => ['é', 'è', 'ẻ', 'ẽ', 'ẹ', 'ê', 'ế', 'ề', 'ể', 'ễ', 'ệ', 'ë', 'ē', 'ę', 'ě', 'ĕ', 'ė', 'ε', 'έ', 'ἐ', 'ἑ', 'ἒ', 'ἓ', 'ἔ', 'ἕ', 'ὲ', 'έ', 'е', 'ё', 'э', 'є', 'ə', 'ဧ', 'ေ', 'ဲ', 'ე', 'ए'],
431+
'f' => ['ф', 'φ', 'ف', 'ƒ', 'ფ'],
432+
'g' => ['ĝ', 'ğ', 'ġ', 'ģ', 'г', 'ґ', 'γ', 'ج', 'ဂ', 'გ'],
433+
'h' => ['ĥ', 'ħ', 'η', 'ή', 'ح', 'ه', 'ဟ', 'ှ', 'ჰ'],
434+
'i' => ['í', 'ì', 'ỉ', 'ĩ', 'ị', 'î', 'ï', 'ī', 'ĭ', 'į', 'ı', 'ι', 'ί', 'ϊ', 'ΐ', 'ἰ', 'ἱ', 'ἲ', 'ἳ', 'ἴ', 'ἵ', 'ἶ', 'ἷ', 'ὶ', 'ί', 'ῐ', 'ῑ', 'ῒ', 'ΐ', 'ῖ', 'ῗ', 'і', 'ї', 'и', 'ဣ', 'ိ', 'ီ', 'ည်', 'ǐ', 'ი', 'इ'],
435+
'j' => ['ĵ', 'ј', 'Ј', 'ჯ'],
436+
'k' => ['ķ', 'ĸ', 'к', 'κ', 'Ķ', 'ق', 'ك', 'က', 'კ', 'ქ'],
437+
'l' => ['ł', 'ľ', 'ĺ', 'ļ', 'ŀ', 'л', 'λ', 'ل', 'လ', 'ლ'],
438+
'm' => ['м', 'μ', 'م', 'မ', 'მ'],
439+
'n' => ['ñ', 'ń', 'ň', 'ņ', 'ʼn', 'ŋ', 'ν', 'н', 'ن', 'န', 'ნ'],
440+
'o' => ['ó', 'ò', 'ỏ', 'õ', 'ọ', 'ô', 'ố', 'ồ', 'ổ', 'ỗ', 'ộ', 'ơ', 'ớ', 'ờ', 'ở', 'ỡ', 'ợ', 'ø', 'ō', 'ő', 'ŏ', 'ο', 'ὀ', 'ὁ', 'ὂ', 'ὃ', 'ὄ', 'ὅ', 'ὸ', 'ό', 'о', 'و', 'θ', 'ို', 'ǒ', 'ǿ', 'º', 'ო', 'ओ'],
441+
'p' => ['п', 'π', 'ပ', 'პ'],
442+
'q' => ['ყ'],
443+
'r' => ['ŕ', 'ř', 'ŗ', 'р', 'ρ', 'ر', 'რ'],
444+
's' => ['ś', 'š', 'ş', 'с', 'σ', 'ș', 'ς', 'س', 'ص', 'စ', 'ſ', 'ს'],
445+
't' => ['ť', 'ţ', 'т', 'τ', 'ț', 'ت', 'ط', 'ဋ', 'တ', 'ŧ', 'თ', 'ტ'],
446+
'u' => ['ú', 'ù', 'ủ', 'ũ', 'ụ', 'ư', 'ứ', 'ừ', 'ử', 'ữ', 'ự', 'û', 'ū', 'ů', 'ű', 'ŭ', 'ų', 'µ', 'у', 'ဉ', 'ု', 'ူ', 'ǔ', 'ǖ', 'ǘ', 'ǚ', 'ǜ', 'უ', 'उ'],
447+
'v' => ['в', 'ვ', 'ϐ'],
448+
'w' => ['ŵ', 'ω', 'ώ', 'ဝ', 'ွ'],
449+
'x' => ['χ', 'ξ'],
450+
'y' => ['ý', 'ỳ', 'ỷ', 'ỹ', 'ỵ', 'ÿ', 'ŷ', 'й', 'ы', 'υ', 'ϋ', 'ύ', 'ΰ', 'ي', 'ယ'],
451+
'z' => ['ź', 'ž', 'ż', 'з', 'ζ', 'ز', 'ဇ', 'ზ'],
452+
'aa' => ['ع', 'आ'],
453+
'ae' => ['ä', 'æ', 'ǽ'],
454+
'ai' => ['ऐ'],
455+
'at' => ['@'],
456+
'ch' => ['ч', 'ჩ', 'ჭ'],
444457
'dj' => ['ђ', 'đ'],
445-
'dz' => ['џ'],
446-
'gh' => ['غ'],
447-
'kh' => ['х', 'خ'],
458+
'dz' => ['џ', 'ძ'],
459+
'ei' => ['ऍ'],
460+
'gh' => ['غ', 'ღ'],
461+
'ii' => ['ई'],
462+
'ij' => ['ij'],
463+
'kh' => ['х', 'خ', 'ხ'],
448464
'lj' => ['љ'],
449465
'nj' => ['њ'],
450466
'oe' => ['ö', 'œ'],
467+
'oi' => ['ऑ'],
468+
'oii' => ['ऒ'],
451469
'ps' => ['ψ'],
452-
'sh' => ['ш'],
470+
'sh' => ['ш', 'შ'],
453471
'shch' => ['щ'],
454472
'ss' => ['ß'],
455-
'th' => ['þ', 'ث', 'ذ', 'ظ'],
456-
'ts' => ['ц'],
473+
'sx' => ['ŝ'],
474+
'th' => ['þ', 'ϑ', 'ث', 'ذ', 'ظ'],
475+
'ts' => ['ц', 'ც', 'წ'],
457476
'ue' => ['ü'],
477+
'uu' => ['ऊ'],
458478
'ya' => ['я'],
459479
'yu' => ['ю'],
460-
'zh' => ['ж'],
480+
'zh' => ['ж', 'ჟ'],
461481
'(c)' => ['©'],
462-
'A' => ['Á', 'À', 'Ả', 'Ã', 'Ạ', 'Ă', 'Ắ', 'Ằ', 'Ẳ', 'Ẵ', 'Ặ', 'Â', 'Ấ', 'Ầ', 'Ẩ', 'Ẫ', 'Ậ', 'Å', 'Ā', 'Ą', 'Α', 'Ά', 'Ἀ', 'Ἁ', 'Ἂ', 'Ἃ', 'Ἄ', 'Ἅ', 'Ἆ', 'Ἇ', 'ᾈ', 'ᾉ', 'ᾊ', 'ᾋ', 'ᾌ', 'ᾍ', 'ᾎ', 'ᾏ', 'Ᾰ', 'Ᾱ', 'Ὰ', 'Ά', 'ᾼ', 'А'],
463-
'B' => ['Б', 'Β'],
482+
'A' => ['Á', 'À', 'Ả', 'Ã', 'Ạ', 'Ă', 'Ắ', 'Ằ', 'Ẳ', 'Ẵ', 'Ặ', 'Â', 'Ấ', 'Ầ', 'Ẩ', 'Ẫ', 'Ậ', 'Å', 'Ā', 'Ą', 'Α', 'Ά', 'Ἀ', 'Ἁ', 'Ἂ', 'Ἃ', 'Ἄ', 'Ἅ', 'Ἆ', 'Ἇ', 'ᾈ', 'ᾉ', 'ᾊ', 'ᾋ', 'ᾌ', 'ᾍ', 'ᾎ', 'ᾏ', 'Ᾰ', 'Ᾱ', 'Ὰ', 'Ά', 'ᾼ', 'А', 'Ǻ', 'Ǎ'],
483+
'B' => ['Б', 'Β', 'ब'],
464484
'C' => ['Ç', 'Ć', 'Č', 'Ĉ', 'Ċ'],
465485
'D' => ['Ď', 'Ð', 'Đ', 'Ɖ', 'Ɗ', 'Ƌ', 'ᴅ', 'ᴆ', 'Д', 'Δ'],
466486
'E' => ['É', 'È', 'Ẻ', 'Ẽ', 'Ẹ', 'Ê', 'Ế', 'Ề', 'Ể', 'Ễ', 'Ệ', 'Ë', 'Ē', 'Ę', 'Ě', 'Ĕ', 'Ė', 'Ε', 'Έ', 'Ἐ', 'Ἑ', 'Ἒ', 'Ἓ', 'Ἔ', 'Ἕ', 'Έ', 'Ὲ', 'Е', 'Ё', 'Э', 'Є', 'Ə'],
467487
'F' => ['Ф', 'Φ'],
468488
'G' => ['Ğ', 'Ġ', 'Ģ', 'Г', 'Ґ', 'Γ'],
469-
'H' => ['Η', 'Ή'],
470-
'I' => ['Í', 'Ì', 'Ỉ', 'Ĩ', 'Ị', 'Î', 'Ï', 'Ī', 'Ĭ', 'Į', 'İ', 'Ι', 'Ί', 'Ϊ', 'Ἰ', 'Ἱ', 'Ἳ', 'Ἴ', 'Ἵ', 'Ἶ', 'Ἷ', 'Ῐ', 'Ῑ', 'Ὶ', 'Ί', 'И', 'І', 'Ї'],
489+
'H' => ['Η', 'Ή', 'Ħ'],
490+
'I' => ['Í', 'Ì', 'Ỉ', 'Ĩ', 'Ị', 'Î', 'Ï', 'Ī', 'Ĭ', 'Į', 'İ', 'Ι', 'Ί', 'Ϊ', 'Ἰ', 'Ἱ', 'Ἳ', 'Ἴ', 'Ἵ', 'Ἶ', 'Ἷ', 'Ῐ', 'Ῑ', 'Ὶ', 'Ί', 'И', 'І', 'Ї', 'Ǐ', 'ϒ'],
471491
'K' => ['К', 'Κ'],
472-
'L' => ['Ĺ', 'Ł', 'Л', 'Λ', 'Ļ'],
492+
'L' => ['Ĺ', 'Ł', 'Л', 'Λ', 'Ļ', 'Ľ', 'Ŀ', 'ल'],
473493
'M' => ['М', 'Μ'],
474494
'N' => ['Ń', 'Ñ', 'Ň', 'Ņ', 'Ŋ', 'Н', 'Ν'],
475-
'O' => ['Ó', 'Ò', 'Ỏ', 'Õ', 'Ọ', 'Ô', 'Ố', 'Ồ', 'Ổ', 'Ỗ', 'Ộ', 'Ơ', 'Ớ', 'Ờ', 'Ở', 'Ỡ', 'Ợ', 'Ø', 'Ō', 'Ő', 'Ŏ', 'Ο', 'Ό', 'Ὀ', 'Ὁ', 'Ὂ', 'Ὃ', 'Ὄ', 'Ὅ', 'Ὸ', 'Ό', 'О', 'Θ', 'Ө'],
495+
'O' => ['Ó', 'Ò', 'Ỏ', 'Õ', 'Ọ', 'Ô', 'Ố', 'Ồ', 'Ổ', 'Ỗ', 'Ộ', 'Ơ', 'Ớ', 'Ờ', 'Ở', 'Ỡ', 'Ợ', 'Ø', 'Ō', 'Ő', 'Ŏ', 'Ο', 'Ό', 'Ὀ', 'Ὁ', 'Ὂ', 'Ὃ', 'Ὄ', 'Ὅ', 'Ὸ', 'Ό', 'О', 'Θ', 'Ө', 'Ǒ', 'Ǿ'],
476496
'P' => ['П', 'Π'],
477-
'R' => ['Ř', 'Ŕ', 'Р', 'Ρ'],
497+
'R' => ['Ř', 'Ŕ', 'Р', 'Ρ', 'Ŗ'],
478498
'S' => ['Ş', 'Ŝ', 'Ș', 'Š', 'Ś', 'С', 'Σ'],
479499
'T' => ['Ť', 'Ţ', 'Ŧ', 'Ț', 'Т', 'Τ'],
480-
'U' => ['Ú', 'Ù', 'Ủ', 'Ũ', 'Ụ', 'Ư', 'Ứ', 'Ừ', 'Ử', 'Ữ', 'Ự', 'Û', 'Ū', 'Ů', 'Ű', 'Ŭ', 'Ų', 'У'],
500+
'U' => ['Ú', 'Ù', 'Ủ', 'Ũ', 'Ụ', 'Ư', 'Ứ', 'Ừ', 'Ử', 'Ữ', 'Ự', 'Û', 'Ū', 'Ů', 'Ű', 'Ŭ', 'Ų', 'У', 'Ǔ', 'Ǖ', 'Ǘ', 'Ǚ', 'Ǜ'],
481501
'V' => ['В'],
482-
'W' => ['Ω', 'Ώ'],
483-
'X' => ['Χ'],
484-
'Y' => ['Ý', 'Ỳ', 'Ỷ', 'Ỹ', 'Ỵ', 'Ÿ', 'Ῠ', 'Ῡ', 'Ὺ', 'Ύ', 'Ы', 'Й', 'Υ', 'Ϋ'],
502+
'W' => ['Ω', 'Ώ', 'Ŵ'],
503+
'X' => ['Χ', 'Ξ'],
504+
'Y' => ['Ý', 'Ỳ', 'Ỷ', 'Ỹ', 'Ỵ', 'Ÿ', 'Ῠ', 'Ῡ', 'Ὺ', 'Ύ', 'Ы', 'Й', 'Υ', 'Ϋ', 'Ŷ'],
485505
'Z' => ['Ź', 'Ž', 'Ż', 'З', 'Ζ'],
486-
'AE' => ['Ä', 'Æ'],
506+
'AE' => ['Ä', 'Æ', 'Ǽ'],
487507
'CH' => ['Ч'],
488508
'DJ' => ['Ђ'],
489509
'DZ' => ['Џ'],
510+
'GX' => ['Ĝ'],
511+
'HX' => ['Ĥ'],
512+
'IJ' => ['IJ'],
513+
'JX' => ['Ĵ'],
490514
'KH' => ['Х'],
491515
'LJ' => ['Љ'],
492516
'NJ' => ['Њ'],
493-
'OE' => ['Ö'],
517+
'OE' => ['Ö', 'Œ'],
494518
'PS' => ['Ψ'],
495519
'SH' => ['Ш'],
496520
'SHCH' => ['Щ'],

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL