MAGETWO-59810: Move dateTimeProcessing back to Adminhtml\Category

Author: danmooney2

app/code/Magento/Catalog/Controller/Adminhtml/Category.php

@@ -17,6 +17,23 @@ abstract class Category extends \Magento\Backend\App\Action
      */
     const ADMIN_RESOURCE = 'Magento_Catalog::categories';
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
+     */
+    protected $dateFilter;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date|null $dateFilter
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter = null
+    ) {
+        $this->dateFilter = $dateFilter;
+        parent::__construct($context);
+    }
+
     /**
      * Initialize requested category and put it into registry.
      * Root category can be returned, if inappropriate store/category is specified
@@ -119,4 +136,27 @@ protected function ajaxRequestResponse($category, $resultPage)
         $resultJson->setData($eventResponse->getData());
         return $resultJson;
     }
+
+    /**
+     * Datetime data preprocessing
+     *
+     * @param \Magento\Catalog\Model\Category $category
+     * @param array $postData
+     *
+     * @return array
+     */
+    protected function dateTimePreprocessing($category, $postData)
+    {
+        $dateFieldFilters = [];
+        $attributes = $category->getAttributes();
+        foreach ($attributes as $attrKey => $attribute) {
+            if ($attribute->getBackend()->getType() == 'datetime') {
+                if (array_key_exists($attrKey, $postData) && $postData[$attrKey] != '') {
+                    $dateFieldFilters[$attrKey] = $this->dateFilter;
+                }
+            }
+        }
+        $inputFilter = new \Zend_Filter_Input($dateFieldFilters, [], $postData);
+        return $inputFilter->getUnescaped();
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -54,11 +54,6 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
      */
     private $eavConfig;
 
-    /**
-     * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
-     */
-    private $dateFilter;
-
     /**
      * Constructor
      *
@@ -79,11 +74,10 @@ public function __construct(
         StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig = null
     ) {
-        parent::__construct($context);
+        parent::__construct($context, $dateFilter);
         $this->resultRawFactory = $resultRawFactory;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
-        $this->dateFilter = $dateFilter;
         $this->storeManager = $storeManager;
         $this->eavConfig = $eavConfig
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
@@ -371,27 +365,4 @@ protected function getRedirectParams($isNewCategory, $hasError, $categoryId, $pa
         }
         return ['path' => $path, 'params' => $params];
     }
-
-    /**
-     * Datetime data preprocessing
-     *
-     * @param \Magento\Catalog\Model\Category $category
-     * @param array $postData
-     *
-     * @return array
-     */
-    private function dateTimePreprocessing($category, $postData)
-    {
-        $dateFieldFilters = [];
-        $attributes = $category->getAttributes();
-        foreach ($attributes as $attrKey => $attribute) {
-            if ($attribute->getBackend()->getType() == 'datetime') {
-                if (array_key_exists($attrKey, $postData) && $postData[$attrKey] != '') {
-                    $dateFieldFilters[$attrKey] = $this->dateFilter;
-                }
-            }
-        }
-        $inputFilter = new \Zend_Filter_Input($dateFieldFilters, [], $postData);
-        return $inputFilter->getUnescaped();
-    }
 }