Merge remote-tracking branch 'mainline/develop' into automated_tests

Author: Stanislav Idolov

app/code/Magento/Quote/Model/Product/Plugin/RemoveQuoteItems.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Quote\Model\Product\Plugin;
 
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+
 class RemoveQuoteItems
 {
     /**
@@ -21,19 +23,17 @@ public function __construct(\Magento\Quote\Model\Product\QuoteItemsCleanerInterf
     }
 
     /**
-     * @param \Magento\Catalog\Model\ResourceModel\Product $subject
-     * @param \Closure $proceed
+     * @param ProductResource $subject
+     * @param ProductResource $result
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
-     * @return mixed
+     * @return ProductResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * TODO: reimplement with after plugin
      */
-    public function aroundDelete(
-        \Magento\Catalog\Model\ResourceModel\Product $subject,
-        \Closure $proceed,
+    public function afterDelete(
+        ProductResource $subject,
+        ProductResource $result,
         \Magento\Catalog\Api\Data\ProductInterface $product
     ) {
-        $result = $proceed($product);
         $this->quoteItemsCleaner->execute($product);
         return $result;
     }

app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/RemoveQuoteItemsTest.php

@@ -23,16 +23,13 @@ protected function setUp()
         $this->model = new \Magento\Quote\Model\Product\Plugin\RemoveQuoteItems($this->quoteItemsCleanerMock);
     }
 
-    public function testAroundDelete()
+    public function testAfterDelete()
     {
         $productResourceMock = $this->getMock(\Magento\Catalog\Model\ResourceModel\Product::class, [], [], '', false);
         $productMock = $this->getMock(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $closure = function () use ($productResourceMock) {
-            return $productResourceMock;
-        };
 
         $this->quoteItemsCleanerMock->expects($this->once())->method('execute')->with($productMock);
-        $result = $this->model->aroundDelete($productResourceMock, $closure, $productMock);
+        $result = $this->model->afterDelete($productResourceMock, $productResourceMock, $productMock);
         $this->assertEquals($result, $productResourceMock);
     }
 }

app/code/Magento/Ui/view/base/web/js/form/element/date.js

@@ -167,38 +167,22 @@ define([
         prepareDateTimeFormats: function () {
             this.pickerDateTimeFormat = this.options.dateFormat;
             this.momentFormat = this.options.dateFormat ?
-                this.convertToMomentFormat(this.options.dateFormat) : this.momentFormat;
+                    utils.convertToMomentFormat(this.options.dateFormat) : this.momentFormat;
 
             if (this.options.showsTime) {
                 this.pickerDateTimeFormat += ' ' + this.options.timeFormat;
             }
 
-            this.pickerDateTimeFormat = utils.normalizeDate(this.pickerDateTimeFormat);
+            this.pickerDateTimeFormat = utils.convertToMomentFormat(this.pickerDateTimeFormat);
 
             if (this.dateFormat) {
                 this.inputDateFormat = this.dateFormat;
             }
 
-            this.inputDateFormat = utils.normalizeDate(this.inputDateFormat);
-            this.outputDateFormat = utils.normalizeDate(this.outputDateFormat);
+            this.inputDateFormat = utils.convertToMomentFormat(this.inputDateFormat);
+            this.outputDateFormat = utils.convertToMomentFormat(this.outputDateFormat);
 
             this.validationParams.dateFormat = this.outputDateFormat;
-        },
-
-        /**
-         * Converts PHP IntlFormatter format to moment format.
-         *
-         * @param {String} format - PHP format
-         * @returns {String} - moment compatible formatting
-         */
-        convertToMomentFormat: function (format) {
-            var newFormat;
-
-            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
-            newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the date
-            newFormat = newFormat.replace(/mm|m/gi, 'MM'); //replace the month
-
-            return newFormat;
         }
     });
 });

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/datepicker.js

@@ -53,7 +53,7 @@ define([
                 'setDate',
                 moment(
                     observable(),
-                    utils.normalizeDate(
+                    utils.convertToMomentFormat(
                         options.dateFormat + (options.showsTime ? ' ' + options.timeFormat : '')
                     )
                 ).toDate()