Merge branch 'coding_style_prs'

OXID-eSales · Mar 10, 2020 · cd34b1e · cd34b1e
2 parents 6891f0f + b89181a
commit cd34b1e
Show file tree

Hide file tree

Showing 152 changed files with 182 additions and 304 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -144,12 +144,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Refactor calls to deprecated `getStr` [PR-758](https://github.com/OXID-eSales/oxideshop_ce/pull/758)
 - Fixed missed deprecated getConfig and getSession method usages [PR-721](https://github.com/OXID-eSales/oxideshop_ce/pull/721)
 - Improve oxseo::OXOBJECTID index to fit current queries [PR-466](https://github.com/OXID-eSales/oxideshop_ce/pull/466)
-- Typos in CountryList::_getSecondSortFieldName doc [PR-741](https://github.com/OXID-eSales/oxideshop_ce/pull/741)
+- Replaced BC classes with namespaced ones [PR-772](https://github.com/OXID-eSales/oxideshop_ce/pull/772)
 - Improved various docs, variable and other coding style problems:
+    - [PR-741](https://github.com/OXID-eSales/oxideshop_ce/pull/741)
     - [PR-761](https://github.com/OXID-eSales/oxideshop_ce/pull/761)
     - [PR-748](https://github.com/OXID-eSales/oxideshop_ce/pull/748) 
     - [PR-756](https://github.com/OXID-eSales/oxideshop_ce/pull/756)
     - [PR-765](https://github.com/OXID-eSales/oxideshop_ce/pull/765)
+    - [PR-780](https://github.com/OXID-eSales/oxideshop_ce/pull/780)
+    - [PR-778](https://github.com/OXID-eSales/oxideshop_ce/pull/778)
+    - [PR-779](https://github.com/OXID-eSales/oxideshop_ce/pull/779)
+    - [PR-777](https://github.com/OXID-eSales/oxideshop_ce/pull/777)
+    - [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/Component/NewsComponent.php b/source/Application/Component/NewsComponent.php
@@ -14,7 +14,6 @@
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a
  *                                         module in v6.0.0
- *
  */
 class NewsComponent extends \OxidEsales\Eshop\Core\Controller\BaseController
 {

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/AdminDetailsController.php b/source/Application/Controller/Admin/AdminDetailsController.php
@@ -351,7 +351,6 @@ protected function _resetCounts($aIds)
      *                                             else
      * @param string            $field             The input field we want to edit
      * @param string            $stylesheet        The name of the CSS file
-     *
      */
     protected function configureTextEditorHandler(
         TextEditorHandler $textEditorHandler,

diff --git a/source/Application/Controller/Admin/AdminNews.php b/source/Application/Controller/Admin/AdminNews.php
@@ -14,7 +14,6 @@
  * Admin Menu: Customer Info -> News.
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a module in v6.0.0
- *
  */
 class AdminNews extends \OxidEsales\Eshop\Application\Controller\Admin\AdminController
 {

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/DiagnosticsMain.php b/source/Application/Controller/Admin/DiagnosticsMain.php
@@ -83,7 +83,6 @@ protected function _getErrorMessage()
 
     /**
      * Calls parent constructor and initializes checker object
-     *
      */
     public function __construct()
     {

diff --git a/source/Application/Controller/Admin/DiscountArticlesAjax.php b/source/Application/Controller/Admin/DiscountArticlesAjax.php
@@ -15,7 +15,6 @@
  */
 class DiscountArticlesAjax extends \OxidEsales\Eshop\Application\Controller\Admin\ListComponentAjax
 {
-    /**  */
     const NEW_DISCOUNT_LIST_ID = "-1";
 
     /**

diff --git a/source/Application/Controller/Admin/ModuleList.php b/source/Application/Controller/Admin/ModuleList.php
@@ -21,7 +21,6 @@ class ModuleList extends \OxidEsales\Eshop\Application\Controller\Admin\AdminLis
 {
     /**
      * @var array Loaded modules array
-     *
      */
     protected $_aModules = [];
 

diff --git a/source/Application/Controller/Admin/NewsMainAjax.php b/source/Application/Controller/Admin/NewsMainAjax.php
@@ -14,7 +14,6 @@
  * Class manages news user groups rights
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a module in v6.0.0
- *
  */
 class NewsMainAjax extends \OxidEsales\Eshop\Application\Controller\Admin\ListComponentAjax
 {

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/Admin/ShopRdfa.php b/source/Application/Controller/Admin/ShopRdfa.php
@@ -14,7 +14,6 @@
  * Admin shop system RDFa manager.
  * Collects shop system settings, updates it on user submit, etc.
  * Admin Menu: Main Menu -> Core Settings -> RDFa.
- *
  */
 class ShopRdfa extends \OxidEsales\Eshop\Application\Controller\Admin\ShopConfiguration
 {

diff --git a/source/Application/Controller/Admin/VoucherSerieGenerate.php b/source/Application/Controller/Admin/VoucherSerieGenerate.php
@@ -12,7 +12,6 @@
 
 /**
  * Voucher Serie generator class
- *
  */
 class VoucherSerieGenerate extends \OxidEsales\Eshop\Application\Controller\Admin\VoucherSerieMain
 {

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/DownloadController.php b/source/Application/Controller/DownloadController.php
@@ -14,7 +14,6 @@
 
 /**
  * Article file download page.
- *
  */
 class DownloadController extends \OxidEsales\Eshop\Application\Controller\FrontendController
 {

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/NewsController.php b/source/Application/Controller/NewsController.php
@@ -15,7 +15,6 @@
  *
  * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to
  *                                         a module in v6.0.0
- *
  */
 class NewsController extends \OxidEsales\Eshop\Application\Controller\FrontendController
 {

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()
     {
@@ -116,7 +116,6 @@ public function getWishList()
      *
      * Template variables:
      * <b>wish_result</b>, <b>search</b>
-     *
      */
     public function searchForWishList()
     {
@@ -135,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/ActionList.php b/source/Application/Model/ActionList.php
@@ -12,7 +12,6 @@
 
 /**
  * Promotion List manager.
- *
  */
 class ActionList extends \OxidEsales\Eshop\Core\Model\ListModel
 {

diff --git a/source/Application/Model/Actions.php b/source/Application/Model/Actions.php
@@ -16,7 +16,6 @@
 
 /**
  * Article actions manager. Collects and keeps actions of chosen article.
- *
  */
 class Actions extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel
 {

diff --git a/source/Application/Model/AmountPriceList.php b/source/Application/Model/AmountPriceList.php
@@ -11,7 +11,6 @@
 
 /**
  * Article amount price list
- *
  */
 class AmountPriceList extends \OxidEsales\Eshop\Core\Model\ListModel
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
      *
      * @deprecated since v.5.3.0 (2016-06-17); The Admin Menu: Customer Info -> News feature will be moved to a
      *                                         module in v6.0.0
-     *
      */
     class NewsComponent extends \OxidEsales\Eshop\Core\Controller\BaseController
     {
@@ Expand Down @@