Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MTA-2766

Author: lanken

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
   - 5.5
   - 5.6
+  - 7.0
 env:
   - TEST_SUITE=unit
   - TEST_SUITE=integration_part_1
@@ -37,13 +38,7 @@ before_script:
   # Mock mail
   - sudo service postfix stop
   - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
-  - echo -e '#!/usr/bin/env bash\nexit 0' | sudo tee /usr/sbin/sendmail
-  - >
-      echo 'sendmail_path = "/usr/sbin/sendmail -t -i "'
-      | sudo tee "/home/travis/.phpenv/versions/`php -i
-      | grep "PHP Version"
-      | head -n 1
-      | grep -o -P '\d+\.\d+\.\d+.*'`/etc/conf.d/sendmail.ini"
+  - echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini
   # Disable xDebug
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   # Install MySQL 5.6, create DB for integration tests

app/autoload.php

@@ -13,7 +13,16 @@
  */
 define('BP', dirname(__DIR__));
 
-$vendorDir = require BP . '/app/etc/vendor_path.php';
+define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
+
+if (!file_exists(VENDOR_PATH)) {
+    throw new \Exception(
+        'We can\'t read some files that are required to run the Magento application. '
+         . 'This usually means file permissions are set incorrectly.'
+    );
+}
+
+$vendorDir = require VENDOR_PATH;
 $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
 
 /* 'composer install' validation */

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -95,8 +95,10 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
      * @param \Magento\CatalogImportExport\Model\Export\Product\Type\Factory $_typeFactory
      * @param \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider
      * @param \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer
+     * @param \Magento\Framework\Model\Entity\MetadataPool $metadataPool
      * @param ImportProduct\StoreResolver $storeResolver
      * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
+     * @param \Magento\Framework\Model\Entity\MetadataPool $metadataPool
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -117,6 +119,7 @@ public function __construct(
         \Magento\CatalogImportExport\Model\Export\Product\Type\Factory $_typeFactory,
         \Magento\Catalog\Model\Product\LinkTypeProvider $linkTypeProvider,
         \Magento\CatalogImportExport\Model\Export\RowCustomizerInterface $rowCustomizer,
+        \Magento\Framework\Model\Entity\MetadataPool $metadataPool,
         \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver,
         \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
     ) {
@@ -139,7 +142,8 @@ public function __construct(
             $attributeColFactory,
             $_typeFactory,
             $linkTypeProvider,
-            $rowCustomizer
+            $rowCustomizer,
+            $metadataPool
         );
     }
 

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

@@ -107,6 +107,11 @@ class AdvancedPricingTest extends \PHPUnit_Framework_TestCase
      */
     protected $groupRepository;
 
+    /**
+     * @var \Magento\Framework\Model\Entity\MetadataPool|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $metadataPool;
+
     /**
      * @var \Magento\ImportExport\Model\Export\Adapter\AbstractAdapter| \PHPUnit_Framework_MockObject_MockObject
      */
@@ -285,6 +290,13 @@ protected function setUp()
             '',
             false
         );
+        $this->metadataPool = $this->getMock(
+            '\Magento\Framework\Model\Entity\MetadataPool',
+            [],
+            [],
+            '',
+            false
+        );
         $this->writer = $this->getMock(
             'Magento\ImportExport\Model\Export\Adapter\AbstractAdapter',
             [
@@ -343,6 +355,7 @@ protected function setUp()
             $this->typeFactory,
             $this->linkTypeProvider,
             $this->rowCustomizer,
+            $this->metadataPool,
             $this->storeResolver,
             $this->groupRepository
         );

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -4,22 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Store switcher block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Backend\Block\Store;
 
 /**
+ * Store switcher block
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Switcher extends \Magento\Backend\Block\Template
 {
     /**
      * URL for store switcher hint
      */
-    const HINT_URL = 'http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes';
+    const HINT_URL = 'http://docs.magento.com/m2/ce/user_guide/stores/configuration.html';
 
     /**
      * Name of website variable

app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

@@ -50,8 +50,6 @@ require([
             showTime: false,
             showHour: false,
             showMinute: false,
-            localTimezone: <?php /* @escapeNotVerified */ echo $block->getTimezoneOffsetSeconds() ?>,
-            serverTimezoneSeconds:<?php /* @escapeNotVerified */ echo $block->getStoreTimestamp() ?>,
             yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });

app/code/Magento/Braintree/composer.json

@@ -16,7 +16,7 @@
         "magento/module-directory": "100.0.*",
         "magento/module-theme": "100.0.*",
         "magento/framework": "100.0.*",
-        "braintree/braintree_php": "2.39.0"
+        "braintree/braintree_php": "3.7.0"
     },
     "suggest": {
         "magento/module-checkout-agreements": "100.0.*"

app/code/Magento/BraintreeTwo/view/adminhtml/layout/sales_order_create_index.xml

@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <css src="Magento_BraintreeTwo::css/styles.css"/>
-    </head>
     <body>
         <referenceBlock name="order_create_billing_form">
             <action method="setMethodFormTemplate">

app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/cc.phtml

@@ -36,9 +36,12 @@ $ccType = $block->getInfoData('cc_type');
             <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
         </label>
         <div class="admin__field-control control">
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_number" class="control-container">
+            <div id="<?php /* @noEscape */ echo $code; ?>_cc_number" class="admin__control-text hosted-control">
                 <span class="icon-type"></span>
             </div>
+            <div class="hosted-error admin__field-error">
+                <?php echo $block->escapeHtml(__('Please enter valid Credit Card Number')); ?>
+            </div>
         </div>
     </div>
 
@@ -47,9 +50,15 @@ $ccType = $block->getInfoData('cc_type');
             <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
         </label>
         <div class="admin__field-control control">
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_month" class="control-container select-date"></div>
-            <span class="inline-separator">/</span>
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_year" class="control-container select-date"></div>
+            <div class="hosted-date-wrap">
+                <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_month"
+                     class="admin__control-text hosted-control hosted-date"></div>
+
+                <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_year"
+                     class="admin__control-text hosted-control hosted-date"></div>
+
+                <div class="hosted-error admin__field-error"><?php echo $block->escapeHtml(__('Please enter valid Expiration Date')); ?></div>
+            </div>
         </div>
     </div>
     <?php if($block->hasVerification()): ?>
@@ -58,7 +67,12 @@ $ccType = $block->getInfoData('cc_type');
                 <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
             </label>
             <div class="admin__field-control control">
-                <div id="<?php /* @noEscape */ echo $code; ?>_cc_cid" class="control-container"></div>
+                <div id="<?php /* @noEscape */ echo $code; ?>_cc_cid"
+                     class="admin__control-text hosted-control hosted-cid"></div>
+
+                <div class="hosted-error admin__field-error">
+                    <?php echo $block->escapeHtml(__('Please enter valid Card Verification Number')); ?>
+                </div>
             </div>
         </div>
     <?php endif; ?>