From 14859db3c8c50207b115f58d6ba3f5e4f17a8584 Mon Sep 17 00:00:00 2001
From: Simon Gilli <typo3@gilbertsoft.org>
Date: Mon, 9 Apr 2018 00:35:04 +0200
Subject: [PATCH] [BUGFIX] Minor fixes in SiteLanguage
This patch fixes some minor issues in getter methods.
Resolves: #84670
Releases: master
Change-Id: I4123238ca17bc3c3463090117b975997ea092a7e
Reviewed-on: https://review.typo3.org/56610
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
---
.../core/Classes/Site/Entity/SiteLanguage.php | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php b/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php
index 126155a1b010..f4092899afac 100644
--- a/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php
+++ b/typo3/sysext/core/Classes/Site/Entity/SiteLanguage.php
@@ -223,7 +223,7 @@ class SiteLanguage
*/
public function getNavigationTitle(): string
{
- return $this->navigationTitle ?? $this->getTitle();
+ return $this->navigationTitle ?: $this->getTitle();
}
/**
@@ -242,14 +242,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 +249,7 @@ class SiteLanguage
*/
public function getTwoLetterIsoCode(): string
{
- return $this->twoLetterIsoCode ?? '';
+ return $this->twoLetterIsoCode;
}
/**
@@ -267,7 +259,7 @@ class SiteLanguage
*/
public function getHreflang(): string
{
- return $this->hreflang ?? '';
+ return $this->hreflang;
}
/**
@@ -277,7 +269,15 @@ class SiteLanguage
*/
public function getDirection(): string
{
- return $this->direction ?? '';
+ return $this->direction;
+ }
+
+ /**
+ * @return string
+ */
+ public function getFallbackType(): string
+ {
+ return $this->fallbackType;
}
/**
--
GitLab