Merge remote-tracking branch 'remotes/mainline_ce/develop' into MAGETWO-32744

Conflicts:
	composer.lock
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

Author: Pechenushko

.travis.yml

@@ -9,6 +9,11 @@ env:
   - TEST_SUITE=integration_integrity
   - TEST_SUITE=static_phpcs
   - TEST_SUITE=static_annotation
+cache:
+  apt: true
+  directories:
+    - $HOME/.composer/cache
+    - $HOME/.cache/bin
 matrix:
   exclude:
     - php: 5.6
@@ -18,6 +23,16 @@ matrix:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix
+  - sh -c 'if [ "$CASHER_DIR" ]; then
+         if [ -x $HOME/.cache/bin/composer ]; then
+           $HOME/.cache/bin/composer self-update; echo '';
+         else
+           mkdir -p $HOME/.cache/bin;
+           curl --connect-timeout 30 -sS https://getcomposer.org/installer \
+           | php -- --install-dir $HOME/.cache/bin/ --filename composer;
+         fi
+       fi'
+  - export PATH="$HOME/.cache/bin:$PATH"
 before_script:
   # Mock mail
   - sudo service postfix stop
@@ -46,7 +61,7 @@ before_script:
   # Change memory_limit for travis
   - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - phpenv rehash;
-  - composer install --no-interaction --dev
+  - composer install --no-interaction --prefer-dist
 script:
   # Unit tests
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
@@ -59,4 +74,4 @@ script:
   # Static tests [Code Style]
   - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
   # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -137,18 +137,6 @@
                     <comment>Alternative text for next link in pagination menu. If empty, default arrow image will used.</comment>
                 </field>
             </group>
-            <group id="email" translate="label" type="text" sortOrder="510" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Transactional Emails</label>
-                <field id="logo" translate="label" type="image" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Logo Image</label>
-                    <comment>Allowed file types: jpg, jpeg, gif, png</comment>
-                    <backend_model>Magento\Config\Model\Config\Backend\Email\Logo</backend_model>
-                    <base_url type="media" scope_info="1">email/logo</base_url>
-                </field>
-                <field id="logo_alt" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Logo Image Alt</label>
-                </field>
-            </group>
         </section>
         <section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Developer</label>
@@ -287,6 +275,9 @@
                 <field id="phone" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Store Phone Number</label>
                 </field>
+                <field id="hours" translate="label" type="text" sortOrder="22" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Store Hours of Operation</label>
+                </field>
                 <field id="country_id" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Country</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>

app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml renamed to app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml

@@ -70,6 +70,8 @@ protected function _prepareForm()
         }
         $this->_coreRegistry->register('attribute_type_hidden_fields', $_hiddenFields);
 
+        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
+
         $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
         $frontendInputElm->setValues($frontendInputValues);
 

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php

@@ -43,7 +43,7 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
-        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Set Name')]);
+        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Product Template Name')]);
         $fieldset->addField(
             'attribute_set_name',
             'text',

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php

@@ -27,7 +27,7 @@ protected function _prepareLayout()
             'addButton',
             'Magento\Backend\Block\Widget\Button',
             [
-                'label' => __('Add New Set'),
+                'label' => __('Add Product Template'),
                 'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/add') . '\')',
                 'class' => 'add primary add-set'
             ]

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php

@@ -37,7 +37,7 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Catalog::catalog_products');
-        $resultPage->getConfig()->getTitle()->set((__('Products')));
+        $resultPage->getConfig()->getTitle()->prepend(__('Catalog'));
         return $resultPage;
     }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php

@@ -93,7 +93,7 @@ public function setUseSessionInUrl($flag)
      */
     public function viewDirective($construction)
     {
-        $params = $this->_getIncludeParameters($construction[2]);
+        $params = $this->_getParameters($construction[2]);
         $params['_absolute'] = $this->_useAbsoluteLinks;
         /**
          * @bug: the "_absolute" key is not supported by underlying services
@@ -122,7 +122,7 @@ public function viewDirective($construction)
      */
     public function mediaDirective($construction)
     {
-        $params = $this->_getIncludeParameters($construction[2]);
+        $params = $this->_getParameters($construction[2]);
         return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
 
@@ -136,7 +136,7 @@ public function mediaDirective($construction)
      */
     public function storeDirective($construction)
     {
-        $params = $this->_getIncludeParameters($construction[2]);
+        $params = $this->_getParameters($construction[2]);
         if (!isset($params['_query'])) {
             $params['_query'] = [];
         }

app/code/Magento/Catalog/Model/Template/Filter.php

@@ -144,7 +144,7 @@ public function isWishlistActive()
      */
     public function getCheckoutUrl()
     {
-        return $this->getUrl('checkout/onepage', ['_secure' => true]);
+        return $this->getUrl('checkout', ['_secure' => true]);
     }
 
     /**

app/code/Magento/Checkout/Block/Cart.php

@@ -88,7 +88,7 @@ public function getImageHtmlTemplate()
      */
     public function getCheckoutUrl()
     {
-        return $this->getUrl('checkout/onepage');
+        return $this->getUrl('checkout');
     }
 
     /**