PR-776 Remove space around union types in docblocks

Related #776 # Conflicts: # CHANGELOG.md
OXID-eSales · Mar 9, 2020 · b89181a · b89181a
1 parent 3fbad1e
commit b89181a
Show file tree

Hide file tree

Showing 27 changed files with 63 additions and 62 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
     {