Remove yiisoft/i18n dependency + Refactor ApplicationParameters (#363)

vjik · web-flow · commit 46fe6f67053b · 2025-07-15T20:21:10.000+03:00
diff --git a/composer.json b/composer.json
@@ -58,7 +58,6 @@
         "yiisoft/error-handler": "^4.1",
         "yiisoft/html": "^3.11",
         "yiisoft/http": "^1.2",
-        "yiisoft/i18n": "^1.2.1",
         "yiisoft/injector": "^1.2",
         "yiisoft/log": "^2.1.1",
         "yiisoft/log-target-file": "^3.0",
diff --git a/config/common/di/application-parameters.php b/config/common/di/application-parameters.php
@@ -8,8 +8,10 @@
 
 return [
     ApplicationParameters::class => [
-        'class' => ApplicationParameters::class,
-        'charset()' => [$params['app']['charset']],
-        'name()' => [$params['app']['name']],
+        '__construct()' => [
+            'name' => $params['app']['name'],
+            'charset' => $params['app']['charset'],
+            'locale' => $params['app']['locale'],
+        ],
     ],
 ];
diff --git a/config/common/di/i18n.php b/config/common/di/i18n.php
diff --git a/resources/views/layout/main.php b/resources/views/layout/main.php
@@ -4,15 +4,13 @@
 
 use App\Asset\AppAsset;
 use Yiisoft\Html\Html;
-use Yiisoft\I18n\Locale;
 
 /**
  * @var App\ApplicationParameters $applicationParameters
  * @var Yiisoft\Aliases\Aliases $aliases
  * @var Yiisoft\Assets\AssetManager $assetManager
  * @var string $content
  * @var string|null $csrf
- * @var Locale $locale
  * @var Yiisoft\View\WebView $this
  * @var Yiisoft\Router\CurrentRoute $currentRoute
  * @var Yiisoft\Router\UrlGeneratorInterface $urlGenerator
@@ -28,9 +26,9 @@
 
 $this->beginPage()
 ?><!DOCTYPE html>
-<html lang="<?= Html::encode($locale->language()) ?>">
+<html lang="<?= Html::encode($applicationParameters->locale) ?>">
 <head>
-    <meta charset="<?= Html::encode($applicationParameters->getCharset()) ?>">
+    <meta charset="<?= Html::encode($applicationParameters->charset) ?>">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><?= Html::encode($this->getTitle()) ?></title>
@@ -77,7 +75,7 @@
 <div class="footer">
     <div class="footer_copyright">
         <a href="https://www.yiiframework.com/" target="_blank" rel="noopener">
-            © <?= date('Y') ?>  <?= Html::encode($applicationParameters->getName()) ?>
+            © <?= date('Y') ?>  <?= Html::encode($applicationParameters->name) ?>
         </a>
     </div>
     <div class="footer_icons">
diff --git a/resources/views/site/index.php b/resources/views/site/index.php
@@ -12,7 +12,7 @@
 use Yiisoft\Translator\TranslatorInterface;
 use Yiisoft\View\WebView;
 
-$this->setTitle($applicationParameters->getName());
+$this->setTitle($applicationParameters->name);
 ?>
 
 <div class="text-center">
diff --git a/src/ApplicationParameters.php b/src/ApplicationParameters.php
@@ -4,32 +4,11 @@
 
 namespace App;
 
-final class ApplicationParameters
+final readonly class ApplicationParameters
 {
-    private string $charset = 'UTF-8';
-    private string $name = 'My Project';
-
-    public function getCharset(): string
-    {
-        return $this->charset;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function charset(string $value): self
-    {
-        $new = clone $this;
-        $new->charset = $value;
-        return $new;
-    }
-
-    public function name(string $value): self
-    {
-        $new = clone $this;
-        $new->name = $value;
-        return $new;
-    }
+    public function __construct(
+        public string $name = 'My Project',
+        public string $charset = 'UTF-8',
+        public string $locale = 'en',
+    ) {}
 }
diff --git a/src/ViewInjection/LayoutViewInjection.php b/src/ViewInjection/LayoutViewInjection.php
@@ -6,7 +6,6 @@
 
 use Yiisoft\Aliases\Aliases;
 use Yiisoft\Assets\AssetManager;
-use Yiisoft\I18n\Locale;
 use Yiisoft\Router\CurrentRoute;
 use Yiisoft\Yii\View\Renderer\LayoutParametersInjectionInterface;
 
@@ -15,7 +14,6 @@
     public function __construct(
         private Aliases $aliases,
         private AssetManager $assetManager,
-        private Locale $locale,
         private CurrentRoute $currentRoute,
     ) {}
 
@@ -24,7 +22,6 @@ public function getLayoutParameters(): array
         return [
             'aliases' => $this->aliases,
             'assetManager' => $this->assetManager,
-            'locale' => $this->locale,
             'currentRoute' => $this->currentRoute,
         ];
     }
