Merge branch 'b-7.1.x' into b-8.0.x

OXID-eSales · Mar 18, 2024 · 846766e · 846766e
2 parents db2d95d + ef65b0a
commit 846766e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 30 deletions.
diff --git a/source/Application/Controller/AccountWishlistController.php b/source/Application/Controller/AccountWishlistController.php
@@ -18,6 +18,7 @@
  * login name in special field. OXID eShop -> MY ACCOUNT
  *  -> Newsletter.
  */
+#[\AllowDynamicProperties]
 class AccountWishlistController extends \OxidEsales\Eshop\Application\Controller\AccountController
 {
     /**
@@ -104,11 +105,6 @@ class AccountWishlistController extends \OxidEsales\Eshop\Application\Controller
      */
     protected $_iViewIndexState = VIEW_INDEXSTATE_NOINDEXNOFOLLOW;
 
-    /**
-     * @var bool|array
-     */
-    protected $_aWishProductList;
-
     /**
      * If user is logged in loads his wishlist articles (articles may be accessed by
      * \OxidEsales\Eshop\Application\Model\User::GetBasket()), loads similar articles (is available) for

diff --git a/source/Application/Controller/BasketController.php b/source/Application/Controller/BasketController.php
@@ -19,6 +19,7 @@
  * similar products, top offer articles.
  * OXID eShop -> SHOPPING CART.
  */
+#[\AllowDynamicProperties]
 class BasketController extends \OxidEsales\Eshop\Application\Controller\FrontendController
 {
     /**
@@ -96,11 +97,6 @@ class BasketController extends \OxidEsales\Eshop\Application\Controller\Frontend
      */
     protected $_aSimilarRecommListIds = null;
 
-    /**
-     * @var int
-     */
-    private $_iWrapCnt;
-
     /**
      * Executes parent::render(), creates list with basket articles
      * Returns name of template file basket::_sThisTemplate (for Search

diff --git a/source/Application/Controller/ContactController.php b/source/Application/Controller/ContactController.php
@@ -64,11 +64,6 @@ class ContactController extends \OxidEsales\Eshop\Application\Controller\Fronten
      */
     protected $_iViewIndexState = VIEW_INDEXSTATE_NOINDEXNOFOLLOW;
 
-    /**
-     * @var mixed|null|string
-     */
-    private $_oUserData;
-
     /**
      * @return string
      */

diff --git a/source/Application/Model/BasketItem.php b/source/Application/Model/BasketItem.php
@@ -16,6 +16,7 @@
 /**
  * UserBasketItem class, responsible for storing most important fields
  */
+#[\AllowDynamicProperties]
 class BasketItem extends \OxidEsales\Eshop\Core\Base
 {
     /**
@@ -223,8 +224,6 @@ class BasketItem extends \OxidEsales\Eshop\Core\Base
      */
     protected $basketItemKey = null;
 
-    public $oxuserbasketitems__oxamount;
-
     /**
      * Getter for basketItemkey.
      *

diff --git a/source/Application/Model/Category.php b/source/Application/Model/Category.php
@@ -16,6 +16,7 @@
  * Collects category information (articles, etc.), performs insertion/deletion
  * of categories nodes. By recursion methods are set structure of category.
  */
+#[\AllowDynamicProperties]
 class Category extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implements \OxidEsales\Eshop\Core\Contract\IUrl
 {
     /**
@@ -130,11 +131,6 @@ class Category extends \OxidEsales\Eshop\Core\Model\MultiLanguageModel implement
      */
     protected $_oParent = null;
 
-    /**
-     * @var string|array|bool|int
-     */
-    public $oxcategories__oxdefsort;
-
     /**
      * Class constructor, initiates parent constructor (parent::oxI18n()).
      */
@@ -146,17 +142,10 @@ public function __construct()
 
     /**
      * Gets default sorting value
-     *
-     * @return string|null
      */
     public function getDefaultSorting()
     {
-        if (is_object($this->oxcategories__oxdefsort) && $this->oxcategories__oxdefsort->value)
-        {
-            return $this->oxcategories__oxdefsort->value;
-        }
-
-        return null;
+        return $this->getFieldData('oxdefsort');
     }
 
     /**