remove get language

luyadev · Apr 21, 2021 · 339d00f · 339d00f
1 parent c660dec
commit 339d00f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/core/console/commands/ThemeController.php b/core/console/commands/ThemeController.php
@@ -184,7 +184,7 @@ private function renderLayout($themeName)
 $this->beginPage();
 ?>
 <!DOCTYPE html>
-<html lang="<?= Yii::$app->composition->language; ?>">
+<html lang="<?= Yii::$app->composition->langShortCode; ?>">
     <head>
         <title><?= $this->title; ?></title>
         <meta charset="utf-8">

diff --git a/docs/guide/app-module-urlrules.md b/docs/guide/app-module-urlrules.md
@@ -100,7 +100,7 @@ In order to define the url rules from the urlManager config scope, you can just
 
 > When composition is enabled, it will take the correct route for the current language and prefix the pattern if enable in composition config.
 
-To verify which composition language is used you can dump `Yii::$app->composition->language`. The {{luya\web\Composition}} component is taking care of LUYA multi language websites and is registered by default for all LUYA projects.
+To verify which composition language is used you can dump `Yii::$app->composition->langShortCode`. The {{luya\web\Composition}} component is taking care of LUYA multi language websites and is registered by default for all LUYA projects.
 
 ## Application Controller Routes
 

diff --git a/tests/core/web/CompositionTest.php b/tests/core/web/CompositionTest.php
@@ -9,17 +9,6 @@
  * removed tests to implemented here (if not already).
  *
  *
- $parts = Yii::$app->composition->get();
-
- $this->assertArrayHasKey('langShortCode', $parts);
- $this->assertArrayHasKey('foo', $parts);
- $this->assertArrayHasKey('bar', $parts);
-
- $this->assertEquals('de', $parts['langShortCode']);
- $this->assertEquals('de', Yii::$app->composition->getLanguage());
- $this->assertEquals('1234', $parts['foo']);
- $this->assertEquals('luya09', $parts['bar']);
-
  *
  * @author nadar
  */

diff --git a/tests/core/web/UrlManagerTest.php b/tests/core/web/UrlManagerTest.php
@@ -311,7 +311,7 @@ public function testCompositionRuleWithHiddenLanguageButCompositionLangShortCode
         $request = new Request();
         $request->pathInfo = 'mentions-legales';
         $composition = new Composition($request, ['hidden' => true, 'default' => ['langShortCode' => 'fr']]);
-        $this->assertSame('fr', $composition->language);
+        $this->assertSame('fr', $composition->langShortCode);
         $urlManager = new UrlManager();
         $urlManager->composition = $composition;
         $urlManager->addRules([