Merge branch 'FearlessKiwis-MAGETWO-36840-low-stock-date' into develop

Author: Yu Tang

app/code/Magento/CatalogInventory/Model/Stock/Item.php

@@ -239,11 +239,11 @@ public function getIsDecimalDivided()
     }
 
     /**
-     * @return int Timestamp
+     * @return string Timestamp
      */
     public function getLowStockDate()
     {
-        return (int) $this->_getData(static::LOW_STOCK_DATE);
+        return $this->_getData(static::LOW_STOCK_DATE);
     }
 
     /**

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/ItemTest.php

@@ -395,4 +395,12 @@ public function getStoreIdDataProvider()
             [0, $this->storeId],
         ];
     }
+
+    public function testGetLowStockDate()
+    {
+        // ensure we do *not* return '2015' due to casting to an int
+        $date = '2015-4-17';
+        $this->item->setLowStockDate($date);
+        $this->assertEquals($date, $this->item->getLowStockDate());
+    }
 }

dev/tests/api-functional/testsuite/Magento/CatalogInventory/Api/StockItemTest.php

@@ -223,7 +223,7 @@ public function saveStockItemBySkuWithWrongInputDataProvider()
                     'enable_qty_increments' => '',
                     'use_config_manage_stock' => 1,
                     'manage_stock' => 1,
-                    'low_stock_date' => 0,
+                    'low_stock_date' => '',
                     'is_decimal_divided' => '',
                     'stock_status_changed_auto' => 0
                 ],