Merge pull request #477 from coreshop/beta-2

[Beta.2] beta.2 release
coreshop · Jun 18, 2018 · 51bccb1 · 51bccb1
2 parents 2d3e30a + d24a356
commit 51bccb1
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 155 deletions.
diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -17,7 +17,7 @@ final class Version
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '0';
     const RELEASE_VERSION = '0';
-    const EXTRA_VERSION = 'beta.1';
+    const EXTRA_VERSION = 'beta.2';
 
     /**
      * @return string

diff --git a/src/CoreShop/Component/Customer/Model/Customer.php b/src/CoreShop/Component/Customer/Model/Customer.php
@@ -243,24 +243,4 @@ public function isEqualTo(UserInterface $user)
     {
         return $user instanceof self && $user->getId() === $this->getId();
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getLocale()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us getLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->getLocaleCode();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setLocale($locale)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us setLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->setLocaleCode($locale);
-    }
 }
diff --git a/src/CoreShop/Component/Customer/Model/CustomerInterface.php b/src/CoreShop/Component/Customer/Model/CustomerInterface.php
@@ -101,20 +101,6 @@ public function getPasswordResetHash();
      */
     public function setPasswordResetHash($passwordResetHash);
 
-    /**
-     * @return string
-     *
-     * @deprecated use getLocaleCode
-     */
-    public function getLocale();
-
-    /**
-     * @param string $locale
-     *
-     * @deprecated use setLocaleCode
-     */
-    public function setLocale($locale);
-
     /**
      * @return bool
      */

diff --git a/src/CoreShop/Component/Order/Model/Order.php b/src/CoreShop/Component/Order/Model/Order.php
@@ -176,45 +176,4 @@ public function setPaymentProvider($paymentProvider)
     {
         throw new ImplementedByPimcoreException(__CLASS__, __METHOD__);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSaleLanguage()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us getLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->getLocaleCode();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSaleLanguage($saleLanguage)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us setLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->setLocaleCode($saleLanguage);
-    }
-
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getOrderLanguage()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us getLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->getLocaleCode();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setOrderLanguage($orderLanguage)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us setLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->setLocaleCode($orderLanguage);
-    }
 }
diff --git a/src/CoreShop/Component/Order/Model/OrderInterface.php b/src/CoreShop/Component/Order/Model/OrderInterface.php
@@ -58,20 +58,6 @@ public function getPaymentState();
      */
     public function setPaymentState($paymentState);
 
-    /**
-     * @return string
-     *
-     * @deprecated use getLocaleCode
-     */
-    public function getOrderLanguage();
-
-    /**
-     * @param $orderLanguage
-     *
-     * @deprecated use setLocaleCode
-     */
-    public function setOrderLanguage($orderLanguage);
-
     /**
      * @return Carbon
      */

diff --git a/src/CoreShop/Component/Order/Model/Quote.php b/src/CoreShop/Component/Order/Model/Quote.php
@@ -79,45 +79,4 @@ public function setQuoteNumber($quoteNumber)
     {
         throw new ImplementedByPimcoreException(__CLASS__, __METHOD__);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSaleLanguage()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us getLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->getLocaleCode();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSaleLanguage($saleLanguage)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us setLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->setLocaleCode($saleLanguage);
-    }
-
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getQuoteLanguage()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us getLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->getLocaleCode();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setQuoteLanguage($quoteLanguage)
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since CoreShop 2.0.0-beta.1 and will be removed in CoreShop 2.0.0-beta.2. Please us setLocaleCode instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->setLocaleCode($quoteLanguage);
-    }
 }
diff --git a/src/CoreShop/Component/Order/Model/QuoteInterface.php b/src/CoreShop/Component/Order/Model/QuoteInterface.php
@@ -17,16 +17,6 @@
 
 interface QuoteInterface extends SaleInterface
 {
-    /**
-     * @return string
-     */
-    public function getQuoteLanguage();
-
-    /**
-     * @param $quoteLanguage
-     */
-    public function setQuoteLanguage($quoteLanguage);
-
     /**
      * @return Carbon
      */

diff --git a/src/CoreShop/Component/Order/Model/SaleInterface.php b/src/CoreShop/Component/Order/Model/SaleInterface.php
@@ -26,20 +26,6 @@ interface SaleInterface extends ProposalInterface, PimcoreModelInterface
      */
     public function getItemForProduct(PurchasableInterface $product);
 
-    /**
-     * @return string
-     *
-     * @deprecated use getLocaleCode
-     */
-    public function getSaleLanguage();
-
-    /**
-     * @param $saleLanguage
-     *
-     * @deprecated use setLocaleCode
-     */
-    public function setSaleLanguage($saleLanguage);
-
     /**
      * @return CurrencyInterface
      */