diff --git a/CHANGELOG.md b/CHANGELOG.md
index 300cf55373..5a22244aa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -158,6 +158,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - [PR-774](https://github.com/OXID-eSales/oxideshop_ce/pull/774)
     - [PR-773](https://github.com/OXID-eSales/oxideshop_ce/pull/773)
     - [PR-775](https://github.com/OXID-eSales/oxideshop_ce/pull/775)
+    - [PR-776](https://github.com/OXID-eSales/oxideshop_ce/pull/776)
     
 ### Security
 
diff --git a/source/Application/Controller/AccountController.php b/source/Application/Controller/AccountController.php
index 134d45ad13..a13e169aac 100644
--- a/source/Application/Controller/AccountController.php
+++ b/source/Application/Controller/AccountController.php
@@ -150,7 +150,7 @@ protected function _getLoginTemplate()
     /**
      * Confirms term agreement. Returns value of confirmed term
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function confirmTerms()
     {
@@ -241,7 +241,7 @@ public function getOrderCnt()
     /**
      * Return the active article id
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getArticleId()
     {
diff --git a/source/Application/Controller/AccountOrderController.php b/source/Application/Controller/AccountOrderController.php
index f8bcebd22f..f6e2b10cbb 100644
--- a/source/Application/Controller/AccountOrderController.php
+++ b/source/Application/Controller/AccountOrderController.php
@@ -102,7 +102,7 @@ public function getOrderList()
     /**
      * Template variable getter. Returns ordered articles
      *
-     * @return \OxidEsales\Eshop\Application\Model\ArticleList | false
+     * @return \OxidEsales\Eshop\Application\Model\ArticleList|false
      */
     public function getOrderArticleList()
     {
diff --git a/source/Application/Controller/AccountWishlistController.php b/source/Application/Controller/AccountWishlistController.php
index 4ec76f703a..7c69b90e12 100644
--- a/source/Application/Controller/AccountWishlistController.php
+++ b/source/Application/Controller/AccountWishlistController.php
@@ -144,7 +144,7 @@ public function showSuggest()
     /**
      * Show the Wishlist
      *
-     * @return \OxidEsales\Eshop\Application\Model\UserBasket | bool
+     * @return \OxidEsales\Eshop\Application\Model\UserBasket|bool
      */
     public function getWishList()
     {
@@ -164,7 +164,7 @@ public function getWishList()
     /**
      * Returns array of producst assigned to user wish list
      *
-     * @return array | bool
+     * @return array|bool
      */
     public function getWishProductList()
     {
@@ -313,7 +313,7 @@ public function searchForWishList()
      * Returns a list of users which were found according to search condition.
      * If no users were found - false is returned
      *
-     * @return \OxidEsales\Eshop\Core\Model\ListModel | bool
+     * @return \OxidEsales\Eshop\Core\Model\ListModel|bool
      */
     public function getWishListUsers()
     {
diff --git a/source/Application/Controller/Admin/ArticleSeo.php b/source/Application/Controller/Admin/ArticleSeo.php
index cfbeae34f9..719def555b 100644
--- a/source/Application/Controller/Admin/ArticleSeo.php
+++ b/source/Application/Controller/Admin/ArticleSeo.php
@@ -215,7 +215,7 @@ protected function _getManufacturerList($oArticle)
     /**
      * Returns active category object, used for seo url getter
      *
-     * @return \OxidEsales\Eshop\Application\Model\Category | null
+     * @return \OxidEsales\Eshop\Application\Model\Category|null
      */
     public function getActCategory()
     {
@@ -227,7 +227,7 @@ public function getActCategory()
     /**
      * Returns active vendor object if available
      *
-     * @return \OxidEsales\Eshop\Application\Model\Vendor | null
+     * @return \OxidEsales\Eshop\Application\Model\Vendor|null
      */
     public function getActVendor()
     {
@@ -239,7 +239,7 @@ public function getActVendor()
     /**
      * Returns active manufacturer object if available
      *
-     * @return \OxidEsales\Eshop\Application\Model\Manufacturer | null
+     * @return \OxidEsales\Eshop\Application\Model\Manufacturer|null
      */
     public function getActManufacturer()
     {
diff --git a/source/Application/Controller/Admin/OrderArticle.php b/source/Application/Controller/Admin/OrderArticle.php
index 16b693b5d3..55a79fc460 100644
--- a/source/Application/Controller/Admin/OrderArticle.php
+++ b/source/Application/Controller/Admin/OrderArticle.php
@@ -96,7 +96,7 @@ public function getSearchProductArtNr()
     /**
      * If possible returns searched/found oxarticle object
      *
-     * @return \OxidEsales\Eshop\Application\Model\Article | false
+     * @return \OxidEsales\Eshop\Application\Model\Article|false
      */
     public function getSearchProduct()
     {
diff --git a/source/Application/Controller/ArticleDetailsController.php b/source/Application/Controller/ArticleDetailsController.php
index ab289befdf..83c8032a14 100644
--- a/source/Application/Controller/ArticleDetailsController.php
+++ b/source/Application/Controller/ArticleDetailsController.php
@@ -186,7 +186,7 @@ protected function _getParentProduct($parentId)
     /**
      * In case list type is "search" returns search parameters which will be added to product details link
      *
-     * @return string | null
+     * @return string|null
      */
     protected function _getAddUrlParams()
     {
diff --git a/source/Application/Controller/BasketController.php b/source/Application/Controller/BasketController.php
index 6619d166b0..408825c652 100644
--- a/source/Application/Controller/BasketController.php
+++ b/source/Application/Controller/BasketController.php
@@ -121,7 +121,7 @@ public function render()
     /**
      * Return the current articles from the basket
      *
-     * @return object | bool
+     * @return object|bool
      */
     public function getBasketArticles()
     {
@@ -141,7 +141,7 @@ public function getBasketArticles()
     /**
      * return the basket articles
      *
-     * @return object | bool
+     * @return object|bool
      */
     public function getFirstBasketProduct()
     {
@@ -160,7 +160,7 @@ public function getFirstBasketProduct()
     /**
      * return the similar articles
      *
-     * @return object | bool
+     * @return object|bool
      */
     public function getBasketSimilarList()
     {
diff --git a/source/Application/Controller/FrontendController.php b/source/Application/Controller/FrontendController.php
index fc0f7c8061..5c42cf5470 100644
--- a/source/Application/Controller/FrontendController.php
+++ b/source/Application/Controller/FrontendController.php
@@ -2571,7 +2571,7 @@ public function getContentCategory()
     /**
      * Returns array of fields which must be filled during registration
      *
-     * @return array | bool
+     * @return array|bool
      */
     public function getMustFillFields()
     {
@@ -2593,7 +2593,7 @@ public function getMustFillFields()
      *
      * @param string $field required field to check
      *
-     * @return array | bool
+     * @return array|bool
      */
     public function isFieldRequired($field)
     {
diff --git a/source/Application/Controller/RegisterController.php b/source/Application/Controller/RegisterController.php
index aec20e9b7d..611c164214 100644
--- a/source/Application/Controller/RegisterController.php
+++ b/source/Application/Controller/RegisterController.php
@@ -77,7 +77,7 @@ public function render()
     /**
      * Returns registration error code (if it was set)
      *
-     * @return int | null
+     * @return int|null
      */
     public function getRegistrationError()
     {
@@ -87,7 +87,7 @@ public function getRegistrationError()
     /**
      * Return registration status (if it was set)
      *
-     * @return int | null
+     * @return int|null
      */
     public function getRegistrationStatus()
     {
diff --git a/source/Application/Controller/WishListController.php b/source/Application/Controller/WishListController.php
index 5910e3e357..93f1abf8b6 100644
--- a/source/Application/Controller/WishListController.php
+++ b/source/Application/Controller/WishListController.php
@@ -62,7 +62,7 @@ class WishListController extends \OxidEsales\Eshop\Application\Controller\Fronte
     /**
      * return the user which is owner of the wish list
      *
-     * @return object | bool
+     * @return object|bool
      */
     public function getWishUser()
     {
@@ -89,7 +89,7 @@ public function getWishUser()
     /**
      * return the articles which are in the wish list
      *
-     * @return object | bool
+     * @return object|bool
      */
     public function getWishList()
     {
@@ -134,7 +134,7 @@ public function searchForWishList()
      * Returns a list of users which were found according to search condition.
      * If no users were found - false is returned
      *
-     * @return \OxidEsales\Eshop\Core\Model\ListModel | bool
+     * @return \OxidEsales\Eshop\Core\Model\ListModel|bool
      */
     public function getWishListUsers()
     {
diff --git a/source/Application/Model/Article.php b/source/Application/Model/Article.php
index ab63750bd6..5cc820b6fc 100644
--- a/source/Application/Model/Article.php
+++ b/source/Application/Model/Article.php
@@ -70,21 +70,21 @@ class Article extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements
     /**
      * cached article variant min price
      *
-     * @var double | null
+     * @var double|null
      */
     protected $_dVarMinPrice = null;
 
     /**
      * cached article variant max price
      *
-     * @var double | null
+     * @var double|null
      */
     protected $_dVarMaxPrice = null;
 
     /**
      * caches article vat
      *
-     * @var double | null
+     * @var double|null
      */
     protected $_dArticleVat = null;
 
@@ -2960,7 +2960,7 @@ public function getStock()
      * Returns formatted delivery date. If the date is past or not set ('0000-00-00') returns false.
      *
      * @deprecated since v6.2 (2020-02-26); use getRestockDate();
-     * @return false|string
+     * @return string|bool
      */
     public function getDeliveryDate()
     {
@@ -2970,7 +2970,7 @@ public function getDeliveryDate()
     /**
      * Returns formatted delivery date. If the date is past or not set ('0000-00-00') returns false.
      *
-     * @return false|string
+     * @return string|bool
      */
     public function getRestockDate()
     {
@@ -2987,7 +2987,7 @@ public function getRestockDate()
      *
      * @deprecated since v5.1 (2013-10-03); use getTPrice() and oxPrice modifier;
      *
-     * @return double | bool
+     * @return double|bool
      */
     public function getFTPrice()
     {
@@ -3549,7 +3549,7 @@ public function hasAmountPrice()
      * @param bool      $blRemoveNotOrderables if true, removes from list not orderable articles, which are out of stock [optional]
      * @param bool|null $forceCoreTableUsage   if true forces core table use, default is false [optional]
      *
-     * @return array | oxsimplevariantlist | oxarticlelist
+     * @return array|oxsimplevariantlist|oxarticlelist
      */
     protected function _loadVariantList($loadSimpleVariants, $blRemoveNotOrderables = true, $forceCoreTableUsage = null)
     {
diff --git a/source/Application/Model/Basket.php b/source/Application/Model/Basket.php
index d440de6122..a7df88fa21 100644
--- a/source/Application/Model/Basket.php
+++ b/source/Application/Model/Basket.php
@@ -2277,7 +2277,7 @@ public function getDelCostVatPercent()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getDelCostVat()
     {
@@ -2369,7 +2369,7 @@ public function getPayCostNet()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return double | bool
+     * @return double|bool
      */
     public function getPaymentCosts()
     {
@@ -2394,7 +2394,7 @@ public function getPaymentCost()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getFPaymentCosts()
     {
@@ -2425,7 +2425,7 @@ public function getVoucherDiscValue()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getFVoucherDiscountValue()
     {
@@ -2469,7 +2469,7 @@ public function getGiftCardCostVatPercent()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getWrappCostVat()
     {
@@ -2511,7 +2511,7 @@ public function getWrappCostNet()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getFWrappingCosts()
     {
@@ -2539,7 +2539,7 @@ public function getWrappingCost()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getGiftCardCostVat()
     {
@@ -2581,7 +2581,7 @@ public function getGiftCardCostNet()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getFGiftCardCosts()
     {
@@ -2621,7 +2621,7 @@ public function getFPrice()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getFDeliveryCosts()
     {
@@ -2639,7 +2639,7 @@ public function getFDeliveryCosts()
      *
      * @deprecated in v4.8/5.1 on 2013-10-14; for formatting use oxPrice smarty plugin
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getDeliveryCosts()
     {
diff --git a/source/Application/Model/BasketItem.php b/source/Application/Model/BasketItem.php
index 1c35425871..76362f382a 100644
--- a/source/Application/Model/BasketItem.php
+++ b/source/Application/Model/BasketItem.php
@@ -226,7 +226,7 @@ class BasketItem extends \OxidEsales\Eshop\Core\Base
     /**
      * Getter for basketItemkey.
      *
-     * @return string | null
+     * @return string|null
      */
     public function getBasketItemKey()
     {
diff --git a/source/Application/Model/Content.php b/source/Application/Model/Content.php
index aa701b8473..98301302c1 100644
--- a/source/Application/Model/Content.php
+++ b/source/Application/Model/Content.php
@@ -198,7 +198,7 @@ protected function assignContentData($fetchedContent, $onlyActive = false)
      * @param array $data
      * @param bool  $checkIfActive
      *
-     * @return array | null
+     * @return array|null
      */
     protected function filterInactive($data, $checkIfActive = false)
     {
diff --git a/source/Application/Model/OrderArticle.php b/source/Application/Model/OrderArticle.php
index 821dd488cf..9fceae3a34 100644
--- a/source/Application/Model/OrderArticle.php
+++ b/source/Application/Model/OrderArticle.php
@@ -346,7 +346,7 @@ public function checkForStock($dAmount, $dArtStockAmount = 0)
      *
      * @param string $sArticleId article id (optional, is not passed oxorderarticles__oxartid will be used)
      *
-     * @return \OxidEsales\Eshop\Application\Model\Article | false
+     * @return \OxidEsales\Eshop\Application\Model\Article|false
      */
     protected function _getOrderArticle($sArticleId = null)
     {
diff --git a/source/Application/Model/SeoEncoderArticle.php b/source/Application/Model/SeoEncoderArticle.php
index 45c0fb8d50..6df2264a9f 100644
--- a/source/Application/Model/SeoEncoderArticle.php
+++ b/source/Application/Model/SeoEncoderArticle.php
@@ -109,7 +109,7 @@ public function getArticleRecommUri($oArticle, $iLang)
      *
      * @deprecated since v5.3 (2016-06-17); Listmania will be moved to an own module.
      *
-     * @return \OxidEsales\Eshop\Application\Model\RecommendationList | null
+     * @return \OxidEsales\Eshop\Application\Model\RecommendationList|null
      */
     protected function _getRecomm($oArticle, $iLang)
     {
@@ -222,7 +222,7 @@ public function getArticleUri($oArticle, $iLang, $blRegenerate = false)
      * @param \OxidEsales\Eshop\Application\Model\Article $oArticle product
      * @param int                                         $iLang    language id
      *
-     * @return \OxidEsales\Eshop\Application\Model\Category | null
+     * @return \OxidEsales\Eshop\Application\Model\Category|null
      */
     protected function _getCategory($oArticle, $iLang)
     {
@@ -414,7 +414,7 @@ public function getArticleVendorUri($oArticle, $iLang, $blRegenerate = false)
      * @param \OxidEsales\Eshop\Application\Model\Article $oArticle product
      * @param int                                         $iLang    language id
      *
-     * @return \OxidEsales\Eshop\Application\Model\Vendor | null
+     * @return \OxidEsales\Eshop\Application\Model\Vendor|null
      */
     protected function _getVendor($oArticle, $iLang)
     {
@@ -491,7 +491,7 @@ public function getArticleManufacturerUri($oArticle, $iLang, $blRegenerate = fal
      * @param \OxidEsales\Eshop\Application\Model\Article $oArticle product
      * @param int                                         $iLang    language id
      *
-     * @return \OxidEsales\Eshop\Application\Model\Manufacturer | null
+     * @return \OxidEsales\Eshop\Application\Model\Manufacturer|null
      */
     protected function _getManufacturer($oArticle, $iLang)
     {
diff --git a/source/Application/Model/VariantHandler.php b/source/Application/Model/VariantHandler.php
index 85a69f49ac..05119f4fa8 100644
--- a/source/Application/Model/VariantHandler.php
+++ b/source/Application/Model/VariantHandler.php
@@ -334,7 +334,7 @@ protected function _fillVariantSelections($oVariantList, $iVarSelCnt, &$aFilter,
      *
      * @param array $aFilter user given filter
      *
-     * @return array | bool
+     * @return array|bool
      */
     protected function _cleanFilter($aFilter)
     {
diff --git a/source/Application/Model/VatSelector.php b/source/Application/Model/VatSelector.php
index b567c86c2b..257ace804f 100644
--- a/source/Application/Model/VatSelector.php
+++ b/source/Application/Model/VatSelector.php
@@ -36,7 +36,7 @@ class VatSelector extends \OxidEsales\Eshop\Core\Base
      * @param bool                                     $blCacheReset reset cache
      *
      * @throws oxObjectException if wrong country
-     * @return double | false
+     * @return double|false
      */
     public function getUserVat(\OxidEsales\Eshop\Application\Model\User $oUser, $blCacheReset = false)
     {
@@ -96,7 +96,7 @@ protected function _getForeignCountryUserVat(\OxidEsales\Eshop\Application\Model
      *
      * @param \OxidEsales\Eshop\Application\Model\Article $oArticle given article
      *
-     * @return float | false
+     * @return float|false
      */
     protected function _getVatForArticleCategory(\OxidEsales\Eshop\Application\Model\Article $oArticle)
     {
@@ -181,7 +181,7 @@ public function getBasketItemVat(\OxidEsales\Eshop\Application\Model\Article $oA
      *
      * @param \OxidEsales\Eshop\Application\Model\Article $oArticle article object
      *
-     * @return double | false
+     * @return double|false
      */
     public function getArticleUserVat(\OxidEsales\Eshop\Application\Model\Article $oArticle)
     {
diff --git a/source/Core/Curl.php b/source/Core/Curl.php
index 8f1102879a..b77a351d3e 100644
--- a/source/Core/Curl.php
+++ b/source/Core/Curl.php
@@ -29,7 +29,7 @@ class Curl
     /**
      * URL to call
      *
-     * @var string | null
+     * @var string|null
      */
     protected $_sUrl = null;
 
@@ -50,7 +50,7 @@ class Curl
     /**
      * Parameter to be added to call url
      *
-     * @var array | null
+     * @var array|null
      */
     protected $_aParameters = null;
 
@@ -85,7 +85,7 @@ class Curl
     /**
      * Request HTTP status call code.
      *
-     * @var int | null
+     * @var int|null
      */
     protected $_sStatusCode = null;
 
diff --git a/source/Core/Field.php b/source/Core/Field.php
index 383c8bd489..d5502bcdb0 100644
--- a/source/Core/Field.php
+++ b/source/Core/Field.php
@@ -97,7 +97,7 @@ public function __isset($name)
      *
      * @param string $name Variable name
      *
-     * @return string | null
+     * @return string|null
      */
     public function __get($name)
     {
diff --git a/source/Core/PictureHandler.php b/source/Core/PictureHandler.php
index 5fd2a13d77..22e3d314a8 100644
--- a/source/Core/PictureHandler.php
+++ b/source/Core/PictureHandler.php
@@ -303,7 +303,7 @@ public function getAltImageUrl($sFilePath, $sFile, $blSSL = null)
      * @param string $sAltPath alternative picture path [optional]
      * @param bool   $bSsl     Whether to force SSL
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getPicUrl($sPath, $sFile, $sSize, $sIndex = null, $sAltPath = false, $bSsl = null)
     {
@@ -328,7 +328,7 @@ public function getPicUrl($sPath, $sFile, $sSize, $sIndex = null, $sAltPath = fa
      * @param string $sIndex picture index [optional]
      * @param bool   $bSsl   Whether to force SSL
      *
-     * @return string | bool
+     * @return string|bool
      */
     public function getProductPicUrl($sPath, $sFile, $sSize, $sIndex = null, $bSsl = null)
     {
diff --git a/source/Core/Registry.php b/source/Core/Registry.php
index 977a64c3a8..690ed8cc41 100644
--- a/source/Core/Registry.php
+++ b/source/Core/Registry.php
@@ -24,7 +24,7 @@ class Registry
     /**
      * Hold BC class to Unified Namespace class map
      *
-     * @var null| array
+     * @var null|array
      */
     protected static $backwardsCompatibilityClassMap = null;
 
diff --git a/source/Core/UtilsFile.php b/source/Core/UtilsFile.php
index d78a0695ed..949c80944a 100644
--- a/source/Core/UtilsFile.php
+++ b/source/Core/UtilsFile.php
@@ -316,7 +316,7 @@ protected function _getImagePath($sType)
      * @param int    $iImgNum  number of image (e.g. numper of ZOOM1 is 1)
      * @param string $sImgConf config parameter name, which keeps size info
      *
-     * @return array | null
+     * @return array|null
      */
     protected function _getImageSize($sImgType, $iImgNum, $sImgConf)
     {
diff --git a/source/Core/utils/oxpicgenerator.php b/source/Core/utils/oxpicgenerator.php
index c0d95f581e..c8b0adeec7 100644
--- a/source/Core/utils/oxpicgenerator.php
+++ b/source/Core/utils/oxpicgenerator.php
@@ -135,7 +135,7 @@ function checkSizeAndCopy($sSrc, $sTarget, $iWidth, $iHeight, $iOrigWidth, $iOri
      * @param int    $iOriginalHeight original height
      * @param int    $iGDVer          GD library version @deprecated
      *
-     * @return string | false
+     * @return string|false
      */
     function resizeGif($sSrc, $sTarget, $iWidth, $iHeight, $iOriginalWidth, $iOriginalHeight, $iGDVer)
     {
@@ -174,7 +174,7 @@ function resizeGif($sSrc, $sTarget, $iWidth, $iHeight, $iOriginalWidth, $iOrigin
      * @param int      $iGdVer            GD library version @deprecated
      * @param resource $hDestinationImage destination image handle
      *
-     * @return string | false
+     * @return string|false
      */
     function resizePng($sSrc, $sTarget, $iWidth, $iHeight, $aImageInfo, $iGdVer, $hDestinationImage)
     {
@@ -222,7 +222,7 @@ function resizePng($sSrc, $sTarget, $iWidth, $iHeight, $aImageInfo, $iGdVer, $hD
      * @param resource $hDestinationImage destination image handle
      * @param int      $iDefQuality       new image quality
      *
-     * @return string | false
+     * @return string|false
      */
     function resizeJpeg($sSrc, $sTarget, $iWidth, $iHeight, $aImageInfo, $iGdVer, $hDestinationImage, $iDefQuality)
     {
diff --git a/source/Setup/Dispatcher.php b/source/Setup/Dispatcher.php
index b15eb2695e..c9a5d95a14 100644
--- a/source/Setup/Dispatcher.php
+++ b/source/Setup/Dispatcher.php
@@ -40,7 +40,7 @@ public function run()
     /**
      * Returns name of controller action script to perform
      *
-     * @return string | null
+     * @return string|null
      */
     protected function _chooseCurrentAction()
     {
diff --git a/source/Setup/Utilities.php b/source/Setup/Utilities.php
index 2a39ed14f6..2ab535afac 100644
--- a/source/Setup/Utilities.php
+++ b/source/Setup/Utilities.php
@@ -377,7 +377,7 @@ public function setCookie($sName, $sValue, $iExpireDate, $sPath)
      *
      * @param string $sFile path to file
      *
-     * @return string | mixed
+     * @return string|mixed
      */
     public function getFileContents($sFile)
     {