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

Oleksii Korshenko · Oleksii Korshenko · commit ee3cd0f968ac · 2017-07-05T13:57:46.000-05:00
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -168,10 +168,13 @@ public function isLoggedIn()
      */
     public function prolong()
     {
+        $lifetime = $this->_config->getValue(self::XML_PATH_SESSION_LIFETIME);
         $cookieValue = $this->cookieManager->getCookie($this->getName());
+
         if ($cookieValue) {
             $this->setUpdatedAt(time());
             $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setDuration($lifetime)
                 ->setPath($this->sessionConfig->getCookiePath())
                 ->setDomain($this->sessionConfig->getCookieDomain())
                 ->setSecure($this->sessionConfig->getCookieSecure())
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php b/app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
@@ -158,12 +158,21 @@ public function testProlong()
     {
         $name = session_name();
         $cookie = 'cookie';
+        $lifetime = 900;
         $path = '/';
         $domain = 'magento2';
         $secure = true;
         $httpOnly = true;
 
+        $this->config->expects($this->once())
+            ->method('getValue')
+            ->with(\Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME)
+            ->willReturn($lifetime);
         $cookieMetadata = $this->getMock(\Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class);
+        $cookieMetadata->expects($this->once())
+            ->method('setDuration')
+            ->with($lifetime)
+            ->will($this->returnSelf());
         $cookieMetadata->expects($this->once())
             ->method('setPath')
             ->with($path)
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -408,7 +408,7 @@
         <section id="web" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Web</label>
             <tab>general</tab>
-            <resource>Magento_Backend::web</resource>
+            <resource>Magento_Config::web</resource>
             <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Url Options</label>
                 <field id="use_store" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -518,7 +518,7 @@ protected function getOptionInfo()
                                 'dataType' => Form\Element\DataType\Text::NAME,
                                 'formElement' => Form\Element\Select::NAME,
                                 'componentType' => Form\Field::NAME,
-                                'component' => 'Magento_Bundle/js/components/bundle-input-type',
+                                'component' => 'Magento_Ui/js/form/element/select',
                                 'parentContainer' => 'product_bundle_container',
                                 'selections' => 'bundle_selections',
                                 'isDefaultIndex' => 'is_default',
@@ -594,8 +594,11 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Ui/js/dynamic-rows/record',
-                        'is_collection' => true
+                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'is_collection' => true,
+                        'imports' => [
+                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
+                        ]
                     ],
                 ],
             ],
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js
@@ -58,6 +58,10 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
+
+            if (this.prefer === 'radio' && this.checked()) {
+                this.clearValues();
+            }
         },
 
         /**
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js
@@ -29,6 +29,7 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
+            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-input-type.js
@@ -3,6 +3,11 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated Not used anymore
+ * @see Magento_Bundle/js/components/bundle-record
+ * @see Magento_Bundle/js/components/bundle-checkbox
+ */
 define([
     'Magento_Ui/js/form/element/select',
     'uiRegistry'
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-record.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-record.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/dynamic-rows/record',
+    'uiRegistry'
+], function (Record, registry) {
+    'use strict';
+
+    return Record.extend({
+        /**
+         * @param {String} val - type of Input Type
+         */
+        onTypeChanged: function (val) {
+            var columnVisibility  = !(val === 'multi' || val === 'checkbox');
+
+            registry.async(this.name + '.' + 'selection_can_change_qty')(function (elem) {
+                elem.visible(columnVisibility);
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="currency" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Currency Setup</label>
             <tab>general</tab>
-            <resource>Magento_Backend::currency</resource>
+            <resource>Magento_Config::currency</resource>
             <group id="options" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Currency Options</label>
                 <field id="base" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -84,7 +84,6 @@ protected function _construct()
      */
     public function getTotals()
     {
-        $this->getQuote()->setTotalsCollectedFlag(false);
         $this->getQuote()->collectTotals();
         if ($this->getQuote()->isVirtual()) {
             $totals = $this->getQuote()->getBillingAddress()->getTotals();
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php
@@ -87,7 +87,6 @@ protected function setUp()
     public function testGetTotals($isVirtual)
     {
         $expected = 'expected';
-        $this->quoteMock->expects($this->at(0))->method('setTotalsCollectedFlag')->with(false);
         $this->quoteMock->expects($this->at(1))->method('collectTotals');
         $this->quoteMock->expects($this->once())->method('isVirtual')->willreturn($isVirtual);
         if ($isVirtual) {
diff --git a/app/code/Magento/SendFriend/etc/adminhtml/system.xml b/app/code/Magento/SendFriend/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="sendfriend" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Email to a Friend</label>
             <tab>catalog</tab>
-            <resource>Magento_Backend::sendfriend</resource>
+            <resource>Magento_Config::sendfriend</resource>
             <group id="email" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Email Templates</label>
                 <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Bundle/adminhtml/js/components/bundle-checkbox.test.js
@@ -0,0 +1,63 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+
+define(['Magento_Bundle/js/components/bundle-checkbox', 'uiRegistry'], function (BundleCheckbox, registry) {
+    'use strict';
+
+    describe('Magento_Bundle/js/components/bundle-checkbox', function () {
+
+        var unit,
+            typeMap = {
+                typeMap: {
+                    select: 'radio',
+                    radio: 'radio',
+                    checkbox: 'checkbox',
+                    multi: 'checkbox'
+                }
+            };
+
+        beforeEach(function () {
+            unit = new BundleCheckbox({
+                dataScope: 'bundle-checkbox',
+                elementTmpl: jasmine.createSpy(),
+                clearValues: jasmine.createSpy()
+            });
+        });
+
+        describe('test changeType method', function () {
+            it('Do not clear values for "multi" select type', function () {
+                spyOn(registry, 'get').and.returnValue(typeMap);
+                spyOn(unit, 'checked').and.returnValue(false);
+
+                unit.changeType('multi');
+
+                expect(unit.prefer).toBe('checkbox');
+                expect(unit.clearValues).not.toHaveBeenCalled();
+            });
+
+            it('Do not clear values for "radio" select type if item not checked', function () {
+                spyOn(registry, 'get').and.returnValue(typeMap);
+                spyOn(unit, 'checked').and.returnValue(false);
+
+                unit.changeType('select');
+
+                expect(unit.prefer).toBe('radio');
+                expect(unit.clearValues).not.toHaveBeenCalled();
+            });
+
+            it('Clear values for "radio" select type', function () {
+                spyOn(registry, 'get').and.returnValue(typeMap);
+                spyOn(unit, 'checked').and.returnValue(true);
+
+                unit.changeType('select');
+
+                expect(unit.prefer).toBe('radio');
+                expect(unit.clearValues).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -464,7 +464,7 @@ public function insertMultiple($table, array $data);
      *      array('value1', 'value2')
      *
      * @param   string $table
-     * @param   array $columns  the data array column map
+     * @param   string[] $columns  the data array column map
      * @param   array $data
      * @return  int
      */
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -1973,12 +1973,13 @@ public function insertMultiple($table, array $data)
      *      array('value1', 'value2')
      *
      * @param   string $table
-     * @param   array $columns
+     * @param   string[] $columns
      * @param   array $data
-     * @return  int
-     * @throws  \Zend_Db_Exception
+     * @param   int $strategy
+     * @return int
+     * @throws \Zend_Db_Exception
      */
-    public function insertArray($table, array $columns, array $data)
+    public function insertArray($table, array $columns, array $data, $strategy = 0)
     {
         $values       = [];
         $bind         = [];
@@ -1990,10 +1991,16 @@ public function insertArray($table, array $columns, array $data)
             $values[] = $this->_prepareInsertData($row, $bind);
         }
 
-        $insertQuery = $this->_getInsertSqlQuery($table, $columns, $values);
+        switch ($strategy) {
+            case self::INSERT_ON_DUPLICATE:
+                $query = $this->_getReplaceSqlQuery($table, $columns, $values);
+                break;
+            default:
+                $query = $this->_getInsertSqlQuery($table, $columns, $values);
+        }
 
         // execute the statement and return the number of affected rows
-        $stmt   = $this->query($insertQuery, $bind);
+        $stmt   = $this->query($query, $bind);
         $result = $stmt->rowCount();
 
         return $result;
@@ -3635,6 +3642,26 @@ protected function _getInsertSqlQuery($tableName, array $columns, array $values)
         return $insertSql;
     }
 
+    /**
+     * Return replace sql query
+     *
+     * @param string $tableName
+     * @param array $columns
+     * @param array $values
+     * @return string
+     */
+    protected function _getReplaceSqlQuery($tableName, array $columns, array $values)
+    {
+        $tableName = $this->quoteIdentifier($tableName, true);
+        $columns   = array_map([$this, 'quoteIdentifier'], $columns);
+        $columns   = implode(',', $columns);
+        $values    = implode(', ', $values);
+
+        $replaceSql = sprintf('REPLACE INTO %s (%s) VALUES %s', $tableName, $columns, $values);
+
+        return $replaceSql;
+    }
+
     /**
      * Return ddl type
      *
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
@@ -133,7 +133,8 @@ public function __construct(
         /**
          * Cookie settings: lifetime, path, domain, httpOnly. These govern settings for the session cookie.
          */
-        $this->configureCookieLifetime();
+        $lifetime = $this->_scopeConfig->getValue($this->lifetimePath, $this->_scopeType);
+        $this->setCookieLifetime($lifetime, self::COOKIE_LIFETIME_DEFAULT);
 
         $path = $this->_scopeConfig->getValue(self::XML_PATH_COOKIE_PATH, $this->_scopeType);
         $path = empty($path) ? $this->_httpRequest->getBasePath() : $path;
@@ -515,15 +516,4 @@ public function __call($method, $args)
             throw new \BadMethodCallException(sprintf('Method "%s" does not exist in %s', $method, get_class($this)));
         }
     }
-
-    /**
-     * Set session cookie lifetime according to configuration
-     *
-     * @return $this
-     */
-    protected function configureCookieLifetime()
-    {
-        $lifetime = $this->_scopeConfig->getValue($this->lifetimePath, $this->_scopeType);
-        return $this->setCookieLifetime($lifetime, self::COOKIE_LIFETIME_DEFAULT);
-    }
 }
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
@@ -351,7 +351,7 @@ public function constructorDataProvider()
                 true,
                 [
                     'session.cache_limiter' => 'files',
-                    'session.cookie_lifetime' => 0,
+                    'session.cookie_lifetime' => 7200,
                     'session.cookie_path' => '/',
                     'session.cookie_domain' => 'init.host',
                     'session.cookie_httponly' => false,
@@ -419,6 +419,7 @@ protected function getModel($validator)
 
         $this->configMock = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $getValueReturnMap = [
+            ['test_web/test_cookie/test_cookie_lifetime', 'store', null, 7200],
             ['web/cookie/cookie_path', 'store', null, ''],
         ];
         $this->configMock->method('getValue')

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ protected function _construct()`
`84`	`84`	`*/`
`85`	`85`	`public function getTotals()`
`86`	`86`	`{`
`87`		`- $this->getQuote()->setTotalsCollectedFlag(false);`
`88`	`87`	`$this->getQuote()->collectTotals();`
`89`	`88`	`if ($this->getQuote()->isVirtual()) {`
`90`	`89`	`$totals = $this->getQuote()->getBillingAddress()->getTotals();`