Skip to content

Commit a6e9bb5

Browse files
authored
[12.x] Reorder some core aliases in alphabetical order. (#57706)
* Reorder core aliases in alphabetical order. * Add a test case to assert that core container aliases are registered by default.
1 parent 801b780 commit a6e9bb5

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/Illuminate/Foundation/Application.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,6 +1631,8 @@ public function registerCoreContainerAliases()
16311631
'app' => [self::class, \Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class, \Psr\Container\ContainerInterface::class],
16321632
'auth' => [\Illuminate\Auth\AuthManager::class, \Illuminate\Contracts\Auth\Factory::class],
16331633
'auth.driver' => [\Illuminate\Contracts\Auth\Guard::class],
1634+
'auth.password' => [\Illuminate\Auth\Passwords\PasswordBrokerManager::class, \Illuminate\Contracts\Auth\PasswordBrokerFactory::class],
1635+
'auth.password.broker' => [\Illuminate\Auth\Passwords\PasswordBroker::class, \Illuminate\Contracts\Auth\PasswordBroker::class],
16341636
'blade.compiler' => [\Illuminate\View\Compilers\BladeCompiler::class],
16351637
'cache' => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
16361638
'cache.store' => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class, \Psr\SimpleCache\CacheInterface::class],
@@ -1648,12 +1650,9 @@ public function registerCoreContainerAliases()
16481650
'filesystem.cloud' => [\Illuminate\Contracts\Filesystem\Cloud::class],
16491651
'hash' => [\Illuminate\Hashing\HashManager::class],
16501652
'hash.driver' => [\Illuminate\Contracts\Hashing\Hasher::class],
1651-
'translator' => [\Illuminate\Translation\Translator::class, \Illuminate\Contracts\Translation\Translator::class],
16521653
'log' => [\Illuminate\Log\LogManager::class, \Psr\Log\LoggerInterface::class],
16531654
'mail.manager' => [\Illuminate\Mail\MailManager::class, \Illuminate\Contracts\Mail\Factory::class],
16541655
'mailer' => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],
1655-
'auth.password' => [\Illuminate\Auth\Passwords\PasswordBrokerManager::class, \Illuminate\Contracts\Auth\PasswordBrokerFactory::class],
1656-
'auth.password.broker' => [\Illuminate\Auth\Passwords\PasswordBroker::class, \Illuminate\Contracts\Auth\PasswordBroker::class],
16571656
'queue' => [\Illuminate\Queue\QueueManager::class, \Illuminate\Contracts\Queue\Factory::class, \Illuminate\Contracts\Queue\Monitor::class],
16581657
'queue.connection' => [\Illuminate\Contracts\Queue\Queue::class],
16591658
'queue.failer' => [\Illuminate\Queue\Failed\FailedJobProviderInterface::class],
@@ -1664,6 +1663,7 @@ public function registerCoreContainerAliases()
16641663
'router' => [\Illuminate\Routing\Router::class, \Illuminate\Contracts\Routing\Registrar::class, \Illuminate\Contracts\Routing\BindingRegistrar::class],
16651664
'session' => [\Illuminate\Session\SessionManager::class],
16661665
'session.store' => [\Illuminate\Session\Store::class, \Illuminate\Contracts\Session\Session::class],
1666+
'translator' => [\Illuminate\Translation\Translator::class, \Illuminate\Contracts\Translation\Translator::class],
16671667
'url' => [\Illuminate\Routing\UrlGenerator::class, \Illuminate\Contracts\Routing\UrlGenerator::class],
16681668
'validator' => [\Illuminate\Validation\Factory::class, \Illuminate\Contracts\Validation\Factory::class],
16691669
'view' => [\Illuminate\View\Factory::class, \Illuminate\Contracts\View\Factory::class],

tests/Foundation/FoundationApplicationTest.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,18 @@ public function exists(string $path): bool
636636
$this->assertFalse($app->routesAreCached());
637637
$this->assertStringContainsString('routes-v7.php', $files->pathRequested);
638638
}
639+
640+
public function testCoreContainerAliasesAreRegisteredByDefault(): void
641+
{
642+
$app = new Application();
643+
644+
$this->assertTrue($app->isAlias(\Illuminate\Contracts\Translation\Translator::class));
645+
$this->assertSame('translator', $app->getAlias(\Illuminate\Contracts\Translation\Translator::class));
646+
$this->assertTrue($app->isAlias(\Illuminate\Contracts\Auth\PasswordBrokerFactory::class));
647+
$this->assertSame('auth.password', $app->getAlias(\Illuminate\Contracts\Auth\PasswordBrokerFactory::class));
648+
$this->assertTrue($app->isAlias(\Illuminate\Contracts\Auth\PasswordBroker::class));
649+
$this->assertSame('auth.password.broker', $app->getAlias(\Illuminate\Contracts\Auth\PasswordBroker::class));
650+
}
639651
}
640652

641653
class ApplicationBasicServiceProviderStub extends ServiceProvider

0 commit comments

Comments
 (0)