Skip to content

Commit 740b910

Browse files
committed
fix: use alias to get same instance
1 parent 82bbc97 commit 740b910

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/config/src/ConfigProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
namespace Hypervel\Config;
66

77
use Hyperf\Contract\ConfigInterface;
8-
use Hypervel\Config\Contracts\Repository as ConfigContract;
98

109
class ConfigProvider
1110
{
1211
public function __invoke(): array
1312
{
1413
return [
1514
'dependencies' => [
16-
ConfigContract::class => ConfigFactory::class,
1715
ConfigInterface::class => ConfigFactory::class,
1816
],
1917
];

src/config/src/Functions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Hypervel\Config;
66

77
use Hyperf\Context\ApplicationContext;
8-
use Hyperf\Contract\ConfigInterface;
8+
use Hypervel\Config\Contracts\Repository as ConfigContract;
99

1010
/**
1111
* Get / set the specified configuration value.
@@ -17,7 +17,7 @@
1717
*/
1818
function config(mixed $key = null, mixed $default = null): mixed
1919
{
20-
$config = ApplicationContext::getContainer()->get(ConfigInterface::class);
20+
$config = ApplicationContext::getContainer()->get(ConfigContract::class);
2121

2222
if (is_null($key)) {
2323
return $config;

src/foundation/src/Application.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,10 @@ protected function registerCoreContainerAliases(): void
524524
\Hypervel\Foundation\Application::class,
525525
],
526526
\Hypervel\Foundation\Console\Contracts\Kernel::class => ['artisan'],
527-
\Hyperf\Contract\ConfigInterface::class => ['config'],
527+
\Hyperf\Contract\ConfigInterface::class => [
528+
'config',
529+
\Hypervel\Config\Contracts\Repository::class,
530+
],
528531
\Psr\EventDispatcher\EventDispatcherInterface::class => [
529532
'events',
530533
\Hypervel\Event\Contracts\EventDispatcherContract::class,
@@ -554,6 +557,7 @@ protected function registerCoreContainerAliases(): void
554557
'request',
555558
\Hyperf\HttpServer\Contract\RequestInterface::class,
556559
\Hyperf\HttpServer\Request::class,
560+
\Hypervel\Http\Contracts\RequestContract::class,
557561
],
558562
\Hyperf\HttpServer\Contract\ResponseInterface::class => [
559563
'response',

src/http/src/ConfigProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace Hypervel\Http;
66

77
use Hyperf\HttpServer\CoreMiddleware as HyperfCoreMiddleware;
8-
use Hypervel\Http\Contracts\RequestContract;
98
use Hypervel\Http\Contracts\ResponseContract;
109
use Psr\Http\Message\ServerRequestInterface;
1110

@@ -15,7 +14,6 @@ public function __invoke(): array
1514
{
1615
return [
1716
'dependencies' => [
18-
RequestContract::class => Request::class,
1917
ResponseContract::class => Response::class,
2018
ServerRequestInterface::class => Request::class,
2119
HyperfCoreMiddleware::class => CoreMiddleware::class,

0 commit comments

Comments
 (0)