MAGETWO-36882: Stabilizing branch

Author: valdislav

app/code/Magento/Sales/Model/Resource/Order/Status.php

@@ -17,7 +17,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Status extends EntityAbstract
+class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
 {
     /**
      * Status labels table
@@ -33,40 +33,6 @@ class Status extends EntityAbstract
      */
     protected $stateTable;
 
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @param \Magento\Framework\Model\Resource\Db\Context $context
-     * @param \Magento\Sales\Model\Resource\Attribute $attribute
-     * @param Manager $sequenceManager
-     * @param EntitySnapshot $entitySnapshot
-     * @param LogWriter $logger
-     * @param null $resourcePrefix
-     * @param \Magento\Sales\Model\Resource\GridInterface $gridAggregator
-     */
-    public function __construct(
-        \Magento\Framework\Model\Resource\Db\Context $context,
-        \Magento\Sales\Model\Resource\Attribute $attribute,
-        Manager $sequenceManager,
-        EntitySnapshot $entitySnapshot,
-        LogWriter $logger,
-        $resourcePrefix = null,
-        \Magento\Sales\Model\Resource\GridInterface $gridAggregator = null
-    ) {
-        $this->logger = $logger;
-        parent::__construct(
-            $context,
-            $attribute,
-            $sequenceManager,
-            $entitySnapshot,
-            $resourcePrefix,
-            $gridAggregator
-        );
-    }
-
     /**
      * Internal constructor
      *

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

@@ -215,4 +215,9 @@
             <argument name="resourcePrefix" xsi:type="string">sales</argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Model\Resource\Order\Status">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
 </config>