Adopt factory (#62)

samdark · web-flow · commit e6dafd854c81 · 2021-04-13T15:36:54.000+03:00
diff --git a/config/packages/yiisoft/aliases/common.php b/config/packages/yiisoft/aliases/common.php
@@ -8,7 +8,7 @@
 
 return [
     Aliases::class => [
-        '__class' => Aliases::class,
+        'class' => Aliases::class,
         '__construct()' => [$params['yiisoft/aliases']['aliases']],
     ],
 ];
diff --git a/config/packages/yiisoft/assets/web.php b/config/packages/yiisoft/assets/web.php
@@ -10,13 +10,13 @@
 use Yiisoft\Assets\AssetManager;
 use Yiisoft\Assets\AssetPublisher;
 use Yiisoft\Assets\AssetPublisherInterface;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 
 /** @var array $params */
 
 return [
     AssetConverterInterface::class => [
-        '__class' => AssetConverter::class,
+        'class' => AssetConverter::class,
         'setCommand()' => [
             $params['yiisoft/assets']['assetConverter']['command']['from'],
             $params['yiisoft/assets']['assetConverter']['command']['to'],
@@ -26,21 +26,21 @@
     ],
 
     AssetLoaderInterface::class => [
-        '__class' => AssetLoader::class,
+        'class' => AssetLoader::class,
         'setAppendTimestamp()' => [$params['yiisoft/assets']['assetLoader']['appendTimestamp']],
         'setAssetMap()' => [$params['yiisoft/assets']['assetLoader']['assetMap']],
         'setBasePath()' => [$params['yiisoft/assets']['assetLoader']['basePath']],
         'setBaseUrl()' => [$params['yiisoft/assets']['assetLoader']['baseUrl']],
     ],
 
     AssetPublisherInterface::class => [
-        '__class' => AssetPublisher::class,
+        'class' => AssetPublisher::class,
         'setForceCopy()' => [$params['yiisoft/assets']['assetPublisher']['forceCopy']],
         'setLinkAssets()' => [$params['yiisoft/assets']['assetPublisher']['linkAssets']],
     ],
 
     AssetManager::class => [
-        '__class' => AssetManager::class,
+        'class' => AssetManager::class,
         '__construct()' => [
             Reference::to(Aliases::class),
             Reference::to(AssetLoaderInterface::class),
diff --git a/config/packages/yiisoft/csrf/web.php b/config/packages/yiisoft/csrf/web.php
@@ -11,11 +11,11 @@
 use Yiisoft\Csrf\Synchronizer\SynchronizerCsrfToken;
 use Yiisoft\Csrf\Hmac\IdentityGenerator\SessionCsrfTokenIdentityGenerator;
 use Yiisoft\Csrf\Hmac\HmacCsrfToken;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 
 return [
     CsrfTokenInterface::class => [
-        '__class' => MaskedCsrfToken::class,
+        'class' => MaskedCsrfToken::class,
         '__construct()' => [
             'token' => Reference::to(SynchronizerCsrfToken::class),
         ],
diff --git a/config/packages/yiisoft/log-target-file/common.php b/config/packages/yiisoft/log-target-file/common.php
@@ -15,7 +15,7 @@
     LoggerInterface::class => static fn (FileTarget $fileTarget) => new Logger([$fileTarget]),
 
     FileRotatorInterface::class => [
-        '__class' => FileRotator::class,
+        'class' => FileRotator::class,
         '__construct()' => [
             $params['yiisoft/log-target-file']['fileRotator']['maxFileSize'],
             $params['yiisoft/log-target-file']['fileRotator']['maxFiles'],
diff --git a/config/packages/yiisoft/router-fastroute/common.php b/config/packages/yiisoft/router-fastroute/common.php
@@ -7,7 +7,7 @@
 
 return [
     UrlGeneratorInterface::class => [
-        '__class' => UrlGenerator::class,
+        'class' => UrlGenerator::class,
         'setEncodeRaw()' => [$params['yiisoft/router-fastroute']['encodeRaw']],
     ],
 ];
diff --git a/config/packages/yiisoft/session/web.php b/config/packages/yiisoft/session/web.php
@@ -11,7 +11,7 @@
 
 return [
     SessionInterface::class => [
-        '__class' => Session::class,
+        'class' => Session::class,
         '__construct()' => [
             $params['yiisoft/session']['session']['options'],
             $params['yiisoft/session']['session']['handler'],
diff --git a/config/packages/yiisoft/user/web.php b/config/packages/yiisoft/user/web.php
@@ -9,7 +9,7 @@
 use Yiisoft\Auth\IdentityWithTokenRepositoryInterface;
 use Yiisoft\Auth\Method\HttpHeader;
 use Yiisoft\Auth\Middleware\Authentication;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 
 /** @var array $params */
 
diff --git a/config/packages/yiisoft/view/common.php b/config/packages/yiisoft/view/common.php
@@ -9,7 +9,7 @@
 
 return [
     View::class => [
-        '__class' => View::class,
+        'class' => View::class,
         '__construct()' => [
             'basePath' => static fn (Aliases $aliases) => $aliases->get($params['yiisoft/view']['basePath']),
         ],
diff --git a/config/packages/yiisoft/view/params.php b/config/packages/yiisoft/view/params.php
@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Yiisoft\Assets\AssetManager;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 
 return [
     'yiisoft/view' => [
diff --git a/config/packages/yiisoft/view/web.php b/config/packages/yiisoft/view/web.php
@@ -24,7 +24,7 @@
     },
 
     WebView::class => [
-        '__class' => WebView::class,
+        'class' => WebView::class,
         '__construct()' => [
             'basePath' => static fn (Aliases $aliases) => $aliases->get($params['yiisoft/view']['basePath']),
         ],
diff --git a/config/packages/yiisoft/yii-console/console.php b/config/packages/yiisoft/yii-console/console.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 use Yiisoft\Yii\Console\Application;
 use Yiisoft\Yii\Console\CommandLoader;
 use Yiisoft\Yii\Console\SymfonyEventDispatcher;
@@ -13,14 +13,14 @@
 
 return [
     CommandLoaderInterface::class => [
-        '__class' => CommandLoader::class,
+        'class' => CommandLoader::class,
         '__construct()' => [
             'commandMap' => $params['yiisoft/yii-console']['commands'],
         ],
     ],
 
     Application::class => [
-        '__class' => Application::class,
+        'class' => Application::class,
         'setDispatcher()' => [Reference::to(SymfonyEventDispatcher::class)],
         'setCommandLoader()' => [Reference::to(CommandLoaderInterface::class)],
         'addOptions()' => [
diff --git a/config/web/application.php b/config/web/application.php
@@ -8,7 +8,7 @@
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Router\Middleware\Router;
 use Yiisoft\Yii\Web\Middleware\SubFolder;
-use Yiisoft\Factory\Definitions\Reference;
+use Yiisoft\Factory\Definition\Reference;
 
 return [
     Yiisoft\Yii\Web\Application::class => [
