MAGETWO-32775: Prepare pull request for Checkout related modules MSC

Author: Stanislav Idolov

app/code/Magento/Directory/Model/Currency.php

@@ -14,8 +14,7 @@
 use Magento\Directory\Exception;
 use Magento\Directory\Model\Currency\Filter;
 
-class Currency extends \Magento\Framework\Model\AbstractExtensibleModel implements
-    \Magento\Quote\Api\Data\CurrencyInterface
+class Currency extends \Magento\Framework\Model\AbstractModel
 {
     /**
      * CONFIG path constants
@@ -66,8 +65,6 @@ class Currency extends \Magento\Framework\Model\AbstractExtensibleModel implemen
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
-     * @param \Magento\Framework\Api\AttributeDataBuilder $customAttributeBuilder
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Helper\Data $directoryHelper
@@ -80,8 +77,6 @@ class Currency extends \Magento\Framework\Model\AbstractExtensibleModel implemen
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Api\MetadataServiceInterface $metadataService,
-        \Magento\Framework\Api\AttributeDataBuilder $customAttributeBuilder,
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Helper\Data $directoryHelper,
@@ -94,8 +89,6 @@ public function __construct(
         parent::__construct(
             $context,
             $registry,
-            $metadataService,
-            $customAttributeBuilder,
             $resource,
             $resourceCollection,
             $data
@@ -392,68 +385,4 @@ public function saveRates($rates)
         $this->_getResource()->saveRates($rates);
         return $this;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getGlobalCurrencyCode()
-    {
-        return $this->getData('global_currency_code');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBaseCurrencyCode()
-    {
-        return $this->getData('base_currency_code');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStoreCurrencyCode()
-    {
-        return $this->getData('store_currency_code');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getQuoteCurrencyCode()
-    {
-        return $this->getData('quote_currency_code');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStoreToBaseRate()
-    {
-        return $this->getData('store_to_base_rate');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStoreToQuoteRate()
-    {
-        return $this->getData('store_to_quote_rate');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBaseToGlobalRate()
-    {
-        return $this->getData('base_to_global_rate');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBaseToQuoteRate()
-    {
-        return $this->getData('base_to_quote_rate');
-    }
 }

app/code/Magento/Quote/Model/Cart/Currency.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Model\Cart;
+
+/**
+ * @codeCoverageIgnore
+ */
+class Currency extends \Magento\Framework\Model\AbstractExtensibleModel implements
+    \Magento\Quote\Api\Data\CurrencyInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getGlobalCurrencyCode()
+    {
+        return $this->getData('global_currency_code');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBaseCurrencyCode()
+    {
+        return $this->getData('base_currency_code');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStoreCurrencyCode()
+    {
+        return $this->getData('store_currency_code');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getQuoteCurrencyCode()
+    {
+        return $this->getData('quote_currency_code');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStoreToBaseRate()
+    {
+        return $this->getData('store_to_base_rate');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStoreToQuoteRate()
+    {
+        return $this->getData('store_to_quote_rate');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBaseToGlobalRate()
+    {
+        return $this->getData('base_to_global_rate');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBaseToQuoteRate()
+    {
+        return $this->getData('base_to_quote_rate');
+    }
+}

app/code/Magento/Quote/etc/di.xml

@@ -30,5 +30,5 @@
     <preference for="Magento\Quote\Api\CartTotalRepositoryInterface" type="\Magento\Quote\Model\Cart\CartTotalRepository" />
     <preference for="Magento\Quote\Api\Data\TotalsInterface" type="\Magento\Quote\Model\Cart\Totals" />
     <preference for="Magento\Quote\Api\Data\TotalsItemInterface" type="\Magento\Quote\Model\Quote\Cart\Totals\Item" />
-    <preference for="Magento\Quote\Api\Data\CurrencyInterface" type="\Magento\Directory\Model\Currency" />
+    <preference for="Magento\Quote\Api\Data\CurrencyInterface" type="\Magento\Quote\Model\Cart\Currency" />
 </config>