Merge remote-tracking branch 'upstream/develop' into feature/fix-credit-memo-item-base-tax-amount

Author: erikhansen

.htaccess

@@ -285,10 +285,3 @@
 ## http://developer.yahoo.com/performance/rules.html#etags
 
     #FileETag none
-
-############################################
-## Add custom headers
-<IfModule mod_headers.c>
-    Header set X-Content-Type-Options "nosniff"
-    Header set X-XSS-Protection "1; mode=block"
-</IfModule>

.travis.yml

@@ -1,7 +1,11 @@
+sudo: required
+dist: trusty
+
 language: php
 php:
   - 5.5
   - 5.6
+  - 7.0
 env:
   - TEST_SUITE=unit
   - TEST_SUITE=integration_part_1
@@ -37,24 +41,16 @@ 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
   - >
       sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
-      sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
-      sudo apt-get autoremove;
-      sudo apt-get autoclean;
-      sudo apt-add-repository ppa:ondrej/mysql-5.6 -y;
-      sudo apt-get update;
-      sudo apt-get install mysql-server-5.6 mysql-client-5.6;
+      sudo apt-get remove -y -qq --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
+      sudo apt-get -y -qq autoremove;
+      sudo apt-get -y -qq autoclean;
+      sudo apt-get install -y -qq mysql-server-5.6 mysql-client-5.6;
       mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
       mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
       fi"

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/Authorizenet/Test/Unit/Model/DirectpostTest.php

@@ -331,7 +331,7 @@ public function testCheckResponseCodeFailure($responseCode)
         $this->dataHelperMock->expects($this->any())
             ->method('wrapGatewayError')
             ->with($reasonText)
-            ->willReturn(__('Gateway error: ' . $reasonText));
+            ->willReturn(__('Gateway error: %1', $reasonText));
 
         $this->directpost->checkResponseCode();
     }

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/Controller/Adminhtml/System/Store/DeleteGroupPost.php

@@ -40,7 +40,7 @@ public function execute()
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete store. Please, try again later.'));
+            $this->messageManager->addException($e, __('Unable to delete the store. Please try again later.'));
         }
         return $redirectResult->setPath('adminhtml/*/editGroup', ['group_id' => $itemId]);
     }

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

@@ -44,7 +44,7 @@ public function execute()
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete store view. Please, try again later.'));
+            $this->messageManager->addException($e, __('Unable to delete the store view. Please try again later.'));
         }
         return $redirectResult->setPath('adminhtml/*/editStore', ['store_id' => $itemId]);
     }

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteWebsitePost.php

@@ -42,7 +42,7 @@ public function execute()
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Unable to delete website. Please, try again later.'));
+            $this->messageManager->addException($e, __('Unable to delete the website. Please try again later.'));
         }
         return $redirectResult->setPath('*/*/editWebsite', ['website_id' => $itemId]);
     }