Merge remote-tracking branch 'mainline-ce/develop' into nord_develop

Conflicts:
	composer.lock

Author: Denys Rudchenko

.gitignore

@@ -31,6 +31,8 @@ atlassian*
 !/pub/media/customer/.htaccess
 /pub/media/downloadable/*
 !/pub/media/downloadable/.htaccess
+/pub/media/import/*
+!/pub/media/import/.htaccess
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

.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/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
+
+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
+use Magento\Catalog\Model\Product as CatalogProduct;
+
+class GetFilter extends ExportController
+{
+    /**
+     * Get grid-filter of entity attributes action.
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
+     */
+    public function execute()
+    {
+        $data = $this->getRequest()->getParams();
+        if ($this->getRequest()->isXmlHttpRequest() && $data) {
+            try {
+                if ($data['entity'] == ExportAdvancedPricing::ENTITY_ADVANCED_PRICING) {
+                    $data['entity'] = CatalogProduct::ENTITY;
+                }
+                /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+                $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+                /** @var $attrFilterBlock \Magento\ImportExport\Block\Adminhtml\Export\Filter */
+                $attrFilterBlock = $resultLayout->getLayout()->getBlock('export.filter');
+                /** @var $export \Magento\ImportExport\Model\Export */
+                $export = $this->_objectManager->create('Magento\ImportExport\Model\Export');
+                $export->setData($data);
+                $export->filterAttributeCollection(
+                    $attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
+                );
+                return $resultLayout;
+            } catch (\Exception $e) {
+                $this->messageManager->addError($e->getMessage());
+            }
+        } else {
+            $this->messageManager->addError(__('Please correct the data sent.'));
+        }
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $resultRedirect->setPath('adminhtml/*/index');
+        return $resultRedirect;
+    }
+}