Merge pull request #1275 from magento-engcom/develop-prs

#10126
#10105
#10094
#9189
#7174
#10149
#10151
#10140

Author: Oleksii Korshenko

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

@@ -131,7 +131,7 @@ public function getHtml()
     public function getEscapedValue($index = null)
     {
         $value = $this->getValue($index);
-        if ($value instanceof \DateTime) {
+        if ($value instanceof \DateTimeInterface) {
             return $this->dateTimeFormatter->formatObject(
                 $value,
                 $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

@@ -147,7 +147,7 @@ public function getEscapedValue($index = null)
     {
         if ($this->getColumn()->getFilterTime()) {
             $value = $this->getValue($index);
-            if ($value instanceof \DateTime) {
+            if ($value instanceof \DateTimeInterface) {
                 return $this->_localeDate->formatDateTime($value);
             }
             return $value;

app/code/Magento/CatalogRule/Model/ResourceModel/Rule.php

@@ -153,7 +153,7 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $rule)
      * Get catalog rules product price for specific date, website and
      * customer group
      *
-     * @param \DateTime $date
+     * @param \DateTimeInterface $date
      * @param int $wId
      * @param int $gId
      * @param int $pId
@@ -173,13 +173,13 @@ public function getRulePrice($date, $wId, $gId, $pId)
      * Retrieve product prices by catalog rule for specific date, website and customer group
      * Collect data with  product Id => price pairs
      *
-     * @param \DateTime $date
+     * @param \DateTimeInterface $date
      * @param int $websiteId
      * @param int $customerGroupId
      * @param array $productIds
      * @return array
      */
-    public function getRulePrices(\DateTime $date, $websiteId, $customerGroupId, $productIds)
+    public function getRulePrices(\DateTimeInterface $date, $websiteId, $customerGroupId, $productIds)
     {
         $connection = $this->getConnection();
         $select = $connection->select()

app/code/Magento/Customer/Setup/UpgradeData.php

@@ -155,6 +155,10 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             );
         }
 
+        if (version_compare($context->getVersion(), '2.0.12', '<')) {
+            $this->upgradeVersionTwoZeroTwelve($customerSetup);
+        }
+
         $indexer = $this->indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
         $indexer->reindexAll();
         $this->eavConfig->clear();
@@ -636,6 +640,15 @@ private function upgradeVersionTwoZeroSeven($customerSetup)
         );
     }
 
+    /**
+     * @param CustomerSetup $customerSetup
+     * @return void
+     */
+    private function upgradeVersionTwoZeroTwelve(CustomerSetup $customerSetup)
+    {
+        $customerSetup->updateAttribute('customer_address', 'vat_id', 'frontend_label', 'VAT Number');
+    }
+
     /**
      * @param ModuleDataSetupInterface $setup
      * @return void

app/code/Magento/Customer/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Customer" setup_version="2.0.11">
+    <module name="Magento_Customer" setup_version="2.0.12">
         <sequence>
             <module name="Magento_Eav"/>
             <module name="Magento_Directory"/>

app/code/Magento/Eav/Model/Entity/Attribute/Backend/Datetime.php

@@ -65,7 +65,7 @@ public function beforeSave($object)
      * string format used from input fields (all date input fields need apply locale settings)
      * int value can be declared in code (this meen whot we use valid date)
      *
-     * @param string|int|\DateTime $date
+     * @param string|int|\DateTimeInterface $date
      * @return string
      */
     public function formatDate($date)
@@ -76,7 +76,7 @@ public function formatDate($date)
         // unix timestamp given - simply instantiate date object
         if (is_scalar($date) && preg_match('/^[0-9]+$/', $date)) {
             $date = (new \DateTime())->setTimestamp($date);
-        } elseif (!($date instanceof \DateTime)) {
+        } elseif (!($date instanceof \DateTimeInterface)) {
             // normalized format expecting Y-m-d[ H:i:s]  - time is optional
             $date = new \DateTime($date);
         }

app/code/Magento/Indexer/Model/Mview/View/State.php

@@ -140,7 +140,7 @@ public function getUpdated()
     /**
      * Set state updated time
      *
-     * @param string|int|\DateTime $updated
+     * @param string|int|\DateTimeInterface $updated
      * @return $this
      */
     public function setUpdated($updated)

app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js

@@ -332,6 +332,7 @@ define(['jquery', 'jquery/ui'], function ($) {
                     .attr('webkitallowfullscreen', '')
                     .attr('mozallowfullscreen', '')
                     .attr('allowfullscreen', '')
+                    .attr('referrerPolicy', 'origin')
             );
             this._player = window.$f(this.element.children(':first')[0]);
 

app/code/Magento/Reports/Model/ResourceModel/Report/AbstractReport.php

@@ -188,8 +188,8 @@ protected function _clearTableByDateRange(
      * @param string $table
      * @param string $column
      * @param string $whereColumn
-     * @param null|string|\DateTime $from
-     * @param null|string|\DateTime $to
+     * @param null|string|\DateTimeInterface $from
+     * @param null|string|\DateTimeInterface $to
      * @param [][] $additionalWhere
      * @param string $alias
      * @return \Magento\Framework\DB\Select
@@ -440,12 +440,12 @@ protected function _getTZOffsetTransitions($timezone, $from = null, $to = null)
         $tzTransitions = [];
         try {
             if (!empty($from)) {
-                $from = $from instanceof \DateTime
+                $from = $from instanceof \DateTimeInterface
                     ? $from->getTimestamp()
                     : (new \DateTime($from))->getTimestamp();
             }
 
-            $to = $to instanceof \DateTime
+            $to = $to instanceof \DateTimeInterface
                 ? $to
                 : new \DateTime($to);
             $nextPeriod = $this->getConnection()->formatDate(

app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php

@@ -19,14 +19,14 @@ class Collection extends \Magento\Framework\Data\Collection
     /**
      * From value
      *
-     * @var string
+     * @var \DateTime
      */
     protected $_from;
 
     /**
      * To value
      *
-     * @var string
+     * @var \DateTime
      */
     protected $_to;
 
@@ -114,14 +114,14 @@ public function setPeriod($period)
      * Set interval
      * @codeCoverageIgnore
      *
-     * @param \DateTime $fromDate
-     * @param \DateTime $toDate
+     * @param \DateTimeInterface $fromDate
+     * @param \DateTimeInterface $toDate
      * @return $this
      */
-    public function setInterval($fromDate, $toDate)
+    public function setInterval(\DateTimeInterface $fromDate, \DateTimeInterface $toDate)
     {
-        $this->_from = $fromDate;
-        $this->_to = $toDate;
+        $this->_from = new \DateTime($fromDate->format('Y-m-d'), $fromDate->getTimezone());
+        $this->_to = new \DateTime($toDate->format('Y-m-d'), $toDate->getTimezone());
 
         return $this;
     }