Merge branch 'b-6.1.x' into b-6.x

OXID-eSales · Oct 15, 2018 · 1efc604 · 1efc604
2 parents 8cc24a7 + 305c233
commit 1efc604
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,13 +36,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Language constants `source/Application/views/admin/[de,en]/lang.php`:
   `SHOP_CONFIG_INCLUDE_PRODUCT_REVIEW_LINKS_IN_ORDER_EMAIL` 
 
-### Deprecated
-- `\OxidEsales\EshopCommunity\Core\Base::setConfig`
-- `\OxidEsales\EshopCommunity\Core\Base::getConfig`
-- `\OxidEsales\EshopCommunity\Core\Email::$_oConfig`
-- `\OxidEsales\EshopCommunity\Core\Email::setConfig`
-- `\OxidEsales\EshopCommunity\Core\Email::getConfig`
-
 ### Fixed
 - Fix global variable name in startProfile [PR-651](https://github.com/OXID-eSales/oxideshop_ce/pull/651)
 - Improve a check of module id in ModuleExtensionsCleaner::filterExtensionsByModuleId [PR-662](https://github.com/OXID-eSales/oxideshop_ce/pull/662)

diff --git a/source/Core/Base.php b/source/Core/Base.php
@@ -86,8 +86,6 @@ public function __construct()
     }
 
     /**
-     * @deprecated since v6.3.1 (2018-10-01); This method will be removed completely. Use OxidEsales\Eshop\Core\Registry::getConfig() in the future.
-     *
      * oxConfig instance getter
      *
      * @return \OxidEsales\Eshop\Core\Config
@@ -102,8 +100,6 @@ public function getConfig()
     }
 
     /**
-     * @deprecated since v6.3.1 (2018-10-01); This method will be removed completely. Use OxidEsales\Eshop\Core\Registry::getConfig()->setConfigParam() in the future.
-     *
      * oxConfig instance setter
      *
      * @param \OxidEsales\Eshop\Core\Config $config config object

diff --git a/source/Core/Email.php b/source/Core/Email.php
@@ -272,11 +272,7 @@ class Email extends \PHPMailer
      */
     protected $_sCharSet = null;
 
-    /**
-     * @deprecated since v6.3.1 (2018-10-01); This property will be removed completely.
-     *
-     * @var \OxidEsales\Eshop\Core\Config
-     */
+    /** @var \OxidEsales\Eshop\Core\Config */
     protected $_oConfig = null;
 
     /**
@@ -327,8 +323,6 @@ public function __call($method, $args)
     }
 
     /**
-     * @deprecated since v6.3.1 (2018-10-01); This method will be removed completely. Use OxidEsales\Eshop\Core\Registry::getConfig() in the future.
-     *
      * oxConfig instance getter
      *
      * @return \OxidEsales\Eshop\Core\Config
@@ -343,8 +337,6 @@ public function getConfig()
     }
 
     /**
-     * @deprecated since v6.3.1 (2018-10-01); This method will be removed completely. Use OxidEsales\Eshop\Core\Registry::getConfig()->setConfigParam() in the future.
-     *
      * oxConfig instance setter
      *
      * @param \OxidEsales\Eshop\Core\Config $config config object