[TASK] Remove dependency between SiteLanguage and Site

[Packages/TYPO3.CMS.git] / typo3 / sysext / core / Classes / Site / Entity / SiteLanguage.php

diff --git a/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php b/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php
index 126155a..2c9ff62 100644 (file)
--- a/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php
+++ b/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php
@@ -17,15 +17,10 @@ namespace TYPO3\CMS\Core\Site\Entity;
  */
 
 /**
- * Entity representing a sys_sitelanguage configuration of a site object.
+ * Entity representing a site_language configuration of a site object.
  */
 class SiteLanguage
 {
-    /**
-     * @var Site
-     */
-    protected $site;
-
     /**
      * The language mapped to the sys_language DB entry.
      *
@@ -112,15 +107,13 @@ class SiteLanguage
 
     /**
      * SiteLanguage constructor.
-     * @param Site $site
      * @param int $languageId
      * @param string $locale
      * @param string $base
      * @param array $attributes
      */
-    public function __construct(Site $site, int $languageId, string $locale, string $base, array $attributes)
+    public function __construct(int $languageId, string $locale, string $base, array $attributes)
     {
-        $this->site = $site;
         $this->languageId = $languageId;
         $this->locale = $locale;
         $this->base = $base;
@@ -178,14 +171,6 @@ class SiteLanguage
         ];
     }
 
-    /**
-     * @return Site
-     */
-    public function getSite(): Site
-    {
-        return $this->site;
-    }
-
     /**
      * @return int
      */
@@ -223,7 +208,7 @@ class SiteLanguage
      */
     public function getNavigationTitle(): string
     {
-        return $this->navigationTitle ?? $this->getTitle();
+        return $this->navigationTitle ?: $this->getTitle();
     }
 
     /**
@@ -242,14 +227,6 @@ class SiteLanguage
         return $this->typo3Language;
     }
 
-    /**
-     * @return string
-     */
-    public function getFallbackType(): string
-    {
-        return $this->fallbackType;
-    }
-
     /**
      * Returns the ISO-639-1 language ISO code
      *
@@ -257,7 +234,7 @@ class SiteLanguage
      */
     public function getTwoLetterIsoCode(): string
     {
-        return $this->twoLetterIsoCode ?? '';
+        return $this->twoLetterIsoCode;
     }
 
     /**
@@ -267,7 +244,7 @@ class SiteLanguage
      */
     public function getHreflang(): string
     {
-        return $this->hreflang ?? '';
+        return $this->hreflang;
     }
 
     /**
@@ -277,7 +254,15 @@ class SiteLanguage
      */
     public function getDirection(): string
     {
-        return $this->direction ?? '';
+        return $this->direction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFallbackType(): string
+    {
+        return $this->fallbackType;
     }
 
     /**