MAGETWO-35090: Implement SalesIncrement module

Author: akaplya

app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Customer\Block\Address\Renderer;
 
-use Magento\Customer\Model\Address\AbstractAddress;
+use Magento\Customer\Model\Address\AddressModelInterface;
 use Magento\Customer\Model\Address\Mapper;
 use Magento\Customer\Model\Metadata\ElementFactory;
 use Magento\Framework\View\Element\AbstractBlock;
@@ -112,7 +112,7 @@ public function getFormat(AbstractAddress $address = null)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function render(AbstractAddress $address, $format = null)
+    public function render(AddressModelInterface $address, $format = null)
     {
         $address = $address->getDataModel(0, 0);
         return $this->renderArray($this->addressMapper->toFlatArray($address), $format);

app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php

@@ -6,6 +6,7 @@
 namespace Magento\Customer\Block\Address\Renderer;
 
 use Magento\Directory\Model\Country\Format;
+use Magento\Customer\Model\Address\AddressModelInterface;
 
 /**
  * Address renderer interface
@@ -32,12 +33,12 @@ public function getType();
     /**
      * Render address
      *
-     * @param \Magento\Customer\Model\Address\AbstractAddress $address
+     * @param AddressModelInterface $address
      * @param string|null $format
      * @return mixed
      * @deprecated All new code should use renderArray based on Metadata service
      */
-    public function render(\Magento\Customer\Model\Address\AbstractAddress $address, $format = null);
+    public function render(AddressModelInterface $address, $format = null);
 
     /**
      * Get a format object for a given address attributes, based on the type set earlier.

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -29,7 +29,7 @@
  * @method bool getShouldIgnoreValidation()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AbstractAddress extends AbstractExtensibleModel
+class AbstractAddress extends AbstractExtensibleModel implements AddressModelInterface
 {
     /**
      * Possible customer address types

app/code/Magento/Customer/Model/Address/AddressModelInterface.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Model\Address;
+
+/**
+ * Interface AddressInterface
+ */
+interface AddressModelInterface
+{
+    /**
+     * Get steet line by number
+     *
+     * @param int $number
+     * @return string
+     */
+    public function getStreetLine($number);
+
+    /**
+     * Create fields street1, street2, etc.
+     *
+     * To be used in controllers for views data
+     *
+     * @return $this
+     */
+    public function explodeStreetAddress();
+}

app/code/Magento/Payment/Block/Info.php

@@ -25,13 +25,13 @@ class Info extends \Magento\Framework\View\Element\Template
     /**
      * Retrieve info model
      *
-     * @return \Magento\Payment\Model\Info
+     * @return \Magento\Payment\Model\InfoInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getInfo()
     {
         $info = $this->getData('info');
-        if (!$info instanceof \Magento\Payment\Model\Info) {
+        if (!$info instanceof \Magento\Payment\Model\InfoInterface) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We cannot retrieve the payment info model object.')
             );

app/code/Magento/Payment/Helper/Data.php

@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\Store;
 use Magento\Payment\Block\Form;
-use Magento\Payment\Model\Info;
+use Magento\Payment\Model\InfoInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\LayoutInterface;
 use Magento\Framework\View\LayoutFactory;
@@ -186,7 +186,7 @@ public function getMethodFormBlock(MethodInterface $method, LayoutInterface $lay
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @return Template
      */
-    public function getInfoBlock(Info $info, LayoutInterface $layout = null)
+    public function getInfoBlock(InfoInterface $info, LayoutInterface $layout = null)
     {
         $layout = $layout ?: $this->_layout;
         $blockType = $info->getMethodInstance()->getInfoBlockType();

app/code/Magento/Payment/Model/Info.php

@@ -10,7 +10,7 @@
 /**
  * Payment information model
  */
-class Info extends AbstractExtensibleModel
+class Info extends AbstractExtensibleModel implements InfoInterface
 {
     /**
      * Additional information container

app/code/Magento/Payment/Model/InfoInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Payment\Model;
+
+interface InfoInterface
+{
+    /**
+     * Encrypt data
+     *
+     * @param string $data
+     * @return string
+     */
+    public function encrypt($data);
+
+    /**
+     * Decrypt data
+     *
+     * @param string $data
+     * @return string
+     */
+    public function decrypt($data);
+}

app/code/Magento/Payment/Model/Method/AbstractMethod.php

@@ -497,7 +497,7 @@ public function getInfoBlockType()
     public function getInfoInstance()
     {
         $instance = $this->getData('info_instance');
-        if (!$instance instanceof \Magento\Payment\Model\Info) {
+        if (!$instance instanceof \Magento\Payment\Model\InfoInterface) {
             throw new \Magento\Framework\Exception\LocalizedException(__('We cannot retrieve the payment information object instance.'));
         }
         return $instance;

app/code/Magento/Sales/Model/AbstractModel.php

@@ -84,7 +84,7 @@ protected function _setDataByKey($key, $value)
             $this->setId($value);
             return;
         }
-        if (isset($this->_data[$key]) && $this->_data[$key] != $value) {
+        if (isset($this->_data[$key]) && $this->getData($key) != $value) {
             $this->rawData[$key] = $value;
             return;
         } else if (!isset($this->_data[$key])) {