diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
index d5488ecc5d085ee4a5d4b535ccf24040dbaee2a6..ac8cb91222fba47c7c686c10b45d6b81e87db2eb 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
@@ -14,6 +14,12 @@ namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg;
use Magento\Backend\Block\Widget\Form;
use Magento\Backend\Block\Widget\Form\Generic;
+/**
+ * Class Content
+ *
+ * @deprecated
+ * @see \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav
+ */
class Content extends Generic
{
/**
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 1419c17e11b298d1fcdc554a3131d7b8c9b8ffe8..e1680ab5a4081946b73b375a85c0b53cf916afd4 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -754,7 +754,10 @@ class Eav extends AbstractModifier
$meta['arguments']['data']['config']['wysiwyg'] = true;
$meta['arguments']['data']['config']['wysiwygConfigData'] = [
'add_variables' => false,
- 'add_widgets' => false
+ 'add_widgets' => false,
+ 'add_directives' => true,
+ 'use_container' => true,
+ 'container_class' => 'hor-scroll',
];
return $meta;
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index c9d155177e48a588a655d603234482ac53cbe545..fa704272962162d43edd1d129c1229275614015a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -5,7 +5,6 @@
*/
namespace Magento\CatalogImportExport\Model\Export;
-use Magento\Framework\DB\Ddl\Table;
use Magento\ImportExport\Model\Import;
use \Magento\Store\Model\Store;
use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
@@ -850,6 +849,24 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
return $writer->getContents();
}
+ /**
+ * {@inheritdoc}
+ */
+ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection\AbstractCollection $collection)
+ {
+ $exportFilter = !empty($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP]) ?
+ $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP] : [];
+
+ if (isset($exportFilter['category_ids'])
+ && trim($exportFilter['category_ids'])
+ && $collection instanceof \Magento\Catalog\Model\ResourceModel\Product\Collection
+ ) {
+ $collection->addCategoriesFilter(['in' => explode(',', $exportFilter['category_ids'])]);
+ }
+
+ return parent::_prepareEntityCollection($collection);
+ }
+
/**
* Get export data for collection
*
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
index 0afede93546f2c8ba69f8af9b64b70013b5d2c22..dc9e440b045f86ad2e85de45124ac01881d3892c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
@@ -227,7 +227,34 @@ class ProductTest extends \PHPUnit_Framework_TestCase
$this->assertContains('""Option 2""', $exportData);
$this->assertContains('""Option 3""', $exportData);
- $this->assertContains('""Option 4 """"!@#$%^&*"""', $exportData);
- $this->assertContains('text_attribute=""!@#$%^&*()_+1234567890-=|\:;"""', $exportData);
+ $this->assertContains('""Option 4 """"!@#$%^&*""', $exportData);
+ $this->assertContains('text_attribute=""!@#$%^&*()_+1234567890-=|\:;""""\'<,>.?/', $exportData);
+ }
+
+ /**
+ * Verify that "category ids" filter correctly applies to export result
+ *
+ * @magentoDataFixture Magento/CatalogImportExport/_files/product_export_with_categories.php
+ */
+ public function testCategoryIdsFilter()
+ {
+ $this->model->setWriter(
+ $this->objectManager->create(
+ \Magento\ImportExport\Model\Export\Adapter\Csv::class
+ )
+ );
+
+ $this->model->setParameters([
+ \Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP => [
+ 'category_ids' => '2,13'
+ ]
+ ]);
+
+ $exportData = $this->model->export();
+
+ $this->assertContains('Simple Product', $exportData);
+ $this->assertContains('Simple Product Three', $exportData);
+ $this->assertNotContains('Simple Product Two', $exportData);
+ $this->assertNotContains('Simple Product Not Visible On Storefront', $exportData);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_categories.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_categories.php
new file mode 100644
index 0000000000000000000000000000000000000000..e65ff00bcffcabd1e2fdeae3810876178e0d06aa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_categories.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+require dirname(dirname(__DIR__)) . '/Catalog/_files/categories.php';
diff --git a/dev/tests/static/get_github_changes.php b/dev/tests/static/get_github_changes.php
index c142aae18d8ecd5a4ab3fa895e32e5510b71683b..f332208cd17d0861dd1b28bd7096a0b3fe0066a5 100644
--- a/dev/tests/static/get_github_changes.php
+++ b/dev/tests/static/get_github_changes.php
@@ -12,9 +12,9 @@
// @codingStandardsIgnoreFile
define(
-'USAGE',
-<<<USAGE
- php -f get_github_changes.php --
+ 'USAGE',
+ <<<USAGE
+ php -f get_github_changes.php --
--output-file="<output_file>"
--base-path="<base_path>"
--repo="<main_repo>"
@@ -36,6 +36,8 @@ $fileExtensions = explode(',', isset($options['file-extensions']) ? $options['fi
$mainline = 'mainline_' . (string)rand(0, 9999);
$repo = getRepo($options, $mainline);
+$branches = $repo->getBranches('--remotes');
+generateBranchesList($options['output-file'], $branches, $options['branch']);
$changes = retrieveChangesAcrossForks($mainline, $repo, $options['branch']);
$changedFiles = getChangedFiles($changes, $fileExtensions);
generateChangedFilesList($options['output-file'], $changedFiles);
@@ -57,6 +59,25 @@ function generateChangedFilesList($outputFile, $changedFiles)
fclose($changedFilesList);
}
+/**
+ * Generates a file containing origin branches
+ *
+ * @param string $outputFile
+ * @param array $branches
+ * @param string $branchName
+ * @return void
+ */
+function generateBranchesList($outputFile, $branches, $branchName)
+{
+ $branchOutputFile = str_replace('changed_files', 'branches', $outputFile);
+ $branchesList = fopen($branchOutputFile, 'w');
+ fwrite($branchesList, $branchName . PHP_EOL);
+ foreach ($branches as $branch) {
+ fwrite($branchesList, substr(strrchr($branch, '/'), 1) . PHP_EOL);
+ }
+ fclose($branchesList);
+}
+
/**
* Gets list of changed files
*
@@ -84,7 +105,7 @@ function getChangedFiles(array $changes, array $fileExtensions)
*
* @param array $options
* @param string $mainline
- * @return array
+ * @return GitRepo
* @throws Exception
*/
function getRepo($options, $mainline)
@@ -203,6 +224,19 @@ class GitRepo
$this->call(sprintf('fetch %s', $remoteAlias));
}
+ /**
+ * Returns branches
+ *
+ * @param string $source
+ * @return array|mixed
+ */
+ public function getBranches($source = '--all')
+ {
+ $result = $this->call(sprintf('branch ' . $source));
+
+ return is_array($result) ? $result : [];
+ }
+
/**
* Returns files changes between branch and HEAD
*
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
index 87bd329ef3b5611475c6ee9486cdc9f27c4ea5fe..2f3d312fb41ffba1287bafd324a64ac751316d5c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
@@ -15,38 +15,49 @@ class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
/**
* @var string
*/
- protected static $changedFilesPattern = __DIR__ . '/../_files/changed_files*';
+ private static $branchesFilesPattern = __DIR__ . '/../_files/branches*';
/**
* @var string
*/
- protected static $changedFileList = '';
+ private static $changedFilesPattern = __DIR__ . '/../_files/changed_files*';
/**
- * @var string Path for Magento's composer.json
+ * @var string
*/
- protected static $composerFilePath = BP . '/composer.json';
+ private static $changedFileList = '';
/**
- * @var bool Is tests executes on develop branch
+ * @var bool
*/
- protected static $isOnDevVersion = false;
+ private static $actualBranch = false;
/**
* Set changed files paths and list for all projects
*/
public static function setUpBeforeClass()
{
- foreach (glob(self::$changedFilesPattern) as $changedFile) {
- self::$changedFileList .= file_get_contents($changedFile) . PHP_EOL;
- }
+ foreach (glob(self::$branchesFilesPattern) as $branchesFile) {
+ //get the current branchname from the first line
+ $branchName = trim(file($branchesFile)[0]);
+ if ($branchName === 'develop') {
+ self::$actualBranch = true;
+ } else {
+ //get current minor branch name
+ preg_match('|^(\d+\.\d+)|', $branchName, $minorBranch);
+ $branchName = $minorBranch[0];
+
+ //get all version branches
+ preg_match_all('|^(\d+\.\d+)|m', file_get_contents($branchesFile), $matches);
- if (file_exists(self::$composerFilePath)) {
- $jsonData = json_decode(file_get_contents(self::$composerFilePath));
- if (substr((string) $jsonData->version, -4) == '-dev') {
- self::$isOnDevVersion = true;
+ //check is this a latest release branch
+ self::$actualBranch = ($branchName == max($matches[0]));
}
}
+
+ foreach (glob(self::$changedFilesPattern) as $changedFile) {
+ self::$changedFileList .= file_get_contents($changedFile) . PHP_EOL;
+ }
}
/**
@@ -54,15 +65,14 @@ class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
*/
public function testModuleXmlFiles()
{
- if (self::$isOnDevVersion) {
- $this->markTestSkipped('This test isn\'t applicable to the developer version of Magento');
+ if (!self::$actualBranch) {
+ preg_match_all('|etc/module\.xml$|mi', self::$changedFileList, $matches);
+ $this->assertEmpty(
+ reset($matches),
+ 'module.xml changes for patch releases in non-actual branches are not allowed:' . PHP_EOL .
+ implode(PHP_EOL, array_values(reset($matches)))
+ );
}
- preg_match_all('|etc/module\.xml$|mi', self::$changedFileList, $matches);
- $this->assertEmpty(
- reset($matches),
- 'module.xml changes for patch releases in non-actual branches are not allowed:' . PHP_EOL .
- implode(PHP_EOL, array_values(reset($matches)))
- );
}
/**
@@ -70,14 +80,13 @@ class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
*/
public function testModuleSetupFiles()
{
- if (self::$isOnDevVersion) {
- $this->markTestSkipped('This test isn\'t applicable to the developer version of Magento');
+ if (!self::$actualBranch) {
+ preg_match_all('|app/code/Magento/[^/]+/Setup/[^/]+$|mi', self::$changedFileList, $matches);
+ $this->assertEmpty(
+ reset($matches),
+ 'Code with changes for DB schema or data in non-actual branches are not allowed:' . PHP_EOL .
+ implode(PHP_EOL, array_values(reset($matches)))
+ );
}
- preg_match_all('|app/code/Magento/[^/]+/Setup/[^/]+$|mi', self::$changedFileList, $matches);
- $this->assertEmpty(
- reset($matches),
- 'Code with changes for DB schema or data in non-actual branches are not allowed:' . PHP_EOL .
- implode(PHP_EOL, array_values(reset($matches)))
- );
}
}
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
index 66b72857d003397b8a756dc6aae9c0de70c58eeb..167903f62c760ca8ce495efe0dc42c98546d161f 100755
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -357,6 +357,8 @@ define([
// escape special chars in directives url to use it in regular expression
var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1');
var reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)'));
+ content = decodeURIComponent(content);
+
return content.gsub(reg, function(match) {
return Base64.mageDecode(match[1]);
}.bind(this));