From 23cbf4ae7632d59279eb262e44d05d9c0fc0f772 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Wed, 11 Feb 2015 15:59:35 +0200 Subject: [PATCH 001/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33996: Rename module to AdvancedSearch - Move files and fix tests --- Block/Recommendations.php | 10 +++ Block/SearchData.php | 86 +++++++++++++++++++++++ Block/SearchDataInterface.php | 32 +++++++++ Block/Suggestions.php | 10 +++ Model/SearchDataProvider.php | 27 +++++++ Model/SearchDataProviderInterface.php | 24 +++++++ README.md | 1 + composer.json | 24 +++++++ etc/di.xml | 21 ++++++ etc/module.xml | 10 +++ view/frontend/templates/search_data.phtml | 27 +++++++ 11 files changed, 272 insertions(+) create mode 100644 Block/Recommendations.php create mode 100644 Block/SearchData.php create mode 100644 Block/SearchDataInterface.php create mode 100644 Block/Suggestions.php create mode 100644 Model/SearchDataProvider.php create mode 100644 Model/SearchDataProviderInterface.php create mode 100644 README.md create mode 100644 composer.json create mode 100644 etc/di.xml create mode 100644 etc/module.xml create mode 100644 view/frontend/templates/search_data.phtml diff --git a/Block/Recommendations.php b/Block/Recommendations.php new file mode 100644 index 0000000000000..ea4525e3de0c0 --- /dev/null +++ b/Block/Recommendations.php @@ -0,0 +1,10 @@ +searchDataProvider = $searchDataProvider; + $this->query = $queryFactory->get(); + $this->title = $title; + parent::__construct($context, $data); + } + + /** + * {@inheritdoc} + */ + public function getSearchData() + { + return $this->searchDataProvider->getSearchData($this->query); + } + + /** + * {@inheritdoc} + */ + public function isCountResultsEnabled() + { + return $this->searchDataProvider->isCountResultsEnabled(); + } + + /** + * {@inheritdoc} + */ + public function getLink($queryText) + { + return $this->getUrl('*/*/') . '?q=' . urlencode($queryText); + } + + /** + * {@inheritdoc} + */ + public function getTitle() + { + return $this->title; + } +} diff --git a/Block/SearchDataInterface.php b/Block/SearchDataInterface.php new file mode 100644 index 0000000000000..5389a975788a6 --- /dev/null +++ b/Block/SearchDataInterface.php @@ -0,0 +1,32 @@ + + + + + Magento\AdvancedSearch\Model\SearchDataProvider + SSSRelated search terms + + + + + Magento\AdvancedSearch\Model\SearchDataProvider + Did you mean + + + diff --git a/etc/module.xml b/etc/module.xml new file mode 100644 index 0000000000000..28517ba5975b3 --- /dev/null +++ b/etc/module.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml new file mode 100644 index 0000000000000..91391500229db --- /dev/null +++ b/view/frontend/templates/search_data.phtml @@ -0,0 +1,27 @@ + +getSearchData(); +if (count($data)):?> +
+
AAAgetTitle()); ?>
+ +
+ getQueryText() ?> + isCountResultsEnabled()): ?> + getResultsCount() ?> + +
+ +
+ From 56eaf1444e90c7d952ffb2c528054d0174573ccd Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Wed, 11 Feb 2015 17:32:27 +0200 Subject: [PATCH 002/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33996: Rename module to AdvancedSearch - Remove debug data --- etc/di.xml | 2 +- view/frontend/templates/search_data.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/di.xml b/etc/di.xml index d749fa3f90afd..aa1b9ea36bff4 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -9,7 +9,7 @@ Magento\AdvancedSearch\Model\SearchDataProvider - SSSRelated search terms + Related search terms diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml index 91391500229db..01d9404cdd4a1 100644 --- a/view/frontend/templates/search_data.phtml +++ b/view/frontend/templates/search_data.phtml @@ -13,7 +13,7 @@ $data = $block->getSearchData(); if (count($data)):?>
-
AAAgetTitle()); ?>
+
getTitle()); ?>
Date: Thu, 12 Feb 2015 16:02:51 +0200 Subject: [PATCH 003/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33985: Move recommendation to ES and introduce API for them --- Block/Adminhtml/Search/Edit.php | 29 +++ Block/Adminhtml/Search/Grid.php | 111 +++++++++ Model/Adminhtml/Search/Grid/Options.php | 56 +++++ Model/Recommendations/DataProvider.php | 151 ++++++++++++ Model/Recommendations/Observer.php | 47 ++++ Model/Resource/Recommendations.php | 221 ++++++++++++++++++ Model/Resource/Search/Grid/Collection.php | 76 ++++++ composer.json | 44 ++-- etc/adminhtml/events.xml | 15 ++ etc/adminhtml/system.xml | 53 +++++ etc/config.xml | 18 ++ etc/di.xml | 2 +- etc/module.xml | 3 +- sql/advancedsearch_setup/install-2.0.0.php | 49 ++++ .../adminhtml/layout/catalog_search_block.xml | 131 +++++++++++ view/adminhtml/layout/catalog_search_edit.xml | 28 +++ .../layout/catalog_search_relatedgrid.xml | 13 ++ .../layout/catalogsearch_result_index.xml | 20 ++ 18 files changed, 1043 insertions(+), 24 deletions(-) create mode 100644 Block/Adminhtml/Search/Edit.php create mode 100644 Block/Adminhtml/Search/Grid.php create mode 100644 Model/Adminhtml/Search/Grid/Options.php create mode 100644 Model/Recommendations/DataProvider.php create mode 100644 Model/Recommendations/Observer.php create mode 100644 Model/Resource/Recommendations.php create mode 100644 Model/Resource/Search/Grid/Collection.php create mode 100644 etc/adminhtml/events.xml create mode 100644 etc/adminhtml/system.xml create mode 100644 etc/config.xml create mode 100644 sql/advancedsearch_setup/install-2.0.0.php create mode 100644 view/adminhtml/layout/catalog_search_block.xml create mode 100644 view/adminhtml/layout/catalog_search_edit.xml create mode 100644 view/adminhtml/layout/catalog_search_relatedgrid.xml create mode 100644 view/frontend/layout/catalogsearch_result_index.xml diff --git a/Block/Adminhtml/Search/Edit.php b/Block/Adminhtml/Search/Edit.php new file mode 100644 index 0000000000000..5f78bcc84579e --- /dev/null +++ b/Block/Adminhtml/Search/Edit.php @@ -0,0 +1,29 @@ + + */ +class Edit extends \Magento\Backend\Block\Widget\Grid\Container +{ + /** + * Enable grid container + * + * @return void + */ + protected function _construct() + { + $this->_blockGroup = 'Magento_AdvancedSearch'; + $this->_controller = 'adminhtml_search'; + $this->_headerText = __('Related Search Terms'); + $this->_addButtonLabel = __('Add New Search Term'); + parent::_construct(); + $this->buttonList->remove('add'); + } +} diff --git a/Block/Adminhtml/Search/Grid.php b/Block/Adminhtml/Search/Grid.php new file mode 100644 index 0000000000000..791986dbb4de2 --- /dev/null +++ b/Block/Adminhtml/Search/Grid.php @@ -0,0 +1,111 @@ + + */ +class Grid extends \Magento\Backend\Block\Widget\Grid +{ + /** + * @var \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options + */ + protected $_options; + + /** + * @var \Magento\Framework\Registry + */ + protected $_registryManager; + + /** + * @var \Magento\Core\Helper\Data + */ + protected $_coreHelper; + + /** + * @param \Magento\Backend\Block\Template\Context $context + * @param \Magento\Backend\Helper\Data $backendHelper + * @param \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options $options + * @param \Magento\Framework\Registry $registry + * @param \Magento\Core\Helper\Data $coreHelper + * @param array $data + */ + public function __construct( + \Magento\Backend\Block\Template\Context $context, + \Magento\Backend\Helper\Data $backendHelper, + \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options $options, + \Magento\Framework\Registry $registry, + \Magento\Core\Helper\Data $coreHelper, + array $data = [] + ) { + $this->_coreHelper = $coreHelper; + parent::__construct($context, $backendHelper, $data); + $this->_options = $options; + $this->_registryManager = $registry; + $this->setDefaultFilter(['query_id_selected' => 1]); + } + + /** + * Retrieve a value from registry by a key + * + * @return mixed + */ + public function getQuery() + { + return $this->_registryManager->registry('current_catalog_search'); + } + + /** + * Add column filter to collection + * + * @param \Magento\Backend\Block\Widget\Grid\Column $column + * @return $this + */ + protected function _addColumnFilterToCollection($column) + { + // Set custom filter for query selected flag + if ($column->getId() == 'query_id_selected' && $this->getQuery()->getId()) { + $selectedIds = $this->getSelectedQueries(); + if (empty($selectedIds)) { + $selectedIds = 0; + } + if ($column->getFilter()->getValue()) { + $this->getCollection()->addFieldToFilter('query_id', ['in' => $selectedIds]); + } elseif (!empty($selectedIds)) { + $this->getCollection()->addFieldToFilter('query_id', ['nin' => $selectedIds]); + } + } else { + parent::_addColumnFilterToCollection($column); + } + return $this; + } + + /** + * Retrieve selected related queries from grid + * + * @return array + */ + public function getSelectedQueries() + { + return $this->_options->toOptionArray(); + } + + /** + * Get queries json + * + * @return string + */ + public function getQueriesJson() + { + $queries = array_flip($this->getSelectedQueries()); + if (!empty($queries)) { + return $this->_coreHelper->jsonEncode($queries); + } + return '{}'; + } +} diff --git a/Model/Adminhtml/Search/Grid/Options.php b/Model/Adminhtml/Search/Grid/Options.php new file mode 100644 index 0000000000000..f0bee6bbd0caa --- /dev/null +++ b/Model/Adminhtml/Search/Grid/Options.php @@ -0,0 +1,56 @@ +_request = $request; + $this->_registryManager = $registry; + $this->_searchResourceModel = $searchResourceModel; + } + + /** + * {@inheritdoc} + */ + public function toOptionArray() + { + $queries = $this->_request->getPost('selected_queries'); + + $currentQueryId = $this->_registryManager->registry('current_catalog_search')->getId(); + $queryIds = []; + if (is_null($queries) && !empty($currentQueryId)) { + $queryIds = $this->_searchResourceModel->getRelatedQueries($currentQueryId); + } + return $queryIds; + } +} diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php new file mode 100644 index 0000000000000..583215dd0d33d --- /dev/null +++ b/Model/Recommendations/DataProvider.php @@ -0,0 +1,151 @@ +scopeConfig = $scopeConfig; + $this->searchLayer = $layerResolver->get(); + $this->queryFactory = $queryFactory; + $this->recommendationsFactory = $recommendationsFactory; + $this->queryResultFactory = $queryResultFactory; + } + + /** + * @return bool + */ + public function isCountResultsEnabled() + { + return (bool)$this->scopeConfig->getValue( + self::CONFIG_SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED, + ScopeInterface::SCOPE_STORE + ); + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter + */ + public function getSearchData(QueryInterface $query, $limit = null, $additionalFilters = []) + { + $recommendations = []; + + if (!$this->isSearchRecommendationsEnabled()) { + return []; + } + + foreach ($this->getSearchRecommendations() as $recommendation) { + $recommendations[] = $this->queryResultFactory->create( + [ + 'queryText' => $recommendation['query_text'], + 'resultsCount' => $recommendation['num_results'], + ] + ); + } + return $recommendations; + } + + /** + * @return array + */ + private function getSearchRecommendations() + { + $productCollection = $this->searchLayer->getProductCollection(); + $searchQueryText = $this->queryFactory->get()->getQueryText(); + + $params = ['store_id' => $productCollection->getStoreId()]; + + $searchRecommendationsEnabled = $this->isSearchRecommendationsEnabled(); + $searchRecommendationsCount = $this->getSearchRecommendationsCount(); + + if ($searchRecommendationsCount < 1) { + $searchRecommendationsCount = 1; + } + if ($searchRecommendationsEnabled) { + /** @var \Magento\AdvancedSearch\Model\Resource\Recommendations $recommendations */ + $recommendations = $this->recommendationsFactory->create(); + return $recommendations->getRecommendationsByQuery( + $searchQueryText, + $params, + $searchRecommendationsCount + ); + } else { + return []; + } + } + + /** + * @return bool + */ + private function isSearchRecommendationsEnabled() + { + return (bool)$this->scopeConfig->getValue( + self::CONFIG_SEARCH_RECOMMENDATIONS_ENABLED, + ScopeInterface::SCOPE_STORE + ); + } + + /** + * @return bool + */ + private function getSearchRecommendationsCount() + { + return (int)$this->scopeConfig->getValue( + self::CONFIG_SEARCH_RECOMMENDATIONS_RESULTS_COUNT, + ScopeInterface::SCOPE_STORE + ); + } +} diff --git a/Model/Recommendations/Observer.php b/Model/Recommendations/Observer.php new file mode 100644 index 0000000000000..c3bd6117a40b0 --- /dev/null +++ b/Model/Recommendations/Observer.php @@ -0,0 +1,47 @@ +recommendationsFactory = $recommendationsFactory; + } + + /** + * Save search query relations after save search query + * + * @param EventObserver $observer + * @return void + */ + public function searchQueryEditFormAfterSave(EventObserver $observer) + { + $searchQueryModel = $observer->getEvent()->getDataObject(); + $queryId = $searchQueryModel->getId(); + $relatedQueries = $searchQueryModel->getSelectedQueriesGrid(); + + if (strlen($relatedQueries) == 0) { + $relatedQueries = []; + } else { + $relatedQueries = explode('&', $relatedQueries); + } + + $this->recommendationsFactory->create()->saveRelatedQueries($queryId, $relatedQueries); + } +} diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php new file mode 100644 index 0000000000000..5d9539280db1c --- /dev/null +++ b/Model/Resource/Recommendations.php @@ -0,0 +1,221 @@ + + */ +class Recommendations extends \Magento\Framework\Model\Resource\Db\AbstractDb +{ + + /** + * Search query model + * + * @var \Magento\Search\Model\Query + */ + protected $_searchQueryModel; + + /** + * Construct + * + * @param \Magento\Framework\App\Resource $resource + * @param \Magento\Search\Model\QueryFactory $queryFactory + */ + public function __construct( + \Magento\Framework\App\Resource $resource, + \Magento\Search\Model\QueryFactory $queryFactory + ) { + parent::__construct($resource); + $this->_searchQueryModel = $queryFactory->create(); + } + + /** + * Init main table + * + * @return void + */ + protected function _construct() + { + $this->_init('catalogsearch_recommendations', 'id'); + } + + /** + * Save search relations + * + * @param int $queryId + * @param array $relatedQueries + * @return $this + */ + public function saveRelatedQueries($queryId, $relatedQueries = []) + { + $adapter = $this->_getWriteAdapter(); + $whereOr = []; + if (count($relatedQueries) > 0) { + $whereOr[] = implode( + ' AND ', + [ + $adapter->quoteInto('query_id=?', $queryId), + $adapter->quoteInto('relation_id NOT IN(?)', $relatedQueries) + ] + ); + $whereOr[] = implode( + ' AND ', + [ + $adapter->quoteInto('relation_id = ?', $queryId), + $adapter->quoteInto('query_id NOT IN(?)', $relatedQueries) + ] + ); + } else { + $whereOr[] = $adapter->quoteInto('query_id = ?', $queryId); + $whereOr[] = $adapter->quoteInto('relation_id = ?', $queryId); + } + $whereCond = '(' . implode(') OR (', $whereOr) . ')'; + $adapter->delete($this->getMainTable(), $whereCond); + + $existsRelatedQueries = $this->getRelatedQueries($queryId); + $neededRelatedQueries = array_diff($relatedQueries, $existsRelatedQueries); + foreach ($neededRelatedQueries as $relationId) { + $adapter->insert($this->getMainTable(), ["query_id" => $queryId, "relation_id" => $relationId]); + } + return $this; + } + + /** + * Retrieve related search queries + * + * @param int|array $queryId + * @param bool $limit + * @param bool $order + * @return array + */ + public function getRelatedQueries($queryId, $limit = false, $order = false) + { + $collection = $this->_searchQueryModel->getResourceCollection(); + $adapter = $this->_getReadAdapter(); + + $queryIdCond = $adapter->quoteInto('main_table.query_id IN (?)', $queryId); + + $collection->getSelect()->join( + ['sr' => $collection->getTable('catalogsearch_recommendations')], + '(sr.query_id=main_table.query_id OR sr.relation_id=main_table.query_id) AND ' . $queryIdCond + )->reset( + \Zend_Db_Select::COLUMNS + )->columns( + [ + 'rel_id' => $adapter->getCheckSql('main_table.query_id=sr.query_id', 'sr.relation_id', 'sr.query_id'), + ] + ); + if (!empty($limit)) { + $collection->getSelect()->limit($limit); + } + if (!empty($order)) { + $collection->getSelect()->order($order); + } + + $queryIds = $adapter->fetchCol($collection->getSelect()); + return $queryIds; + } + + /** + * Retrieve related search queries by single query + * + * @param string $query + * @param array $params + * @param int $searchRecommendationsCount + * @return array + */ + public function getRecommendationsByQuery($query, $params, $searchRecommendationsCount) + { + $this->_searchQueryModel->loadByQuery($query); + + if (isset($params['store_id'])) { + $this->_searchQueryModel->setStoreId($params['store_id']); + } + $relatedQueriesIds = $this->loadByQuery($query, $searchRecommendationsCount); + $relatedQueries = []; + if (count($relatedQueriesIds)) { + $adapter = $this->_getReadAdapter(); + $mainTable = $this->_searchQueryModel->getResourceCollection()->getMainTable(); + $select = $adapter->select()->from( + ['main_table' => $mainTable], + ['query_text', 'num_results'] + )->where( + 'query_id IN(?)', + $relatedQueriesIds + )->where( + 'num_results > 0' + ); + $relatedQueries = $adapter->fetchAll($select); + } + + return $relatedQueries; + } + + /** + * Retrieve search terms which are started with $queryWords + * + * @param string $query + * @param int $searchRecommendationsCount + * @return array + */ + protected function loadByQuery($query, $searchRecommendationsCount) + { + $adapter = $this->_getReadAdapter(); + $queryId = $this->_searchQueryModel->getId(); + $relatedQueries = $this->getRelatedQueries($queryId, $searchRecommendationsCount, 'num_results DESC'); + if ($searchRecommendationsCount - count($relatedQueries) < 1) { + return $relatedQueries; + } + + $queryWords = [$query]; + if (strpos($query, ' ') !== false) { + $queryWords = array_unique(array_merge($queryWords, explode(' ', $query))); + foreach ($queryWords as $key => $word) { + $queryWords[$key] = trim($word); + if (strlen($word) < 3) { + unset($queryWords[$key]); + } + } + } + + $likeCondition = []; + foreach ($queryWords as $word) { + $likeCondition[] = $adapter->quoteInto('query_text LIKE ?', $word . '%'); + } + $likeCondition = implode(' OR ', $likeCondition); + + $select = $adapter->select()->from( + $this->_searchQueryModel->getResource()->getMainTable(), + ['query_id'] + )->where( + new \Zend_Db_Expr($likeCondition) + )->where( + 'store_id=?', + $this->_searchQueryModel->getStoreId() + )->order( + 'num_results DESC' + )->limit( + $searchRecommendationsCount + 1 + ); + $ids = $adapter->fetchCol($select); + + if (!is_array($ids)) { + $ids = []; + } + + $key = array_search($queryId, $ids); + if ($key !== false) { + unset($ids[$key]); + } + $ids = array_unique(array_merge($relatedQueries, $ids)); + $ids = array_slice($ids, 0, $searchRecommendationsCount); + return $ids; + } +} diff --git a/Model/Resource/Search/Grid/Collection.php b/Model/Resource/Search/Grid/Collection.php new file mode 100644 index 0000000000000..012d6d3acb2dc --- /dev/null +++ b/Model/Resource/Search/Grid/Collection.php @@ -0,0 +1,76 @@ +_registryManager = $registry; + parent::__construct( + $entityFactory, + $logger, + $fetchStrategy, + $eventManager, + $storeManager, + $resourceHelper, + $connection, + $resource + ); + } + + /** + * Initialize select + * + * @return $this + */ + protected function _initSelect() + { + parent::_initSelect(); + $queryId = $this->getQuery()->getId(); + if ($queryId) { + $this->addFieldToFilter('query_id', ['nin' => $queryId]); + } + return $this; + } + + /** + * Retrieve a value from registry by a key + * + * @return \Magento\Search\Model\Query + */ + public function getQuery() + { + return $this->_registryManager->registry('current_catalog_search'); + } +} diff --git a/composer.json b/composer.json index 6554b029a8706..113b24c11ceb9 100644 --- a/composer.json +++ b/composer.json @@ -1,24 +1,24 @@ { - "name": "magento/module-advanced-search", - "description": "N/A", - "require": { - "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta6", - "magento/module-search": "0.42.0-beta6", - "magento/magento-composer-installer": "*" - }, - "type": "magento2-module", - "version": "0.42.0-beta6", - "license": [ - "OSL-3.0", - "AFL-3.0" - ], - "extra": { - "map": [ - [ - "*", - "Magento/AdvancedSearch" - ] - ] - } + "name": "magento/module-advanced-search", + "description": "N/A", + "require": { + "php": "~5.5.0|~5.6.0", + "magento/framework": "0.42.0-beta6", + "magento/module-search": "0.42.0-beta6", + "magento/magento-composer-installer": "*" + }, + "type": "magento2-module", + "version": "0.42.0-beta6", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "extra": { + "map": [ + [ + "*", + "Magento/AdvancedSearch" + ] + ] + } } diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml new file mode 100644 index 0000000000000..6b61068123790 --- /dev/null +++ b/etc/adminhtml/events.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml new file mode 100644 index 0000000000000..94817554d4166 --- /dev/null +++ b/etc/adminhtml/system.xml @@ -0,0 +1,53 @@ + + + + +
+ + + + When you enable this option your site may slow down. + Magento\Backend\Model\Config\Source\Yesno + + + + validate-digits + + 1 + + + + + Magento\Backend\Model\Config\Source\Yesno + + 1 + + + +
+ + diff --git a/etc/config.xml b/etc/config.xml new file mode 100644 index 0000000000000..f45dc07f902d0 --- /dev/null +++ b/etc/config.xml @@ -0,0 +1,18 @@ + + + + + + + 1 + 5 + 0 + + + + diff --git a/etc/di.xml b/etc/di.xml index aa1b9ea36bff4..324962c84c165 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -8,7 +8,7 @@ xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd"> - Magento\AdvancedSearch\Model\SearchDataProvider + Magento\AdvancedSearch\Model\Recommendations\DataProvider Related search terms diff --git a/etc/module.xml b/etc/module.xml index 28517ba5975b3..7e495721ae329 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -5,6 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/sql/advancedsearch_setup/install-2.0.0.php b/sql/advancedsearch_setup/install-2.0.0.php new file mode 100644 index 0000000000000..5d586bafff447 --- /dev/null +++ b/sql/advancedsearch_setup/install-2.0.0.php @@ -0,0 +1,49 @@ +startSetup(); + +$table = $installer->getConnection()->newTable( + $installer->getTable('catalogsearch_recommendations') +)->addColumn( + 'id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], + 'Id' +)->addColumn( + 'query_id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + ['unsigned' => true, 'nullable' => false, 'default' => '0'], + 'Query Id' +)->addColumn( + 'relation_id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + ['unsigned' => true, 'nullable' => false, 'default' => '0'], + 'Relation Id' +)->addForeignKey( + $installer->getFkName('catalogsearch_recommendations', 'query_id', 'search_query', 'query_id'), + 'query_id', + $installer->getTable('search_query'), + 'query_id', + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE +)->addForeignKey( + $installer->getFkName('catalogsearch_recommendations', 'relation_id', 'search_query', 'query_id'), + 'relation_id', + $installer->getTable('search_query'), + 'query_id', + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE +)->setComment('Advanced Search Recommendations'); +$installer->getConnection()->createTable($table); + +$installer->endSetup(); diff --git a/view/adminhtml/layout/catalog_search_block.xml b/view/adminhtml/layout/catalog_search_block.xml new file mode 100644 index 0000000000000..d0bc0b0d7c7aa --- /dev/null +++ b/view/adminhtml/layout/catalog_search_block.xml @@ -0,0 +1,131 @@ + + + + + + + + catalog_search_grid + Magento\AdvancedSearch\Model\Resource\Search\Grid\Collection + name + ASC + 1 + 1 + + 1 + + + + + + */*/edit + + getId + + + + + + query_id + query_id_selected + checkbox + query_id_selected + + + + + + ID + query_id + col-id + col-id + + + + + Search Query + query_text + + + + + Store + store_id + store + 1 + 0 + + + + + Results + num_results + number + + + + + Uses + popularity + number + + + + + Synonym + synonym_for + + + + + Redirect URL + redirect + + + + + Suggested Term + 1 + display_in_terms + options + + + 1 + Yes + + + 0 + No + + + + + + + Action + catalog + action + getId + 0 + 0 + + + Edit + + */*/edit + + id + + + + + + + + + diff --git a/view/adminhtml/layout/catalog_search_edit.xml b/view/adminhtml/layout/catalog_search_edit.xml new file mode 100644 index 0000000000000..c0ebcdbd95c6b --- /dev/null +++ b/view/adminhtml/layout/catalog_search_edit.xml @@ -0,0 +1,28 @@ + + + + + + + + + + search.edit.grid + getSelectedQueries + selected_queries_grid + selected_queries_grid + + + + edit_form + + + + + + diff --git a/view/adminhtml/layout/catalog_search_relatedgrid.xml b/view/adminhtml/layout/catalog_search_relatedgrid.xml new file mode 100644 index 0000000000000..48d015ad4f158 --- /dev/null +++ b/view/adminhtml/layout/catalog_search_relatedgrid.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/view/frontend/layout/catalogsearch_result_index.xml b/view/frontend/layout/catalogsearch_result_index.xml new file mode 100644 index 0000000000000..10fcba00c2fc6 --- /dev/null +++ b/view/frontend/layout/catalogsearch_result_index.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + From 7d42765e94add94c6be262948646e56ca9348750 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Thu, 12 Feb 2015 18:07:16 +0200 Subject: [PATCH 004/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33985: Move recommendation to ES and introduce API for them - Rename SearchDataProviderInterface to SuggestedQueriesInterface - Add dependency to magento-backend - Fix issue where Recommendations uses it's own query factory --- Block/SearchData.php | 14 ++++---- Block/SearchDataInterface.php | 2 +- Model/Recommendations/DataProvider.php | 36 +++++++------------ ...hDataProvider.php => SuggestedQueries.php} | 14 ++++---- ...face.php => SuggestedQueriesInterface.php} | 8 ++--- composer.json | 1 + etc/di.xml | 2 +- view/frontend/templates/search_data.phtml | 2 +- 8 files changed, 35 insertions(+), 44 deletions(-) rename Model/{SearchDataProvider.php => SuggestedQueries.php} (56%) rename Model/{SearchDataProviderInterface.php => SuggestedQueriesInterface.php} (57%) diff --git a/Block/SearchData.php b/Block/SearchData.php index 5ea26d0b01037..51fb837128ffc 100644 --- a/Block/SearchData.php +++ b/Block/SearchData.php @@ -8,7 +8,7 @@ use Magento\Framework\View\Element\Template; use Magento\Search\Model\QueryFactoryInterface; use Magento\Search\Model\QueryInterface; -use Magento\AdvancedSearch\Model\SearchDataProviderInterface; +use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; abstract class SearchData extends Template implements SearchDataInterface { @@ -23,7 +23,7 @@ abstract class SearchData extends Template implements SearchDataInterface protected $title; /** - * @var SearchDataProviderInterface + * @var SuggestedQueriesInterface */ private $searchDataProvider; @@ -34,14 +34,14 @@ abstract class SearchData extends Template implements SearchDataInterface /** * @param Template\Context $context - * @param SearchDataProviderInterface $searchDataProvider + * @param SuggestedQueriesInterface $searchDataProvider * @param QueryFactoryInterface $queryFactory * @param string $title * @param array $data */ public function __construct( Template\Context $context, - SearchDataProviderInterface $searchDataProvider, + SuggestedQueriesInterface $searchDataProvider, QueryFactoryInterface $queryFactory, $title, array $data = [] @@ -57,15 +57,15 @@ public function __construct( */ public function getSearchData() { - return $this->searchDataProvider->getSearchData($this->query); + return $this->searchDataProvider->getItems($this->query); } /** * {@inheritdoc} */ - public function isCountResultsEnabled() + public function isShowResultsCount() { - return $this->searchDataProvider->isCountResultsEnabled(); + return $this->searchDataProvider->isResultsCountEnabled(); } /** diff --git a/Block/SearchDataInterface.php b/Block/SearchDataInterface.php index 5389a975788a6..19a20f78da5e5 100644 --- a/Block/SearchDataInterface.php +++ b/Block/SearchDataInterface.php @@ -17,7 +17,7 @@ public function getSearchData(); /** * @return bool */ - public function isCountResultsEnabled(); + public function isShowResultsCount(); /** * @param string $queryText diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index 583215dd0d33d..e9c154b046867 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -8,13 +8,13 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\Store\ScopeInterface; use Magento\Search\Model\QueryInterface; -use Magento\AdvancedSearch\Model\SearchDataProviderInterface; +use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; -class DataProvider implements SearchDataProviderInterface +class DataProvider implements SuggestedQueriesInterface { - const CONFIG_SEARCH_RECOMMENDATIONS_ENABLED = 'catalog/search/search_recommendations_enabled'; - const CONFIG_SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED = 'catalog/search/search_recommendations_count_results_enabled'; - const CONFIG_SEARCH_RECOMMENDATIONS_RESULTS_COUNT = 'catalog/search/search_recommendations_count'; + const CONFIG_IS_ENABLED = 'catalog/search/search_recommendations_enabled'; + const CONFIG_RESULTS_COUNT_ENABLED = 'catalog/search/search_recommendations_count_results_enabled'; + const CONFIG_RESULTS_COUNT = 'catalog/search/search_recommendations_count'; /** * @var \Magento\Search\Model\QueryResultFactory @@ -31,11 +31,6 @@ class DataProvider implements SearchDataProviderInterface */ private $scopeConfig; - /** - * @var \Magento\Search\Model\QueryFactory - */ - private $queryFactory; - /** * @var \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory */ @@ -44,21 +39,18 @@ class DataProvider implements SearchDataProviderInterface /** * @param ScopeConfigInterface $scopeConfig * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver - * @param \Magento\Search\Model\QueryFactory $queryFactory * @param \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory $recommendationsFactory * @param \Magento\Search\Model\QueryResultFactory $queryResultFactory */ public function __construct( ScopeConfigInterface $scopeConfig, \Magento\Catalog\Model\Layer\Resolver $layerResolver, - \Magento\Search\Model\QueryFactory $queryFactory, \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory $recommendationsFactory, \Magento\Search\Model\QueryResultFactory $queryResultFactory ) { $this->scopeConfig = $scopeConfig; $this->searchLayer = $layerResolver->get(); - $this->queryFactory = $queryFactory; $this->recommendationsFactory = $recommendationsFactory; $this->queryResultFactory = $queryResultFactory; } @@ -66,20 +58,18 @@ public function __construct( /** * @return bool */ - public function isCountResultsEnabled() + public function isResultsCountEnabled() { return (bool)$this->scopeConfig->getValue( - self::CONFIG_SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED, + self::CONFIG_RESULTS_COUNT_ENABLED, ScopeInterface::SCOPE_STORE ); } /** * {@inheritdoc} - * - * @SuppressWarnings(PHPMD.UnusedFormalParameter */ - public function getSearchData(QueryInterface $query, $limit = null, $additionalFilters = []) + public function getItems(QueryInterface $query) { $recommendations = []; @@ -87,7 +77,7 @@ public function getSearchData(QueryInterface $query, $limit = null, $additionalF return []; } - foreach ($this->getSearchRecommendations() as $recommendation) { + foreach ($this->getSearchRecommendations($query) as $recommendation) { $recommendations[] = $this->queryResultFactory->create( [ 'queryText' => $recommendation['query_text'], @@ -101,10 +91,10 @@ public function getSearchData(QueryInterface $query, $limit = null, $additionalF /** * @return array */ - private function getSearchRecommendations() + private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $query) { $productCollection = $this->searchLayer->getProductCollection(); - $searchQueryText = $this->queryFactory->get()->getQueryText(); + $searchQueryText = $query->getQueryText(); $params = ['store_id' => $productCollection->getStoreId()]; @@ -133,7 +123,7 @@ private function getSearchRecommendations() private function isSearchRecommendationsEnabled() { return (bool)$this->scopeConfig->getValue( - self::CONFIG_SEARCH_RECOMMENDATIONS_ENABLED, + self::CONFIG_IS_ENABLED, ScopeInterface::SCOPE_STORE ); } @@ -144,7 +134,7 @@ private function isSearchRecommendationsEnabled() private function getSearchRecommendationsCount() { return (int)$this->scopeConfig->getValue( - self::CONFIG_SEARCH_RECOMMENDATIONS_RESULTS_COUNT, + self::CONFIG_RESULTS_COUNT, ScopeInterface::SCOPE_STORE ); } diff --git a/Model/SearchDataProvider.php b/Model/SuggestedQueries.php similarity index 56% rename from Model/SearchDataProvider.php rename to Model/SuggestedQueries.php index 130a504a864c1..3093715840330 100644 --- a/Model/SearchDataProvider.php +++ b/Model/SuggestedQueries.php @@ -7,21 +7,23 @@ use Magento\Search\Model\QueryInterface; -class SearchDataProvider implements SearchDataProviderInterface +class SuggestedQueries implements SuggestedQueriesInterface { + /** * {@inheritdoc} */ - public function getSearchData(QueryInterface $query, $limit = null, $additionalFilters = []) + public function isResultsCountEnabled() { - return []; + return false; } /** - * {@inheritdoc} + * @param QueryInterface $query + * @return \Magento\Search\Model\QueryResult[] */ - public function isCountResultsEnabled() + public function getItems(QueryInterface $query) { - return false; + return []; } } diff --git a/Model/SearchDataProviderInterface.php b/Model/SuggestedQueriesInterface.php similarity index 57% rename from Model/SearchDataProviderInterface.php rename to Model/SuggestedQueriesInterface.php index ddcc6d6a4b312..63b2827596767 100644 --- a/Model/SearchDataProviderInterface.php +++ b/Model/SuggestedQueriesInterface.php @@ -7,18 +7,16 @@ use Magento\Search\Model\QueryInterface; -interface SearchDataProviderInterface +interface SuggestedQueriesInterface { /** * @param QueryInterface $query - * @param int $limit - * @param array $additionalFilters * @return \Magento\Search\Model\QueryResult[] */ - public function getSearchData(QueryInterface $query, $limit = null, $additionalFilters = []); + public function getItems(QueryInterface $query); /** * @return bool */ - public function isCountResultsEnabled(); + public function isResultsCountEnabled(); } diff --git a/composer.json b/composer.json index 113b24c11ceb9..6e2138b51792a 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,7 @@ "php": "~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta6", "magento/module-search": "0.42.0-beta6", + "magento/module-backend": "0.42.0-beta6", "magento/magento-composer-installer": "*" }, "type": "magento2-module", diff --git a/etc/di.xml b/etc/di.xml index 324962c84c165..239aceec97202 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -14,7 +14,7 @@ - Magento\AdvancedSearch\Model\SearchDataProvider + Magento\AdvancedSearch\Model\SuggestedQueries Did you mean diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml index 01d9404cdd4a1..6d213e465c9af 100644 --- a/view/frontend/templates/search_data.phtml +++ b/view/frontend/templates/search_data.phtml @@ -18,7 +18,7 @@ if (count($data)):?>
getQueryText() ?> - isCountResultsEnabled()): ?> + isShowResultsCount()): ?> getResultsCount() ?>
From dda9d77930c902e65daf81e266c87eb6f6ff8d38 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Thu, 12 Feb 2015 18:39:50 +0200 Subject: [PATCH 005/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33985: Move recommendation to ES and introduce API for them - Fix unit tests --- Block/SearchData.php | 2 +- Block/SearchDataInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Block/SearchData.php b/Block/SearchData.php index 51fb837128ffc..7b5964f140f07 100644 --- a/Block/SearchData.php +++ b/Block/SearchData.php @@ -55,7 +55,7 @@ public function __construct( /** * {@inheritdoc} */ - public function getSearchData() + public function getItems() { return $this->searchDataProvider->getItems($this->query); } diff --git a/Block/SearchDataInterface.php b/Block/SearchDataInterface.php index 19a20f78da5e5..72368979c675e 100644 --- a/Block/SearchDataInterface.php +++ b/Block/SearchDataInterface.php @@ -12,7 +12,7 @@ interface SearchDataInterface * * @return array */ - public function getSearchData(); + public function getItems(); /** * @return bool From 0d7bcd103b2fb8bc68a7646b6f37c1f419f03682 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Thu, 12 Feb 2015 20:03:34 +0200 Subject: [PATCH 006/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33985: Move recommendation to ES and introduce API for them - Fix dependency declaration --- composer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/composer.json b/composer.json index 6e2138b51792a..c48faf4bf892e 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,8 @@ "magento/framework": "0.42.0-beta6", "magento/module-search": "0.42.0-beta6", "magento/module-backend": "0.42.0-beta6", + "magento/module-catalog": "0.42.0-beta6", + "magento/module-core": "0.42.0-beta6", "magento/magento-composer-installer": "*" }, "type": "magento2-module", From 2abaa9847e3011df8645d7f2e6cbb64ceca706f3 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Fri, 13 Feb 2015 10:55:28 +0200 Subject: [PATCH 007/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33985: Move recommendation to ES and introduce API for them - Fix deprecated method call - Refactor getSearchRecommendations method in DataProvider --- Model/Recommendations/DataProvider.php | 31 ++++++++++------------- view/frontend/templates/search_data.phtml | 2 +- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index e9c154b046867..15afac7747f93 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -89,32 +89,27 @@ public function getItems(QueryInterface $query) } /** + * @param QueryInterface $query * @return array */ private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $query) { - $productCollection = $this->searchLayer->getProductCollection(); - $searchQueryText = $query->getQueryText(); - - $params = ['store_id' => $productCollection->getStoreId()]; + $recommendations = []; - $searchRecommendationsEnabled = $this->isSearchRecommendationsEnabled(); - $searchRecommendationsCount = $this->getSearchRecommendationsCount(); + if ($this->isSearchRecommendationsEnabled()) { + $productCollection = $this->searchLayer->getProductCollection(); + $params = ['store_id' => $productCollection->getStoreId()]; - if ($searchRecommendationsCount < 1) { - $searchRecommendationsCount = 1; - } - if ($searchRecommendationsEnabled) { - /** @var \Magento\AdvancedSearch\Model\Resource\Recommendations $recommendations */ - $recommendations = $this->recommendationsFactory->create(); - return $recommendations->getRecommendationsByQuery( - $searchQueryText, + /** @var \Magento\AdvancedSearch\Model\Resource\Recommendations $recommendationsResource */ + $recommendationsResource = $this->recommendationsFactory->create(); + $recommendations = $recommendationsResource->getRecommendationsByQuery( + $query->getQueryText(), $params, - $searchRecommendationsCount + $this->getSearchRecommendationsCount() ); - } else { - return []; } + + return $recommendations; } /** @@ -129,7 +124,7 @@ private function isSearchRecommendationsEnabled() } /** - * @return bool + * @return int */ private function getSearchRecommendationsCount() { diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml index 6d213e465c9af..282ebbd995c34 100644 --- a/view/frontend/templates/search_data.phtml +++ b/view/frontend/templates/search_data.phtml @@ -10,7 +10,7 @@ ?> getSearchData(); +$data = $block->getItems(); if (count($data)):?>
getTitle()); ?>
From 936fc6ab4abfd6bac7915cdb1325a00462b60184 Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Fri, 13 Feb 2015 19:27:55 +0200 Subject: [PATCH 008/616] Merge branch 'S61' into MAGETWO-31039 Conflicts: app/code/Magento/Solr/composer.json dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6554b029a8706..7dffb386eb1a8 100644 --- a/composer.json +++ b/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta6", - "magento/module-search": "0.42.0-beta6", + "magento/framework": "0.42.0-beta7", + "magento/module-search": "0.42.0-beta7", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta6", + "version": "0.42.0-beta7", "license": [ "OSL-3.0", "AFL-3.0" From ef142740f3fbb1656fa3e637cb45602d2568ec01 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Tue, 17 Feb 2015 18:46:27 +0200 Subject: [PATCH 009/616] MAGETWO-33986: Introduce API for Suggestion --- etc/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/config.xml b/etc/config.xml index f45dc07f902d0..5ac965e326839 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -9,6 +9,9 @@ + 1 + 2 + 0 1 5 0 From 0725aa3cf2fad3c3d25747d846762f2f23547666 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Tue, 17 Feb 2015 18:51:07 +0200 Subject: [PATCH 010/616] MAGETWO-33985: Move recommendation to ES and introduce API for them - Add undeclared dependencies --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 7dffb386eb1a8..ab13fb2032edc 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,9 @@ "php": "~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta7", "magento/module-search": "0.42.0-beta7", + "magento/module-backend": "0.42.0-beta7", + "magento/module-core": "0.42.0-beta7", + "magento/module-catalog": "0.42.0-beta7", "magento/magento-composer-installer": "*" }, "type": "magento2-module", From 6011c6344211b0af1e41b74052e289594d18f307 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Thu, 19 Feb 2015 14:30:00 +0200 Subject: [PATCH 011/616] MAGETWO-31039: Introduce Enterprise Search module functionality MAGETWO-33986: Introduce API for Suggestion - Move UI of Suggestions configuration to AdvancedSearch module - Remove unused 'use' statement --- etc/adminhtml/system.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 94817554d4166..2e21098967bd4 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -47,6 +47,27 @@ 1 + + + + When you enable this option your site may slow down. + Magento\Backend\Model\Config\Source\Yesno + + + + + 1 + + + + + Magento\Backend\Model\Config\Source\Yesno + When you enable this option your site may slow down. + + 1 + + + From cfd7bd54bb02cf956fb5ccba8e2b564b463d3664 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Tue, 24 Feb 2015 14:42:11 +0200 Subject: [PATCH 012/616] MAGETWO-34246: Sync with mainline and stabilize tests --- Model/Recommendations/DataProvider.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index 15afac7747f93..48edbacb1bc42 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -47,8 +47,7 @@ public function __construct( \Magento\Catalog\Model\Layer\Resolver $layerResolver, \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory $recommendationsFactory, \Magento\Search\Model\QueryResultFactory $queryResultFactory - ) - { + ) { $this->scopeConfig = $scopeConfig; $this->searchLayer = $layerResolver->get(); $this->recommendationsFactory = $recommendationsFactory; From 233b812df871d2bd816467ba5d631e54c7e69974 Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Wed, 25 Feb 2015 19:19:04 +0200 Subject: [PATCH 013/616] Merge remote-tracking branch 'mainline/develop' into develop Conflicts: app/code/Magento/AdvancedSearch/composer.json app/code/Magento/Invitation/composer.json app/code/Magento/Solr/Helper/Data.php app/code/Magento/Solr/Model/Adapter/PhpExtension.php app/code/Magento/Solr/Model/Adapter/Solr/AbstractSolr.php app/code/Magento/Solr/Model/Client/Solr.php app/code/Magento/Solr/Model/Layer/Category/Filter/Attribute.php app/code/Magento/Solr/Model/Layer/Category/Filter/Category.php app/code/Magento/Solr/Model/Layer/Category/Filter/Price.php app/code/Magento/Solr/Model/Layer/Search/FilterableAttributeList.php app/code/Magento/Solr/Model/Price/Interval.php app/code/Magento/Solr/Model/Resource/Engine.php app/code/Magento/Solr/composer.json dev/tests/unit/testsuite/Magento/Solr/Model/Catalog/Layer/Filter/AttributeTest.php dev/tests/unit/testsuite/Magento/Solr/Model/Layer/Category/Filter/PriceTest.php dev/tests/unit/testsuite/Magento/Solr/Model/Layer/Search/FilterableAttributeListTest.php --- Model/Recommendations/DataProvider.php | 2 +- Model/Resource/Search/Grid/Collection.php | 4 ++-- composer.json | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index 48edbacb1bc42..9e0c7a052e356 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedSearch\Model\Recommendations; use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Framework\Store\ScopeInterface; +use Magento\Store\Model\ScopeInterface; use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; diff --git a/Model/Resource/Search/Grid/Collection.php b/Model/Resource/Search/Grid/Collection.php index 012d6d3acb2dc..6ca1e92ed45e0 100644 --- a/Model/Resource/Search/Grid/Collection.php +++ b/Model/Resource/Search/Grid/Collection.php @@ -19,7 +19,7 @@ class Collection extends \Magento\Search\Model\Resource\Query\Collection * @param \Psr\Log\LoggerInterface $logger * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy * @param \Magento\Framework\Event\ManagerInterface $eventManager - * @param \Magento\Framework\Store\StoreManagerInterface $storeManager + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Search\Model\Resource\Helper $resourceHelper * @param \Magento\Framework\Registry $registry * @param mixed $connection @@ -30,7 +30,7 @@ public function __construct( \Psr\Log\LoggerInterface $logger, \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy, \Magento\Framework\Event\ManagerInterface $eventManager, - \Magento\Framework\Store\StoreManagerInterface $storeManager, + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Search\Model\Resource\Helper $resourceHelper, \Magento\Framework\Registry $registry, $connection = null, diff --git a/composer.json b/composer.json index ab13fb2032edc..52d044b55c624 100644 --- a/composer.json +++ b/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta7", - "magento/module-search": "0.42.0-beta7", - "magento/module-backend": "0.42.0-beta7", - "magento/module-core": "0.42.0-beta7", - "magento/module-catalog": "0.42.0-beta7", + "magento/framework": "0.42.0-beta9", + "magento/module-search": "0.42.0-beta9", + "magento/module-backend": "0.42.0-beta9", + "magento/module-core": "0.42.0-beta9", + "magento/module-catalog": "0.42.0-beta9", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta7", + "version": "0.42.0-beta9", "license": [ "OSL-3.0", "AFL-3.0" From 0dd642b242b7c8412cbea759ab637c58cb5c160a Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Wed, 25 Feb 2015 19:48:27 +0200 Subject: [PATCH 014/616] MAGETWO-33990: Prepare Pull Request MAGETWO-34246: Sync with mainline and stabilize tests --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 52d044b55c624..9caa624d210fe 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "magento/module-search": "0.42.0-beta9", "magento/module-backend": "0.42.0-beta9", "magento/module-core": "0.42.0-beta9", + "magento/module-store": "0.42.0-beta9", "magento/module-catalog": "0.42.0-beta9", "magento/magento-composer-installer": "*" }, From 69ee55337d1b975b1395b389e6ecab157919457c Mon Sep 17 00:00:00 2001 From: Illia Grybkov Date: Fri, 27 Feb 2015 17:52:09 +0200 Subject: [PATCH 015/616] MAGETWO-33990: Prepare Pull Request MAGETWO-34246: Sync with mainline and stabilize tests - Add dependency to Config module --- composer.json | 1 + etc/adminhtml/system.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9caa624d210fe..3cedd2a4bb271 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "magento/module-search": "0.42.0-beta9", "magento/module-backend": "0.42.0-beta9", "magento/module-core": "0.42.0-beta9", + "magento/module-config": "0.42.0-beta9", "magento/module-store": "0.42.0-beta9", "magento/module-catalog": "0.42.0-beta9", "magento/magento-composer-installer": "*" diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 2e21098967bd4..2a34f084e0d35 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="../../../Config/etc/system_file.xsd">
From d1a235d44e2ac4945507c8b4220ccfffe94a10a9 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Mon, 2 Mar 2015 11:15:05 +0200 Subject: [PATCH 016/616] MAGETWO-34246: Sync with mainline and stabilize tests --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 3cedd2a4bb271..9caa624d210fe 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,6 @@ "magento/module-search": "0.42.0-beta9", "magento/module-backend": "0.42.0-beta9", "magento/module-core": "0.42.0-beta9", - "magento/module-config": "0.42.0-beta9", "magento/module-store": "0.42.0-beta9", "magento/module-catalog": "0.42.0-beta9", "magento/magento-composer-installer": "*" From 9f799cd2ae4ac866ac80f837b7798ca93a1dfbd0 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Wed, 4 Mar 2015 08:38:15 +0200 Subject: [PATCH 017/616] MAGETWO-33984: [TD] Remove unused code from Solr Module --- etc/module.xml | 6 +++++- sql/advancedsearch_setup/install-2.0.0.php | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/etc/module.xml b/etc/module.xml index 7e495721ae329..fcfea735a24bb 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -7,5 +7,9 @@ --> - + + + + + diff --git a/sql/advancedsearch_setup/install-2.0.0.php b/sql/advancedsearch_setup/install-2.0.0.php index 5d586bafff447..142b896131455 100644 --- a/sql/advancedsearch_setup/install-2.0.0.php +++ b/sql/advancedsearch_setup/install-2.0.0.php @@ -46,4 +46,15 @@ )->setComment('Advanced Search Recommendations'); $installer->getConnection()->createTable($table); +$installer->getConnection()->addIndex( + $installer->getTable('search_query'), + $installer->getIdxName('search_query', ['num_results']), + 'num_results' +); +$installer->getConnection()->addIndex( + $installer->getTable('search_query'), + $installer->getIdxName('search_query', ['query_text', 'store_id', 'num_results']), + ['query_text', 'store_id', 'num_results'] +); + $installer->endSetup(); From dec84184ec1a21a33d2a9de775c68b9fb02aa0a7 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Wed, 4 Mar 2015 09:51:02 +0200 Subject: [PATCH 018/616] Merge remote-tracking branch 'mainline/develop' into develop Conflicts: app/code/Magento/AdvancedSearch/composer.json app/code/Magento/Solr/composer.json --- Model/Resource/Recommendations.php | 10 ++++++---- composer.json | 14 +++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index 5d9539280db1c..a253e23c527fa 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -25,14 +25,16 @@ class Recommendations extends \Magento\Framework\Model\Resource\Db\AbstractDb /** * Construct * - * @param \Magento\Framework\App\Resource $resource + * @param \Magento\Framework\Model\Resource\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory + * @param string|null $resourcePrefix */ public function __construct( - \Magento\Framework\App\Resource $resource, - \Magento\Search\Model\QueryFactory $queryFactory + \Magento\Framework\Model\Resource\Db\Context $context, + \Magento\Search\Model\QueryFactory $queryFactory, + $resourcePrefix = null ) { - parent::__construct($resource); + parent::__construct($context, $resourcePrefix); $this->_searchQueryModel = $queryFactory->create(); } diff --git a/composer.json b/composer.json index 9caa624d210fe..0cdc48b8b151b 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta9", - "magento/module-search": "0.42.0-beta9", - "magento/module-backend": "0.42.0-beta9", - "magento/module-core": "0.42.0-beta9", - "magento/module-store": "0.42.0-beta9", - "magento/module-catalog": "0.42.0-beta9", + "magento/framework": "0.42.0-beta10", + "magento/module-search": "0.42.0-beta10", + "magento/module-backend": "0.42.0-beta10", + "magento/module-core": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta10", + "magento/module-catalog": "0.42.0-beta10", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta9", + "version": "0.42.0-beta10", "license": [ "OSL-3.0", "AFL-3.0" From b9533b2f0f1e9e1dac4af678fd80854bd9efb1a2 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Wed, 4 Mar 2015 12:04:34 +0200 Subject: [PATCH 019/616] MAGETWO-34246: Sync with mainline and stabilize tests --- etc/adminhtml/system.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 2a34f084e0d35..ba2fbfbd989a9 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -19,7 +19,7 @@ showInStore="1"> When you enable this option your site may slow down. - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno 1 @@ -51,7 +51,7 @@ When you enable this option your site may slow down. - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno @@ -61,7 +61,7 @@ - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno When you enable this option your site may slow down. 1 From 6e3895176aef7c3db78e3005c2993b976dc72efe Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Wed, 4 Mar 2015 12:04:34 +0200 Subject: [PATCH 020/616] MAGETWO-34246: Sync with mainline and stabilize tests --- etc/adminhtml/system.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 2a34f084e0d35..ba2fbfbd989a9 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -19,7 +19,7 @@ showInStore="1"> When you enable this option your site may slow down. - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno 1 @@ -51,7 +51,7 @@ When you enable this option your site may slow down. - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno @@ -61,7 +61,7 @@ - Magento\Backend\Model\Config\Source\Yesno + Magento\Config\Model\Config\Source\Yesno When you enable this option your site may slow down. 1 From 1354d84d00acbb69a652e5ae7672e726a3db77e8 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Thu, 5 Mar 2015 10:46:21 +0200 Subject: [PATCH 021/616] Merge remote-tracking branch 'mainline/develop' into develop Conflicts: app/code/Magento/EnterpriseSearch/etc/module.xml app/code/Magento/Solr/sql/solr_setup/install-2.0.0.php dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php --- Block/Adminhtml/Search/Grid.php | 12 ++-- Setup/InstallSchema.php | 68 ++++++++++++++++++++++ etc/module.xml | 2 +- sql/advancedsearch_setup/install-2.0.0.php | 49 ---------------- 4 files changed, 75 insertions(+), 56 deletions(-) create mode 100644 Setup/InstallSchema.php delete mode 100644 sql/advancedsearch_setup/install-2.0.0.php diff --git a/Block/Adminhtml/Search/Grid.php b/Block/Adminhtml/Search/Grid.php index 791986dbb4de2..6d02e40845554 100644 --- a/Block/Adminhtml/Search/Grid.php +++ b/Block/Adminhtml/Search/Grid.php @@ -23,16 +23,16 @@ class Grid extends \Magento\Backend\Block\Widget\Grid protected $_registryManager; /** - * @var \Magento\Core\Helper\Data + * @var \Magento\Framework\Json\Helper\Data */ - protected $_coreHelper; + protected $jsonHelper; /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Helper\Data $backendHelper * @param \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options $options * @param \Magento\Framework\Registry $registry - * @param \Magento\Core\Helper\Data $coreHelper + * @param \Magento\Framework\Json\Helper\Data $jsonHelper * @param array $data */ public function __construct( @@ -40,10 +40,10 @@ public function __construct( \Magento\Backend\Helper\Data $backendHelper, \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options $options, \Magento\Framework\Registry $registry, - \Magento\Core\Helper\Data $coreHelper, + \Magento\Framework\Json\Helper\Data $jsonHelper, array $data = [] ) { - $this->_coreHelper = $coreHelper; + $this->jsonHelper = $jsonHelper; parent::__construct($context, $backendHelper, $data); $this->_options = $options; $this->_registryManager = $registry; @@ -104,7 +104,7 @@ public function getQueriesJson() { $queries = array_flip($this->getSelectedQueries()); if (!empty($queries)) { - return $this->_coreHelper->jsonEncode($queries); + return $this->jsonHelper->jsonEncode($queries); } return '{}'; } diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php new file mode 100644 index 0000000000000..87b87ce773328 --- /dev/null +++ b/Setup/InstallSchema.php @@ -0,0 +1,68 @@ +startSetup(); + + $table = $installer->getConnection()->newTable( + $installer->getTable('catalogsearch_recommendations') + )->addColumn( + 'id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], + 'Id' + )->addColumn( + 'query_id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + ['unsigned' => true, 'nullable' => false, 'default' => '0'], + 'Query Id' + )->addColumn( + 'relation_id', + \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, + null, + ['unsigned' => true, 'nullable' => false, 'default' => '0'], + 'Relation Id' + )->addForeignKey( + $installer->getFkName('catalogsearch_recommendations', 'query_id', 'search_query', 'query_id'), + 'query_id', + $installer->getTable('search_query'), + 'query_id', + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE + )->addForeignKey( + $installer->getFkName('catalogsearch_recommendations', 'relation_id', 'search_query', 'query_id'), + 'relation_id', + $installer->getTable('search_query'), + 'query_id', + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, + \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE + )->setComment('Advanced Search Recommendations'); + $installer->getConnection()->createTable($table); + + $installer->endSetup(); + + + } +} \ No newline at end of file diff --git a/etc/module.xml b/etc/module.xml index 7e495721ae329..f8cbf5a720685 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -7,5 +7,5 @@ --> - + diff --git a/sql/advancedsearch_setup/install-2.0.0.php b/sql/advancedsearch_setup/install-2.0.0.php deleted file mode 100644 index 5d586bafff447..0000000000000 --- a/sql/advancedsearch_setup/install-2.0.0.php +++ /dev/null @@ -1,49 +0,0 @@ -startSetup(); - -$table = $installer->getConnection()->newTable( - $installer->getTable('catalogsearch_recommendations') -)->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' -)->addColumn( - 'query_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Query Id' -)->addColumn( - 'relation_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Relation Id' -)->addForeignKey( - $installer->getFkName('catalogsearch_recommendations', 'query_id', 'search_query', 'query_id'), - 'query_id', - $installer->getTable('search_query'), - 'query_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE -)->addForeignKey( - $installer->getFkName('catalogsearch_recommendations', 'relation_id', 'search_query', 'query_id'), - 'relation_id', - $installer->getTable('search_query'), - 'query_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE -)->setComment('Advanced Search Recommendations'); -$installer->getConnection()->createTable($table); - -$installer->endSetup(); From ccb75442e4085d6f394804f18e97b82824f8fd90 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Thu, 5 Mar 2015 12:05:13 +0200 Subject: [PATCH 022/616] MAGETWO-34246: Sync with mainline and stabilize tests --- Setup/InstallSchema.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index 87b87ce773328..acf1802fb4035 100644 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -4,7 +4,7 @@ * See COPYING.txt for license details. */ -namespace Magento\Solr\Setup; +namespace Magento\AdvancedSearch\Setup; use Magento\Framework\Setup\InstallSchemaInterface; use Magento\Framework\Setup\ModuleContextInterface; @@ -62,7 +62,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con $installer->getConnection()->createTable($table); $installer->endSetup(); - - } } \ No newline at end of file From 2bd77d64b66199a21669c5ab6144084ebcf36ea7 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Thu, 5 Mar 2015 15:16:04 +0200 Subject: [PATCH 023/616] MAGETWO-34246: Sync with mainline and stabilize tests --- Setup/InstallSchema.php | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index acf1802fb4035..95741f927c91a 100644 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -63,4 +63,4 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con $installer->endSetup(); } -} \ No newline at end of file +} diff --git a/composer.json b/composer.json index 0cdc48b8b151b..09107101f3109 100644 --- a/composer.json +++ b/composer.json @@ -6,9 +6,9 @@ "magento/framework": "0.42.0-beta10", "magento/module-search": "0.42.0-beta10", "magento/module-backend": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", "magento/module-store": "0.42.0-beta10", "magento/module-catalog": "0.42.0-beta10", + "magento/module-catalog-search": "0.42.0-beta10", "magento/magento-composer-installer": "*" }, "type": "magento2-module", From 0fcd8c03318def897e80b6d7ea34241ad4681c01 Mon Sep 17 00:00:00 2001 From: Igor Miniailo Date: Fri, 6 Mar 2015 14:33:10 +0200 Subject: [PATCH 024/616] MAGETWO-31084: M2 GitHub Update (version 0.42.0-beta11) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 09107101f3109..8616680fb14ae 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", - "magento/module-search": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-search": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", + "magento/module-search": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-search": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" From 72a3f16b61b73c3a1a68c1e4f236304ec7850d2f Mon Sep 17 00:00:00 2001 From: Christopher O'Toole Date: Sun, 8 Mar 2015 19:35:05 -0500 Subject: [PATCH 025/616] MAGETWO-34323: Move Magento/AdvancedSearch module unit tests --- Test/Unit/Block/SearchDataTest.php | 98 ++++++++++++++++++++++++++++ Test/Unit/Model/DataProviderTest.php | 38 +++++++++++ 2 files changed, 136 insertions(+) create mode 100644 Test/Unit/Block/SearchDataTest.php create mode 100644 Test/Unit/Model/DataProviderTest.php diff --git a/Test/Unit/Block/SearchDataTest.php b/Test/Unit/Block/SearchDataTest.php new file mode 100644 index 0000000000000..ae2f44bd40d15 --- /dev/null +++ b/Test/Unit/Block/SearchDataTest.php @@ -0,0 +1,98 @@ +dataProvider = $this->getMockBuilder('\Magento\AdvancedSearch\Model\SuggestedQueriesInterface') + ->disableOriginalConstructor() + ->setMethods(['getItems', 'isResultsCountEnabled']) + ->getMockForAbstractClass(); + + $this->searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface') + ->disableOriginalConstructor() + ->setMethods(['getQueryText']) + ->getMockForAbstractClass(); + $this->queryFactory = $this->getMockBuilder('\Magento\Search\Model\QueryFactoryInterface') + ->disableOriginalConstructor() + ->setMethods(['get']) + ->getMockForAbstractClass(); + $this->queryFactory->expects($this->once()) + ->method('get') + ->will($this->returnValue($this->searchQuery)); + $this->context = $this->getMockBuilder('\Magento\Framework\View\Element\Template\Context') + ->disableOriginalConstructor() + ->getMock(); + $this->block = $this->getMockBuilder('\Magento\AdvancedSearch\Block\SearchData')->setConstructorArgs( + [ + $this->context, + $this->dataProvider, + $this->queryFactory, + 'Test Title', + [], + ] + ) + ->setMethods(['getUrl']) + ->getMockForAbstractClass(); + } + + public function testGetSuggestions() + { + $value = [1, 2, 3, 100500]; + + $this->dataProvider->expects($this->once()) + ->method('getItems') + ->with($this->searchQuery) + ->will($this->returnValue($value)); + $actualValue = $this->block->getItems(); + $this->assertEquals($value, $actualValue); + } + + public function testGetLink() + { + $searchQuery = 'Some test search query'; + $expectedResult = '?q=Some+test+search+query'; + $actualResult = $this->block->getLink($searchQuery); + $this->assertEquals($expectedResult, $actualResult); + } + + public function testIsShowResultsCount() + { + $value = 'qwertyasdfzxcv'; + $this->dataProvider->expects($this->once()) + ->method('isResultsCountEnabled') + ->will($this->returnValue($value)); + $this->assertEquals($value, $this->block->isShowResultsCount()); + } +} diff --git a/Test/Unit/Model/DataProviderTest.php b/Test/Unit/Model/DataProviderTest.php new file mode 100644 index 0000000000000..e7c4c5474e257 --- /dev/null +++ b/Test/Unit/Model/DataProviderTest.php @@ -0,0 +1,38 @@ +objectManager = new ObjectManager($this); + } + + public function testGetRecommendations() + { + /** @var \Magento\Search\Model\QueryInterface|\PHPUnit_Framework_MockObject_MockObject $searchQuery */ + $searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface')->getMockForAbstractClass(); + /** @var \Magento\AdvancedSearch\Model\SuggestedQueries $dataProvider */ + $dataProvider = $this->objectManager->getObject('Magento\AdvancedSearch\Model\SuggestedQueries'); + $this->assertEquals([], $dataProvider->getItems($searchQuery)); + } + + public function testIsResultsCountEnabled() + { + /** @var \Magento\AdvancedSearch\Model\SuggestedQueries $dataProvider */ + $dataProvider = $this->objectManager->getObject('Magento\AdvancedSearch\Model\SuggestedQueries'); + $this->assertFalse($dataProvider->isResultsCountEnabled()); + } +} From 075548e3802924771f08d5f3870e72601c6bc6ad Mon Sep 17 00:00:00 2001 From: Christopher O'Toole Date: Mon, 9 Mar 2015 13:00:38 -0500 Subject: [PATCH 026/616] MAGETWO-34864: TestFramework code should be a framework component --- Test/Unit/Model/DataProviderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/DataProviderTest.php b/Test/Unit/Model/DataProviderTest.php index e7c4c5474e257..164464f6a7206 100644 --- a/Test/Unit/Model/DataProviderTest.php +++ b/Test/Unit/Model/DataProviderTest.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedSearch\Test\Unit\Model; -use Magento\Framework\Test\Unit\TestFramework\Helper\ObjectManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; class DataProviderTest extends \PHPUnit_Framework_TestCase { From 47fb2b6922dd11b3d8b8e238a73a3b8a2dd187fe Mon Sep 17 00:00:00 2001 From: Bryant Luk Date: Fri, 13 Mar 2015 23:30:37 -0500 Subject: [PATCH 027/616] MAGETWO-34952: Final cleanup to ensure Core module is properly removed - Fix config.xsd reference in AdvancedSearch --- etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/config.xml b/etc/config.xml index 5ac965e326839..eb9ef331523d4 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + From 37734d54b90b9fb68c7934fc0bde7661d923b61e Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Wed, 18 Mar 2015 11:45:12 +0200 Subject: [PATCH 028/616] MAGETWO-32710: Code micro-optimizations --- Model/Adminhtml/Search/Grid/Options.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Adminhtml/Search/Grid/Options.php b/Model/Adminhtml/Search/Grid/Options.php index f0bee6bbd0caa..66c909951c27b 100644 --- a/Model/Adminhtml/Search/Grid/Options.php +++ b/Model/Adminhtml/Search/Grid/Options.php @@ -48,7 +48,7 @@ public function toOptionArray() $currentQueryId = $this->_registryManager->registry('current_catalog_search')->getId(); $queryIds = []; - if (is_null($queries) && !empty($currentQueryId)) { + if ($queries === null && !empty($currentQueryId)) { $queryIds = $this->_searchResourceModel->getRelatedQueries($currentQueryId); } return $queryIds; From 7e8f1d1dd9a7757de9c87aa92fae2cb93cf29f4b Mon Sep 17 00:00:00 2001 From: Vladimir Pelipenko Date: Fri, 20 Mar 2015 16:46:27 +0200 Subject: [PATCH 029/616] MAGETWO-31086: M2 GitHub Update (version 0.74.0-beta1) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 8616680fb14ae..f923e6dbb6f24 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta11", - "magento/module-search": "0.42.0-beta11", - "magento/module-backend": "0.42.0-beta11", - "magento/module-store": "0.42.0-beta11", - "magento/module-catalog": "0.42.0-beta11", - "magento/module-catalog-search": "0.42.0-beta11", + "magento/framework": "0.74.0-beta1", + "magento/module-search": "0.74.0-beta1", + "magento/module-backend": "0.74.0-beta1", + "magento/module-store": "0.74.0-beta1", + "magento/module-catalog": "0.74.0-beta1", + "magento/module-catalog-search": "0.74.0-beta1", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta11", + "version": "0.74.0-beta1", "license": [ "OSL-3.0", "AFL-3.0" From a539f83273a74e865449e07fa1ff17cd26428c45 Mon Sep 17 00:00:00 2001 From: Vladimir Pelipenko Date: Fri, 27 Mar 2015 12:56:13 +0200 Subject: [PATCH 030/616] MAGETWO-31777: M2 GitHub Update (version 0.74.0-beta2) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index f923e6dbb6f24..66a6a70cbb2fc 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta1", - "magento/module-search": "0.74.0-beta1", - "magento/module-backend": "0.74.0-beta1", - "magento/module-store": "0.74.0-beta1", - "magento/module-catalog": "0.74.0-beta1", - "magento/module-catalog-search": "0.74.0-beta1", + "magento/framework": "0.74.0-beta2", + "magento/module-search": "0.74.0-beta2", + "magento/module-backend": "0.74.0-beta2", + "magento/module-store": "0.74.0-beta2", + "magento/module-catalog": "0.74.0-beta2", + "magento/module-catalog-search": "0.74.0-beta2", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta1", + "version": "0.74.0-beta2", "license": [ "OSL-3.0", "AFL-3.0" From 4d6cecc8c20cf4700f8b441cc560cd67b57f8aa5 Mon Sep 17 00:00:00 2001 From: Serhiy Shkolyarenko Date: Fri, 3 Apr 2015 13:01:03 +0300 Subject: [PATCH 031/616] MAGETWO-33524: M2 GitHub Update (version 0.74.0-beta3) updated CHANGELOG.md and release version --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 66a6a70cbb2fc..c616ab6371dc7 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta2", - "magento/module-search": "0.74.0-beta2", - "magento/module-backend": "0.74.0-beta2", - "magento/module-store": "0.74.0-beta2", - "magento/module-catalog": "0.74.0-beta2", - "magento/module-catalog-search": "0.74.0-beta2", + "magento/framework": "0.74.0-beta3", + "magento/module-search": "0.74.0-beta3", + "magento/module-backend": "0.74.0-beta3", + "magento/module-store": "0.74.0-beta3", + "magento/module-catalog": "0.74.0-beta3", + "magento/module-catalog-search": "0.74.0-beta3", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta2", + "version": "0.74.0-beta3", "license": [ "OSL-3.0", "AFL-3.0" From b2cb280d82fdf7cc282a48f65c3e8cf6f8bdc86c Mon Sep 17 00:00:00 2001 From: Anton Kaplya Date: Mon, 6 Apr 2015 16:31:35 +0300 Subject: [PATCH 032/616] MAGETWO-35640: Remove cascade FK actions (ON UPDATE) --- Setup/InstallSchema.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index 95741f927c91a..e44909be8f733 100644 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -49,14 +49,12 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con 'query_id', $installer->getTable('search_query'), 'query_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE )->addForeignKey( $installer->getFkName('catalogsearch_recommendations', 'relation_id', 'search_query', 'query_id'), 'relation_id', $installer->getTable('search_query'), 'query_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE, \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE )->setComment('Advanced Search Recommendations'); $installer->getConnection()->createTable($table); From 035bb706609831fd481cbd2ee4e008103c3bcada Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Fri, 10 Apr 2015 13:44:21 +0300 Subject: [PATCH 033/616] MAGETWO-33525: M2 GitHub Update (version 0.74.0-beta4) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index c616ab6371dc7..e88c391463954 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta3", - "magento/module-search": "0.74.0-beta3", - "magento/module-backend": "0.74.0-beta3", - "magento/module-store": "0.74.0-beta3", - "magento/module-catalog": "0.74.0-beta3", - "magento/module-catalog-search": "0.74.0-beta3", + "magento/framework": "0.74.0-beta4", + "magento/module-search": "0.74.0-beta4", + "magento/module-backend": "0.74.0-beta4", + "magento/module-store": "0.74.0-beta4", + "magento/module-catalog": "0.74.0-beta4", + "magento/module-catalog-search": "0.74.0-beta4", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta3", + "version": "0.74.0-beta4", "license": [ "OSL-3.0", "AFL-3.0" From 502633606705c2779837703eb8afd357de453f84 Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 14 Apr 2015 08:42:04 -0500 Subject: [PATCH 034/616] MAGETWO-35470: Update prepare package tool to prepare all ee packages -correct composer.json files --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e88c391463954..321268b86830d 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,7 @@ "type": "magento2-module", "version": "0.74.0-beta4", "license": [ - "OSL-3.0", - "AFL-3.0" + "proprietary" ], "extra": { "map": [ From 84738ac354872b3f28234adffd99420d7dc64491 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 15 Apr 2015 13:09:55 -0500 Subject: [PATCH 035/616] MAGETWO-35470: Update prepare package tool to prepare all ee packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit －add liense files --- LICENSE_EE.txt | 437 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 437 insertions(+) create mode 100644 LICENSE_EE.txt diff --git a/LICENSE_EE.txt b/LICENSE_EE.txt new file mode 100644 index 0000000000000..2bddf5feda6ba --- /dev/null +++ b/LICENSE_EE.txt @@ -0,0 +1,437 @@ +MAGENTO(tm) ENTERPRISE EDITION +END USER LICENSE AGREEMENT + +This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. +through its Magento division ("Magento"), and the Licensee executing the Magento Order Form +(defined below). The parties agree as follows: + +TERMS AND CONDITIONS + +1. License + 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with + other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, + non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of + installing and using it on a computer and solely for internal purposes, in accordance with the + Software's technical documentation and solely during the periods and on the maximum number + of Designated Servers specified in one or more applicable Magento or Magento-authorized + reseller ordering schedules (the "Magento Order Form") executed with Licensee. + + 1.2. In the event that Licensee's actual number of Servers of a particular Software license + exceeds the licensed number of Designated Servers on such license, Licensee shall promptly + provide Magento with written notice and pay Magento the fees required to license such + additional Server(s) in accordance with the commercial terms set out in the Magento Order + Form. + + 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the + maximum number of licensed Servers of the Software. Magento reserves the right to audit + Licensee's use of the Software during normal business hours and with reasonable notice and to + include means within the Software to limit Licensee's use of the Software to the licensed + number of Servers. + + 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated + technical documentation, for use by Licensee in accordance with this Agreement. Subject to + Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server + copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights + under this Agreement. + + 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a + temporary basis without charge any time a Designated Server is inoperative due to a + malfunction beyond the control of Licensee. Licensee may transfer the Software on a + permanent basis to a single replacement Server without charge. Licensee agrees to provide + Magento with written notice, including the Server type and operating system, of any such + transfer to a backup or replacement Server within five (5) days thereafter. + + 1.6. Licensee acknowledges that portions of the Software are also freely available to the public + under Magento's open source version of the Software, known as Magento Community Edition, + subject to certain conditions, with limited warranties and other limited assurances, and without + service or support. As an express condition for the license granted hereunder, Licensee agrees + that any use during the term of this Agreement of such open source versions of the Software, + whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed + use of the Software for purposes of the calculation of fees payable under the Agreement. + + 1.7. Magento also grants Licensee the right to modify and create derivative works of the + Software. Licensee may contribute the rights in any of those derivative works back to Magento. + Licensee may contact Magento for more information regarding contributions of derivative + works rights to Magento. Regardless of whether Licensee contributes such derivative works + rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of + the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and + royalty-free license to reproduce, create derivative works of, distribute, perform, and display + any derivative works of the Software developed by or for Licensee, and to use, make, have + made, sell, offer to sell, import, export, and otherwise exploit any product based on any such + derivative works. + +2. License Exclusions + 2.1 Except as expressly authorized herein, Licensee shall not: + a. use or deploy the Software on any Server in excess of the number of Designated Servers + specified in the applicable Magento Order Form; + + b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, + networking, batch processing or transfer of, the Software to any third party, or permit any + person or entity to have access to the Software by means of a time sharing, remote + computing services, networking, batch processing, service bureau or time sharing + arrangement; + + c. export the Software in violation of U.S. Department of Commerce export administration + regulations. + + 2.2. No license, right or interest in any Magento trademark, trade name or service mark is + granted hereunder. + +3. Fees and Payment Terms + Licensee agrees to the fees and payment terms that are described in each Magento Order Form + executed by Licensee. + +4. Title and Protection + 4.1. Magento (or its third party providers) retains title to all portions of the Software and other + Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable + proprietary information, and Licensee shall not disclose them to anyone other than those of its + employees or consultants under written nondisclosure obligations at least as restrictive as + those contained in this Agreement, having a need to know for purposes consistent with this + Agreement. Licensee shall be responsible for the compliance of such employees or consultants. + Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright + and proprietary information notices as were affixed to the original. The obligations set forth in + this Section shall survive termination of this Agreement. + + 4.2. Licensee acknowledges that the Software includes certain open source software which is + governed by the applicable license terms thereof. A list of such open source software, as + amended from time to time, including the links applicable to such open source software is + specified in the product software bundled within the Software, and the Software is subject to + the provisions of such license agreements, and in the event of any contradiction between the + provisions of this Agreement and the provisions of such applicable license agreement, the + provisions of the applicable open source license agreement shall prevail solely with respect to + such open source software products. + + 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the + "Government"), the Government agrees that such Product is "commercial computer software" + or "commercial computer software documentation" and that, absent a written agreement to + the contrary, the Government's rights with respect thereto are limited by the terms of this + Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. + +5. Patent and Copyright Indemnity + Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support + Services (as defined below), Magento shall indemnify and defend Licensee against any claims made + by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section + 5, means the Software as delivered by Magento, excluding the open source software programs + described in Section 4.2) as permitted in this Agreement directly infringes such third party's United + States patent or copyright, provided that Licensee complies with the requirements of this Section. + Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any + intellectual property rights, (b) provide Magento with all information and assistance requested of it + with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or + settle any and all such claims. + + In the event that a court holds that the Software, or if Magento believes a court may hold that the + Software, infringes the intellectual property rights of any third party, Magento may (but is not + obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue + using the Software, replace or modify the Software so that it becomes non-infringing while providing + substantially equivalent performance or, accept return of the Software, terminate this Agreement, + and refund Licensee an amount equal to the license fees paid to Magento multiplied by the + percentage of the term of the license for the Software that Licensee did not enjoy due to the early + termination by Magento. + + Magento shall have no liability or obligation under this Agreement to the extent the alleged + infringement is based on (i) a modification or derivative work of the Software developed by anyone + other than Magento; (ii), a combination of the Software with any product or service not provided by + Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) + use of the Software other than in accordance with this Agreement or the documentation; (iv) + indirect or willful infringement; or (v) any open source code, as described in Section 4.2. + + This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement + related to the Software. + +6. Default and Termination + 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its + obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) + Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in + Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party + fails to perform any other material obligation under this Agreement and such failure remains + uncured for more than thirty (30) days after receipt of written notice thereof. + + 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights + available to it under the law, may terminate this Agreement and all licenses granted hereunder + by written notice to the defaulting party. + + 6.3. Within thirty (30) days after termination of the Software license or this Agreement or + expiration of the license term as specified in the Magento Order Form, Licensee shall certify in + writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that + all copies or embodiments thereof in any form, including partial copies within modified + versions, have been destroyed. + +7. Warranty + 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days + commencing upon Magento's electronic delivery of the Software to Licensee that the Software, + as delivered, will in all material respects perform the functions described in the specifications + contained in the documentation provided with the Software. In the event that the Software + does not, in all material respects, perform the functions therein described, Magento or its + authorized reseller will undertake to correct any reported error in accordance with the Support + Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire + liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant + that the Software will meet Licensee's requirements, that the Software will operate in the + combinations which Licensee may select for use, that the operation of the Software will be + uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED + IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". + + 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY + WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. + MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR + TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, + ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR + AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING + TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. + +8. Limitation of Liability + 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS + OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE + USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; + LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; + OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES + (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A + CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR + UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING + OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER + TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, + FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. + + 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN + WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH + RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE + LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, + THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE + SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. + +9. Support Services Terms and Conditions + For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide + support services and Updates for the Software as described in Magento's standard Support Services + Terms and Conditions, which follow. Magento will have no obligation to provide support for any + modifications or derivative works of the Software developed by anyone other than Magento. + +10. Customer References + Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer + lists and other related marketing materials. The parties shall cooperate to undertake mutually- + agreed joint marketing activities. + +11. Notices + All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by + facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order + Form, or such other address as either party may indicate by at least ten (10) days prior written + notice to the other party. Notices to Magento shall be sent to the Contracts Administration + Department. + +12. Assignment + Licensee may not assign this Agreement without the prior written consent of Magento; provided + that such consent shall not be required for assignment to a purchaser of all or substantially all of the + assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and + conditions of this Agreement. Any prohibited assignment shall be null and void. + +13. Entire Agreement + Along with Magento's standard Support Services Terms and Conditions, which follow, and the + Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, + which supersedes all proposals or prior agreements, oral or written, including any online (click- + through) agreement which Licensee may have accepted in conjunction with the downloading of the + Software, and all other communications between the parties relating to the subject matter hereof. + No purchase order, other ordering document or any hand written or typewritten text which purports + to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the + terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both + parties, all such proposed variations or additions are objected to and shall have no force or effect. + +14. General + This Agreement is made in and shall be governed by the laws of the State of California, without + giving effect to any principles that provide for the application of the law of another jurisdiction. All + proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, + California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. + The United Nations Convention for the International Sale of Goods shall not apply. The section + headings herein are provided for convenience only and have no substantive effect on the + construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall + be liable for any failure to perform due to causes beyond its reasonable control. If any provision of + this Agreement is held to be unenforceable, this Agreement shall be construed without such + provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such + party's right to exercise such right or any other right in the future. This Agreement may be amended + only by a written document executed by a duly authorized representative of each of the parties. The + parties agree to receive electronic documents and accept electronic signatures (information + attached or logically associated with such document and clicked or otherwise adopted with an intent + to sign) including in counterparts which shall be valid substitutes for paper-based documents and + signatures, and the legal validity of a transaction will not be denied on the ground that it is not in + writing. + +15. Definitions + "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a + particular Software license. Such Server may be that of a third-party under nondisclosure obligations + that will host the Software for the benefit of Licensee. + + "Modifications" means any code developed by Licensee or any third party, including without + limitation, configuration, integrations, implementations, or localizations to the external layer of the + core, baseline Software product. The term "Modifications" excludes Updates. + + "Proprietary Material" means the Software, related documentation, and all parts, copies and + modifications thereof, and any other information, in whatever form, received by Licensee + hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is + or becomes a part of the public domain through no act or omission of Licensee; or (b) was in + Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from + Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or + (d) is independently developed by Licensee without reference to or use of Magento's Proprietary + Material. + + "Server" means each physical or virtual server from which a single instance of the Software is + accessed and used either for production purposes ("Production Server Instance") or for non- + production purposes, such as development, testing, training and other non-operational business + transactions ("Non-Production Server Instance"). For example, if one server contains two (2) + instances of the Software, i.e., one Production Server Instance and one Non-Production Server + Instance, then a Server license is required for each of such instances; development in-house and by + third-party consultants requires licenses for two Non-Production Server Instances. + + "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) + Enterprise Edition, provided solely in source code, including associated technical documentation, + and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise + specified herein, the term Software includes certain open source software programs described in + Section 4.2. "Software" does not include any Modifications. + + "Updates" means all published revisions and corrections to the printed documentation and + corrections and new releases of the Software which are generally made available to Magento's + supported customers at no additional cost or for media and handling charges only. Updates shall not + include any options or future products which Magento sells separately. + + +SUPPORT SERVICES TERMS AND CONDITIONS + +Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the +Agreement. + +1. "Support Services" consists of: + a. Advice regarding the downloading, installation and configuration of the Software (including + Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to + the Software), when used by Licensee on systems that meet the Software's "System + Requirements" specified on Magento's website at www.magentocommerce.com/system- + requirements. + + b. Facilities for bug tracking, escalation of problems for priority attention, and access to + community-supported FAQs and Forums relating to the Software. + + c. Assistance with troubleshooting to diagnose and fix errors in the Software. + + d. Access to Magento documentation relating to the Software, including authorization to make + copies of that documentation for internal use as specified in the Agreement. + +2. Exclusions from Support Services. + Magento shall have no obligation to support (i) versions of the + Software other than the then-current and immediately previous releases, which are operated on a + supported hardware/operating system platform specified in the release notes for the Software; (ii) + altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by + Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with + Magento's instructions. Magento is not responsible for hardware changes necessitated by changes + to the Software. Support Services does not include: + a. Assistance in the development or debugging of Licensee's system, including the operating + system and support tools. + + b. Information and assistance on technical issues related to the installation, administration, and + use of enabling technologies such as databases, computer networks, and communications. + + c. Assistance with the installation and configuration of hardware including, but not limited to + computers, hard disks, networks, and printers. + +3. Subcontractors. + Magento or its authorized resellers reserve the right to subcontract any or all of + the work to be performed under these Support Terms, and Magento retains responsibility for any + work so subcontracted. + +4. Licensee Responsibilities. + Licensee shall provide commercially reasonable cooperation and full + information to Magento or its authorized resellers with respect to the furnishing of Support Services + under this Agreement. + +5. Support Contacts. + Licensee shall designate one or more support contacts that are authorized to + submit Software problems. If Licensee has purchased the license from a Magento-authorized + reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license + directly from Magento, Licensee may contact Magento on the www.magentocommere.com website + or at its toll-free Support telephone number. + +6. Problem Priority. + Upon receipt of a properly submitted Software problem, as specified on + Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall + prioritize it in accordance with the guidelines below: + + a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely + impacts the Licensee's Production Server Instance, or because of which Licensee's Production + Server Instance is down or not functioning, or that results in a loss of production data and no + work around exists. P1 problems must be reported on Magento's toll-free support telephone + number in order to expedite resolution. Magento will use continuous efforts during its normal + hours of operation, with appropriate escalation to senior management, to provide a resolution + for any P1 problem as soon as is commercially reasonable. + + b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is + functioning but in a reduced capacity, or the Problem is causing significant impact to portions of + the Licensee's business operations and productivity, or the Software is exposed to potential loss + or interruption of service. Problems existing in a non-production environment that would + otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P2 + problem as soon as is commercially reasonable. + + c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- + critical loss of functionality, or that impairs some operations but allows Licensee's operations to + continue to function. Problems for which there is limited or no loss or functionality or impact to + Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P3 + problem in time for the next minor release of the Software. + + d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature + or documentation related, but the Software works without normal hours of operation to + provide a resolution for any P4 problem in time for the next major release of the Software. + + e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or + modification to add official support and documentation for unsupported or undocumented + feature, or features that do not exist in the Software. Magento will take ERs into consideration + in the product management process, but has no obligation to deliver enhancements based on + any ER. + +7. Response Times. + Magento or its authorized reseller shall exercise commercially reasonable efforts + to meet the response times specified below for Gold Support (unless Licensee has upgraded to + Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem + properly submitted by Licensee: + + Magento GOLD Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + North American Telephone Support Hours M-F 08:00 - 17:00 (PT) + European Telephone Support Hours M-F 08:30 - 17:30 (CET) + Telephone Response Time P1 Issues* 4 business hours + Response Time P2-P4 Issues* 24 business hours + *From initial contact + + + Magento PLATINUM Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + Telephone Support Hours 24 hours + Telephone Response Time P1 Issues* Up to 2 hours + Response Time P2-P4 Issues* 4 business hours + *From initial contact + + +8. Prohibited Use. + As a condition of Licensee's use of the Forums, Licensee will not use (and will + prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or + regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, + defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software + viruses or any other computer code, files or programs that may interrupt, destroy or limit the + functionality of any computer software or hardware or telecommunications equipment; (iv) to + infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any + third party; or (v) use the Forums for any purpose other than their intended use. + +9. Term and Termination. + Magento will provide Support Services and any Updates to Licensee + during the periods identified in the Magento Order Form, subject to Licensee's payment of the + applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee + materially breaches the Support Services provisions and does not cure such breach within thirty (30) + days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. + +10. General. + Magento shall not be liable for any failure or delay in performance under these Support + Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be + severed from these Support Terms. Licensee agrees that any information received pursuant to these + Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the + License Agreement. Licensee's obligation of payment of moneys due under these Support Terms + shall survive termination of these Support Terms or the License Agreement. These Support Terms + state the entire agreement regarding provision of Support Services to Licensee and may be amended + only by a written amendment set forth on a separate document executed by authorized + representatives of both parties. From 074e18e0b2b8fac8eb5ef7020f3741deee8c3bfe Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Mon, 20 Apr 2015 12:21:47 +0300 Subject: [PATCH 036/616] MAGETWO-33526: M2 GitHub Update (version 0.74.0-beta5) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index e88c391463954..0c41b6c980c61 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta4", - "magento/module-search": "0.74.0-beta4", - "magento/module-backend": "0.74.0-beta4", - "magento/module-store": "0.74.0-beta4", - "magento/module-catalog": "0.74.0-beta4", - "magento/module-catalog-search": "0.74.0-beta4", + "magento/framework": "0.74.0-beta5", + "magento/module-search": "0.74.0-beta5", + "magento/module-backend": "0.74.0-beta5", + "magento/module-store": "0.74.0-beta5", + "magento/module-catalog": "0.74.0-beta5", + "magento/module-catalog-search": "0.74.0-beta5", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta4", + "version": "0.74.0-beta5", "license": [ "OSL-3.0", "AFL-3.0" From 90e8c672f9ebc99f36f67ae22fd93302d5979022 Mon Sep 17 00:00:00 2001 From: Vlad Veselov Date: Fri, 24 Apr 2015 06:59:43 -0400 Subject: [PATCH 037/616] MAGETWO-33527: M2 GitHub Update (version 0.74.0-beta6) - update version with git grep --name-only '0.74.0-beta5' | grep -v 'CHANGELOG.md' | xargs -i@ sed -i 's/0.74.0-beta5/0.74.0-beta6/g' @ --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index eaa4c41c230f2..867292c09cd60 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta5", - "magento/module-search": "0.74.0-beta5", - "magento/module-backend": "0.74.0-beta5", - "magento/module-store": "0.74.0-beta5", - "magento/module-catalog": "0.74.0-beta5", - "magento/module-catalog-search": "0.74.0-beta5", + "magento/framework": "0.74.0-beta6", + "magento/module-search": "0.74.0-beta6", + "magento/module-backend": "0.74.0-beta6", + "magento/module-store": "0.74.0-beta6", + "magento/module-catalog": "0.74.0-beta6", + "magento/module-catalog-search": "0.74.0-beta6", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta5", + "version": "0.74.0-beta6", "license": [ "proprietary" ], From 3d3225508dabe061778332aa9bad3ef76656818b Mon Sep 17 00:00:00 2001 From: Michael Logvin Date: Thu, 30 Apr 2015 11:37:11 +0300 Subject: [PATCH 038/616] MAGETWO-33528: M2 GitHub Update (version 0.74.0-beta7) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 867292c09cd60..f5bce1a13eb88 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta6", - "magento/module-search": "0.74.0-beta6", - "magento/module-backend": "0.74.0-beta6", - "magento/module-store": "0.74.0-beta6", - "magento/module-catalog": "0.74.0-beta6", - "magento/module-catalog-search": "0.74.0-beta6", + "magento/framework": "0.74.0-beta7", + "magento/module-search": "0.74.0-beta7", + "magento/module-backend": "0.74.0-beta7", + "magento/module-store": "0.74.0-beta7", + "magento/module-catalog": "0.74.0-beta7", + "magento/module-catalog-search": "0.74.0-beta7", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta6", + "version": "0.74.0-beta7", "license": [ "proprietary" ], From bf0e7b15335a45c54b072a93a9154bc79748aa38 Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Thu, 7 May 2015 11:17:28 +0300 Subject: [PATCH 039/616] MAGETWO-35824: [MX] [Dragons] Code coverage - Sprint 67 - MAGETWO-36986: Coverage or refactoring method - Magento\Search\Model\Resource\Helper::prepareTerms --- Model/Resource/Search/Grid/Collection.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/Model/Resource/Search/Grid/Collection.php b/Model/Resource/Search/Grid/Collection.php index 6ca1e92ed45e0..ec9d3eaffa404 100644 --- a/Model/Resource/Search/Grid/Collection.php +++ b/Model/Resource/Search/Grid/Collection.php @@ -20,7 +20,6 @@ class Collection extends \Magento\Search\Model\Resource\Query\Collection * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Store\Model\StoreManagerInterface $storeManager - * @param \Magento\Search\Model\Resource\Helper $resourceHelper * @param \Magento\Framework\Registry $registry * @param mixed $connection * @param mixed $resource @@ -31,7 +30,6 @@ public function __construct( \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy, \Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Store\Model\StoreManagerInterface $storeManager, - \Magento\Search\Model\Resource\Helper $resourceHelper, \Magento\Framework\Registry $registry, $connection = null, $resource = null @@ -43,7 +41,6 @@ public function __construct( $fetchStrategy, $eventManager, $storeManager, - $resourceHelper, $connection, $resource ); From b4eb0b10dcbae2de81997cf551112ea52ec8234d Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Thu, 7 May 2015 15:45:53 +0300 Subject: [PATCH 040/616] MAGETWO-35824: [MX] [Dragons] Code coverage - Sprint 67 - MAGETWO-36986: Coverage or refactoring method - Magento\Search\Model\Resource\Helper::prepareTerms --- Model/Resource/Search/Grid/Collection.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Model/Resource/Search/Grid/Collection.php b/Model/Resource/Search/Grid/Collection.php index ec9d3eaffa404..0c0fb5e80167f 100644 --- a/Model/Resource/Search/Grid/Collection.php +++ b/Model/Resource/Search/Grid/Collection.php @@ -20,6 +20,7 @@ class Collection extends \Magento\Search\Model\Resource\Query\Collection * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy * @param \Magento\Framework\Event\ManagerInterface $eventManager * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param \Magento\Framework\DB\Helper $resourceHelper * @param \Magento\Framework\Registry $registry * @param mixed $connection * @param mixed $resource @@ -30,6 +31,7 @@ public function __construct( \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy, \Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Store\Model\StoreManagerInterface $storeManager, + \Magento\Framework\DB\Helper $resourceHelper, \Magento\Framework\Registry $registry, $connection = null, $resource = null @@ -41,6 +43,7 @@ public function __construct( $fetchStrategy, $eventManager, $storeManager, + $resourceHelper, $connection, $resource ); From 22b02b185aa13d18d96d4747b68a9ef6a20c2630 Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Fri, 8 May 2015 09:34:50 +0300 Subject: [PATCH 041/616] MAGETWO-33530: M2 GitHub Update (version 0.74.0-beta8) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index f5bce1a13eb88..e5ddc8dbc5fa6 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta7", - "magento/module-search": "0.74.0-beta7", - "magento/module-backend": "0.74.0-beta7", - "magento/module-store": "0.74.0-beta7", - "magento/module-catalog": "0.74.0-beta7", - "magento/module-catalog-search": "0.74.0-beta7", + "magento/framework": "0.74.0-beta8", + "magento/module-search": "0.74.0-beta8", + "magento/module-backend": "0.74.0-beta8", + "magento/module-store": "0.74.0-beta8", + "magento/module-catalog": "0.74.0-beta8", + "magento/module-catalog-search": "0.74.0-beta8", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta7", + "version": "0.74.0-beta8", "license": [ "proprietary" ], From 84cfed185dd81777b85d403d3d275f0760efd606 Mon Sep 17 00:00:00 2001 From: Vlad Veselov Date: Fri, 15 May 2015 11:33:42 -0400 Subject: [PATCH 042/616] MAGETWO-33531: M2 GitHub Update (version 0.74.0-beta9) - update version with git grep --name-only '0.74.0-beta8' | grep -v 'CHANGELOG.md' | xargs -i@ sed -i 's/0.74.0-beta8/0.74.0-beta9/g' @ --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index e5ddc8dbc5fa6..c0515c1d03855 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta8", - "magento/module-search": "0.74.0-beta8", - "magento/module-backend": "0.74.0-beta8", - "magento/module-store": "0.74.0-beta8", - "magento/module-catalog": "0.74.0-beta8", - "magento/module-catalog-search": "0.74.0-beta8", + "magento/framework": "0.74.0-beta9", + "magento/module-search": "0.74.0-beta9", + "magento/module-backend": "0.74.0-beta9", + "magento/module-store": "0.74.0-beta9", + "magento/module-catalog": "0.74.0-beta9", + "magento/module-catalog-search": "0.74.0-beta9", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta8", + "version": "0.74.0-beta9", "license": [ "proprietary" ], From dd0573a4dda35d5026e932381e74fa74ccbc3707 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 22 May 2015 12:32:13 +0300 Subject: [PATCH 043/616] MAGETWO-33532: M2 GitHub Update (version 0.74.0-beta10) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index c0515c1d03855..0524abe289d2e 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta9", - "magento/module-search": "0.74.0-beta9", - "magento/module-backend": "0.74.0-beta9", - "magento/module-store": "0.74.0-beta9", - "magento/module-catalog": "0.74.0-beta9", - "magento/module-catalog-search": "0.74.0-beta9", + "magento/framework": "0.74.0-beta10", + "magento/module-search": "0.74.0-beta10", + "magento/module-backend": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta10", + "magento/module-catalog": "0.74.0-beta10", + "magento/module-catalog-search": "0.74.0-beta10", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta9", + "version": "0.74.0-beta10", "license": [ "proprietary" ], From 82a3242beeb33e1d29c5930706ab88f39bcf9898 Mon Sep 17 00:00:00 2001 From: Alex Bomko Date: Fri, 29 May 2015 23:59:45 +0300 Subject: [PATCH 044/616] MAGETWO-33533: M2 GitHub Update (version 0.74.0-beta11) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 0524abe289d2e..6d324d26490fd 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta10", - "magento/module-search": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-search": "0.74.0-beta10", + "magento/framework": "0.74.0-beta11", + "magento/module-search": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-search": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "proprietary" ], From 605f906b699cfae859a95f9f3cd34cd92f0c79d4 Mon Sep 17 00:00:00 2001 From: Dmytro Kvashnin Date: Fri, 5 Jun 2015 11:22:59 +0300 Subject: [PATCH 045/616] MAGETWO-33534: M2 GitHub Update (version 0.74.0-beta12) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 6d324d26490fd..94eabc3eee11f 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta11", - "magento/module-search": "0.74.0-beta11", - "magento/module-backend": "0.74.0-beta11", - "magento/module-store": "0.74.0-beta11", - "magento/module-catalog": "0.74.0-beta11", - "magento/module-catalog-search": "0.74.0-beta11", + "magento/framework": "0.74.0-beta12", + "magento/module-search": "0.74.0-beta12", + "magento/module-backend": "0.74.0-beta12", + "magento/module-store": "0.74.0-beta12", + "magento/module-catalog": "0.74.0-beta12", + "magento/module-catalog-search": "0.74.0-beta12", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta11", + "version": "0.74.0-beta12", "license": [ "proprietary" ], From 8cc73d72b073a8a905d413a8d7c5d25adfe4daf8 Mon Sep 17 00:00:00 2001 From: Volodymyr Kholoshenko Date: Mon, 8 Jun 2015 14:41:20 +0300 Subject: [PATCH 046/616] MAGETWO-38343: Arbitrary code execution in "Related search terms" block --- view/frontend/templates/search_data.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml index 282ebbd995c34..ffd295597e32e 100644 --- a/view/frontend/templates/search_data.phtml +++ b/view/frontend/templates/search_data.phtml @@ -5,7 +5,7 @@ */ // @codingStandardsIgnoreFile /** - * @var \Magento\AdvancedSearch\Block\SearchDataInterface $block + * @var \Magento\AdvancedSearch\Block\SearchData $block */ ?>
getQueryText() ?> + >escapeHtml($additionalInfo->getQueryText()) ?> isShowResultsCount()): ?> getResultsCount() ?> From 9278330f1b88ea13feebdc40d50f94584697879e Mon Sep 17 00:00:00 2001 From: Volodymyr Kholoshenko Date: Mon, 8 Jun 2015 14:41:20 +0300 Subject: [PATCH 047/616] MAGETWO-38343: Arbitrary code execution in "Related search terms" block --- Block/SuggestedQueriesMock.php | 48 +++++++++++++++++++++++ Block/SuggestionsTest.php | 70 ++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 Block/SuggestedQueriesMock.php create mode 100644 Block/SuggestionsTest.php diff --git a/Block/SuggestedQueriesMock.php b/Block/SuggestedQueriesMock.php new file mode 100644 index 0000000000000..ce2cd813eb27c --- /dev/null +++ b/Block/SuggestedQueriesMock.php @@ -0,0 +1,48 @@ +results as $result) { + $return[] = new QueryResult($result, 1); + } + return $return; + } + + /** + * @return bool + */ + public function isResultsCountEnabled() + { + return true; + } + + /** + * @param array $results + * @return void + */ + public function setItems(array $results) + { + $this->results = $results; + } +} diff --git a/Block/SuggestionsTest.php b/Block/SuggestionsTest.php new file mode 100644 index 0000000000000..faf0d75a76818 --- /dev/null +++ b/Block/SuggestionsTest.php @@ -0,0 +1,70 @@ +get('Magento\Framework\App\State')->setAreaCode('frontend'); + Bootstrap::getObjectManager()->configure( + [ + 'Magento\AdvancedSearch\Block\Suggestions' => [ + 'arguments' => [ + 'title' => 'Search Data Title', + ] + ], + 'preferences' => [ + 'Magento\Solr\Model\DataProvider\Suggestions' => + 'Magento\AdvancedSearch\Block\SuggestedQueriesMock', + ] + ] + ); + $layout = Bootstrap::getObjectManager()->get('Magento\Framework\View\LayoutInterface'); + $this->block = $layout->createBlock('Magento\AdvancedSearch\Block\Suggestions'); + $this->block->setNameInLayout('suggestions'); + } + + /** + * @return void + */ + public function testRenderEscaping() + { + /** @var \Magento\AdvancedSearch\Block\SuggestedQueriesMock $dataProvider */ + $dataProvider = Bootstrap::getObjectManager()->get('Magento\Solr\Model\DataProvider\Suggestions'); + + $dataProvider->setItems( + [ + 'test item', + "" + ] + ); + + $html = $this->block->getBlockHtml('suggestions'); + + $this->assertContains('test+item', $html); + $this->assertContains('test item', $html); + + $this->assertNotContains('", 1) + ]); - Bootstrap::getObjectManager()->get('Magento\Framework\App\State')->setAreaCode('frontend'); - Bootstrap::getObjectManager()->configure( - [ - 'Magento\AdvancedSearch\Block\Suggestions' => [ - 'arguments' => [ - 'title' => 'Search Data Title', - ] - ], - 'preferences' => [ - 'Magento\Solr\Model\DataProvider\Suggestions' => - 'Magento\AdvancedSearch\Block\SuggestedQueriesMock', - ] - ] - ); - $layout = Bootstrap::getObjectManager()->get('Magento\Framework\View\LayoutInterface'); - $this->block = $layout->createBlock('Magento\AdvancedSearch\Block\Suggestions'); + Bootstrap::getObjectManager()->removeSharedInstance(SuggestionsDataProvider::CLASS); + Bootstrap::getObjectManager()->addSharedInstance($suggestions, SuggestionsDataProvider::CLASS); + + $this->block = Bootstrap::getObjectManager()->get(LayoutInterface::CLASS)->createBlock(Suggestions::CLASS); $this->block->setNameInLayout('suggestions'); } - /** - * @return void - */ - public function testRenderEscaping() + protected function tearDown() { - /** @var \Magento\AdvancedSearch\Block\SuggestedQueriesMock $dataProvider */ - $dataProvider = Bootstrap::getObjectManager()->get('Magento\Solr\Model\DataProvider\Suggestions'); - - $dataProvider->setItems( - [ - 'test item', - "" - ] - ); + Bootstrap::getObjectManager()->removeSharedInstance(SuggestionsDataProvider::CLASS); + } + public function testRenderEscaping() + { $html = $this->block->getBlockHtml('suggestions'); $this->assertContains('test+item', $html); From 670761d2efc4a1b3674bc344c0ada0c0319bdb4c Mon Sep 17 00:00:00 2001 From: Evgeniy Kolesov Date: Fri, 19 Jun 2015 16:04:15 +0300 Subject: [PATCH 050/616] MAGETWO-33536: M2 GitHub Update (version 0.74.0-beta14) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 9524c50ee7751..34f1559bf8732 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta13", - "magento/module-search": "0.74.0-beta13", - "magento/module-backend": "0.74.0-beta13", - "magento/module-store": "0.74.0-beta13", - "magento/module-catalog": "0.74.0-beta13", - "magento/module-catalog-search": "0.74.0-beta13", + "magento/framework": "0.74.0-beta14", + "magento/module-search": "0.74.0-beta14", + "magento/module-backend": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta14", + "magento/module-catalog-search": "0.74.0-beta14", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta13", + "version": "0.74.0-beta14", "license": [ "proprietary" ], From 5534b57b9bbc7278c9f14c354b55f11ce7ff9cef Mon Sep 17 00:00:00 2001 From: David Alger Date: Mon, 22 Jun 2015 11:21:51 -0500 Subject: [PATCH 051/616] MAGETWO-39000 Responsive email templates in Blank Theme (EE only) - regenerated en_US locale files prior to updating templates to use localization directives --- i18n/en_US.csv | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 i18n/en_US.csv diff --git a/i18n/en_US.csv b/i18n/en_US.csv new file mode 100644 index 0000000000000..c119b13592a77 --- /dev/null +++ b/i18n/en_US.csv @@ -0,0 +1,21 @@ +"Related Search Terms","Related Search Terms" +"Add New Search Term","Add New Search Term" +"Enable Search Recommendations","Enable Search Recommendations" +"When you enable this option your site may slow down.","When you enable this option your site may slow down." +"Search Recommendations Count","Search Recommendations Count" +"Show Results Count for Each Recommendation","Show Results Count for Each Recommendation" +"Enable Search Suggestions","Enable Search Suggestions" +"Search Suggestions Count","Search Suggestions Count" +"Show Results Count for Each Suggestion","Show Results Count for Each Suggestion" +ID,ID +"Search Query","Search Query" +Store,Store +Results,Results +Uses,Uses +Synonym,Synonym +"Redirect URL","Redirect URL" +"Suggested Term","Suggested Term" +Yes,Yes +No,No +Action,Action +Edit,Edit From 4ff84d21b02ffb897edbf6ffadc1bc9f26a56a4d Mon Sep 17 00:00:00 2001 From: Natalia Momotenko Date: Fri, 26 Jun 2015 18:58:53 +0300 Subject: [PATCH 052/616] MAGETWO-33537: M2 GitHub Update (version 0.74.0-beta15) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 34f1559bf8732..fbe7188a24e0a 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta14", - "magento/module-search": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-catalog-search": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", + "magento/module-search": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-search": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "proprietary" ], From b4898e93cdd349a2c7f4d23ad2bef23106b50eb5 Mon Sep 17 00:00:00 2001 From: Vladimir Pelipenko Date: Fri, 3 Jul 2015 16:11:18 +0300 Subject: [PATCH 053/616] MAGETWO-33538: M2 GitHub Update (version 0.74.0-beta16) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index fbe7188a24e0a..830a854d6648f 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta15", - "magento/module-search": "0.74.0-beta15", - "magento/module-backend": "0.74.0-beta15", - "magento/module-store": "0.74.0-beta15", - "magento/module-catalog": "0.74.0-beta15", - "magento/module-catalog-search": "0.74.0-beta15", + "magento/framework": "0.74.0-beta16", + "magento/module-search": "0.74.0-beta16", + "magento/module-backend": "0.74.0-beta16", + "magento/module-store": "0.74.0-beta16", + "magento/module-catalog": "0.74.0-beta16", + "magento/module-catalog-search": "0.74.0-beta16", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta15", + "version": "0.74.0-beta16", "license": [ "proprietary" ], From 74b53b3a1dd9308ba9425a54c5b53ee32acc79fe Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Fri, 3 Jul 2015 12:47:55 -0500 Subject: [PATCH 054/616] Revert "MAGETWO-39000 Responsive email templates in Blank Theme (EE only)" This reverts commit 7a60511665540b134896f00558da6560fc3f07e3. Conflicts: app/code/Magento/Rma/i18n/en_US.csv --- i18n/en_US.csv | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 i18n/en_US.csv diff --git a/i18n/en_US.csv b/i18n/en_US.csv deleted file mode 100644 index c119b13592a77..0000000000000 --- a/i18n/en_US.csv +++ /dev/null @@ -1,21 +0,0 @@ -"Related Search Terms","Related Search Terms" -"Add New Search Term","Add New Search Term" -"Enable Search Recommendations","Enable Search Recommendations" -"When you enable this option your site may slow down.","When you enable this option your site may slow down." -"Search Recommendations Count","Search Recommendations Count" -"Show Results Count for Each Recommendation","Show Results Count for Each Recommendation" -"Enable Search Suggestions","Enable Search Suggestions" -"Search Suggestions Count","Search Suggestions Count" -"Show Results Count for Each Suggestion","Show Results Count for Each Suggestion" -ID,ID -"Search Query","Search Query" -Store,Store -Results,Results -Uses,Uses -Synonym,Synonym -"Redirect URL","Redirect URL" -"Suggested Term","Suggested Term" -Yes,Yes -No,No -Action,Action -Edit,Edit From 8a417c2e557c2bad2e9914ee8d84fd973accec92 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Fri, 10 Jul 2015 14:13:42 +0300 Subject: [PATCH 055/616] MAGETWO-38343: Arbitrary code execution in "Related search terms" block -- fix integration tests --- Block/SuggestionsTest.php | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Block/SuggestionsTest.php b/Block/SuggestionsTest.php index ce52c24d6a423..5ec0457ce74e5 100644 --- a/Block/SuggestionsTest.php +++ b/Block/SuggestionsTest.php @@ -8,7 +8,6 @@ use Magento\TestFramework\Helper\Bootstrap; use Magento\Search\Model\QueryResult; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; -use Magento\Solr\Model\DataProvider\Suggestions as SuggestionsDataProvider; use Magento\Framework\View\LayoutInterface; /** @@ -16,32 +15,26 @@ */ class SuggestionsTest extends \PHPUnit_Framework_TestCase { - /** @var Suggestions */ + /** @var \Magento\AdvancedSearch\Block\Suggestions */ protected $block; protected function setUp() { - $suggestions = $this->getMock(SuggestedQueriesInterface::CLASS); - $suggestions->expects($this->any())->method('getItems')->willReturn([ + $suggestedQueries = $this->getMock(SuggestedQueriesInterface::CLASS); + $suggestedQueries->expects($this->any())->method('getItems')->willReturn([ new QueryResult('test item', 1), new QueryResult("", 1) ]); - Bootstrap::getObjectManager()->removeSharedInstance(SuggestionsDataProvider::CLASS); - Bootstrap::getObjectManager()->addSharedInstance($suggestions, SuggestionsDataProvider::CLASS); - - $this->block = Bootstrap::getObjectManager()->get(LayoutInterface::CLASS)->createBlock(Suggestions::CLASS); - $this->block->setNameInLayout('suggestions'); - } - - protected function tearDown() - { - Bootstrap::getObjectManager()->removeSharedInstance(SuggestionsDataProvider::CLASS); + $this->block = Bootstrap::getObjectManager()->create('Magento\AdvancedSearch\Block\Suggestions', [ + 'searchDataProvider' => $suggestedQueries, + 'title' => 'title', + ]); } public function testRenderEscaping() { - $html = $this->block->getBlockHtml('suggestions'); + $html = $this->block->toHtml(); $this->assertContains('test+item', $html); $this->assertContains('test item', $html); From 2d375cb87088cdc33f9084e5b514baa88b406695 Mon Sep 17 00:00:00 2001 From: Vladimir Pelipenko Date: Wed, 15 Jul 2015 16:51:00 +0300 Subject: [PATCH 056/616] MAGETWO-40129: M2 GitHub Update (version 1.0.0-beta) --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 830a854d6648f..34a3ac9d6c88b 100644 --- a/composer.json +++ b/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta16", - "magento/module-search": "0.74.0-beta16", - "magento/module-backend": "0.74.0-beta16", - "magento/module-store": "0.74.0-beta16", - "magento/module-catalog": "0.74.0-beta16", - "magento/module-catalog-search": "0.74.0-beta16", + "magento/framework": "1.0.0-beta", + "magento/module-search": "1.0.0-beta", + "magento/module-backend": "1.0.0-beta", + "magento/module-store": "1.0.0-beta", + "magento/module-catalog": "1.0.0-beta", + "magento/module-catalog-search": "1.0.0-beta", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta16", + "version": "1.0.0-beta", "license": [ "proprietary" ], From 51471354a30e0597c4b17545e3e7ca6ff7c350fb Mon Sep 17 00:00:00 2001 From: Andrii Kasian Date: Sun, 19 Jul 2015 18:20:17 +0300 Subject: [PATCH 057/616] MAGETWO-40014: Unify connection interface EE modules --- Model/Resource/Recommendations.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index a253e23c527fa..db053dd635e51 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -57,7 +57,7 @@ protected function _construct() */ public function saveRelatedQueries($queryId, $relatedQueries = []) { - $adapter = $this->_getWriteAdapter(); + $adapter = $this->getConnection(); $whereOr = []; if (count($relatedQueries) > 0) { $whereOr[] = implode( @@ -100,7 +100,7 @@ public function saveRelatedQueries($queryId, $relatedQueries = []) public function getRelatedQueries($queryId, $limit = false, $order = false) { $collection = $this->_searchQueryModel->getResourceCollection(); - $adapter = $this->_getReadAdapter(); + $adapter = $this->getConnection(); $queryIdCond = $adapter->quoteInto('main_table.query_id IN (?)', $queryId); @@ -143,7 +143,7 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation $relatedQueriesIds = $this->loadByQuery($query, $searchRecommendationsCount); $relatedQueries = []; if (count($relatedQueriesIds)) { - $adapter = $this->_getReadAdapter(); + $adapter = $this->getConnection(); $mainTable = $this->_searchQueryModel->getResourceCollection()->getMainTable(); $select = $adapter->select()->from( ['main_table' => $mainTable], @@ -169,7 +169,7 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation */ protected function loadByQuery($query, $searchRecommendationsCount) { - $adapter = $this->_getReadAdapter(); + $adapter = $this->getConnection(); $queryId = $this->_searchQueryModel->getId(); $relatedQueries = $this->getRelatedQueries($queryId, $searchRecommendationsCount, 'num_results DESC'); if ($searchRecommendationsCount - count($relatedQueries) < 1) { From f0ac3243c63388dce29ccdbffb04307d8c2c3d05 Mon Sep 17 00:00:00 2001 From: Volodymyr Kholoshenko Date: Wed, 22 Jul 2015 12:20:13 +0300 Subject: [PATCH 058/616] MAGETWO-40435: Rename resourcePrefix to connectionName properties and variables --- Model/Resource/Recommendations.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index db053dd635e51..8194b88508298 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -27,14 +27,14 @@ class Recommendations extends \Magento\Framework\Model\Resource\Db\AbstractDb * * @param \Magento\Framework\Model\Resource\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory - * @param string|null $resourcePrefix + * @param string|null $connectionName */ public function __construct( \Magento\Framework\Model\Resource\Db\Context $context, \Magento\Search\Model\QueryFactory $queryFactory, - $resourcePrefix = null + $connectionName = null ) { - parent::__construct($context, $resourcePrefix); + parent::__construct($context, $connectionName); $this->_searchQueryModel = $queryFactory->create(); } From 732cf3034f6141115cd8b4375e9b1764f5a93ab3 Mon Sep 17 00:00:00 2001 From: Volodymyr Kholoshenko Date: Wed, 22 Jul 2015 15:22:38 +0300 Subject: [PATCH 059/616] MAGETWO-40435: Rename resourcePrefix to connectionName properties and variables --- Model/Resource/Recommendations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index 8194b88508298..746a11a1ab6d7 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -27,7 +27,7 @@ class Recommendations extends \Magento\Framework\Model\Resource\Db\AbstractDb * * @param \Magento\Framework\Model\Resource\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory - * @param string|null $connectionName + * @param string $connectionName */ public function __construct( \Magento\Framework\Model\Resource\Db\Context $context, From 22bf868e6dedb2fa34fb47e6a6f9c16e2be4a50c Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Wed, 22 Jul 2015 18:42:52 +0300 Subject: [PATCH 060/616] MAGETWO-40663: Rename all Adapter* variables and properties to Connection --- Model/Resource/Recommendations.php | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index db053dd635e51..b6996e0d6a381 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -57,34 +57,34 @@ protected function _construct() */ public function saveRelatedQueries($queryId, $relatedQueries = []) { - $adapter = $this->getConnection(); + $connection = $this->getConnection(); $whereOr = []; if (count($relatedQueries) > 0) { $whereOr[] = implode( ' AND ', [ - $adapter->quoteInto('query_id=?', $queryId), - $adapter->quoteInto('relation_id NOT IN(?)', $relatedQueries) + $connection->quoteInto('query_id=?', $queryId), + $connection->quoteInto('relation_id NOT IN(?)', $relatedQueries) ] ); $whereOr[] = implode( ' AND ', [ - $adapter->quoteInto('relation_id = ?', $queryId), - $adapter->quoteInto('query_id NOT IN(?)', $relatedQueries) + $connection->quoteInto('relation_id = ?', $queryId), + $connection->quoteInto('query_id NOT IN(?)', $relatedQueries) ] ); } else { - $whereOr[] = $adapter->quoteInto('query_id = ?', $queryId); - $whereOr[] = $adapter->quoteInto('relation_id = ?', $queryId); + $whereOr[] = $connection->quoteInto('query_id = ?', $queryId); + $whereOr[] = $connection->quoteInto('relation_id = ?', $queryId); } $whereCond = '(' . implode(') OR (', $whereOr) . ')'; - $adapter->delete($this->getMainTable(), $whereCond); + $connection->delete($this->getMainTable(), $whereCond); $existsRelatedQueries = $this->getRelatedQueries($queryId); $neededRelatedQueries = array_diff($relatedQueries, $existsRelatedQueries); foreach ($neededRelatedQueries as $relationId) { - $adapter->insert($this->getMainTable(), ["query_id" => $queryId, "relation_id" => $relationId]); + $connection->insert($this->getMainTable(), ["query_id" => $queryId, "relation_id" => $relationId]); } return $this; } @@ -100,9 +100,9 @@ public function saveRelatedQueries($queryId, $relatedQueries = []) public function getRelatedQueries($queryId, $limit = false, $order = false) { $collection = $this->_searchQueryModel->getResourceCollection(); - $adapter = $this->getConnection(); + $connection = $this->getConnection(); - $queryIdCond = $adapter->quoteInto('main_table.query_id IN (?)', $queryId); + $queryIdCond = $connection->quoteInto('main_table.query_id IN (?)', $queryId); $collection->getSelect()->join( ['sr' => $collection->getTable('catalogsearch_recommendations')], @@ -111,7 +111,7 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) \Zend_Db_Select::COLUMNS )->columns( [ - 'rel_id' => $adapter->getCheckSql('main_table.query_id=sr.query_id', 'sr.relation_id', 'sr.query_id'), + 'rel_id' => $connection->getCheckSql('main_table.query_id=sr.query_id', 'sr.relation_id', 'sr.query_id'), ] ); if (!empty($limit)) { @@ -121,7 +121,7 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) $collection->getSelect()->order($order); } - $queryIds = $adapter->fetchCol($collection->getSelect()); + $queryIds = $connection->fetchCol($collection->getSelect()); return $queryIds; } @@ -143,9 +143,9 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation $relatedQueriesIds = $this->loadByQuery($query, $searchRecommendationsCount); $relatedQueries = []; if (count($relatedQueriesIds)) { - $adapter = $this->getConnection(); + $connection = $this->getConnection(); $mainTable = $this->_searchQueryModel->getResourceCollection()->getMainTable(); - $select = $adapter->select()->from( + $select = $connection->select()->from( ['main_table' => $mainTable], ['query_text', 'num_results'] )->where( @@ -154,7 +154,7 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation )->where( 'num_results > 0' ); - $relatedQueries = $adapter->fetchAll($select); + $relatedQueries = $connection->fetchAll($select); } return $relatedQueries; @@ -169,7 +169,7 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation */ protected function loadByQuery($query, $searchRecommendationsCount) { - $adapter = $this->getConnection(); + $connection = $this->getConnection(); $queryId = $this->_searchQueryModel->getId(); $relatedQueries = $this->getRelatedQueries($queryId, $searchRecommendationsCount, 'num_results DESC'); if ($searchRecommendationsCount - count($relatedQueries) < 1) { @@ -189,11 +189,11 @@ protected function loadByQuery($query, $searchRecommendationsCount) $likeCondition = []; foreach ($queryWords as $word) { - $likeCondition[] = $adapter->quoteInto('query_text LIKE ?', $word . '%'); + $likeCondition[] = $connection->quoteInto('query_text LIKE ?', $word . '%'); } $likeCondition = implode(' OR ', $likeCondition); - $select = $adapter->select()->from( + $select = $connection->select()->from( $this->_searchQueryModel->getResource()->getMainTable(), ['query_id'] )->where( @@ -206,7 +206,7 @@ protected function loadByQuery($query, $searchRecommendationsCount) )->limit( $searchRecommendationsCount + 1 ); - $ids = $adapter->fetchCol($select); + $ids = $connection->fetchCol($select); if (!is_array($ids)) { $ids = []; From 374b0cf8342b3b36f0d2b5b07950320048b2f1a9 Mon Sep 17 00:00:00 2001 From: Roman Ganin Date: Thu, 23 Jul 2015 12:58:08 +0300 Subject: [PATCH 061/616] MAGETWO-40663: Rename all Adapter* variables and properties to Connection - fixed codestyle and unit tests --- Model/Resource/Recommendations.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index b6996e0d6a381..9482f421747b4 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -111,7 +111,11 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) \Zend_Db_Select::COLUMNS )->columns( [ - 'rel_id' => $connection->getCheckSql('main_table.query_id=sr.query_id', 'sr.relation_id', 'sr.query_id'), + 'rel_id' => $connection->getCheckSql( + 'main_table.query_id=sr.query_id', + 'sr.relation_id', + 'sr.query_id' + ), ] ); if (!empty($limit)) { From cf2a2347d1d93817191b562e8d94d4875943fb9d Mon Sep 17 00:00:00 2001 From: Volodymyr Kholoshenko Date: Thu, 23 Jul 2015 14:27:43 +0300 Subject: [PATCH 062/616] MAGETWO-40678: Replace Zend_Db_Select with Magento\Framework\DB\Select in \Magento\Framework\Data\Collection\Db\FetchStrategyInterface --- Model/Resource/Recommendations.php | 2 +- Model/Resource/Search/Grid/Collection.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/Resource/Recommendations.php b/Model/Resource/Recommendations.php index db053dd635e51..6d78dbfe9ced2 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/Resource/Recommendations.php @@ -108,7 +108,7 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) ['sr' => $collection->getTable('catalogsearch_recommendations')], '(sr.query_id=main_table.query_id OR sr.relation_id=main_table.query_id) AND ' . $queryIdCond )->reset( - \Zend_Db_Select::COLUMNS + \Magento\Framework\DB\Select::COLUMNS )->columns( [ 'rel_id' => $adapter->getCheckSql('main_table.query_id=sr.query_id', 'sr.relation_id', 'sr.query_id'), diff --git a/Model/Resource/Search/Grid/Collection.php b/Model/Resource/Search/Grid/Collection.php index 0c0fb5e80167f..fedbb038ccdad 100644 --- a/Model/Resource/Search/Grid/Collection.php +++ b/Model/Resource/Search/Grid/Collection.php @@ -33,7 +33,7 @@ public function __construct( \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Framework\DB\Helper $resourceHelper, \Magento\Framework\Registry $registry, - $connection = null, + \Magento\Framework\DB\Adapter\AdapterInterface $connection = null, $resource = null ) { $this->_registryManager = $registry; From 7ccb7ad7063c78dd4e3014a63d4c1ab4fe6871e1 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Wed, 19 Aug 2015 16:28:59 -0500 Subject: [PATCH 063/616] MAGETWO-41762: [php 7.0] Can't update composer if EE linked version - adding support for php 7.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 34a3ac9d6c88b..8d36f85c06107 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-advanced-search", "description": "N/A", "require": { - "php": "~5.5.0|~5.6.0", + "php": "~5.5.0|~5.6.0|~7.0.0", "magento/framework": "1.0.0-beta", "magento/module-search": "1.0.0-beta", "magento/module-backend": "1.0.0-beta", From a1bb1aae3bbbdcdeb20f3fd37945a25f439cc0ea Mon Sep 17 00:00:00 2001 From: Joan He Date: Tue, 8 Sep 2015 23:11:13 -0500 Subject: [PATCH 064/616] MAGETWO-42282: updated composer.json for each package --- composer.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 34a3ac9d6c88b..537bf441ec853 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,7 @@ "license": [ "proprietary" ], - "extra": { - "map": [ - [ - "*", - "Magento/AdvancedSearch" - ] - ] + "autoload": { + "files": [ "registration.php" ] } } From 9320c18057cfbc73891b4a4af82bd00dae788821 Mon Sep 17 00:00:00 2001 From: Joan He Date: Wed, 9 Sep 2015 15:47:00 -0500 Subject: [PATCH 065/616] MAGETWO-42281: added registrar file to each package --- registration.php | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 registration.php diff --git a/registration.php b/registration.php new file mode 100644 index 0000000000000..322d426a2ec2a --- /dev/null +++ b/registration.php @@ -0,0 +1,11 @@ + Date: Thu, 10 Sep 2015 16:18:09 -0500 Subject: [PATCH 066/616] MAGETWO-42196: Magento components loaded from vendor directory - XSD filepath resolution - Path references to .xsd files are substituted by URNs --- etc/adminhtml/events.xml | 2 +- etc/adminhtml/system.xml | 2 +- etc/config.xml | 2 +- etc/di.xml | 2 +- etc/module.xml | 2 +- view/adminhtml/layout/catalog_search_block.xml | 2 +- view/adminhtml/layout/catalog_search_edit.xml | 2 +- view/adminhtml/layout/catalog_search_relatedgrid.xml | 2 +- view/frontend/layout/catalogsearch_result_index.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml index 6b61068123790..9ec685e5477ff 100644 --- a/etc/adminhtml/events.xml +++ b/etc/adminhtml/events.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:library:framework:Event/etc/events.xsd"> + xsi:noNamespaceSchemaLocation="urn:magento:module:config:etc/system_file.xsd">
diff --git a/etc/config.xml b/etc/config.xml index eb9ef331523d4..f9f7ae72c7f73 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/etc/di.xml b/etc/di.xml index 239aceec97202..bee9e0197e7df 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -5,7 +5,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:library:framework:ObjectManager/etc/config.xsd"> Magento\AdvancedSearch\Model\Recommendations\DataProvider diff --git a/etc/module.xml b/etc/module.xml index 6f5cf270154e9..2a9399ea763fe 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:library:framework:Module/etc/module.xsd"> diff --git a/view/adminhtml/layout/catalog_search_block.xml b/view/adminhtml/layout/catalog_search_block.xml index d0bc0b0d7c7aa..dc38737324e90 100644 --- a/view/adminhtml/layout/catalog_search_block.xml +++ b/view/adminhtml/layout/catalog_search_block.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/view/adminhtml/layout/catalog_search_edit.xml b/view/adminhtml/layout/catalog_search_edit.xml index c0ebcdbd95c6b..bbd56b1c90854 100644 --- a/view/adminhtml/layout/catalog_search_edit.xml +++ b/view/adminhtml/layout/catalog_search_edit.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/view/adminhtml/layout/catalog_search_relatedgrid.xml b/view/adminhtml/layout/catalog_search_relatedgrid.xml index 48d015ad4f158..2c55565b8fdb5 100644 --- a/view/adminhtml/layout/catalog_search_relatedgrid.xml +++ b/view/adminhtml/layout/catalog_search_relatedgrid.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/view/frontend/layout/catalogsearch_result_index.xml b/view/frontend/layout/catalogsearch_result_index.xml index 10fcba00c2fc6..69a6136eafd63 100644 --- a/view/frontend/layout/catalogsearch_result_index.xml +++ b/view/frontend/layout/catalogsearch_result_index.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:library:framework:View/Layout/etc/page_configuration.xsd"> From ce59120a56064643ba0837bfc2e9d34c3287977b Mon Sep 17 00:00:00 2001 From: Viktor Tymchynskyi Date: Fri, 11 Sep 2015 14:08:28 +0300 Subject: [PATCH 067/616] MAGETWO-41781: Create static test - Xss potentially unsafe outputs in *.phtml templates are marked by /* @escapeNotVerified */ annotation --- view/frontend/templates/search_data.phtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml index ffd295597e32e..2dc2cb22a5a74 100644 --- a/view/frontend/templates/search_data.phtml +++ b/view/frontend/templates/search_data.phtml @@ -13,13 +13,13 @@ $data = $block->getItems(); if (count($data)):?>
-
getTitle()); ?>
+
getTitle()); ?>
- escapeHtml($additionalInfo->getQueryText()) ?> isShowResultsCount()): ?> - getResultsCount() ?> + getResultsCount() ?>
From d9c17cea77526811fae781cec02149dd0d464514 Mon Sep 17 00:00:00 2001 From: Eddie Lau Date: Mon, 14 Sep 2015 19:46:39 -0500 Subject: [PATCH 068/616] MAGETWO-42265: Fix code that depends on module location - added autoload section --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 537bf441ec853..1e19d90b9b662 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,9 @@ "proprietary" ], "autoload": { - "files": [ "registration.php" ] + "files": [ "registration.php" ], + "psr-4": { + "Magento\\AdvancedSearch\\": "" + } } } From 7fc4c590b05b45f008e99d13c509df7c8179e817 Mon Sep 17 00:00:00 2001 From: Maksym Savich Date: Thu, 17 Sep 2015 18:38:03 -0500 Subject: [PATCH 069/616] MAGETWO-42855: XSD URN format --- etc/adminhtml/events.xml | 2 +- etc/adminhtml/system.xml | 2 +- etc/config.xml | 2 +- etc/di.xml | 2 +- etc/module.xml | 2 +- view/adminhtml/layout/catalog_search_block.xml | 2 +- view/adminhtml/layout/catalog_search_edit.xml | 2 +- view/adminhtml/layout/catalog_search_relatedgrid.xml | 2 +- view/frontend/layout/catalogsearch_result_index.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml index 9ec685e5477ff..26e85ff78173f 100644 --- a/etc/adminhtml/events.xml +++ b/etc/adminhtml/events.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd"> + xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
diff --git a/etc/config.xml b/etc/config.xml index f9f7ae72c7f73..b5ff38ec74a3f 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/etc/di.xml b/etc/di.xml index bee9e0197e7df..647d191ef5f6d 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -5,7 +5,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd"> Magento\AdvancedSearch\Model\Recommendations\DataProvider diff --git a/etc/module.xml b/etc/module.xml index 2a9399ea763fe..bf37579aeca0f 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> diff --git a/view/adminhtml/layout/catalog_search_block.xml b/view/adminhtml/layout/catalog_search_block.xml index dc38737324e90..f85510984c89c 100644 --- a/view/adminhtml/layout/catalog_search_block.xml +++ b/view/adminhtml/layout/catalog_search_block.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/view/adminhtml/layout/catalog_search_edit.xml b/view/adminhtml/layout/catalog_search_edit.xml index bbd56b1c90854..0d58deca08116 100644 --- a/view/adminhtml/layout/catalog_search_edit.xml +++ b/view/adminhtml/layout/catalog_search_edit.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/view/adminhtml/layout/catalog_search_relatedgrid.xml b/view/adminhtml/layout/catalog_search_relatedgrid.xml index 2c55565b8fdb5..731478ab21209 100644 --- a/view/adminhtml/layout/catalog_search_relatedgrid.xml +++ b/view/adminhtml/layout/catalog_search_relatedgrid.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + diff --git a/view/frontend/layout/catalogsearch_result_index.xml b/view/frontend/layout/catalogsearch_result_index.xml index 69a6136eafd63..b6bf78d16fda4 100644 --- a/view/frontend/layout/catalogsearch_result_index.xml +++ b/view/frontend/layout/catalogsearch_result_index.xml @@ -6,7 +6,7 @@ */ --> + xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"> From dc1a4afb0513e741131cedf1b81eec74c126eb3f Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Wed, 23 Sep 2015 17:33:31 -0500 Subject: [PATCH 070/616] MAGETWO-43225: Remove references to magento/magento-composer-installer - removing magento-composer-installer --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 81e27396135d4..04f764082c7d7 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,7 @@ "magento/module-backend": "1.0.0-beta", "magento/module-store": "1.0.0-beta", "magento/module-catalog": "1.0.0-beta", - "magento/module-catalog-search": "1.0.0-beta", - "magento/magento-composer-installer": "*" + "magento/module-catalog-search": "1.0.0-beta" }, "type": "magento2-module", "version": "1.0.0-beta", From 010709ad129582b1beb224c852ba35233761fcb7 Mon Sep 17 00:00:00 2001 From: Valeriy Nayda Date: Fri, 2 Oct 2015 18:10:36 +0300 Subject: [PATCH 071/616] MAGETWO-43425: Splitting observers Part 4 (TD) - squash commit --- .../{Observer.php => SaveSearchQueryRelationsObserver.php} | 5 +++-- etc/adminhtml/events.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename Model/Recommendations/{Observer.php => SaveSearchQueryRelationsObserver.php} (87%) diff --git a/Model/Recommendations/Observer.php b/Model/Recommendations/SaveSearchQueryRelationsObserver.php similarity index 87% rename from Model/Recommendations/Observer.php rename to Model/Recommendations/SaveSearchQueryRelationsObserver.php index c3bd6117a40b0..aceda40441baf 100644 --- a/Model/Recommendations/Observer.php +++ b/Model/Recommendations/SaveSearchQueryRelationsObserver.php @@ -7,8 +7,9 @@ use Magento\AdvancedSearch\Model\Resource\RecommendationsFactory; use Magento\Framework\Event\Observer as EventObserver; +use Magento\Framework\Event\ObserverInterface; -class Observer +class SaveSearchQueryRelationsObserver implements ObserverInterface { /** @@ -30,7 +31,7 @@ public function __construct(RecommendationsFactory $recommendationsFactory) * @param EventObserver $observer * @return void */ - public function searchQueryEditFormAfterSave(EventObserver $observer) + public function execute(EventObserver $observer) { $searchQueryModel = $observer->getEvent()->getDataObject(); $queryId = $searchQueryModel->getId(); diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml index 6b61068123790..8964c2c3eba26 100644 --- a/etc/adminhtml/events.xml +++ b/etc/adminhtml/events.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd"> + instance="Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver" + method="execute"/> From 618435146e9067ffc01b22d4314aaeda5983ca5e Mon Sep 17 00:00:00 2001 From: Serhiy Shkolyarenko Date: Tue, 6 Oct 2015 17:38:15 +0300 Subject: [PATCH 072/616] MAGETWO-41527: PHP 7 namespace strict compatibility - Updated Magento_AdvancedSearch module for PHP 7 compatibility --- Model/Adminhtml/Search/Grid/Options.php | 6 +++--- Model/Recommendations/DataProvider.php | 8 ++++---- .../Recommendations/SaveSearchQueryRelationsObserver.php | 2 +- Model/{Resource => ResourceModel}/Recommendations.php | 2 +- .../Search/Grid/Collection.php | 2 +- view/adminhtml/layout/catalog_search_block.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename Model/{Resource => ResourceModel}/Recommendations.php (99%) rename Model/{Resource => ResourceModel}/Search/Grid/Collection.php (97%) diff --git a/Model/Adminhtml/Search/Grid/Options.php b/Model/Adminhtml/Search/Grid/Options.php index 66c909951c27b..becb9d969ddda 100644 --- a/Model/Adminhtml/Search/Grid/Options.php +++ b/Model/Adminhtml/Search/Grid/Options.php @@ -20,19 +20,19 @@ class Options implements \Magento\Framework\Option\ArrayInterface protected $_registryManager; /** - * @var \Magento\AdvancedSearch\Model\Resource\Recommendations $_searchResourceModel + * @var \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $_searchResourceModel */ protected $_searchResourceModel; /** * @param \Magento\Framework\App\RequestInterface $request * @param \Magento\Framework\Registry $registry - * @param \Magento\AdvancedSearch\Model\Resource\Recommendations $searchResourceModel + * @param \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $searchResourceModel */ public function __construct( \Magento\Framework\App\RequestInterface $request, \Magento\Framework\Registry $registry, - \Magento\AdvancedSearch\Model\Resource\Recommendations $searchResourceModel + \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $searchResourceModel ) { $this->_request = $request; $this->_registryManager = $registry; diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index 9e0c7a052e356..3c77ea3240363 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -32,20 +32,20 @@ class DataProvider implements SuggestedQueriesInterface private $scopeConfig; /** - * @var \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory + * @var \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory */ private $recommendationsFactory; /** * @param ScopeConfigInterface $scopeConfig * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver - * @param \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory $recommendationsFactory + * @param \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory * @param \Magento\Search\Model\QueryResultFactory $queryResultFactory */ public function __construct( ScopeConfigInterface $scopeConfig, \Magento\Catalog\Model\Layer\Resolver $layerResolver, - \Magento\AdvancedSearch\Model\Resource\RecommendationsFactory $recommendationsFactory, + \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory, \Magento\Search\Model\QueryResultFactory $queryResultFactory ) { $this->scopeConfig = $scopeConfig; @@ -99,7 +99,7 @@ private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $ $productCollection = $this->searchLayer->getProductCollection(); $params = ['store_id' => $productCollection->getStoreId()]; - /** @var \Magento\AdvancedSearch\Model\Resource\Recommendations $recommendationsResource */ + /** @var \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $recommendationsResource */ $recommendationsResource = $this->recommendationsFactory->create(); $recommendations = $recommendationsResource->getRecommendationsByQuery( $query->getQueryText(), diff --git a/Model/Recommendations/SaveSearchQueryRelationsObserver.php b/Model/Recommendations/SaveSearchQueryRelationsObserver.php index aceda40441baf..c770deadf689e 100644 --- a/Model/Recommendations/SaveSearchQueryRelationsObserver.php +++ b/Model/Recommendations/SaveSearchQueryRelationsObserver.php @@ -5,7 +5,7 @@ */ namespace Magento\AdvancedSearch\Model\Recommendations; -use Magento\AdvancedSearch\Model\Resource\RecommendationsFactory; +use Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory; use Magento\Framework\Event\Observer as EventObserver; use Magento\Framework\Event\ObserverInterface; diff --git a/Model/Resource/Recommendations.php b/Model/ResourceModel/Recommendations.php similarity index 99% rename from Model/Resource/Recommendations.php rename to Model/ResourceModel/Recommendations.php index f882eb1c3a4a6..d9adc9de1f820 100644 --- a/Model/Resource/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\AdvancedSearch\Model\Resource; +namespace Magento\AdvancedSearch\Model\ResourceModel; use Magento\Framework\Model\Resource\Db\AbstractDb; diff --git a/Model/Resource/Search/Grid/Collection.php b/Model/ResourceModel/Search/Grid/Collection.php similarity index 97% rename from Model/Resource/Search/Grid/Collection.php rename to Model/ResourceModel/Search/Grid/Collection.php index fedbb038ccdad..afd2c3a11f138 100644 --- a/Model/Resource/Search/Grid/Collection.php +++ b/Model/ResourceModel/Search/Grid/Collection.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\AdvancedSearch\Model\Resource\Search\Grid; +namespace Magento\AdvancedSearch\Model\ResourceModel\Search\Grid; class Collection extends \Magento\Search\Model\Resource\Query\Collection { diff --git a/view/adminhtml/layout/catalog_search_block.xml b/view/adminhtml/layout/catalog_search_block.xml index d0bc0b0d7c7aa..a5509c7742b5d 100644 --- a/view/adminhtml/layout/catalog_search_block.xml +++ b/view/adminhtml/layout/catalog_search_block.xml @@ -11,7 +11,7 @@ catalog_search_grid - Magento\AdvancedSearch\Model\Resource\Search\Grid\Collection + Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection name ASC 1 From 9663a5b05e28478fbab2e659827ab33c55f5925f Mon Sep 17 00:00:00 2001 From: Serhiy Shkolyarenko Date: Tue, 6 Oct 2015 17:41:51 +0300 Subject: [PATCH 073/616] MAGETWO-41527: PHP 7 namespace strict compatibility - Updated Magento_Search module for PHP 7 compatibility --- Model/ResourceModel/Search/Grid/Collection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/ResourceModel/Search/Grid/Collection.php b/Model/ResourceModel/Search/Grid/Collection.php index afd2c3a11f138..38060c3d12720 100644 --- a/Model/ResourceModel/Search/Grid/Collection.php +++ b/Model/ResourceModel/Search/Grid/Collection.php @@ -5,7 +5,7 @@ */ namespace Magento\AdvancedSearch\Model\ResourceModel\Search\Grid; -class Collection extends \Magento\Search\Model\Resource\Query\Collection +class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection { /** * Registry manager From 53b8851e683b3252df82e8a0650e94113fc0d96e Mon Sep 17 00:00:00 2001 From: Iryna Lagno Date: Wed, 7 Oct 2015 16:57:23 +0300 Subject: [PATCH 074/616] MAGETWO-41527: PHP 7 namespace strict compatibility --- Model/ResourceModel/Recommendations.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index d9adc9de1f820..8f45c73b684ad 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -5,14 +5,14 @@ */ namespace Magento\AdvancedSearch\Model\ResourceModel; -use Magento\Framework\Model\Resource\Db\AbstractDb; +use Magento\Framework\Model\ResourceModel\Db\AbstractDb; /** * Catalog search recommendations resource model * * @author Magento Core Team */ -class Recommendations extends \Magento\Framework\Model\Resource\Db\AbstractDb +class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { /** @@ -25,12 +25,12 @@ class Recommendations extends \Magento\Framework\Model\Resource\Db\AbstractDb /** * Construct * - * @param \Magento\Framework\Model\Resource\Db\Context $context + * @param \Magento\Framework\Model\ResourceModel\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory * @param string $connectionName */ public function __construct( - \Magento\Framework\Model\Resource\Db\Context $context, + \Magento\Framework\Model\ResourceModel\Db\Context $context, \Magento\Search\Model\QueryFactory $queryFactory, $connectionName = null ) { From 3619698ad93043695543a66ea9fd9a26d46f97aa Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Wed, 7 Oct 2015 19:17:48 +0300 Subject: [PATCH 075/616] MAGETWO-43598: Splitting observers Part 5 (TD) - MAGETWO-43601: Remove attribute "method" from events.xml configs --- etc/adminhtml/events.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml index 8964c2c3eba26..1f7bce17a75cf 100644 --- a/etc/adminhtml/events.xml +++ b/etc/adminhtml/events.xml @@ -10,6 +10,6 @@ + /> From e5bb5b09e579f9db11af0367e990be873e58c4bd Mon Sep 17 00:00:00 2001 From: Serhiy Shkolyarenko Date: Wed, 7 Oct 2015 20:23:10 +0300 Subject: [PATCH 076/616] MAGETWO-41527: PHP 7 namespace strict compatibility renamed ModelResource --- Model/ResourceModel/Recommendations.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index 8f45c73b684ad..89615f7b06def 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -5,14 +5,14 @@ */ namespace Magento\AdvancedSearch\Model\ResourceModel; -use Magento\Framework\Model\ResourceModel\Db\AbstractDb; +use Magento\Framework\Model\ModelResource\Db\AbstractDb; /** * Catalog search recommendations resource model * * @author Magento Core Team */ -class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb +class Recommendations extends \Magento\Framework\Model\ModelResource\Db\AbstractDb { /** @@ -25,12 +25,12 @@ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\Abstract /** * Construct * - * @param \Magento\Framework\Model\ResourceModel\Db\Context $context + * @param \Magento\Framework\Model\ModelResource\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory * @param string $connectionName */ public function __construct( - \Magento\Framework\Model\ResourceModel\Db\Context $context, + \Magento\Framework\Model\ModelResource\Db\Context $context, \Magento\Search\Model\QueryFactory $queryFactory, $connectionName = null ) { From a37b2834d007dc1816e6a78e3f40ed9abf8f4f04 Mon Sep 17 00:00:00 2001 From: Serhiy Shkolyarenko Date: Mon, 12 Oct 2015 11:59:23 +0300 Subject: [PATCH 077/616] MAGETWO-43923: [GitHub]ModelResource namespace inconsistency renamed namespace --- Model/ResourceModel/Recommendations.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index 89615f7b06def..8f45c73b684ad 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -5,14 +5,14 @@ */ namespace Magento\AdvancedSearch\Model\ResourceModel; -use Magento\Framework\Model\ModelResource\Db\AbstractDb; +use Magento\Framework\Model\ResourceModel\Db\AbstractDb; /** * Catalog search recommendations resource model * * @author Magento Core Team */ -class Recommendations extends \Magento\Framework\Model\ModelResource\Db\AbstractDb +class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { /** @@ -25,12 +25,12 @@ class Recommendations extends \Magento\Framework\Model\ModelResource\Db\Abstract /** * Construct * - * @param \Magento\Framework\Model\ModelResource\Db\Context $context + * @param \Magento\Framework\Model\ResourceModel\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory * @param string $connectionName */ public function __construct( - \Magento\Framework\Model\ModelResource\Db\Context $context, + \Magento\Framework\Model\ResourceModel\Db\Context $context, \Magento\Search\Model\QueryFactory $queryFactory, $connectionName = null ) { From 8e5a1f8a61460a056d5adacd696760794c3d5ae3 Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Thu, 5 Nov 2015 15:19:32 +0200 Subject: [PATCH 078/616] MAGETWO-45012: Magento 2.0.0-rc Publication --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 04f764082c7d7..6042e1796869b 100644 --- a/composer.json +++ b/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0|~7.0.0", - "magento/framework": "1.0.0-beta", - "magento/module-search": "1.0.0-beta", - "magento/module-backend": "1.0.0-beta", - "magento/module-store": "1.0.0-beta", - "magento/module-catalog": "1.0.0-beta", - "magento/module-catalog-search": "1.0.0-beta" + "magento/framework": "100.0.0", + "magento/module-search": "100.0.0", + "magento/module-backend": "100.0.0", + "magento/module-store": "100.0.0", + "magento/module-catalog": "100.0.0", + "magento/module-catalog-search": "100.0.0" }, "type": "magento2-module", - "version": "1.0.0-beta", + "version": "100.0.0", "license": [ "proprietary" ], From 6fd9688fe166da4758d9a5d2c4b03f7a89b5cf27 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 6 Nov 2015 15:09:12 +0200 Subject: [PATCH 079/616] PRD-24: Elastic Search Adapter - Create Base Module Structure --- .../System/Config/TestConnection.php | 62 +++ .../System/Config/TestConnection/Ping.php | 104 +++++ LICENSE_EE.txt | 437 ++++++++++++++++++ Model/Client/Elasticsearch.php | 94 ++++ Model/Client/ElasticsearchFactory.php | 38 ++ Model/Config.php | 75 +++ README.md | 2 + SearchAdapter/ConnectionManager.php | 80 ++++ .../System/Config/TestConnection/PingTest.php | 251 ++++++++++ Test/Unit/Model/Client/ElasticsearchTest.php | 66 +++ composer.json | 23 + config/esconfig.xml | 19 + config/protwords.txt | 21 + config/protwords_en_US.txt | 0 config/stopwords.txt | 57 +++ config/stopwords_en_US.txt | 0 config/synonyms.txt | 31 ++ config/synonyms_en_US.txt | 0 etc/adminhtml/di.xml | 22 + etc/adminhtml/routes.xml | 14 + etc/adminhtml/system.xml | 68 +++ etc/config.xml | 20 + etc/module.xml | 16 + registration.php | 11 + view/adminhtml/requirejs-config.js | 12 + .../system/config/testconnection.phtml | 17 + view/adminhtml/web/js/testconnection.js | 67 +++ 27 files changed, 1607 insertions(+) create mode 100755 Block/Adminhtml/System/Config/TestConnection.php create mode 100755 Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php create mode 100755 LICENSE_EE.txt create mode 100755 Model/Client/Elasticsearch.php create mode 100755 Model/Client/ElasticsearchFactory.php create mode 100755 Model/Config.php create mode 100755 README.md create mode 100755 SearchAdapter/ConnectionManager.php create mode 100755 Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php create mode 100755 Test/Unit/Model/Client/ElasticsearchTest.php create mode 100755 composer.json create mode 100755 config/esconfig.xml create mode 100755 config/protwords.txt create mode 100755 config/protwords_en_US.txt create mode 100755 config/stopwords.txt create mode 100755 config/stopwords_en_US.txt create mode 100755 config/synonyms.txt create mode 100755 config/synonyms_en_US.txt create mode 100755 etc/adminhtml/di.xml create mode 100755 etc/adminhtml/routes.xml create mode 100755 etc/adminhtml/system.xml create mode 100755 etc/config.xml create mode 100755 etc/module.xml create mode 100755 registration.php create mode 100755 view/adminhtml/requirejs-config.js create mode 100755 view/adminhtml/templates/system/config/testconnection.phtml create mode 100755 view/adminhtml/web/js/testconnection.js diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php new file mode 100755 index 0000000000000..a560bd789d265 --- /dev/null +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -0,0 +1,62 @@ +getTemplate()) { + $this->setTemplate('system/config/testconnection.phtml'); + } + return $this; + } + + /** + * Unset some non-related element parameters + * + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) + { + $element = clone $element; + $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue(); + return parent::render($element); + } + + /** + * Get the button and scripts contents + * + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) + { + $originalData = $element->getOriginalData(); + $this->addData( + [ + 'button_label' => __($originalData['button_label']), + 'html_id' => $element->getHtmlId(), + 'ajax_url' => $this->_urlBuilder->getUrl('elasticsearch/search_system_config_testconnection/ping'), + ] + ); + + return $this->_toHtml(); + } +} diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php new file mode 100755 index 0000000000000..3534fa0703444 --- /dev/null +++ b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php @@ -0,0 +1,104 @@ +clientFactory = $clientFactory; + $this->clientHelper = $clientHelper; + $this->resultJsonFactory = $resultJsonFactory; + } + + /** + * Check for connection to server + * + * @return \Magento\Framework\Controller\Result\Json + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + public function execute() + { + $result = [ + 'success' => false, + 'error_message' => __('Please check your credentials.') + ]; + $options = [ + 'hostname' => $this->getRequest()->getParam('host'), + 'port' => $this->getRequest()->getParam('port'), + 'auth' => $this->getRequest()->getParam('auth'), + 'username' => $this->getRequest()->getParam('username'), + 'pass' => $this->getRequest()->getParam('pass'), + ]; + if ($this->validateParams($options)) { + $options['timeout'] = (int)$this->getRequest()->getParam('timeout'); + + $result['error_message'] = ''; + try { + $response = $this->clientFactory->create($this->clientHelper->prepareClientOptions($options))->ping(); + if (isset($response['status']) && strcasecmp($response['status'], 'ok') == 0) { + $result['success'] = true; + } + } catch (\Exception $e) { + $result['error_message'] = strip_tags($e->getMessage()); + } + } + /** @var \Magento\Framework\Controller\Result\Json $resultJson */ + $resultJson = $this->resultJsonFactory->create(); + return $resultJson->setData($result); + } + + /** + * Validate options + * + * @param array $params + * @return bool + */ + private function validateParams(array $params) + { + if ($params['auth'] == '0') { + unset($params['username']); + unset($params['pass']); + unset($params['auth']); + } + + return array_reduce($params, function ($valid, $item) { + return $valid && !empty($item); + }, true); + } +} diff --git a/LICENSE_EE.txt b/LICENSE_EE.txt new file mode 100755 index 0000000000000..2bddf5feda6ba --- /dev/null +++ b/LICENSE_EE.txt @@ -0,0 +1,437 @@ +MAGENTO(tm) ENTERPRISE EDITION +END USER LICENSE AGREEMENT + +This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. +through its Magento division ("Magento"), and the Licensee executing the Magento Order Form +(defined below). The parties agree as follows: + +TERMS AND CONDITIONS + +1. License + 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with + other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, + non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of + installing and using it on a computer and solely for internal purposes, in accordance with the + Software's technical documentation and solely during the periods and on the maximum number + of Designated Servers specified in one or more applicable Magento or Magento-authorized + reseller ordering schedules (the "Magento Order Form") executed with Licensee. + + 1.2. In the event that Licensee's actual number of Servers of a particular Software license + exceeds the licensed number of Designated Servers on such license, Licensee shall promptly + provide Magento with written notice and pay Magento the fees required to license such + additional Server(s) in accordance with the commercial terms set out in the Magento Order + Form. + + 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the + maximum number of licensed Servers of the Software. Magento reserves the right to audit + Licensee's use of the Software during normal business hours and with reasonable notice and to + include means within the Software to limit Licensee's use of the Software to the licensed + number of Servers. + + 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated + technical documentation, for use by Licensee in accordance with this Agreement. Subject to + Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server + copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights + under this Agreement. + + 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a + temporary basis without charge any time a Designated Server is inoperative due to a + malfunction beyond the control of Licensee. Licensee may transfer the Software on a + permanent basis to a single replacement Server without charge. Licensee agrees to provide + Magento with written notice, including the Server type and operating system, of any such + transfer to a backup or replacement Server within five (5) days thereafter. + + 1.6. Licensee acknowledges that portions of the Software are also freely available to the public + under Magento's open source version of the Software, known as Magento Community Edition, + subject to certain conditions, with limited warranties and other limited assurances, and without + service or support. As an express condition for the license granted hereunder, Licensee agrees + that any use during the term of this Agreement of such open source versions of the Software, + whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed + use of the Software for purposes of the calculation of fees payable under the Agreement. + + 1.7. Magento also grants Licensee the right to modify and create derivative works of the + Software. Licensee may contribute the rights in any of those derivative works back to Magento. + Licensee may contact Magento for more information regarding contributions of derivative + works rights to Magento. Regardless of whether Licensee contributes such derivative works + rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of + the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and + royalty-free license to reproduce, create derivative works of, distribute, perform, and display + any derivative works of the Software developed by or for Licensee, and to use, make, have + made, sell, offer to sell, import, export, and otherwise exploit any product based on any such + derivative works. + +2. License Exclusions + 2.1 Except as expressly authorized herein, Licensee shall not: + a. use or deploy the Software on any Server in excess of the number of Designated Servers + specified in the applicable Magento Order Form; + + b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, + networking, batch processing or transfer of, the Software to any third party, or permit any + person or entity to have access to the Software by means of a time sharing, remote + computing services, networking, batch processing, service bureau or time sharing + arrangement; + + c. export the Software in violation of U.S. Department of Commerce export administration + regulations. + + 2.2. No license, right or interest in any Magento trademark, trade name or service mark is + granted hereunder. + +3. Fees and Payment Terms + Licensee agrees to the fees and payment terms that are described in each Magento Order Form + executed by Licensee. + +4. Title and Protection + 4.1. Magento (or its third party providers) retains title to all portions of the Software and other + Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable + proprietary information, and Licensee shall not disclose them to anyone other than those of its + employees or consultants under written nondisclosure obligations at least as restrictive as + those contained in this Agreement, having a need to know for purposes consistent with this + Agreement. Licensee shall be responsible for the compliance of such employees or consultants. + Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright + and proprietary information notices as were affixed to the original. The obligations set forth in + this Section shall survive termination of this Agreement. + + 4.2. Licensee acknowledges that the Software includes certain open source software which is + governed by the applicable license terms thereof. A list of such open source software, as + amended from time to time, including the links applicable to such open source software is + specified in the product software bundled within the Software, and the Software is subject to + the provisions of such license agreements, and in the event of any contradiction between the + provisions of this Agreement and the provisions of such applicable license agreement, the + provisions of the applicable open source license agreement shall prevail solely with respect to + such open source software products. + + 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the + "Government"), the Government agrees that such Product is "commercial computer software" + or "commercial computer software documentation" and that, absent a written agreement to + the contrary, the Government's rights with respect thereto are limited by the terms of this + Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. + +5. Patent and Copyright Indemnity + Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support + Services (as defined below), Magento shall indemnify and defend Licensee against any claims made + by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section + 5, means the Software as delivered by Magento, excluding the open source software programs + described in Section 4.2) as permitted in this Agreement directly infringes such third party's United + States patent or copyright, provided that Licensee complies with the requirements of this Section. + Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any + intellectual property rights, (b) provide Magento with all information and assistance requested of it + with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or + settle any and all such claims. + + In the event that a court holds that the Software, or if Magento believes a court may hold that the + Software, infringes the intellectual property rights of any third party, Magento may (but is not + obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue + using the Software, replace or modify the Software so that it becomes non-infringing while providing + substantially equivalent performance or, accept return of the Software, terminate this Agreement, + and refund Licensee an amount equal to the license fees paid to Magento multiplied by the + percentage of the term of the license for the Software that Licensee did not enjoy due to the early + termination by Magento. + + Magento shall have no liability or obligation under this Agreement to the extent the alleged + infringement is based on (i) a modification or derivative work of the Software developed by anyone + other than Magento; (ii), a combination of the Software with any product or service not provided by + Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) + use of the Software other than in accordance with this Agreement or the documentation; (iv) + indirect or willful infringement; or (v) any open source code, as described in Section 4.2. + + This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement + related to the Software. + +6. Default and Termination + 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its + obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) + Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in + Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party + fails to perform any other material obligation under this Agreement and such failure remains + uncured for more than thirty (30) days after receipt of written notice thereof. + + 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights + available to it under the law, may terminate this Agreement and all licenses granted hereunder + by written notice to the defaulting party. + + 6.3. Within thirty (30) days after termination of the Software license or this Agreement or + expiration of the license term as specified in the Magento Order Form, Licensee shall certify in + writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that + all copies or embodiments thereof in any form, including partial copies within modified + versions, have been destroyed. + +7. Warranty + 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days + commencing upon Magento's electronic delivery of the Software to Licensee that the Software, + as delivered, will in all material respects perform the functions described in the specifications + contained in the documentation provided with the Software. In the event that the Software + does not, in all material respects, perform the functions therein described, Magento or its + authorized reseller will undertake to correct any reported error in accordance with the Support + Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire + liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant + that the Software will meet Licensee's requirements, that the Software will operate in the + combinations which Licensee may select for use, that the operation of the Software will be + uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED + IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". + + 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY + WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. + MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR + TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, + ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR + AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING + TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. + +8. Limitation of Liability + 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS + OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE + USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; + LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; + OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES + (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A + CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR + UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING + OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER + TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, + FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. + + 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN + WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH + RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE + LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, + THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE + SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. + +9. Support Services Terms and Conditions + For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide + support services and Updates for the Software as described in Magento's standard Support Services + Terms and Conditions, which follow. Magento will have no obligation to provide support for any + modifications or derivative works of the Software developed by anyone other than Magento. + +10. Customer References + Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer + lists and other related marketing materials. The parties shall cooperate to undertake mutually- + agreed joint marketing activities. + +11. Notices + All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by + facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order + Form, or such other address as either party may indicate by at least ten (10) days prior written + notice to the other party. Notices to Magento shall be sent to the Contracts Administration + Department. + +12. Assignment + Licensee may not assign this Agreement without the prior written consent of Magento; provided + that such consent shall not be required for assignment to a purchaser of all or substantially all of the + assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and + conditions of this Agreement. Any prohibited assignment shall be null and void. + +13. Entire Agreement + Along with Magento's standard Support Services Terms and Conditions, which follow, and the + Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, + which supersedes all proposals or prior agreements, oral or written, including any online (click- + through) agreement which Licensee may have accepted in conjunction with the downloading of the + Software, and all other communications between the parties relating to the subject matter hereof. + No purchase order, other ordering document or any hand written or typewritten text which purports + to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the + terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both + parties, all such proposed variations or additions are objected to and shall have no force or effect. + +14. General + This Agreement is made in and shall be governed by the laws of the State of California, without + giving effect to any principles that provide for the application of the law of another jurisdiction. All + proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, + California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. + The United Nations Convention for the International Sale of Goods shall not apply. The section + headings herein are provided for convenience only and have no substantive effect on the + construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall + be liable for any failure to perform due to causes beyond its reasonable control. If any provision of + this Agreement is held to be unenforceable, this Agreement shall be construed without such + provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such + party's right to exercise such right or any other right in the future. This Agreement may be amended + only by a written document executed by a duly authorized representative of each of the parties. The + parties agree to receive electronic documents and accept electronic signatures (information + attached or logically associated with such document and clicked or otherwise adopted with an intent + to sign) including in counterparts which shall be valid substitutes for paper-based documents and + signatures, and the legal validity of a transaction will not be denied on the ground that it is not in + writing. + +15. Definitions + "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a + particular Software license. Such Server may be that of a third-party under nondisclosure obligations + that will host the Software for the benefit of Licensee. + + "Modifications" means any code developed by Licensee or any third party, including without + limitation, configuration, integrations, implementations, or localizations to the external layer of the + core, baseline Software product. The term "Modifications" excludes Updates. + + "Proprietary Material" means the Software, related documentation, and all parts, copies and + modifications thereof, and any other information, in whatever form, received by Licensee + hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is + or becomes a part of the public domain through no act or omission of Licensee; or (b) was in + Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from + Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or + (d) is independently developed by Licensee without reference to or use of Magento's Proprietary + Material. + + "Server" means each physical or virtual server from which a single instance of the Software is + accessed and used either for production purposes ("Production Server Instance") or for non- + production purposes, such as development, testing, training and other non-operational business + transactions ("Non-Production Server Instance"). For example, if one server contains two (2) + instances of the Software, i.e., one Production Server Instance and one Non-Production Server + Instance, then a Server license is required for each of such instances; development in-house and by + third-party consultants requires licenses for two Non-Production Server Instances. + + "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) + Enterprise Edition, provided solely in source code, including associated technical documentation, + and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise + specified herein, the term Software includes certain open source software programs described in + Section 4.2. "Software" does not include any Modifications. + + "Updates" means all published revisions and corrections to the printed documentation and + corrections and new releases of the Software which are generally made available to Magento's + supported customers at no additional cost or for media and handling charges only. Updates shall not + include any options or future products which Magento sells separately. + + +SUPPORT SERVICES TERMS AND CONDITIONS + +Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the +Agreement. + +1. "Support Services" consists of: + a. Advice regarding the downloading, installation and configuration of the Software (including + Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to + the Software), when used by Licensee on systems that meet the Software's "System + Requirements" specified on Magento's website at www.magentocommerce.com/system- + requirements. + + b. Facilities for bug tracking, escalation of problems for priority attention, and access to + community-supported FAQs and Forums relating to the Software. + + c. Assistance with troubleshooting to diagnose and fix errors in the Software. + + d. Access to Magento documentation relating to the Software, including authorization to make + copies of that documentation for internal use as specified in the Agreement. + +2. Exclusions from Support Services. + Magento shall have no obligation to support (i) versions of the + Software other than the then-current and immediately previous releases, which are operated on a + supported hardware/operating system platform specified in the release notes for the Software; (ii) + altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by + Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with + Magento's instructions. Magento is not responsible for hardware changes necessitated by changes + to the Software. Support Services does not include: + a. Assistance in the development or debugging of Licensee's system, including the operating + system and support tools. + + b. Information and assistance on technical issues related to the installation, administration, and + use of enabling technologies such as databases, computer networks, and communications. + + c. Assistance with the installation and configuration of hardware including, but not limited to + computers, hard disks, networks, and printers. + +3. Subcontractors. + Magento or its authorized resellers reserve the right to subcontract any or all of + the work to be performed under these Support Terms, and Magento retains responsibility for any + work so subcontracted. + +4. Licensee Responsibilities. + Licensee shall provide commercially reasonable cooperation and full + information to Magento or its authorized resellers with respect to the furnishing of Support Services + under this Agreement. + +5. Support Contacts. + Licensee shall designate one or more support contacts that are authorized to + submit Software problems. If Licensee has purchased the license from a Magento-authorized + reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license + directly from Magento, Licensee may contact Magento on the www.magentocommere.com website + or at its toll-free Support telephone number. + +6. Problem Priority. + Upon receipt of a properly submitted Software problem, as specified on + Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall + prioritize it in accordance with the guidelines below: + + a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely + impacts the Licensee's Production Server Instance, or because of which Licensee's Production + Server Instance is down or not functioning, or that results in a loss of production data and no + work around exists. P1 problems must be reported on Magento's toll-free support telephone + number in order to expedite resolution. Magento will use continuous efforts during its normal + hours of operation, with appropriate escalation to senior management, to provide a resolution + for any P1 problem as soon as is commercially reasonable. + + b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is + functioning but in a reduced capacity, or the Problem is causing significant impact to portions of + the Licensee's business operations and productivity, or the Software is exposed to potential loss + or interruption of service. Problems existing in a non-production environment that would + otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P2 + problem as soon as is commercially reasonable. + + c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- + critical loss of functionality, or that impairs some operations but allows Licensee's operations to + continue to function. Problems for which there is limited or no loss or functionality or impact to + Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P3 + problem in time for the next minor release of the Software. + + d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature + or documentation related, but the Software works without normal hours of operation to + provide a resolution for any P4 problem in time for the next major release of the Software. + + e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or + modification to add official support and documentation for unsupported or undocumented + feature, or features that do not exist in the Software. Magento will take ERs into consideration + in the product management process, but has no obligation to deliver enhancements based on + any ER. + +7. Response Times. + Magento or its authorized reseller shall exercise commercially reasonable efforts + to meet the response times specified below for Gold Support (unless Licensee has upgraded to + Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem + properly submitted by Licensee: + + Magento GOLD Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + North American Telephone Support Hours M-F 08:00 - 17:00 (PT) + European Telephone Support Hours M-F 08:30 - 17:30 (CET) + Telephone Response Time P1 Issues* 4 business hours + Response Time P2-P4 Issues* 24 business hours + *From initial contact + + + Magento PLATINUM Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + Telephone Support Hours 24 hours + Telephone Response Time P1 Issues* Up to 2 hours + Response Time P2-P4 Issues* 4 business hours + *From initial contact + + +8. Prohibited Use. + As a condition of Licensee's use of the Forums, Licensee will not use (and will + prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or + regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, + defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software + viruses or any other computer code, files or programs that may interrupt, destroy or limit the + functionality of any computer software or hardware or telecommunications equipment; (iv) to + infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any + third party; or (v) use the Forums for any purpose other than their intended use. + +9. Term and Termination. + Magento will provide Support Services and any Updates to Licensee + during the periods identified in the Magento Order Form, subject to Licensee's payment of the + applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee + materially breaches the Support Services provisions and does not cure such breach within thirty (30) + days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. + +10. General. + Magento shall not be liable for any failure or delay in performance under these Support + Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be + severed from these Support Terms. Licensee agrees that any information received pursuant to these + Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the + License Agreement. Licensee's obligation of payment of moneys due under these Support Terms + shall survive termination of these Support Terms or the License Agreement. These Support Terms + state the entire agreement regarding provision of Support Services to Licensee and may be amended + only by a written amendment set forth on a separate document executed by authorized + representatives of both parties. diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php new file mode 100755 index 0000000000000..371ec412b0d9c --- /dev/null +++ b/Model/Client/Elasticsearch.php @@ -0,0 +1,94 @@ +buildConfig($options); + if (!($elasticsearchClient instanceof \Elasticsearch\Client)) { + $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config); + } + $this->client = $elasticsearchClient; + $this->clientOptions = $options; + } + + /** + * Ping the elasticseach client + * + * @return bool|array + */ + public function ping() + { + try { + if ($this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]])) { + $pingStatus = ['status' => 'OK']; + } + } catch (NoNodesAvailableException $e) { + $pingStatus = false; + } + return $pingStatus; + } + + /** + * @param array $options + * @return array + */ + public function buildConfig($options = []) + { + $host = preg_replace('/[http|https]:\/\//i', '', $options['hostname']); + $protocol = parse_url($options['hostname'], PHP_URL_SCHEME); + if (!$protocol) { + $protocol = 'http'; + } + if (!empty($options['port'])) { + $host .= ':' . $options['port']; + } + if (!empty($options['enable_auth']) && ($options['enable_auth'] == 1)) { + $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host); + } + $config = [ + 'hosts' => [ + $host + ] + ]; + return $config; + } +} diff --git a/Model/Client/ElasticsearchFactory.php b/Model/Client/ElasticsearchFactory.php new file mode 100755 index 0000000000000..68e874c1c786e --- /dev/null +++ b/Model/Client/ElasticsearchFactory.php @@ -0,0 +1,38 @@ +objectManager = $objectManager; + } + + /** + * {@inheritdoc} + */ + public function create(array $options = []) + { + return $this->objectManager->create( + 'Magento\Elasticsearch\Model\Client\Elasticsearch', + ['options' => $options] + ); + } +} diff --git a/Model/Config.php b/Model/Config.php new file mode 100755 index 0000000000000..edfcd8debb867 --- /dev/null +++ b/Model/Config.php @@ -0,0 +1,75 @@ +scopeConfig = $scopeConfig; + $this->encryptor = $encryptor; + } + + /** + * {@inheritdoc} + */ + public function prepareClientOptions($options = []) + { + $defaultOptions = [ + 'hostname' => $this->getElasticsearchConfigData('server_hostname'), + 'port' => $this->getElasticsearchConfigData('server_port'), + 'index' => $this->getElasticsearchConfigData('index_name'), + 'enable_auth' => $this->getElasticsearchConfigData('enable_auth'), + 'login' => $this->getElasticsearchConfigData('username'), + 'password' => $this->getElasticsearchConfigData('password'), + 'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : 15, + ]; + $options = array_merge($defaultOptions, $options); + return $options; + } + + /** + * Retrieve information from Elasticsearch search engine configuration + * + * @param string $field + * @return string|int + */ + public function getElasticsearchConfigData($field) + { + $path = 'catalog/search/elasticsearch_' . $field; + return $this->scopeConfig->getValue($path); + } +} diff --git a/README.md b/README.md new file mode 100755 index 0000000000000..280ca29f8337b --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +Magento\Elasticsearch module allows to use Elastic search engine for product searching capabilities. +The module implements Magento\Search library interfaces. \ No newline at end of file diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php new file mode 100755 index 0000000000000..c4a1a22179c27 --- /dev/null +++ b/SearchAdapter/ConnectionManager.php @@ -0,0 +1,80 @@ +logger = $logger; + $this->clientFactory = $clientFactory; + $this->clientConfig = $clientConfig; + } + + /** + * Get shared connection + * + * @throws \RuntimeException + * @return Elasticsearch + */ + public function getConnection() + { + if (!$this->client) { + $this->connect(); + } + + return $this->client; + } + + /** + * Connect to Elasticsearch client with default options + * + * @throws \RuntimeException + * @return void + */ + private function connect() + { + try { + $this->client = $this->clientFactory->create($this->clientConfig->prepareClientOptions()); + } catch (\Exception $e) { + $this->logger->critical($e); + throw new \RuntimeException('Elasticsearch client is not set.'); + } + } +} diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php new file mode 100755 index 0000000000000..8e346fe4e2dca --- /dev/null +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php @@ -0,0 +1,251 @@ +requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); + $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); + + $context = $this->getMock( + 'Magento\Backend\App\Action\Context', + ['getRequest', 'getResponse', 'getMessageManager', 'getSession'], + $helper->getConstructArguments( + 'Magento\Backend\App\Action\Context', + [ + 'request' => $this->requestMock + ] + ) + ); + $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->requestMock)); + $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock)); + + $this->client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') + ->disableOriginalConstructor() + ->setMethods(['ping']) + ->getMock(); + + $clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $clientFactory->expects($this->any()) + ->method('create') + ->willReturn($this->client); + + $this->clientHelper = $this->getMockBuilder(ClientOptionsInterface::class) + ->disableOriginalConstructor() + ->setMethods( + [ + 'prepareClientOptions' + ] + ) + ->getMock(); + + $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json') + ->disableOriginalConstructor() + ->getMock(); + + $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $resultJsonFactory->expects($this->atLeastOnce()) + ->method('create') + ->willReturn($this->resultJson); + + $this->controller = new Ping($context, $clientFactory, $this->clientHelper, $resultJsonFactory); + } + + /** + * @dataProvider emptyParamDataProvider + * + * @param string $host + * @param string $port + * @param string $auth + * @param string $username + * @param string $pass + * @return void + */ + public function testExecuteEmptyParam($host, $port, $auth, $username, $pass) + { + $expected = [ + 'success' => false, + 'error_message' => __('Please check your credentials.') + ]; + $this->requestMock->expects($this->atLeastOnce()) + ->method('getParam') + ->willReturnOnConsecutiveCalls($host, $port, $auth, $username, $pass); + $this->resultJson->expects($this->once())->method('setData')->with($expected); + $this->controller->execute(); + } + + /** + * @return array + */ + public function emptyParamDataProvider() + { + return [ + ['', '', '0', '', ''], + ['localhost', '', '0', '', ''], + ['', '9200', '0', '', ''], + ['', '9200', '1', '', ''], + ['localhost', '', '1', '', ''], + ['localhost', '9200', '1', '', ''], + ['localhost', '9200', '1', 'user', ''], + ]; + } + + /** + * @return void + */ + public function testExecute() + { + $expected = [ + 'success' => true, + 'error_message' => '' + ]; + $params = [ + 'hostname' => 'localhost', + 'port' => '8983', + 'auth' => '1', + 'username' => 'user', + 'pass' => 'pass', + 'timeout' => 0 + ]; + $this->clientHelper->expects($this->once()) + ->method('prepareClientOptions') + ->with($params) + ->willReturnArgument(0); + $this->client->expects($this->once()) + ->method('ping') + ->willReturn(['status' => 'OK']); + $this->requestMock->expects($this->atLeastOnce()) + ->method('getParam') + ->willReturnOnConsecutiveCalls( + $params['hostname'], + $params['port'], + $params['auth'], + $params['username'], + $params['pass'] + ); + $this->resultJson->expects($this->once())->method('setData')->with($expected); + $this->controller->execute(); + } + + /** + * @return void + */ + public function testExecuteFailedPing() + { + $expected = [ + 'success' => false, + 'error_message' => '' + ]; + $params = [ + 'hostname' => 'localhost', + 'port' => '8983', + 'auth' => '1', + 'username' => 'user', + 'pass' => 'pass', + 'timeout' => 0 + ]; + $this->clientHelper->expects($this->once()) + ->method('prepareClientOptions') + ->with($params) + ->willReturnArgument(0); + $this->client->expects($this->once()) + ->method('ping') + ->willReturn(['status' => 'notOK']); + $this->requestMock->expects($this->atLeastOnce()) + ->method('getParam') + ->willReturnOnConsecutiveCalls( + $params['hostname'], + $params['port'], + $params['auth'], + $params['username'], + $params['pass'] + ); + $this->resultJson->expects($this->once())->method('setData')->with($expected); + $this->controller->execute(); + } + + /** + * @return void + */ + public function testExecuteException() + { + $expected = [ + 'success' => false, + 'error_message' => __('Something went wrong') + ]; + $params = [ + 'hostname' => 'localhost', + 'port' => '8983', + 'auth' => '1', + 'username' => 'user', + 'pass' => 'pass', + 'timeout' => 0 + ]; + $this->clientHelper->expects($this->once()) + ->method('prepareClientOptions') + ->with($params) + ->willReturnArgument(0); + $this->client->expects($this->once()) + ->method('ping') + ->willThrowException(new \Exception('

Something went wrong<\p>')); + $this->requestMock->expects($this->atLeastOnce()) + ->method('getParam') + ->willReturnOnConsecutiveCalls( + $params['hostname'], + $params['port'], + $params['auth'], + $params['username'], + $params['pass'] + ); + $this->resultJson->expects($this->once())->method('setData')->with($expected); + $this->controller->execute(); + } +} diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php new file mode 100755 index 0000000000000..cea495c120f1b --- /dev/null +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -0,0 +1,66 @@ +elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + ->setMethods(['ping']) + ->disableOriginalConstructor() + ->getMock(); + $this->model = new ElasticsearchClient($this->getOptions(), $this->elasticsearchClientMock); + } + + /** + * @expectedException \Magento\Framework\Exception\LocalizedException + */ + public function testConstructorOptionsException() + { + new ElasticsearchClient([]); + } + + /** + * Test ping functionality + */ + public function testPing() + { + $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(['status' => 'OK']); + $this->assertEquals(['status' => 'OK'], $this->model->ping()); + } + + /** + * Get elasticsearch client options + * + * @return array + */ + protected function getOptions() + { + return [ + 'hostname' => 'localhost', + 'port' => '9200', + 'timeout' => '15', + ]; + } +} diff --git a/composer.json b/composer.json new file mode 100755 index 0000000000000..d7dd35a3dc330 --- /dev/null +++ b/composer.json @@ -0,0 +1,23 @@ +{ + "name": "magento/module-elasticsearch", + "description": "N/A", + "require": { + "php": "~5.5.0|~5.6.0|~7.0.0", + "magento/module-backend": "100.0.0", + "magento/module-advanced-search": "100.0.0", + "magento/module-config": "100.0.0", + "magento/framework": "100.0.0", + "elasticsearch/elasticsearch": "~2.0" + }, + "type": "magento2-module", + "version": "100.0.0", + "license": [ + "proprietary" + ], + "autoload": { + "files": [ "registration.php" ], + "psr-4": { + "Magento\\Elasticsearch\\": "" + } + } +} diff --git a/config/esconfig.xml b/config/esconfig.xml new file mode 100755 index 0000000000000..da6ba0a857d15 --- /dev/null +++ b/config/esconfig.xml @@ -0,0 +1,19 @@ + + + + synonyms.txt + synonyms_en_US.txt + + + stopwords.txt + stopwords_en_US.txt + + + english + english + + + stopwords.txt + stopwords_en_US.txt + + diff --git a/config/protwords.txt b/config/protwords.txt new file mode 100755 index 0000000000000..1dfc0abecbf8d --- /dev/null +++ b/config/protwords.txt @@ -0,0 +1,21 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# Use a protected word file to protect against the stemmer reducing two +# unrelated words to the same base word. + +# Some non-words that normally won't be encountered, +# just to test that they won't be stemmed. +dontstems +zwhacky + diff --git a/config/protwords_en_US.txt b/config/protwords_en_US.txt new file mode 100755 index 0000000000000..e69de29bb2d1d diff --git a/config/stopwords.txt b/config/stopwords.txt new file mode 100755 index 0000000000000..63559b35dd521 --- /dev/null +++ b/config/stopwords.txt @@ -0,0 +1,57 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# a couple of test stopwords to test that the words are really being +# configured from this file: +stopworda +stopwordb + +#Standard english stop words taken from Lucene's StopAnalyzer +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with \ No newline at end of file diff --git a/config/stopwords_en_US.txt b/config/stopwords_en_US.txt new file mode 100755 index 0000000000000..e69de29bb2d1d diff --git a/config/synonyms.txt b/config/synonyms.txt new file mode 100755 index 0000000000000..b0e31cb7ec83a --- /dev/null +++ b/config/synonyms.txt @@ -0,0 +1,31 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +#some test synonym mappings unlikely to appear in real input text +aaa => aaaa +bbb => bbbb1 bbbb2 +ccc => cccc1,cccc2 +a\=>a => b\=>b +a\,a => b\,b +fooaaa,baraaa,bazaaa + +# Some synonym groups specific to this example +GB,gib,gigabyte,gigabytes +MB,mib,megabyte,megabytes +Television, Televisions, TV, TVs +#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming +#after us won't split it into two words. + +# Synonym mappings can be used for spelling correction too +pixima => pixma + diff --git a/config/synonyms_en_US.txt b/config/synonyms_en_US.txt new file mode 100755 index 0000000000000..e69de29bb2d1d diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml new file mode 100755 index 0000000000000..4229917ef9b9f --- /dev/null +++ b/etc/adminhtml/di.xml @@ -0,0 +1,22 @@ + + + + + + Magento\Elasticsearch\Model\Config + Magento\Elasticsearch\Model\Client\ElasticsearchFactory + + + + + + Elasticsearch + + + + diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml new file mode 100755 index 0000000000000..7262d2bee82be --- /dev/null +++ b/etc/adminhtml/routes.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml new file mode 100755 index 0000000000000..3b5539bcc4ad8 --- /dev/null +++ b/etc/adminhtml/system.xml @@ -0,0 +1,68 @@ + + + + +

+ + + + + elasticsearch + + + + + + elasticsearch + + + + + + elasticsearch + + + + + Magento\Config\Model\Config\Source\Yesno + + elasticsearch + + + + + + elasticsearch + 1 + + + + + + elasticsearch + 1 + + + + + + elasticsearch + + + + + Test Connection + Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection + + elasticsearch + + + +
+ + diff --git a/etc/config.xml b/etc/config.xml new file mode 100755 index 0000000000000..729d78bb131f1 --- /dev/null +++ b/etc/config.xml @@ -0,0 +1,20 @@ + + + + + + + localhost + 9200 + magento2 + 0 + 15 + + + + diff --git a/etc/module.xml b/etc/module.xml new file mode 100755 index 0000000000000..4b9df19c41fec --- /dev/null +++ b/etc/module.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/registration.php b/registration.php new file mode 100755 index 0000000000000..ad24de6daa497 --- /dev/null +++ b/registration.php @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js new file mode 100755 index 0000000000000..8153b90a2861c --- /dev/null +++ b/view/adminhtml/web/js/testconnection.js @@ -0,0 +1,67 @@ +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +/*jshint browser:true jquery:true*/ +define([ + "jquery", + 'Magento_Ui/js/modal/alert', + "jquery/ui" +], function($, alert){ + "use strict"; + + $.widget('mage.elasticTestConnection', { + options: { + url: '', + elementId: '', + successText: '', + failedText: '' + }, + + /** + * Bind handlers to events + */ + _create: function() { + this._on({'click': $.proxy(this._connect, this)}); + }, + + /** + * Method triggers an AJAX request to check Elasticsearch connection + * @private + */ + _connect: function() { + var result = this.options.failedText; + var element = $("#" + this.options.elementId) + element.removeClass('success').addClass('fail') + var self = this; + $.ajax({ + url: this.options.url, + showLoader: true, + data : { + host: $('#catalog_search_elasticsearch_server_hostname').val(), + port: $('#catalog_search_elasticsearch_server_port').val(), + auth: $('#catalog_search_elasticsearch_enable_auth').val(), + username: $('#catalog_search_elasticsearch_username').val(), + pass: $('#catalog_search_elasticsearch_password').val(), + timeout: $('#catalog_search_elasticsearch_server_timeout').val() + } + }).done(function(response) { + if (response.success) { + element.removeClass('fail').addClass('success') + result = self.options.successText; + } else { + var msg = response.error_message; + if (msg) { + alert({ + content: $.mage.__(msg) + }); + } + } + }).always(function() { + $("#connection_test_result_es").text(result); + }); + } + }); + + return $.mage.elasticTestConnection; +}); \ No newline at end of file From 6dc03452d9842f566075fa4795b4a1798cc4cced Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 6 Nov 2015 15:09:12 +0200 Subject: [PATCH 080/616] PRD-24: Elastic Search Adapter - Create Base Module Structure --- Model/Client/FactoryInterface.php | 17 +++++++++++++++++ Model/ClientOptionsInterface.php | 19 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 Model/Client/FactoryInterface.php create mode 100755 Model/ClientOptionsInterface.php diff --git a/Model/Client/FactoryInterface.php b/Model/Client/FactoryInterface.php new file mode 100755 index 0000000000000..7a707709ce41a --- /dev/null +++ b/Model/Client/FactoryInterface.php @@ -0,0 +1,17 @@ + Date: Fri, 6 Nov 2015 18:12:47 +0200 Subject: [PATCH 081/616] =?UTF-8?q?PRD-25:=20Search=20Configuration=20?= =?UTF-8?q?=E2=80=93=20Elastic=20Connection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/adminhtml/di.xml | 7 ------- etc/di.xml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 etc/di.xml diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml index 4229917ef9b9f..d023cf458006d 100755 --- a/etc/adminhtml/di.xml +++ b/etc/adminhtml/di.xml @@ -12,11 +12,4 @@ Magento\Elasticsearch\Model\Client\ElasticsearchFactory - - - - Elasticsearch - - - diff --git a/etc/di.xml b/etc/di.xml new file mode 100755 index 0000000000000..5a1268872053d --- /dev/null +++ b/etc/di.xml @@ -0,0 +1,16 @@ + + + + + + + Elasticsearch + + + + From f5e7aefd5f53d9ce0103507c4e4520f4403c83e6 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Sat, 7 Nov 2015 11:00:55 -0600 Subject: [PATCH 082/616] PRD-24: Elastic Search Adapter - Create Base Module Structure - fixed static test failure --- config/esconfig.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/esconfig.xml b/config/esconfig.xml index da6ba0a857d15..cbba60255a766 100755 --- a/config/esconfig.xml +++ b/config/esconfig.xml @@ -1,4 +1,10 @@ + synonyms.txt From 26f8006d6e90a7a0334bc064ff4ad47bfb478526 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Mon, 9 Nov 2015 12:36:41 +0100 Subject: [PATCH 083/616] PRD-24 fixed ping method for some use cases --- Model/Client/Elasticsearch.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 371ec412b0d9c..42d6055c266db 100755 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -42,8 +42,9 @@ public function __construct( __('We were unable to perform the search because of a search engine misconfiguration.') ); } - $config = $this->buildConfig($options); + if (!($elasticsearchClient instanceof \Elasticsearch\Client)) { + $config = $this->buildConfig($options); $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config); } $this->client = $elasticsearchClient; @@ -57,12 +58,12 @@ public function __construct( */ public function ping() { + $pingStatus = false; try { if ($this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]])) { $pingStatus = ['status' => 'OK']; } } catch (NoNodesAvailableException $e) { - $pingStatus = false; } return $pingStatus; } @@ -73,7 +74,7 @@ public function ping() */ public function buildConfig($options = []) { - $host = preg_replace('/[http|https]:\/\//i', '', $options['hostname']); + $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']); $protocol = parse_url($options['hostname'], PHP_URL_SCHEME); if (!$protocol) { $protocol = 'http'; From 27ac5de034b64ab8378ec0b4d426f818a31e4ab6 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Mon, 9 Nov 2015 12:37:23 +0100 Subject: [PATCH 084/616] PRD-82 added missing comment --- config/esconfig.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/esconfig.xml b/config/esconfig.xml index da6ba0a857d15..cbba60255a766 100755 --- a/config/esconfig.xml +++ b/config/esconfig.xml @@ -1,4 +1,10 @@ + synonyms.txt From 9827a71e0c6adea03a97e392ea74223bf4a40f23 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 9 Nov 2015 15:16:02 +0200 Subject: [PATCH 085/616] PRD-82: Process comments from github --- .../System/Config/TestConnection/Ping.php | 2 +- Model/Client/Elasticsearch.php | 15 +++++++++++---- Model/Client/ElasticsearchFactory.php | 1 - Model/Client/FactoryInterface.php | 17 +++++++++++++++++ Model/Config.php | 7 ++++++- SearchAdapter/ConnectionManager.php | 2 +- .../System/Config/TestConnection/PingTest.php | 2 +- etc/adminhtml/di.xml | 1 - etc/di.xml | 1 + 9 files changed, 38 insertions(+), 10 deletions(-) create mode 100755 Model/Client/FactoryInterface.php diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php index 3534fa0703444..61f7341e7a583 100755 --- a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php @@ -8,7 +8,7 @@ use Magento\Backend\App\Action; use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\AdvancedSearch\Model\Client\FactoryInterface; +use Magento\Elasticsearch\Model\Client\FactoryInterface; use Magento\Framework\Controller\Result\JsonFactory; class Ping extends \Magento\Backend\App\Action diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 42d6055c266db..c1ad4d75907e3 100755 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -13,6 +13,13 @@ */ class Elasticsearch { + /**#@+ + * Text flags for Elasticsearch ping statuses + */ + const ELASTICSEARCH_PING_STATUS_OK = 'OK'; + const ELASTICSEARCH_PING_STATUS_ERROR = 'ERROR'; + /**#@-*/ + /** * Elasticsearch Client instance * @@ -54,14 +61,14 @@ public function __construct( /** * Ping the elasticseach client * - * @return bool|array + * @return array */ public function ping() { - $pingStatus = false; + $pingStatus = ['status' => self::ELASTICSEARCH_PING_STATUS_ERROR]; try { if ($this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]])) { - $pingStatus = ['status' => 'OK']; + $pingStatus = ['status' => self::ELASTICSEARCH_PING_STATUS_OK]; } } catch (NoNodesAvailableException $e) { } @@ -72,7 +79,7 @@ public function ping() * @param array $options * @return array */ - public function buildConfig($options = []) + private function buildConfig($options = []) { $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']); $protocol = parse_url($options['hostname'], PHP_URL_SCHEME); diff --git a/Model/Client/ElasticsearchFactory.php b/Model/Client/ElasticsearchFactory.php index 68e874c1c786e..eb5c43009b1f9 100755 --- a/Model/Client/ElasticsearchFactory.php +++ b/Model/Client/ElasticsearchFactory.php @@ -6,7 +6,6 @@ namespace Magento\Elasticsearch\Model\Client; use Magento\Framework\ObjectManagerInterface; -use Magento\AdvancedSearch\Model\Client\FactoryInterface; class ElasticsearchFactory implements FactoryInterface { diff --git a/Model/Client/FactoryInterface.php b/Model/Client/FactoryInterface.php new file mode 100755 index 0000000000000..8e667e8bf621a --- /dev/null +++ b/Model/Client/FactoryInterface.php @@ -0,0 +1,17 @@ + $this->getElasticsearchConfigData('enable_auth'), 'login' => $this->getElasticsearchConfigData('username'), 'password' => $this->getElasticsearchConfigData('password'), - 'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : 15, + 'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT, ]; $options = array_merge($defaultOptions, $options); return $options; diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php index c4a1a22179c27..1b58293df7411 100755 --- a/SearchAdapter/ConnectionManager.php +++ b/SearchAdapter/ConnectionManager.php @@ -6,7 +6,7 @@ namespace Magento\Elasticsearch\SearchAdapter; use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\AdvancedSearch\Model\Client\FactoryInterface; +use Magento\Elasticsearch\Model\Client\FactoryInterface; use Psr\Log\LoggerInterface; use Magento\Elasticsearch\Model\Client\Elasticsearch; diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php index 8e346fe4e2dca..b5ee172a085f4 100755 --- a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php @@ -66,7 +66,7 @@ protected function setUp() ->setMethods(['ping']) ->getMock(); - $clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') + $clientFactory = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\FactoryInterface') ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml index d023cf458006d..33b45929e0580 100755 --- a/etc/adminhtml/di.xml +++ b/etc/adminhtml/di.xml @@ -9,7 +9,6 @@ Magento\Elasticsearch\Model\Config - Magento\Elasticsearch\Model\Client\ElasticsearchFactory diff --git a/etc/di.xml b/etc/di.xml index 5a1268872053d..fe2398903ba0e 100755 --- a/etc/di.xml +++ b/etc/di.xml @@ -6,6 +6,7 @@ */ --> + From 6f0d9217f12852796fdc94150a5a0fe7e8ecd13e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 9 Nov 2015 15:16:02 +0200 Subject: [PATCH 086/616] PRD-82: Process comments from github --- Model/Client/FactoryInterface.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100755 Model/Client/FactoryInterface.php diff --git a/Model/Client/FactoryInterface.php b/Model/Client/FactoryInterface.php deleted file mode 100755 index 7a707709ce41a..0000000000000 --- a/Model/Client/FactoryInterface.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 9 Nov 2015 16:08:15 +0100 Subject: [PATCH 087/616] PRD-76 PRD-78 added DataProvider for AdvancedSearch Suggestions --- Model/DataProvider/Suggestions.php | 54 ++++++++++++++++++++++++++++++ etc/di.xml | 5 +++ 2 files changed, 59 insertions(+) create mode 100644 Model/DataProvider/Suggestions.php diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php new file mode 100644 index 0000000000000..0cf82128ad0a3 --- /dev/null +++ b/Model/DataProvider/Suggestions.php @@ -0,0 +1,54 @@ +scopeConfig = $scopeConfig; + } + + /** + * {@inheritdoc} + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function getItems(QueryInterface $query, $limit = null, $additionalFilters = null) + { + $result = []; + return $result; + } + + /** + * {@inheritdoc} + */ + public function isResultsCountEnabled() + { + return (bool)$this->scopeConfig->getValue( + self::CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED, + ScopeInterface::SCOPE_STORE + ); + } +} diff --git a/etc/di.xml b/etc/di.xml index fe2398903ba0e..de5c34bf6fd37 100755 --- a/etc/di.xml +++ b/etc/di.xml @@ -14,4 +14,9 @@ + + + Magento\Elasticsearch\Model\DataProvider\Suggestions + + From 823600c20f98aa84daea43855446fe11433a707c Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 9 Nov 2015 17:46:44 +0200 Subject: [PATCH 088/616] =?UTF-8?q?PRD-76:=20Process=20feedback=20from=20E?= =?UTF-8?q?S=20Sprint=201=E2=80=A8-=20fix=20error=20from=20ES-code=5Finteg?= =?UTF-8?q?rity=5Ftests.xml=20report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/esconfig.xml | 2 +- config/esconfig.xsd | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100755 config/esconfig.xsd diff --git a/config/esconfig.xml b/config/esconfig.xml index cbba60255a766..d3faa539594e7 100755 --- a/config/esconfig.xml +++ b/config/esconfig.xml @@ -5,7 +5,7 @@ * See COPYING.txt for license details. */ --> - + synonyms.txt synonyms_en_US.txt diff --git a/config/esconfig.xsd b/config/esconfig.xsd new file mode 100755 index 0000000000000..7b386684adc2d --- /dev/null +++ b/config/esconfig.xsd @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + From 365d7e40483fb7491de3c08f6fc81c943ed4fb0c Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Mon, 9 Nov 2015 17:01:27 +0100 Subject: [PATCH 089/616] PRD-76 PRD-78 simplified data provider. added unit test for dataprovider --- Model/DataProvider/Suggestions.php | 27 ++-------------- .../Model/DataProvider/SuggestionsTest.php | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 Test/Unit/Model/DataProvider/SuggestionsTest.php diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 0cf82128ad0a3..c17a6ccb02e07 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -5,7 +5,6 @@ */ namespace Magento\Elasticsearch\Model\DataProvider; -use Magento\Store\Model\ScopeInterface; use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; @@ -14,31 +13,14 @@ */ class Suggestions implements SuggestedQueriesInterface { - const CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED = 'catalog/search/search_suggestion_count_results_enabled'; - - /** - * @var \Magento\Framework\App\Config\ScopeConfigInterface - */ - private $scopeConfig; - - /** - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig - */ - public function __construct( - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig - ) { - $this->scopeConfig = $scopeConfig; - } - /** * {@inheritdoc} * * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function getItems(QueryInterface $query, $limit = null, $additionalFilters = null) + public function getItems(QueryInterface $query) { - $result = []; - return $result; + return []; } /** @@ -46,9 +28,6 @@ public function getItems(QueryInterface $query, $limit = null, $additionalFilter */ public function isResultsCountEnabled() { - return (bool)$this->scopeConfig->getValue( - self::CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED, - ScopeInterface::SCOPE_STORE - ); + return false; } } diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php new file mode 100644 index 0000000000000..80d03b201f456 --- /dev/null +++ b/Test/Unit/Model/DataProvider/SuggestionsTest.php @@ -0,0 +1,31 @@ +objectManager = new ObjectManager($this); + } + + public function testGetItems() + { + /** @var \Magento\Search\Model\QueryInterface|\PHPUnit_Framework_MockObject_MockObject $searchQuery */ + $searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface')->getMockForAbstractClass(); + /** @var \Magento\AdvancedSearch\Model\SuggestedQueries $dataProvider */ + $dataProvider = $this->objectManager->getObject('Magento\Elasticsearch\Model\DataProvider\Suggestions'); + $this->assertEquals([], $dataProvider->getItems($searchQuery)); + } +} From 0678bd9382543e2b6977240f5e5ef18bde32224d Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 10 Nov 2015 15:50:48 +0200 Subject: [PATCH 090/616] PRD-81: Refactor ping functionality (in progress) --- .../System/Config/TestConnection.php | 62 ------------ .../System/Config/TestEsConnection.php | 44 +++++++++ .../System/Config/TestConnection/Ping.php | 95 +------------------ Model/Client/Elasticsearch.php | 3 +- Model/Client/ElasticsearchFactory.php | 1 + Model/Client/FactoryInterface.php | 17 ---- Model/Config.php | 2 +- SearchAdapter/ConnectionManager.php | 2 +- .../System/Config/TestConnection/PingTest.php | 2 +- etc/adminhtml/di.xml | 1 + etc/adminhtml/system.xml | 2 +- etc/di.xml | 1 - view/adminhtml/requirejs-config.js | 12 --- .../system/config/testconnection.phtml | 17 ---- view/adminhtml/web/js/testconnection.js | 67 ------------- 15 files changed, 53 insertions(+), 275 deletions(-) delete mode 100755 Block/Adminhtml/System/Config/TestConnection.php create mode 100755 Block/Adminhtml/System/Config/TestEsConnection.php delete mode 100755 Model/Client/FactoryInterface.php delete mode 100755 view/adminhtml/requirejs-config.js delete mode 100755 view/adminhtml/templates/system/config/testconnection.phtml delete mode 100755 view/adminhtml/web/js/testconnection.js diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php deleted file mode 100755 index a560bd789d265..0000000000000 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ /dev/null @@ -1,62 +0,0 @@ -getTemplate()) { - $this->setTemplate('system/config/testconnection.phtml'); - } - return $this; - } - - /** - * Unset some non-related element parameters - * - * @param \Magento\Framework\Data\Form\Element\AbstractElement $element - * @return string - */ - public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) - { - $element = clone $element; - $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue(); - return parent::render($element); - } - - /** - * Get the button and scripts contents - * - * @param \Magento\Framework\Data\Form\Element\AbstractElement $element - * @return string - */ - protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) - { - $originalData = $element->getOriginalData(); - $this->addData( - [ - 'button_label' => __($originalData['button_label']), - 'html_id' => $element->getHtmlId(), - 'ajax_url' => $this->_urlBuilder->getUrl('elasticsearch/search_system_config_testconnection/ping'), - ] - ); - - return $this->_toHtml(); - } -} diff --git a/Block/Adminhtml/System/Config/TestEsConnection.php b/Block/Adminhtml/System/Config/TestEsConnection.php new file mode 100755 index 0000000000000..682e591f3ffe3 --- /dev/null +++ b/Block/Adminhtml/System/Config/TestEsConnection.php @@ -0,0 +1,44 @@ +getOriginalData(); + $this->addData( + [ + 'button_label' => __($originalData['button_label']), + 'html_id' => $element->getHtmlId(), + 'ajax_url' => $this->_urlBuilder->getUrl('elasticsearch/search_system_config_testconnection/ping'), + 'field_mapping' => [ + 'hostname' => 'catalog_search_elasticsearch_server_hostname', + 'port' => 'catalog_search_elasticsearch_server_port', + 'index' => 'catalog_search_elasticsearch_index_name', + 'enable_auth' => 'catalog_search_elasticsearch_enable_auth', + 'username' => 'catalog_search_elasticsearch_username', + 'password' => 'catalog_search_elasticsearch_password', + 'timeout' => 'catalog_search_elasticsearch_server_timeout', + ], + ] + ); + + return $this->_toHtml(); + } +} diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php index 61f7341e7a583..0febab47eeba0 100755 --- a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php @@ -6,99 +6,6 @@ */ namespace Magento\Elasticsearch\Controller\Adminhtml\Search\System\Config\TestConnection; -use Magento\Backend\App\Action; -use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\Elasticsearch\Model\Client\FactoryInterface; -use Magento\Framework\Controller\Result\JsonFactory; - -class Ping extends \Magento\Backend\App\Action +class Ping extends \Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection\Ping { - /** - * @var FactoryInterface - */ - private $clientFactory; - - /** - * @var ClientInterface - */ - private $clientHelper; - - /** - * @var JsonFactory - */ - private $resultJsonFactory; - - /** - * @param Action\Context $context - * @param FactoryInterface $clientFactory - * @param ClientOptionsInterface $clientHelper - * @param JsonFactory $resultJsonFactory - */ - public function __construct( - Action\Context $context, - FactoryInterface $clientFactory, - ClientOptionsInterface $clientHelper, - JsonFactory $resultJsonFactory - ) { - parent::__construct($context); - $this->clientFactory = $clientFactory; - $this->clientHelper = $clientHelper; - $this->resultJsonFactory = $resultJsonFactory; - } - - /** - * Check for connection to server - * - * @return \Magento\Framework\Controller\Result\Json - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - */ - public function execute() - { - $result = [ - 'success' => false, - 'error_message' => __('Please check your credentials.') - ]; - $options = [ - 'hostname' => $this->getRequest()->getParam('host'), - 'port' => $this->getRequest()->getParam('port'), - 'auth' => $this->getRequest()->getParam('auth'), - 'username' => $this->getRequest()->getParam('username'), - 'pass' => $this->getRequest()->getParam('pass'), - ]; - if ($this->validateParams($options)) { - $options['timeout'] = (int)$this->getRequest()->getParam('timeout'); - - $result['error_message'] = ''; - try { - $response = $this->clientFactory->create($this->clientHelper->prepareClientOptions($options))->ping(); - if (isset($response['status']) && strcasecmp($response['status'], 'ok') == 0) { - $result['success'] = true; - } - } catch (\Exception $e) { - $result['error_message'] = strip_tags($e->getMessage()); - } - } - /** @var \Magento\Framework\Controller\Result\Json $resultJson */ - $resultJson = $this->resultJsonFactory->create(); - return $resultJson->setData($result); - } - - /** - * Validate options - * - * @param array $params - * @return bool - */ - private function validateParams(array $params) - { - if ($params['auth'] == '0') { - unset($params['username']); - unset($params['pass']); - unset($params['auth']); - } - - return array_reduce($params, function ($valid, $item) { - return $valid && !empty($item); - }, true); - } } diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index c1ad4d75907e3..13f5639048831 100755 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -7,11 +7,12 @@ use Magento\Framework\Exception\LocalizedException; use Elasticsearch\Common\Exceptions\NoNodesAvailableException; +use Magento\AdvancedSearch\Model\Client\ClientInterface; /** * Elasticsearch client */ -class Elasticsearch +class Elasticsearch implements ClientInterface { /**#@+ * Text flags for Elasticsearch ping statuses diff --git a/Model/Client/ElasticsearchFactory.php b/Model/Client/ElasticsearchFactory.php index eb5c43009b1f9..68e874c1c786e 100755 --- a/Model/Client/ElasticsearchFactory.php +++ b/Model/Client/ElasticsearchFactory.php @@ -6,6 +6,7 @@ namespace Magento\Elasticsearch\Model\Client; use Magento\Framework\ObjectManagerInterface; +use Magento\AdvancedSearch\Model\Client\FactoryInterface; class ElasticsearchFactory implements FactoryInterface { diff --git a/Model/Client/FactoryInterface.php b/Model/Client/FactoryInterface.php deleted file mode 100755 index 8e667e8bf621a..0000000000000 --- a/Model/Client/FactoryInterface.php +++ /dev/null @@ -1,17 +0,0 @@ - $this->getElasticsearchConfigData('server_port'), 'index' => $this->getElasticsearchConfigData('index_name'), 'enable_auth' => $this->getElasticsearchConfigData('enable_auth'), - 'login' => $this->getElasticsearchConfigData('username'), + 'username' => $this->getElasticsearchConfigData('username'), 'password' => $this->getElasticsearchConfigData('password'), 'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT, ]; diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php index 1b58293df7411..c4a1a22179c27 100755 --- a/SearchAdapter/ConnectionManager.php +++ b/SearchAdapter/ConnectionManager.php @@ -6,7 +6,7 @@ namespace Magento\Elasticsearch\SearchAdapter; use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\Elasticsearch\Model\Client\FactoryInterface; +use Magento\AdvancedSearch\Model\Client\FactoryInterface; use Psr\Log\LoggerInterface; use Magento\Elasticsearch\Model\Client\Elasticsearch; diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php index b5ee172a085f4..8e346fe4e2dca 100755 --- a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php @@ -66,7 +66,7 @@ protected function setUp() ->setMethods(['ping']) ->getMock(); - $clientFactory = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\FactoryInterface') + $clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml index 33b45929e0580..d023cf458006d 100755 --- a/etc/adminhtml/di.xml +++ b/etc/adminhtml/di.xml @@ -9,6 +9,7 @@ Magento\Elasticsearch\Model\Config + Magento\Elasticsearch\Model\Client\ElasticsearchFactory diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 3b5539bcc4ad8..21a949080513c 100755 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -57,7 +57,7 @@ Test Connection - Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection + Magento\Elasticsearch\Block\Adminhtml\System\Config\TestEsConnection elasticsearch diff --git a/etc/di.xml b/etc/di.xml index de5c34bf6fd37..161b50183a5ad 100755 --- a/etc/di.xml +++ b/etc/di.xml @@ -6,7 +6,6 @@ */ --> - diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js deleted file mode 100755 index ced07065929f3..0000000000000 --- a/view/adminhtml/requirejs-config.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ - -var config = { - map: { - '*': { - elasticTestConnection: 'Magento_Elasticsearch/js/testconnection' - } - } -}; \ No newline at end of file diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/view/adminhtml/templates/system/config/testconnection.phtml deleted file mode 100755 index 5000086b359d2..0000000000000 --- a/view/adminhtml/templates/system/config/testconnection.phtml +++ /dev/null @@ -1,17 +0,0 @@ - - - \ No newline at end of file diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js deleted file mode 100755 index 8153b90a2861c..0000000000000 --- a/view/adminhtml/web/js/testconnection.js +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ -/*jshint browser:true jquery:true*/ -define([ - "jquery", - 'Magento_Ui/js/modal/alert', - "jquery/ui" -], function($, alert){ - "use strict"; - - $.widget('mage.elasticTestConnection', { - options: { - url: '', - elementId: '', - successText: '', - failedText: '' - }, - - /** - * Bind handlers to events - */ - _create: function() { - this._on({'click': $.proxy(this._connect, this)}); - }, - - /** - * Method triggers an AJAX request to check Elasticsearch connection - * @private - */ - _connect: function() { - var result = this.options.failedText; - var element = $("#" + this.options.elementId) - element.removeClass('success').addClass('fail') - var self = this; - $.ajax({ - url: this.options.url, - showLoader: true, - data : { - host: $('#catalog_search_elasticsearch_server_hostname').val(), - port: $('#catalog_search_elasticsearch_server_port').val(), - auth: $('#catalog_search_elasticsearch_enable_auth').val(), - username: $('#catalog_search_elasticsearch_username').val(), - pass: $('#catalog_search_elasticsearch_password').val(), - timeout: $('#catalog_search_elasticsearch_server_timeout').val() - } - }).done(function(response) { - if (response.success) { - element.removeClass('fail').addClass('success') - result = self.options.successText; - } else { - var msg = response.error_message; - if (msg) { - alert({ - content: $.mage.__(msg) - }); - } - } - }).always(function() { - $("#connection_test_result_es").text(result); - }); - } - }); - - return $.mage.elasticTestConnection; -}); \ No newline at end of file From 741191d6906e9cce825f1e633c3219d186e8874e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 10 Nov 2015 15:50:48 +0200 Subject: [PATCH 091/616] PRD-81: Refactor ping functionality (in progress) --- .../System/Config/TestConnection.php | 72 +++++++++++++++++ .../System/Config/TestConnection/Ping.php | 77 +++++++++++++++++++ Model/Client/ClientInterface.php | 16 ++++ Model/Client/FactoryInterface.php | 17 ++++ etc/adminhtml/routes.xml | 14 ++++ view/adminhtml/requirejs-config.js | 12 +++ .../system/config/testconnection.phtml | 15 ++++ view/adminhtml/web/js/testconnection.js | 64 +++++++++++++++ 8 files changed, 287 insertions(+) create mode 100755 Block/Adminhtml/System/Config/TestConnection.php create mode 100755 Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php create mode 100755 Model/Client/ClientInterface.php create mode 100755 Model/Client/FactoryInterface.php create mode 100755 etc/adminhtml/routes.xml create mode 100755 view/adminhtml/requirejs-config.js create mode 100755 view/adminhtml/templates/system/config/testconnection.phtml create mode 100755 view/adminhtml/web/js/testconnection.js diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php new file mode 100755 index 0000000000000..9a4baced49b17 --- /dev/null +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -0,0 +1,72 @@ +getTemplate()) { + $this->setTemplate('Magento_AdvancedSearch::system/config/testconnection.phtml'); + } + return $this; + } + + /** + * Unset some non-related element parameters + * + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) + { + $element = clone $element; + $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue(); + return parent::render($element); + } + + /** + * Get the button and scripts contents + * + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) + { + $originalData = $element->getOriginalData(); + $this->addData( + [ + 'button_label' => __($originalData['button_label']), + 'html_id' => $element->getHtmlId(), + 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config_testconnection/ping'), + 'field_mapping' => [], + ] + ); + + return $this->_toHtml(); + } + + /** + * Prepares field mapping array for use in block + * + * @param array $fieldMapping + * @return string + */ + public function prepareFieldMapping($fieldMapping = []) + { + return addslashes(json_encode($fieldMapping)); + } +} diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php new file mode 100755 index 0000000000000..09d36db28e9d3 --- /dev/null +++ b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php @@ -0,0 +1,77 @@ +clientFactory = $clientFactory; + $this->clientHelper = $clientHelper; + $this->resultJsonFactory = $resultJsonFactory; + } + + /** + * Check for connection to server + * + * @return \Magento\Framework\Controller\Result\Json + * @SuppressWarnings(PHPMD.CyclomaticComplexity) + */ + public function execute() + { + $result = [ + 'success' => false, + 'error_message' => __('Please check server credentials') + ]; + $options = $this->getRequest()->getParams(); + + $result['error_message'] = ''; + try { + $response = $this->clientFactory->create($this->clientHelper->prepareClientOptions($options))->ping(); + if (isset($response['status']) && strcasecmp($response['status'], 'ok') == 0) { + $result['success'] = true; + } + } catch (\Exception $e) { + $result['error_message'] = strip_tags($e->getMessage()); + } + + /** @var \Magento\Framework\Controller\Result\Json $resultJson */ + $resultJson = $this->resultJsonFactory->create(); + return $resultJson->setData($result); + } +} diff --git a/Model/Client/ClientInterface.php b/Model/Client/ClientInterface.php new file mode 100755 index 0000000000000..8bdc706d476ad --- /dev/null +++ b/Model/Client/ClientInterface.php @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js new file mode 100755 index 0000000000000..da029f2755209 --- /dev/null +++ b/view/adminhtml/requirejs-config.js @@ -0,0 +1,12 @@ +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +var config = { + map: { + '*': { + testConnection: 'Magento_AdvancedSearch/js/testconnection' + } + } +}; \ No newline at end of file diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/view/adminhtml/templates/system/config/testconnection.phtml new file mode 100755 index 0000000000000..a05796da9076a --- /dev/null +++ b/view/adminhtml/templates/system/config/testconnection.phtml @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js new file mode 100755 index 0000000000000..e012fca40196c --- /dev/null +++ b/view/adminhtml/web/js/testconnection.js @@ -0,0 +1,64 @@ +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +define([ + "jquery", + 'Magento_Ui/js/modal/alert', + "jquery/ui" +], function($, alert){ + "use strict"; + + $.widget('mage.testConnection', { + options: { + url: '', + elementId: '', + successText: '', + failedText: '', + fieldMapping: '' + }, + + /** + * Bind handlers to events + */ + _create: function() { + this._on({'click': $.proxy(this._connect, this)}); + }, + + /** + * Method triggers an AJAX request to check search engine connection + * @private + */ + _connect: function() { + var result = this.options.failedText; + var element = $("#" + this.options.elementId) + element.removeClass('success').addClass('fail') + var self = this; + var params = {}; + $.each($.parseJSON(this.options.fieldMapping), function(key, element) { + params[key]= $("#" + element).val(); + }); + $.ajax({ + url: this.options.url, + showLoader: true, + data : params + }).done(function(response) { + if (response.success) { + element.removeClass('fail').addClass('success') + result = self.options.successText; + } else { + var msg = response.error_message; + if (msg) { + alert({ + content: $.mage.__(msg) + }); + } + } + }).always(function() { + $("#" + self.options.elementId + "_result").text(result); + }); + } + }); + + return $.mage.testConnection; +}); \ No newline at end of file From 6f5e76828da05f9c5be42cdd90e81a6840d70ed1 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 10 Nov 2015 17:52:47 +0200 Subject: [PATCH 092/616] PRD-81: Refactor ping functionality --- .../System/Config/TestEsConnection.php | 1 + Model/Client/Elasticsearch.php | 2 +- .../System/Config/TestConnection/PingTest.php | 116 ++++++++---------- 3 files changed, 52 insertions(+), 67 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestEsConnection.php b/Block/Adminhtml/System/Config/TestEsConnection.php index 682e591f3ffe3..c6741c6daf721 100755 --- a/Block/Adminhtml/System/Config/TestEsConnection.php +++ b/Block/Adminhtml/System/Config/TestEsConnection.php @@ -10,6 +10,7 @@ /** * Elasticsearch test connection block + * @codeCoverageIgnore */ class TestEsConnection extends TestConnection { diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 13f5639048831..847c478b11321 100755 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -45,7 +45,7 @@ public function __construct( $elasticsearchClient = null ) { if (empty($options['hostname']) || ((!empty($options['enable_auth']) && - ($options['enable_auth'] == 1)) && empty($options['username']))) { + ($options['enable_auth'] == 1)) && (empty($options['username']) || empty($options['password'])))) { throw new LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php index 8e346fe4e2dca..fabd10fd977a7 100755 --- a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php @@ -3,7 +3,6 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ - namespace Magento\Elasticsearch\Test\Unit\Controller\Adminhtml\Search\System\Config\TestConnection; use Magento\AdvancedSearch\Model\ClientOptionsInterface; @@ -62,9 +61,9 @@ protected function setUp() $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock)); $this->client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') - ->disableOriginalConstructor() - ->setMethods(['ping']) - ->getMock(); + ->disableOriginalConstructor() + ->setMethods(['ping']) + ->getMock(); $clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') ->disableOriginalConstructor() @@ -92,6 +91,7 @@ protected function setUp() ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); + $resultJsonFactory->expects($this->atLeastOnce()) ->method('create') ->willReturn($this->resultJson); @@ -102,23 +102,28 @@ protected function setUp() /** * @dataProvider emptyParamDataProvider * - * @param string $host - * @param string $port - * @param string $auth + * @param string $hostname + * @param string $enable_auth * @param string $username - * @param string $pass + * @param string $password * @return void */ - public function testExecuteEmptyParam($host, $port, $auth, $username, $pass) + public function testExecuteEmptyParam($hostname, $enable_auth, $username, $password) { - $expected = [ - 'success' => false, - 'error_message' => __('Please check your credentials.') + $options = [ + 'hostname' => $hostname, + 'enable_auth' => $enable_auth, + 'username' => $username, + 'password' => $password, + 'timeout' => 0, ]; - $this->requestMock->expects($this->atLeastOnce()) - ->method('getParam') - ->willReturnOnConsecutiveCalls($host, $port, $auth, $username, $pass); - $this->resultJson->expects($this->once())->method('setData')->with($expected); + $this->requestMock->expects($this->once()) + ->method('getParams') + ->willReturn($options); + $this->clientHelper->expects($this->once()) + ->method('prepareClientOptions') + ->with($options) + ->willReturnArgument(0); $this->controller->execute(); } @@ -128,13 +133,10 @@ public function testExecuteEmptyParam($host, $port, $auth, $username, $pass) public function emptyParamDataProvider() { return [ - ['', '', '0', '', ''], - ['localhost', '', '0', '', ''], - ['', '9200', '0', '', ''], - ['', '9200', '1', '', ''], - ['localhost', '', '1', '', ''], - ['localhost', '9200', '1', '', ''], - ['localhost', '9200', '1', 'user', ''], + ['', '0', '', ''], + ['localhost', '1', '', ''], + ['localhost', '1', 'user', ''], + ['localhost', '1', '', 'password'], ]; } @@ -145,15 +147,15 @@ public function testExecute() { $expected = [ 'success' => true, - 'error_message' => '' + 'errorMessage' => '', ]; $params = [ 'hostname' => 'localhost', - 'port' => '8983', - 'auth' => '1', + 'port' => '9200', + 'enable_auth' => '1', 'username' => 'user', - 'pass' => 'pass', - 'timeout' => 0 + 'password' => 'pass', + 'timeout' => 0, ]; $this->clientHelper->expects($this->once()) ->method('prepareClientOptions') @@ -162,15 +164,9 @@ public function testExecute() $this->client->expects($this->once()) ->method('ping') ->willReturn(['status' => 'OK']); - $this->requestMock->expects($this->atLeastOnce()) - ->method('getParam') - ->willReturnOnConsecutiveCalls( - $params['hostname'], - $params['port'], - $params['auth'], - $params['username'], - $params['pass'] - ); + $this->requestMock->expects($this->once()) + ->method('getParams') + ->willReturn($params); $this->resultJson->expects($this->once())->method('setData')->with($expected); $this->controller->execute(); } @@ -182,15 +178,15 @@ public function testExecuteFailedPing() { $expected = [ 'success' => false, - 'error_message' => '' + 'errorMessage' => '', ]; $params = [ 'hostname' => 'localhost', - 'port' => '8983', - 'auth' => '1', + 'port' => '9201', + 'enable_auth' => '1', 'username' => 'user', - 'pass' => 'pass', - 'timeout' => 0 + 'password' => 'pass', + 'timeout' => 0, ]; $this->clientHelper->expects($this->once()) ->method('prepareClientOptions') @@ -198,16 +194,10 @@ public function testExecuteFailedPing() ->willReturnArgument(0); $this->client->expects($this->once()) ->method('ping') - ->willReturn(['status' => 'notOK']); - $this->requestMock->expects($this->atLeastOnce()) - ->method('getParam') - ->willReturnOnConsecutiveCalls( - $params['hostname'], - $params['port'], - $params['auth'], - $params['username'], - $params['pass'] - ); + ->willReturn(['status' => 'ERROR']); + $this->requestMock->expects($this->once()) + ->method('getParams') + ->willReturn($params); $this->resultJson->expects($this->once())->method('setData')->with($expected); $this->controller->execute(); } @@ -219,15 +209,15 @@ public function testExecuteException() { $expected = [ 'success' => false, - 'error_message' => __('Something went wrong') + 'errorMessage' => __('Something went wrong'), ]; $params = [ 'hostname' => 'localhost', - 'port' => '8983', - 'auth' => '1', + 'port' => '9200', + 'enable_auth' => '1', 'username' => 'user', - 'pass' => 'pass', - 'timeout' => 0 + 'password' => 'pass', + 'timeout' => 0, ]; $this->clientHelper->expects($this->once()) ->method('prepareClientOptions') @@ -236,15 +226,9 @@ public function testExecuteException() $this->client->expects($this->once()) ->method('ping') ->willThrowException(new \Exception('

Something went wrong<\p>')); - $this->requestMock->expects($this->atLeastOnce()) - ->method('getParam') - ->willReturnOnConsecutiveCalls( - $params['hostname'], - $params['port'], - $params['auth'], - $params['username'], - $params['pass'] - ); + $this->requestMock->expects($this->once()) + ->method('getParams') + ->willReturn($params); $this->resultJson->expects($this->once())->method('setData')->with($expected); $this->controller->execute(); } From c3ccacb1036e446076892db1d07be82e5d383810 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 10 Nov 2015 17:52:47 +0200 Subject: [PATCH 093/616] PRD-81: Refactor ping functionality --- .../System/Config/TestConnection/Ping.php | 6 +-- view/adminhtml/requirejs-config.js | 2 +- view/adminhtml/web/js/testconnection.js | 41 +++++++++++-------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php index 09d36db28e9d3..43dadc3c29ec3 100755 --- a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php @@ -56,18 +56,18 @@ public function execute() { $result = [ 'success' => false, - 'error_message' => __('Please check server credentials') + 'errorMessage' => __('Please check server credentials'), ]; $options = $this->getRequest()->getParams(); - $result['error_message'] = ''; + $result['errorMessage'] = ''; try { $response = $this->clientFactory->create($this->clientHelper->prepareClientOptions($options))->ping(); if (isset($response['status']) && strcasecmp($response['status'], 'ok') == 0) { $result['success'] = true; } } catch (\Exception $e) { - $result['error_message'] = strip_tags($e->getMessage()); + $result['errorMessage'] = strip_tags($e->getMessage()); } /** @var \Magento\Framework\Controller\Result\Json $resultJson */ diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js index da029f2755209..2fec1520c73eb 100755 --- a/view/adminhtml/requirejs-config.js +++ b/view/adminhtml/requirejs-config.js @@ -9,4 +9,4 @@ var config = { testConnection: 'Magento_AdvancedSearch/js/testconnection' } } -}; \ No newline at end of file +}; diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js index e012fca40196c..93a7162f1c9f6 100755 --- a/view/adminhtml/web/js/testconnection.js +++ b/view/adminhtml/web/js/testconnection.js @@ -3,11 +3,11 @@ * See COPYING.txt for license details. */ define([ - "jquery", + 'jquery', 'Magento_Ui/js/modal/alert', - "jquery/ui" -], function($, alert){ - "use strict"; + 'jquery/ui' +], function ($, alert) { + 'use strict'; $.widget('mage.testConnection', { options: { @@ -21,44 +21,49 @@ define([ /** * Bind handlers to events */ - _create: function() { - this._on({'click': $.proxy(this._connect, this)}); + _create: function () { + this._on({ + 'click': $.proxy(this._connect, this) + }); }, /** * Method triggers an AJAX request to check search engine connection * @private */ - _connect: function() { + _connect: function () { var result = this.options.failedText; - var element = $("#" + this.options.elementId) - element.removeClass('success').addClass('fail') + var element = $('#' + this.options.elementId); var self = this; var params = {}; - $.each($.parseJSON(this.options.fieldMapping), function(key, element) { - params[key]= $("#" + element).val(); + var msg = ''; + + element.removeClass('success').addClass('fail'); + $.each($.parseJSON(this.options.fieldMapping), function (key, element) { + params[key]= $('#' + element).val(); }); $.ajax({ url: this.options.url, showLoader: true, - data : params - }).done(function(response) { + data: params + }).done(function (response) { if (response.success) { - element.removeClass('fail').addClass('success') + element.removeClass('fail').addClass('success'); result = self.options.successText; } else { - var msg = response.error_message; + msg = response.errorMessage; + if (msg) { alert({ content: $.mage.__(msg) }); } } - }).always(function() { - $("#" + self.options.elementId + "_result").text(result); + }).always(function () { + $('#' + self.options.elementId + '_result').text(result); }); } }); return $.mage.testConnection; -}); \ No newline at end of file +}); From eb0b672c0af0aded3bd7ed5e225c39efd3130480 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 10 Nov 2015 19:02:45 +0200 Subject: [PATCH 094/616] PRD-76: Process feedback from ES Sprint 1 --- Model/Client/ElasticsearchFactory.php | 3 + Test/Unit/Model/Client/ElasticsearchTest.php | 13 ++- Test/Unit/Model/ConfigTest.php | 70 ++++++++++++++ .../Model/DataProvider/SuggestionsTest.php | 8 +- .../SearchAdapter/ConnectionManagerTest.php | 95 +++++++++++++++++++ 5 files changed, 187 insertions(+), 2 deletions(-) create mode 100755 Test/Unit/Model/ConfigTest.php create mode 100755 Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php diff --git a/Model/Client/ElasticsearchFactory.php b/Model/Client/ElasticsearchFactory.php index 68e874c1c786e..09e0118931772 100755 --- a/Model/Client/ElasticsearchFactory.php +++ b/Model/Client/ElasticsearchFactory.php @@ -8,6 +8,9 @@ use Magento\Framework\ObjectManagerInterface; use Magento\AdvancedSearch\Model\Client\FactoryInterface; +/** + * @codeCoverageIgnore + */ class ElasticsearchFactory implements FactoryInterface { /** diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index cea495c120f1b..3c2047df50fec 100755 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -41,6 +41,14 @@ public function testConstructorOptionsException() new ElasticsearchClient([]); } + /** + * Test client creation from the list of options + */ + public function testConstructorWithOptions() + { + new ElasticsearchClient($this->getOptions()); + } + /** * Test ping functionality */ @@ -60,7 +68,10 @@ protected function getOptions() return [ 'hostname' => 'localhost', 'port' => '9200', - 'timeout' => '15', + 'timeout' => 15, + 'enable_auth' => 1, + 'username' => 'user', + 'password' => 'passwd', ]; } } diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php new file mode 100755 index 0000000000000..731a1963be3e0 --- /dev/null +++ b/Test/Unit/Model/ConfigTest.php @@ -0,0 +1,70 @@ +scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->encryptor = $this->getMockBuilder('Magento\Framework\Encryption\EncryptorInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->scopeConfig->expects($this->any()) + ->method('getValue') + ->willReturn(''); + $this->model = new Config( + $this->scopeConfig, + $this->encryptor + ); + } + + /** + * Test prepareClientOptions() method + */ + public function testPrepareClientOptions() + { + $options = [ + 'hostname' => 'localhost', + 'port' => '9200', + 'index' => 'magento2', + 'enable_auth' => '1', + 'username' => 'user', + 'password' => 'pass', + 'timeout' => 1, + ]; + $this->assertEquals($options, $this->model->prepareClientOptions($options)); + } +} diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php index 80d03b201f456..ad818ddaa61ee 100644 --- a/Test/Unit/Model/DataProvider/SuggestionsTest.php +++ b/Test/Unit/Model/DataProvider/SuggestionsTest.php @@ -3,7 +3,6 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ - namespace Magento\Elasticsearch\Test\Unit\Model\Dataprovider; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; @@ -28,4 +27,11 @@ public function testGetItems() $dataProvider = $this->objectManager->getObject('Magento\Elasticsearch\Model\DataProvider\Suggestions'); $this->assertEquals([], $dataProvider->getItems($searchQuery)); } + + public function testIsResultsCountEnabled() + { + /** @var \Magento\AdvancedSearch\Model\SuggestedQueries $dataProvider */ + $dataProvider = $this->objectManager->getObject('Magento\Elasticsearch\Model\DataProvider\Suggestions'); + $this->assertEquals(false, $dataProvider->isResultsCountEnabled()); + } } diff --git a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php new file mode 100755 index 0000000000000..ab82c189dbeb5 --- /dev/null +++ b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php @@ -0,0 +1,95 @@ +logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $this->clientConfig = $this->getMockBuilder(ClientOptionsInterface::class) + ->disableOriginalConstructor() + ->setMethods( + [ + 'prepareClientOptions' + ] + ) + ->getMock(); + $this->clientConfig->expects($this->any()) + ->method('prepareClientOptions') + ->willReturn([]); + $this->model = new ConnectionManager( + $this->clientFactory, + $this->clientConfig, + $this->logger + ); + } + + /** + * Test getConnection() method without errors + */ + public function testGetConnectionSuccessfull() + { + $client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') + ->disableOriginalConstructor() + ->getMock(); + $this->clientFactory->expects($this->any()) + ->method('create') + ->willReturn($client); + $this->model->getConnection(); + } + + /** + * Test getConnection() method with errors + * @expectedException \RuntimeException + */ + public function testGetConnectionFailure() + { + $this->clientFactory->expects($this->any()) + ->method('create') + ->willThrowException(new \Exception('Something went wrong')); + $this->model->getConnection(); + } +} From ab0e52d4a2172a10c4a7520216a1533f400e8133 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 11 Nov 2015 10:42:22 +0200 Subject: [PATCH 095/616] =?UTF-8?q?PRD-76:=20Process=20feedback=20from=20E?= =?UTF-8?q?S=20Sprint=201=E2=80=A8-=20process=20build=20reports=20from=20R?= =?UTF-8?q?un=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 3 ++- .../templates/system/config/testconnection.phtml | 2 +- view/adminhtml/web/js/testconnection.js | 14 +++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 6042e1796869b..ad752a8adf187 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,8 @@ "magento/module-backend": "100.0.0", "magento/module-store": "100.0.0", "magento/module-catalog": "100.0.0", - "magento/module-catalog-search": "100.0.0" + "magento/module-catalog-search": "100.0.0", + "magento/module-config": "100.0.0" }, "type": "magento2-module", "version": "100.0.0", diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/view/adminhtml/templates/system/config/testconnection.phtml index a05796da9076a..743ac05c5bccc 100755 --- a/view/adminhtml/templates/system/config/testconnection.phtml +++ b/view/adminhtml/templates/system/config/testconnection.phtml @@ -10,6 +10,6 @@ "elementId": "getHtmlId() ?>", "successText": "", "failedText": "", - "fieldMapping": "prepareFieldMapping($block->getFieldMapping()) ?>"}, "validation": {}}'> + "fieldMapping": "prepareFieldMapping($block->getFieldMapping()) ?>"}, "validation": {}}'> escapeHtml($block->getButtonLabel()) ?> \ No newline at end of file diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js index 93a7162f1c9f6..daf2b651ee390 100755 --- a/view/adminhtml/web/js/testconnection.js +++ b/view/adminhtml/web/js/testconnection.js @@ -32,15 +32,15 @@ define([ * @private */ _connect: function () { - var result = this.options.failedText; - var element = $('#' + this.options.elementId); - var self = this; - var params = {}; - var msg = ''; + var result = this.options.failedText, + element = $('#' + this.options.elementId), + self = this, + params = {}, + msg = ''; element.removeClass('success').addClass('fail'); - $.each($.parseJSON(this.options.fieldMapping), function (key, element) { - params[key]= $('#' + element).val(); + $.each($.parseJSON(this.options.fieldMapping), function (key, el) { + params[key] = $('#' + el).val(); }); $.ajax({ url: this.options.url, From afb61837b5e366025565a32541ef7c81b1b89ffc Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 11 Nov 2015 10:42:22 +0200 Subject: [PATCH 096/616] =?UTF-8?q?PRD-76:=20Process=20feedback=20from=20E?= =?UTF-8?q?S=20Sprint=201=E2=80=A8-=20process=20build=20reports=20from=20R?= =?UTF-8?q?un=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Block/Adminhtml/System/Config/TestEsConnection.php | 2 +- Model/Client/Elasticsearch.php | 6 +++--- Model/Config.php | 2 +- .../Search/System/Config/TestConnection/PingTest.php | 12 ++++++------ Test/Unit/Model/Client/ElasticsearchTest.php | 2 +- Test/Unit/Model/ConfigTest.php | 2 +- Test/Unit/Model/DataProvider/SuggestionsTest.php | 2 +- composer.json | 3 +-- config/esconfig.xml | 3 ++- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestEsConnection.php b/Block/Adminhtml/System/Config/TestEsConnection.php index c6741c6daf721..041b9dc1a9055 100755 --- a/Block/Adminhtml/System/Config/TestEsConnection.php +++ b/Block/Adminhtml/System/Config/TestEsConnection.php @@ -32,7 +32,7 @@ protected function _getElementHtml(AbstractElement $element) 'hostname' => 'catalog_search_elasticsearch_server_hostname', 'port' => 'catalog_search_elasticsearch_server_port', 'index' => 'catalog_search_elasticsearch_index_name', - 'enable_auth' => 'catalog_search_elasticsearch_enable_auth', + 'enableAuth' => 'catalog_search_elasticsearch_enable_auth', 'username' => 'catalog_search_elasticsearch_username', 'password' => 'catalog_search_elasticsearch_password', 'timeout' => 'catalog_search_elasticsearch_server_timeout', diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 847c478b11321..8efb426e35b1d 100755 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -44,8 +44,8 @@ public function __construct( $options = [], $elasticsearchClient = null ) { - if (empty($options['hostname']) || ((!empty($options['enable_auth']) && - ($options['enable_auth'] == 1)) && (empty($options['username']) || empty($options['password'])))) { + if (empty($options['hostname']) || ((!empty($options['enableAuth']) && + ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) { throw new LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); @@ -90,7 +90,7 @@ private function buildConfig($options = []) if (!empty($options['port'])) { $host .= ':' . $options['port']; } - if (!empty($options['enable_auth']) && ($options['enable_auth'] == 1)) { + if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) { $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host); } $config = [ diff --git a/Model/Config.php b/Model/Config.php index 30da0f29fb01c..3e0eacfa5f206 100755 --- a/Model/Config.php +++ b/Model/Config.php @@ -57,7 +57,7 @@ public function prepareClientOptions($options = []) 'hostname' => $this->getElasticsearchConfigData('server_hostname'), 'port' => $this->getElasticsearchConfigData('server_port'), 'index' => $this->getElasticsearchConfigData('index_name'), - 'enable_auth' => $this->getElasticsearchConfigData('enable_auth'), + 'enableAuth' => $this->getElasticsearchConfigData('enable_auth'), 'username' => $this->getElasticsearchConfigData('username'), 'password' => $this->getElasticsearchConfigData('password'), 'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT, diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php index fabd10fd977a7..4712de9884b77 100755 --- a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php @@ -103,16 +103,16 @@ protected function setUp() * @dataProvider emptyParamDataProvider * * @param string $hostname - * @param string $enable_auth + * @param string $enableAuth * @param string $username * @param string $password * @return void */ - public function testExecuteEmptyParam($hostname, $enable_auth, $username, $password) + public function testExecuteEmptyParam($hostname, $enableAuth, $username, $password) { $options = [ 'hostname' => $hostname, - 'enable_auth' => $enable_auth, + 'enableAuth' => $enableAuth, 'username' => $username, 'password' => $password, 'timeout' => 0, @@ -152,7 +152,7 @@ public function testExecute() $params = [ 'hostname' => 'localhost', 'port' => '9200', - 'enable_auth' => '1', + 'enableAuth' => '1', 'username' => 'user', 'password' => 'pass', 'timeout' => 0, @@ -183,7 +183,7 @@ public function testExecuteFailedPing() $params = [ 'hostname' => 'localhost', 'port' => '9201', - 'enable_auth' => '1', + 'enableAuth' => '1', 'username' => 'user', 'password' => 'pass', 'timeout' => 0, @@ -214,7 +214,7 @@ public function testExecuteException() $params = [ 'hostname' => 'localhost', 'port' => '9200', - 'enable_auth' => '1', + 'enableAuth' => '1', 'username' => 'user', 'password' => 'pass', 'timeout' => 0, diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 3c2047df50fec..aab933b46dffb 100755 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -69,7 +69,7 @@ protected function getOptions() 'hostname' => 'localhost', 'port' => '9200', 'timeout' => 15, - 'enable_auth' => 1, + 'enableAuth' => 1, 'username' => 'user', 'password' => 'passwd', ]; diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index 731a1963be3e0..7eb6ee9e75528 100755 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -60,7 +60,7 @@ public function testPrepareClientOptions() 'hostname' => 'localhost', 'port' => '9200', 'index' => 'magento2', - 'enable_auth' => '1', + 'enableAuth' => '1', 'username' => 'user', 'password' => 'pass', 'timeout' => 1, diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php index ad818ddaa61ee..4a26f55bc1ad1 100644 --- a/Test/Unit/Model/DataProvider/SuggestionsTest.php +++ b/Test/Unit/Model/DataProvider/SuggestionsTest.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Test\Unit\Model\Dataprovider; +namespace Magento\Elasticsearch\Test\Unit\Model\DataProvider; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; diff --git a/composer.json b/composer.json index d7dd35a3dc330..a93b239118559 100755 --- a/composer.json +++ b/composer.json @@ -3,9 +3,8 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0|~7.0.0", - "magento/module-backend": "100.0.0", "magento/module-advanced-search": "100.0.0", - "magento/module-config": "100.0.0", + "magento/module-search": "100.0.0", "magento/framework": "100.0.0", "elasticsearch/elasticsearch": "~2.0" }, diff --git a/config/esconfig.xml b/config/esconfig.xml index d3faa539594e7..5647f3db26ff2 100755 --- a/config/esconfig.xml +++ b/config/esconfig.xml @@ -5,7 +5,8 @@ * See COPYING.txt for license details. */ --> - + synonyms.txt synonyms_en_US.txt From 2c18157f6bb24a824d0bee17646b96949271b56d Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Wed, 11 Nov 2015 23:07:16 +0100 Subject: [PATCH 097/616] PRD-76 refactored ping functionality. missing tests. --- .../System/Config/TestConnection.php | 31 +++ .../System/Config/TestEsConnection.php | 45 ---- .../System/Config/TestConnection/Ping.php | 11 - LICENSE_EE.txt | 0 Model/Client/Elasticsearch.php | 37 +-- Model/Client/ElasticsearchFactory.php | 0 Model/Config.php | 2 +- Model/DataProvider/Suggestions.php | 33 --- README.md | 0 SearchAdapter/ConnectionManager.php | 0 .../System/Config/TestConnection/PingTest.php | 235 ------------------ Test/Unit/Model/Client/ElasticsearchTest.php | 0 Test/Unit/Model/ConfigTest.php | 0 .../SearchAdapter/ConnectionManagerTest.php | 0 composer.json | 0 config/esconfig.xml | 0 config/esconfig.xsd | 0 config/protwords.txt | 0 config/protwords_en_US.txt | 0 config/stopwords.txt | 0 config/stopwords_en_US.txt | 0 config/synonyms.txt | 0 config/synonyms_en_US.txt | 0 etc/adminhtml/di.xml | 0 etc/adminhtml/routes.xml | 0 etc/adminhtml/system.xml | 2 +- etc/config.xml | 0 etc/di.xml | 9 +- etc/module.xml | 0 registration.php | 0 30 files changed, 60 insertions(+), 345 deletions(-) create mode 100644 Block/Adminhtml/System/Config/TestConnection.php delete mode 100755 Block/Adminhtml/System/Config/TestEsConnection.php delete mode 100755 Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php mode change 100755 => 100644 LICENSE_EE.txt mode change 100755 => 100644 Model/Client/Elasticsearch.php mode change 100755 => 100644 Model/Client/ElasticsearchFactory.php mode change 100755 => 100644 Model/Config.php delete mode 100644 Model/DataProvider/Suggestions.php mode change 100755 => 100644 README.md mode change 100755 => 100644 SearchAdapter/ConnectionManager.php delete mode 100755 Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnection/PingTest.php mode change 100755 => 100644 Test/Unit/Model/Client/ElasticsearchTest.php mode change 100755 => 100644 Test/Unit/Model/ConfigTest.php mode change 100755 => 100644 Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php mode change 100755 => 100644 composer.json mode change 100755 => 100644 config/esconfig.xml mode change 100755 => 100644 config/esconfig.xsd mode change 100755 => 100644 config/protwords.txt mode change 100755 => 100644 config/protwords_en_US.txt mode change 100755 => 100644 config/stopwords.txt mode change 100755 => 100644 config/stopwords_en_US.txt mode change 100755 => 100644 config/synonyms.txt mode change 100755 => 100644 config/synonyms_en_US.txt mode change 100755 => 100644 etc/adminhtml/di.xml mode change 100755 => 100644 etc/adminhtml/routes.xml mode change 100755 => 100644 etc/adminhtml/system.xml mode change 100755 => 100644 etc/config.xml mode change 100755 => 100644 etc/di.xml mode change 100755 => 100644 etc/module.xml mode change 100755 => 100644 registration.php diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php new file mode 100644 index 0000000000000..853329958aa77 --- /dev/null +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -0,0 +1,31 @@ + 'catalog_search_engine', + 'hostname' => 'catalog_search_elasticsearch_server_hostname', + 'port' => 'catalog_search_elasticsearch_server_port', + 'index' => 'catalog_search_elasticsearch_index_name', + 'enableAuth' => 'catalog_search_elasticsearch_enable_auth', + 'username' => 'catalog_search_elasticsearch_username', + 'password' => 'catalog_search_elasticsearch_password', + 'timeout' => 'catalog_search_elasticsearch_server_timeout', + ]; + return $this->escapeJsQuote(json_encode($fields), '"'); + } +} diff --git a/Block/Adminhtml/System/Config/TestEsConnection.php b/Block/Adminhtml/System/Config/TestEsConnection.php deleted file mode 100755 index 041b9dc1a9055..0000000000000 --- a/Block/Adminhtml/System/Config/TestEsConnection.php +++ /dev/null @@ -1,45 +0,0 @@ -getOriginalData(); - $this->addData( - [ - 'button_label' => __($originalData['button_label']), - 'html_id' => $element->getHtmlId(), - 'ajax_url' => $this->_urlBuilder->getUrl('elasticsearch/search_system_config_testconnection/ping'), - 'field_mapping' => [ - 'hostname' => 'catalog_search_elasticsearch_server_hostname', - 'port' => 'catalog_search_elasticsearch_server_port', - 'index' => 'catalog_search_elasticsearch_index_name', - 'enableAuth' => 'catalog_search_elasticsearch_enable_auth', - 'username' => 'catalog_search_elasticsearch_username', - 'password' => 'catalog_search_elasticsearch_password', - 'timeout' => 'catalog_search_elasticsearch_server_timeout', - ], - ] - ); - - return $this->_toHtml(); - } -} diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php deleted file mode 100755 index 0febab47eeba0..0000000000000 --- a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php +++ /dev/null @@ -1,11 +0,0 @@ - self::ELASTICSEARCH_PING_STATUS_ERROR]; - try { - if ($this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]])) { - $pingStatus = ['status' => self::ELASTICSEARCH_PING_STATUS_OK]; - } - } catch (NoNodesAvailableException $e) { + return $this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]); + } + + /** + * Validate connection params + * + * @return bool + */ + public function validateConnectionParameters() + { + if (!empty($this->clientOptions['index'])) { + return $this->client->indices()->exists(['index' => $this->clientOptions['index']]); + } else { + // if no index is given simply perform a ping + $this->ping(); } - return $pingStatus; + return true; } /** diff --git a/Model/Client/ElasticsearchFactory.php b/Model/Client/ElasticsearchFactory.php old mode 100755 new mode 100644 diff --git a/Model/Config.php b/Model/Config.php old mode 100755 new mode 100644 index 3e0eacfa5f206..255e557d1ba1c --- a/Model/Config.php +++ b/Model/Config.php @@ -7,7 +7,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\Encryption\EncryptorInterface; -use Magento\AdvancedSearch\Model\ClientOptionsInterface; +use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; /** * Elasticsearch config model diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php deleted file mode 100644 index c17a6ccb02e07..0000000000000 --- a/Model/DataProvider/Suggestions.php +++ /dev/null @@ -1,33 +0,0 @@ -requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false); - $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); - - $context = $this->getMock( - 'Magento\Backend\App\Action\Context', - ['getRequest', 'getResponse', 'getMessageManager', 'getSession'], - $helper->getConstructArguments( - 'Magento\Backend\App\Action\Context', - [ - 'request' => $this->requestMock - ] - ) - ); - $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->requestMock)); - $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock)); - - $this->client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') - ->disableOriginalConstructor() - ->setMethods(['ping']) - ->getMock(); - - $clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') - ->disableOriginalConstructor() - ->setMethods(['create']) - ->getMock(); - - $clientFactory->expects($this->any()) - ->method('create') - ->willReturn($this->client); - - $this->clientHelper = $this->getMockBuilder(ClientOptionsInterface::class) - ->disableOriginalConstructor() - ->setMethods( - [ - 'prepareClientOptions' - ] - ) - ->getMock(); - - $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json') - ->disableOriginalConstructor() - ->getMock(); - - $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory') - ->disableOriginalConstructor() - ->setMethods(['create']) - ->getMock(); - - $resultJsonFactory->expects($this->atLeastOnce()) - ->method('create') - ->willReturn($this->resultJson); - - $this->controller = new Ping($context, $clientFactory, $this->clientHelper, $resultJsonFactory); - } - - /** - * @dataProvider emptyParamDataProvider - * - * @param string $hostname - * @param string $enableAuth - * @param string $username - * @param string $password - * @return void - */ - public function testExecuteEmptyParam($hostname, $enableAuth, $username, $password) - { - $options = [ - 'hostname' => $hostname, - 'enableAuth' => $enableAuth, - 'username' => $username, - 'password' => $password, - 'timeout' => 0, - ]; - $this->requestMock->expects($this->once()) - ->method('getParams') - ->willReturn($options); - $this->clientHelper->expects($this->once()) - ->method('prepareClientOptions') - ->with($options) - ->willReturnArgument(0); - $this->controller->execute(); - } - - /** - * @return array - */ - public function emptyParamDataProvider() - { - return [ - ['', '0', '', ''], - ['localhost', '1', '', ''], - ['localhost', '1', 'user', ''], - ['localhost', '1', '', 'password'], - ]; - } - - /** - * @return void - */ - public function testExecute() - { - $expected = [ - 'success' => true, - 'errorMessage' => '', - ]; - $params = [ - 'hostname' => 'localhost', - 'port' => '9200', - 'enableAuth' => '1', - 'username' => 'user', - 'password' => 'pass', - 'timeout' => 0, - ]; - $this->clientHelper->expects($this->once()) - ->method('prepareClientOptions') - ->with($params) - ->willReturnArgument(0); - $this->client->expects($this->once()) - ->method('ping') - ->willReturn(['status' => 'OK']); - $this->requestMock->expects($this->once()) - ->method('getParams') - ->willReturn($params); - $this->resultJson->expects($this->once())->method('setData')->with($expected); - $this->controller->execute(); - } - - /** - * @return void - */ - public function testExecuteFailedPing() - { - $expected = [ - 'success' => false, - 'errorMessage' => '', - ]; - $params = [ - 'hostname' => 'localhost', - 'port' => '9201', - 'enableAuth' => '1', - 'username' => 'user', - 'password' => 'pass', - 'timeout' => 0, - ]; - $this->clientHelper->expects($this->once()) - ->method('prepareClientOptions') - ->with($params) - ->willReturnArgument(0); - $this->client->expects($this->once()) - ->method('ping') - ->willReturn(['status' => 'ERROR']); - $this->requestMock->expects($this->once()) - ->method('getParams') - ->willReturn($params); - $this->resultJson->expects($this->once())->method('setData')->with($expected); - $this->controller->execute(); - } - - /** - * @return void - */ - public function testExecuteException() - { - $expected = [ - 'success' => false, - 'errorMessage' => __('Something went wrong'), - ]; - $params = [ - 'hostname' => 'localhost', - 'port' => '9200', - 'enableAuth' => '1', - 'username' => 'user', - 'password' => 'pass', - 'timeout' => 0, - ]; - $this->clientHelper->expects($this->once()) - ->method('prepareClientOptions') - ->with($params) - ->willReturnArgument(0); - $this->client->expects($this->once()) - ->method('ping') - ->willThrowException(new \Exception('

Something went wrong<\p>')); - $this->requestMock->expects($this->once()) - ->method('getParams') - ->willReturn($params); - $this->resultJson->expects($this->once())->method('setData')->with($expected); - $this->controller->execute(); - } -} diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php old mode 100755 new mode 100644 diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php old mode 100755 new mode 100644 diff --git a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php old mode 100755 new mode 100644 diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 diff --git a/config/esconfig.xml b/config/esconfig.xml old mode 100755 new mode 100644 diff --git a/config/esconfig.xsd b/config/esconfig.xsd old mode 100755 new mode 100644 diff --git a/config/protwords.txt b/config/protwords.txt old mode 100755 new mode 100644 diff --git a/config/protwords_en_US.txt b/config/protwords_en_US.txt old mode 100755 new mode 100644 diff --git a/config/stopwords.txt b/config/stopwords.txt old mode 100755 new mode 100644 diff --git a/config/stopwords_en_US.txt b/config/stopwords_en_US.txt old mode 100755 new mode 100644 diff --git a/config/synonyms.txt b/config/synonyms.txt old mode 100755 new mode 100644 diff --git a/config/synonyms_en_US.txt b/config/synonyms_en_US.txt old mode 100755 new mode 100644 diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml old mode 100755 new mode 100644 diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml old mode 100755 new mode 100644 diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml old mode 100755 new mode 100644 index 21a949080513c..3b5539bcc4ad8 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -57,7 +57,7 @@ Test Connection - Magento\Elasticsearch\Block\Adminhtml\System\Config\TestEsConnection + Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection elasticsearch diff --git a/etc/config.xml b/etc/config.xml old mode 100755 new mode 100644 diff --git a/etc/di.xml b/etc/di.xml old mode 100755 new mode 100644 index 161b50183a5ad..efe99da59cb3e --- a/etc/di.xml +++ b/etc/di.xml @@ -13,9 +13,14 @@ - + - Magento\Elasticsearch\Model\DataProvider\Suggestions + + \Magento\Elasticsearch\Model\Client\ElasticsearchFactory + + + \Magento\Elasticsearch\Model\Config + diff --git a/etc/module.xml b/etc/module.xml old mode 100755 new mode 100644 diff --git a/registration.php b/registration.php old mode 100755 new mode 100644 From 83c6759348049514dcd8f705fcdf922096b7f9c3 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Wed, 11 Nov 2015 23:07:16 +0100 Subject: [PATCH 098/616] PRD-76 refactored ping functionality. missing tests. --- .../System/Config/TestConnection.php | 14 ++-- .../System/Config/TestConnection/Ping.php | 43 +++++----- Model/Client/ClientInterface.php | 6 +- Model/{ => Client}/ClientOptionsInterface.php | 4 +- Model/Client/ClientPool.php | 81 +++++++++++++++++++ Model/Client/FactoryInterface.php | 0 etc/adminhtml/routes.xml | 0 etc/di.xml | 7 ++ view/adminhtml/requirejs-config.js | 0 .../system/config/testconnection.phtml | 2 +- view/adminhtml/web/js/testconnection.js | 0 11 files changed, 118 insertions(+), 39 deletions(-) mode change 100755 => 100644 Block/Adminhtml/System/Config/TestConnection.php mode change 100755 => 100644 Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php mode change 100755 => 100644 Model/Client/ClientInterface.php rename Model/{ => Client}/ClientOptionsInterface.php (80%) mode change 100755 => 100644 create mode 100644 Model/Client/ClientPool.php mode change 100755 => 100644 Model/Client/FactoryInterface.php mode change 100755 => 100644 etc/adminhtml/routes.xml mode change 100755 => 100644 view/adminhtml/requirejs-config.js mode change 100755 => 100644 view/adminhtml/templates/system/config/testconnection.phtml mode change 100755 => 100644 view/adminhtml/web/js/testconnection.js diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php old mode 100755 new mode 100644 index 9a4baced49b17..01360616c4b3a --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -19,9 +19,7 @@ class TestConnection extends \Magento\Config\Block\System\Config\Form\Field protected function _prepareLayout() { parent::_prepareLayout(); - if (!$this->getTemplate()) { - $this->setTemplate('Magento_AdvancedSearch::system/config/testconnection.phtml'); - } + $this->setTemplate('Magento_AdvancedSearch::system/config/testconnection.phtml'); return $this; } @@ -51,8 +49,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract [ 'button_label' => __($originalData['button_label']), 'html_id' => $element->getHtmlId(), - 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config_testconnection/ping'), - 'field_mapping' => [], + 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config_testconnection/ping') ] ); @@ -60,13 +57,12 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract } /** - * Prepares field mapping array for use in block + * Returns configuration fields in escaped JSON format required to perform the ping request * - * @param array $fieldMapping * @return string */ - public function prepareFieldMapping($fieldMapping = []) + public function getFieldMapping() { - return addslashes(json_encode($fieldMapping)); + return $this->escapeJsQuote(json_encode(['engine' => 'catalog_search_engine']), '"'); } } diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php old mode 100755 new mode 100644 index 43dadc3c29ec3..a4f507a31a4f3 --- a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php @@ -7,21 +7,15 @@ namespace Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection; use Magento\Backend\App\Action; -use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\AdvancedSearch\Model\Client\FactoryInterface; +use Magento\AdvancedSearch\Model\Client\ClientPool; use Magento\Framework\Controller\Result\JsonFactory; class Ping extends \Magento\Backend\App\Action { /** - * @var FactoryInterface + * @var ClientPool */ - private $clientFactory; - - /** - * @var ClientInterface - */ - private $clientHelper; + private $clientPool; /** * @var JsonFactory @@ -29,20 +23,17 @@ class Ping extends \Magento\Backend\App\Action private $resultJsonFactory; /** - * @param Action\Context $context - * @param FactoryInterface $clientFactory - * @param ClientOptionsInterface $clientHelper - * @param JsonFactory $resultJsonFactory + * @param Action\Context $context + * @param ClientPool $clientPool + * @param JsonFactory $resultJsonFactory */ public function __construct( Action\Context $context, - FactoryInterface $clientFactory, - ClientOptionsInterface $clientHelper, + ClientPool $clientPool, JsonFactory $resultJsonFactory ) { parent::__construct($context); - $this->clientFactory = $clientFactory; - $this->clientHelper = $clientHelper; + $this->clientPool = $clientPool; $this->resultJsonFactory = $resultJsonFactory; } @@ -50,24 +41,30 @@ public function __construct( * Check for connection to server * * @return \Magento\Framework\Controller\Result\Json - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function execute() { $result = [ 'success' => false, - 'errorMessage' => __('Please check server credentials'), + 'errorMessage' => '', ]; $options = $this->getRequest()->getParams(); - $result['errorMessage'] = ''; try { - $response = $this->clientFactory->create($this->clientHelper->prepareClientOptions($options))->ping(); - if (isset($response['status']) && strcasecmp($response['status'], 'ok') == 0) { + if (empty($options['engine'])) { + throw new \Magento\Framework\Exception\LocalizedException( + __('Missing search engine parameter.') + ); + } + $response = $this->clientPool->create($options['engine'], $options)->validateConnectionParameters(); + if ($response) { $result['success'] = true; } + } catch (\Magento\Framework\Exception\LocalizedException $e) { + $result['errorMessage'] = $e->getMessage(); } catch (\Exception $e) { - $result['errorMessage'] = strip_tags($e->getMessage()); + $message = strip_tags($e->getMessage()); + $result['errorMessage'] = __($message); } /** @var \Magento\Framework\Controller\Result\Json $resultJson */ diff --git a/Model/Client/ClientInterface.php b/Model/Client/ClientInterface.php old mode 100755 new mode 100644 index 8bdc706d476ad..7f7dd6270a121 --- a/Model/Client/ClientInterface.php +++ b/Model/Client/ClientInterface.php @@ -8,9 +8,9 @@ interface ClientInterface { /** - * Ping search engine + * Validate connection params for search engine * - * @return array + * @return bool */ - public function ping(); + public function validateConnectionParameters(); } diff --git a/Model/ClientOptionsInterface.php b/Model/Client/ClientOptionsInterface.php old mode 100755 new mode 100644 similarity index 80% rename from Model/ClientOptionsInterface.php rename to Model/Client/ClientOptionsInterface.php index 94b9866f1b5ee..4e284bc06fb41 --- a/Model/ClientOptionsInterface.php +++ b/Model/Client/ClientOptionsInterface.php @@ -1,11 +1,9 @@ objectManager = $objectManager; + $this->clientFactoryPool = $clientFactories; + $this->clientOptionsPool = $clientOptions; + } + + /** + * Create client instance + * + * @param string $engine + * @param array $data + * @return \Magento\AdvancedSearch\Model\Client\ClientInterface + */ + public function create($engine, array $data = []) + { + if (!isset($this->clientFactoryPool[$engine])) { + throw new \LogicException( + 'There is no such client factory: ' . $engine + ); + } + $factoryClass = $this->clientFactoryPool[$engine]; + $factory = $this->objectManager->create($factoryClass, $data); + if (!($factory instanceof FactoryInterface)) { + throw new \InvalidArgumentException( + 'Client factory must implement \Magento\AdvancedSearch\Model\Client\FactoryInterface' + ); + } + + $optionsClass = $this->clientOptionsPool[$engine]; + $clientOptions = $this->objectManager->create($optionsClass, $data); + if (!($clientOptions instanceof ClientOptionsInterface)) { + throw new \InvalidArgumentException( + 'Client options must implement \Magento\AdvancedSearch\Model\Client\ClientInterface' + ); + } + + $client = $factory->create($clientOptions->prepareClientOptions($data)); + + return $client; + } +} \ No newline at end of file diff --git a/Model/Client/FactoryInterface.php b/Model/Client/FactoryInterface.php old mode 100755 new mode 100644 diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml old mode 100755 new mode 100644 diff --git a/etc/di.xml b/etc/di.xml index 647d191ef5f6d..6ae6a417d790a 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -18,4 +18,11 @@ Did you mean + + + + Magento\Framework\Search\Adapter\Mysql\Adapter + + + diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js old mode 100755 new mode 100644 diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/view/adminhtml/templates/system/config/testconnection.phtml old mode 100755 new mode 100644 index 743ac05c5bccc..ddab7edf78b33 --- a/view/adminhtml/templates/system/config/testconnection.phtml +++ b/view/adminhtml/templates/system/config/testconnection.phtml @@ -10,6 +10,6 @@ "elementId": "getHtmlId() ?>", "successText": "", "failedText": "", - "fieldMapping": "prepareFieldMapping($block->getFieldMapping()) ?>"}, "validation": {}}'> + "fieldMapping": "getFieldMapping() ?>"}, "validation": {}}'> escapeHtml($block->getButtonLabel()) ?> \ No newline at end of file diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js old mode 100755 new mode 100644 From 559f98cba6afc8298ea7fd03b4ee4f814273d8b3 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Thu, 12 Nov 2015 17:47:13 +0100 Subject: [PATCH 099/616] PRD-76 refactored ClientResolver implementation and renamed controller --- .../System/Config/TestConnection.php | 4 +- Model/Client/Elasticsearch.php | 3 +- Test/Unit/Model/Client/ElasticsearchTest.php | 18 +++++++-- .../Model/DataProvider/SuggestionsTest.php | 37 ------------------- composer.json | 3 ++ etc/di.xml | 2 +- 6 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 Test/Unit/Model/DataProvider/SuggestionsTest.php diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index 853329958aa77..a49b75d6e694c 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -14,7 +14,7 @@ class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Conf /** * {@inheritdoc} */ - public function getFieldMapping() + protected function _getFieldMapping() { $fields = [ 'engine' => 'catalog_search_engine', @@ -26,6 +26,6 @@ public function getFieldMapping() 'password' => 'catalog_search_elasticsearch_password', 'timeout' => 'catalog_search_elasticsearch_server_timeout', ]; - return $this->escapeJsQuote(json_encode($fields), '"'); + return array_merge(parent::_getFieldMapping(), $fields); } } diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 7bb305514b05d..e4473acbbd8b7 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -31,7 +31,6 @@ class Elasticsearch implements ClientInterface * * @param array $options * @param \Elasticsearch\Client|null $elasticsearchClient - * @param \Psr\Log\LoggerInterface $logger * @throws LocalizedException */ public function __construct( @@ -68,7 +67,7 @@ public function ping() * * @return bool */ - public function validateConnectionParameters() + public function testConnection() { if (!empty($this->clientOptions['index'])) { return $this->client->indices()->exists(['index' => $this->clientOptions['index']]); diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index aab933b46dffb..96615a86e892a 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -27,7 +27,7 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase public function setUp() { $this->elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') - ->setMethods(['ping']) + ->setMethods(['ping', 'indices']) ->disableOriginalConstructor() ->getMock(); $this->model = new ElasticsearchClient($this->getOptions(), $this->elasticsearchClientMock); @@ -54,8 +54,19 @@ public function testConstructorWithOptions() */ public function testPing() { - $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(['status' => 'OK']); - $this->assertEquals(['status' => 'OK'], $this->model->ping()); + $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true); + $this->assertEquals(true, $this->model->ping()); + } + + /** + * Test validation of connection parameters + */ + public function testTestConnection() + { + $indicesMock = $this->getMock('\Elasticsearch\Namespaces\IndicesNamespace', ['exists'], [], '', false); + $this->elasticsearchClientMock->expects($this->once())->method('indices')->willReturn($indicesMock); + $indicesMock->expects($this->once())->method('exists')->willReturn(true); + $this->assertEquals(true, $this->model->validateConnectionParameters()); } /** @@ -69,6 +80,7 @@ protected function getOptions() 'hostname' => 'localhost', 'port' => '9200', 'timeout' => 15, + 'index' => 'magento2', 'enableAuth' => 1, 'username' => 'user', 'password' => 'passwd', diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php deleted file mode 100644 index 4a26f55bc1ad1..0000000000000 --- a/Test/Unit/Model/DataProvider/SuggestionsTest.php +++ /dev/null @@ -1,37 +0,0 @@ -objectManager = new ObjectManager($this); - } - - public function testGetItems() - { - /** @var \Magento\Search\Model\QueryInterface|\PHPUnit_Framework_MockObject_MockObject $searchQuery */ - $searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface')->getMockForAbstractClass(); - /** @var \Magento\AdvancedSearch\Model\SuggestedQueries $dataProvider */ - $dataProvider = $this->objectManager->getObject('Magento\Elasticsearch\Model\DataProvider\Suggestions'); - $this->assertEquals([], $dataProvider->getItems($searchQuery)); - } - - public function testIsResultsCountEnabled() - { - /** @var \Magento\AdvancedSearch\Model\SuggestedQueries $dataProvider */ - $dataProvider = $this->objectManager->getObject('Magento\Elasticsearch\Model\DataProvider\Suggestions'); - $this->assertEquals(false, $dataProvider->isResultsCountEnabled()); - } -} diff --git a/composer.json b/composer.json index a93b239118559..25568f794fae9 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0|~7.0.0", + "magento/module-store": "100.0.0", "magento/module-advanced-search": "100.0.0", + "magento/module-catalog-search": "100.0.0", "magento/module-search": "100.0.0", + "magento/module-catalog": "100.0.0", "magento/framework": "100.0.0", "elasticsearch/elasticsearch": "~2.0" }, diff --git a/etc/di.xml b/etc/di.xml index efe99da59cb3e..dcddb29a7ae52 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -13,7 +13,7 @@ - + \Magento\Elasticsearch\Model\Client\ElasticsearchFactory From 1249903e63b4f3813b897ee262ea089c9c3f0335 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Thu, 12 Nov 2015 17:47:13 +0100 Subject: [PATCH 100/616] PRD-76 refactored ClientResolver implementation and renamed controller --- .../System/Config/TestConnection.php | 11 ++--- .../Ping.php => TestConnection.php} | 18 ++++---- Model/Client/ClientInterface.php | 2 +- .../{ClientPool.php => ClientResolver.php} | 44 ++++++++++++++++--- etc/di.xml | 4 +- 5 files changed, 58 insertions(+), 21 deletions(-) rename Controller/Adminhtml/Search/System/Config/{TestConnection/Ping.php => TestConnection.php} (81%) rename Model/Client/{ClientPool.php => ClientResolver.php} (69%) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index 01360616c4b3a..4b46828805284 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -49,7 +49,8 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract [ 'button_label' => __($originalData['button_label']), 'html_id' => $element->getHtmlId(), - 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config_testconnection/ping') + 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config/testconnection'), + 'field_mapping' => $this->escapeJsQuote(json_encode($this->_getFieldMapping()), '"') ] ); @@ -57,12 +58,12 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract } /** - * Returns configuration fields in escaped JSON format required to perform the ping request + * Returns configuration fields required to perform the ping request * - * @return string + * @return array */ - public function getFieldMapping() + protected function _getFieldMapping() { - return $this->escapeJsQuote(json_encode(['engine' => 'catalog_search_engine']), '"'); + return ['engine' => 'catalog_search_engine']; } } diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php similarity index 81% rename from Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php rename to Controller/Adminhtml/Search/System/Config/TestConnection.php index a4f507a31a4f3..bdd981a0fac10 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection/Ping.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -4,18 +4,18 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection; +namespace Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config; use Magento\Backend\App\Action; -use Magento\AdvancedSearch\Model\Client\ClientPool; +use Magento\AdvancedSearch\Model\Client\ClientResolver; use Magento\Framework\Controller\Result\JsonFactory; -class Ping extends \Magento\Backend\App\Action +class TestConnection extends Action { /** - * @var ClientPool + * @var ClientResolver */ - private $clientPool; + private $clientResolver; /** * @var JsonFactory @@ -24,16 +24,16 @@ class Ping extends \Magento\Backend\App\Action /** * @param Action\Context $context - * @param ClientPool $clientPool + * @param ClientResolver $clientResolver * @param JsonFactory $resultJsonFactory */ public function __construct( Action\Context $context, - ClientPool $clientPool, + ClientResolver $clientResolver, JsonFactory $resultJsonFactory ) { parent::__construct($context); - $this->clientPool = $clientPool; + $this->clientResolver = $clientResolver; $this->resultJsonFactory = $resultJsonFactory; } @@ -56,7 +56,7 @@ public function execute() __('Missing search engine parameter.') ); } - $response = $this->clientPool->create($options['engine'], $options)->validateConnectionParameters(); + $response = $this->clientResolver->create($options['engine'], $options)->testConnection(); if ($response) { $result['success'] = true; } diff --git a/Model/Client/ClientInterface.php b/Model/Client/ClientInterface.php index 7f7dd6270a121..519f0dfaf615a 100644 --- a/Model/Client/ClientInterface.php +++ b/Model/Client/ClientInterface.php @@ -12,5 +12,5 @@ interface ClientInterface * * @return bool */ - public function validateConnectionParameters(); + public function testConnection(); } diff --git a/Model/Client/ClientPool.php b/Model/Client/ClientResolver.php similarity index 69% rename from Model/Client/ClientPool.php rename to Model/Client/ClientResolver.php index f0a7dbbb43825..632cc9b2d2ba2 100644 --- a/Model/Client/ClientPool.php +++ b/Model/Client/ClientResolver.php @@ -5,8 +5,15 @@ */ namespace Magento\AdvancedSearch\Model\Client; -class ClientPool +class ClientResolver { + /** + * Scope configuration + * + * @var \Magento\Framework\App\Config\ScopeConfigInterface + */ + protected $scopeConfig; + /** * Object Manager instance * @@ -28,20 +35,45 @@ class ClientPool */ private $clientOptionsPool; + /** + * Config path + * + * @var string + */ + protected $path; + + /** + * Config Scope + */ + protected $scope; + /** * @param \Magento\Framework\ObjectManagerInterface $objectManager * @param array $clientFactories * @param array $clientOptions + * @param string $path + * @param string scope */ public function __construct( \Magento\Framework\ObjectManagerInterface $objectManager, + \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, array $clientFactories, - array $clientOptions + array $clientOptions, + $path, + $scopeType ) { $this->objectManager = $objectManager; + $this->scopeConfig = $scopeConfig; $this->clientFactoryPool = $clientFactories; $this->clientOptionsPool = $clientOptions; + $this->path = $path; + $this->scope = $scopeType; + } + + public function getCurrentEngine() + { + return $this->scopeConfig->getValue($this->path, $this->scope); } /** @@ -51,15 +83,17 @@ public function __construct( * @param array $data * @return \Magento\AdvancedSearch\Model\Client\ClientInterface */ - public function create($engine, array $data = []) + public function create($engine = '', array $data = []) { + $engine = $engine ?: $this->getCurrentEngine(); + if (!isset($this->clientFactoryPool[$engine])) { throw new \LogicException( 'There is no such client factory: ' . $engine ); } $factoryClass = $this->clientFactoryPool[$engine]; - $factory = $this->objectManager->create($factoryClass, $data); + $factory = $this->objectManager->create($factoryClass); if (!($factory instanceof FactoryInterface)) { throw new \InvalidArgumentException( 'Client factory must implement \Magento\AdvancedSearch\Model\Client\FactoryInterface' @@ -67,7 +101,7 @@ public function create($engine, array $data = []) } $optionsClass = $this->clientOptionsPool[$engine]; - $clientOptions = $this->objectManager->create($optionsClass, $data); + $clientOptions = $this->objectManager->create($optionsClass); if (!($clientOptions instanceof ClientOptionsInterface)) { throw new \InvalidArgumentException( 'Client options must implement \Magento\AdvancedSearch\Model\Client\ClientInterface' diff --git a/etc/di.xml b/etc/di.xml index 6ae6a417d790a..f71730d254d02 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -18,11 +18,13 @@ Did you mean - + Magento\Framework\Search\Adapter\Mysql\Adapter + Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH + \Magento\Store\Model\ScopeInterface::SCOPE_STORE From 91c15c2e058c53c694f3dbbcdddcb0b82c22c042 Mon Sep 17 00:00:00 2001 From: maksek Date: Thu, 12 Nov 2015 12:34:32 -0600 Subject: [PATCH 101/616] Magento 2.0.0-rc2 publication --- composer.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 6042e1796869b..66886f9530e91 100644 --- a/composer.json +++ b/composer.json @@ -3,20 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0|~7.0.0", - "magento/framework": "100.0.0", - "magento/module-search": "100.0.0", - "magento/module-backend": "100.0.0", - "magento/module-store": "100.0.0", - "magento/module-catalog": "100.0.0", - "magento/module-catalog-search": "100.0.0" + "magento/framework": "100.0.*", + "magento/module-search": "100.0.*", + "magento/module-backend": "100.0.*", + "magento/module-store": "100.0.*", + "magento/module-catalog": "100.0.*", + "magento/module-catalog-search": "100.0.*" }, "type": "magento2-module", - "version": "100.0.0", + "version": "100.0.1", "license": [ "proprietary" ], "autoload": { - "files": [ "registration.php" ], + "files": [ + "registration.php" + ], "psr-4": { "Magento\\AdvancedSearch\\": "" } From 5e6d60150e1304878fcd21b388f94759e0662a15 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 13 Nov 2015 07:55:47 +0100 Subject: [PATCH 102/616] PRD-76 fixed XSD validation --- config/esconfig.xsd | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/config/esconfig.xsd b/config/esconfig.xsd index 7b386684adc2d..7b04569b8d4de 100644 --- a/config/esconfig.xsd +++ b/config/esconfig.xsd @@ -8,18 +8,19 @@ */ --> - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file From a1588cafc096d342f5a5ceacdbfaef8f4cbdc57f Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 13 Nov 2015 14:03:03 +0100 Subject: [PATCH 103/616] PRD-76 finished unit tests --- .../Search/System/Config/TestConnection.php | 4 +- Model/Client/ClientOptionsInterface.php | 2 +- Model/Client/ClientResolver.php | 16 +- .../System/Config/TestConnectionTest.php | 148 ++++++++++++++++++ Test/Unit/Model/Client/ClientResolverTest.php | 118 ++++++++++++++ 5 files changed, 280 insertions(+), 8 deletions(-) create mode 100644 Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php create mode 100644 Test/Unit/Model/Client/ClientResolverTest.php diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index bdd981a0fac10..21aaa50976a28 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -63,7 +63,9 @@ public function execute() } catch (\Magento\Framework\Exception\LocalizedException $e) { $result['errorMessage'] = $e->getMessage(); } catch (\Exception $e) { - $message = strip_tags($e->getMessage()); + $filter = $this->_objectManager->create('Magento\Framework\Filter\StripTags'); + /* @var $filter \Magento\Framework\Filter\StripTags */ + $message = $filter->filter($e->getMessage()); $result['errorMessage'] = __($message); } diff --git a/Model/Client/ClientOptionsInterface.php b/Model/Client/ClientOptionsInterface.php index 4e284bc06fb41..72a19227de3d2 100644 --- a/Model/Client/ClientOptionsInterface.php +++ b/Model/Client/ClientOptionsInterface.php @@ -11,7 +11,7 @@ interface ClientOptionsInterface * Return search client options * * @param array $options - * @return mixed + * @return array */ public function prepareClientOptions($options = []); } diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index 632cc9b2d2ba2..55590c992171a 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -5,19 +5,22 @@ */ namespace Magento\AdvancedSearch\Model\Client; +use \Magento\Framework\ObjectManagerInterface; +use \Magento\Framework\App\Config\ScopeConfigInterface; + class ClientResolver { /** * Scope configuration * - * @var \Magento\Framework\App\Config\ScopeConfigInterface + * @var ScopeConfigInterface */ protected $scopeConfig; /** * Object Manager instance * - * @var \Magento\Framework\ObjectManagerInterface + * @var ObjectManagerInterface */ protected $objectManager; @@ -49,15 +52,16 @@ class ClientResolver /** - * @param \Magento\Framework\ObjectManagerInterface $objectManager + * @param ObjectManagerInterface $objectManager + * @param ScopeConfigInterface $scopeConfig, * @param array $clientFactories * @param array $clientOptions * @param string $path * @param string scope */ public function __construct( - \Magento\Framework\ObjectManagerInterface $objectManager, - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + ObjectManagerInterface $objectManager, + ScopeConfigInterface $scopeConfig, array $clientFactories, array $clientOptions, $path, @@ -81,7 +85,7 @@ public function getCurrentEngine() * * @param string $engine * @param array $data - * @return \Magento\AdvancedSearch\Model\Client\ClientInterface + * @return ClientInterface */ public function create($engine = '', array $data = []) { diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php new file mode 100644 index 0000000000000..d916fb2b74360 --- /dev/null +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php @@ -0,0 +1,148 @@ +requestMock = $this->getMock('Magento\Framework\App\Request\Http', ['getParams'], [], '', false); + $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); + + $context = $this->getMock( + 'Magento\Backend\App\Action\Context', + ['getRequest', 'getResponse', 'getMessageManager', 'getSession'], + $helper->getConstructArguments( + 'Magento\Backend\App\Action\Context', + [ + 'request' => $this->requestMock + ] + ) + ); + $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->requestMock)); + $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock)); + + $this->clientResolverMock = $this->getMockBuilder('Magento\AdvancedSearch\Model\Client\ClientResolver') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->clientMock = $this->getMock('Magento\AdvancedSearch\Model\Client\ClientInterface'); + + $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json') + ->disableOriginalConstructor() + ->getMock(); + + $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->controller = new TestConnection($context, $this->clientResolverMock, $this->resultJsonFactory); + } + + public function testExecuteEmptyEngine() + { + $this->requestMock->expects($this->once())->method('getParams') + ->will($this->returnValue(['engine' => ''])); + + $this->resultJsonFactory->expects($this->once())->method('create') + ->will($this->returnValue($this->resultJson)); + + $result = array('success' => false, 'errorMessage' => 'Missing search engine parameter.'); + + $this->resultJson->expects($this->once())->method('setData') + ->with($this->equalTo($result)); + + $this->controller->execute(); + } + + public function testExecute() + { + $this->requestMock->expects($this->once())->method('getParams') + ->will($this->returnValue(['engine' => 'engineName'])); + + $this->clientResolverMock->expects($this->once())->method('create') + ->with($this->equalTo('engineName')) + ->will($this->returnValue($this->clientMock)); + + $this->clientMock->expects($this->once())->method('testConnection') + ->will($this->returnValue(true)); + + $this->resultJsonFactory->expects($this->once())->method('create') + ->will($this->returnValue($this->resultJson)); + + $result = array('success' => true, 'errorMessage' => ''); + + $this->resultJson->expects($this->once())->method('setData') + ->with($this->equalTo($result)); + + $this->controller->execute(); + } + + public function testExecutePingFailed() + { + $this->requestMock->expects($this->once())->method('getParams') + ->will($this->returnValue(['engine' => 'engineName'])); + + $this->clientResolverMock->expects($this->once())->method('create') + ->with($this->equalTo('engineName')) + ->will($this->returnValue($this->clientMock)); + + $this->clientMock->expects($this->once())->method('testConnection') + ->will($this->returnValue(false)); + + $this->resultJsonFactory->expects($this->once())->method('create') + ->will($this->returnValue($this->resultJson)); + + $result = array('success' => false, 'errorMessage' => ''); + + $this->resultJson->expects($this->once())->method('setData') + ->with($this->equalTo($result)); + + $this->controller->execute(); + } +} diff --git a/Test/Unit/Model/Client/ClientResolverTest.php b/Test/Unit/Model/Client/ClientResolverTest.php new file mode 100644 index 0000000000000..07c508cb4ec97 --- /dev/null +++ b/Test/Unit/Model/Client/ClientResolverTest.php @@ -0,0 +1,118 @@ +helper = new ObjectManager($this); + + $this->scopeConfig = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface'); + + $this->model= $this->helper->getObject( + '\Magento\AdvancedSearch\Model\Client\ClientResolver', + [ + 'objectManager' => $this->objectManager, + 'scopeConfig' => $this->scopeConfig, + 'clientFactories' => ['engineName' => 'engineFactoryClass'], + 'clientOptions' => ['engineName' => 'engineOptionClass'], + 'path' => 'some_path', + 'scopeType' => 'some_scopeType' + ] + ); + } + + public function testCreate() + { + $this->scopeConfig->expects($this->once())->method('getValue') + ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) + ->will($this->returnValue('engineName')); + + $factoryMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\FactoryInterface'); + + $clientMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientInterface'); + + $clientOptionsMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientOptionsInterface'); + + $this->objectManager->expects($this->exactly(2))->method('create') + ->withConsecutive( + [$this->equalTo('engineFactoryClass')], + [$this->equalTo('engineOptionClass')] + ) + ->willReturnOnConsecutiveCalls( + $factoryMock, + $clientOptionsMock + ); + + $clientOptionsMock->expects($this->once())->method('prepareClientOptions') + ->with([]) + ->will($this->returnValue(['parameters'])); + + $factoryMock->expects($this->once())->method('create') + ->with($this->equalTo(['parameters'])) + ->will($this->returnValue($clientMock)); + + $result = $this->model->create(); + $this->assertInstanceOf('\Magento\AdvancedSearch\Model\Client\ClientInterface', $result); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testCreateExceptionThrown() + { + $this->objectManager->expects($this->once())->method('create') + ->with($this->equalTo('engineFactoryClass')) + ->will($this->returnValue('t')); + + $this->model->create('engineName'); + } + + /** + * @expectedException LogicException + */ + public function testCreateLogicException() + { + $this->model->create('input'); + } + + public function testGetCurrentEngine() + { + $this->scopeConfig->expects($this->once())->method('getValue') + ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) + ->will($this->returnValue('engineName')); + + $this->assertEquals('engineName', $this->model->getCurrentEngine()); + } +} From d8b4c61fbee75f90a81482a976b17d7fe5804adf Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 13 Nov 2015 14:03:03 +0100 Subject: [PATCH 104/616] PRD-76 finished unit tests --- Test/Unit/Model/Client/ElasticsearchTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 96615a86e892a..3341add618ab3 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -66,7 +66,7 @@ public function testTestConnection() $indicesMock = $this->getMock('\Elasticsearch\Namespaces\IndicesNamespace', ['exists'], [], '', false); $this->elasticsearchClientMock->expects($this->once())->method('indices')->willReturn($indicesMock); $indicesMock->expects($this->once())->method('exists')->willReturn(true); - $this->assertEquals(true, $this->model->validateConnectionParameters()); + $this->assertEquals(true, $this->model->testConnection()); } /** From 0928108d2031bac2d323cb271b63c52c94887901 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 13 Nov 2015 15:18:28 +0100 Subject: [PATCH 105/616] PRD-76 use DI for StripTags class creation and fixed possible translation issue --- .../Search/System/Config/TestConnection.php | 17 ++++++++++++----- .../Search/System/Config/TestConnectionTest.php | 12 +++++++++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index 21aaa50976a28..93c36ff63b9f7 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -9,6 +9,7 @@ use Magento\Backend\App\Action; use Magento\AdvancedSearch\Model\Client\ClientResolver; use Magento\Framework\Controller\Result\JsonFactory; +use Magento\Framework\Filter\StripTags; class TestConnection extends Action { @@ -22,19 +23,27 @@ class TestConnection extends Action */ private $resultJsonFactory; + /** + * @var StripTags + */ + private $tagFilter; + /** * @param Action\Context $context * @param ClientResolver $clientResolver * @param JsonFactory $resultJsonFactory + * @param StripTags $tagFilter */ public function __construct( Action\Context $context, ClientResolver $clientResolver, - JsonFactory $resultJsonFactory + JsonFactory $resultJsonFactory, + StripTags $tagFilter ) { parent::__construct($context); $this->clientResolver = $clientResolver; $this->resultJsonFactory = $resultJsonFactory; + $this->tagFilter = $tagFilter; } /** @@ -63,10 +72,8 @@ public function execute() } catch (\Magento\Framework\Exception\LocalizedException $e) { $result['errorMessage'] = $e->getMessage(); } catch (\Exception $e) { - $filter = $this->_objectManager->create('Magento\Framework\Filter\StripTags'); - /* @var $filter \Magento\Framework\Filter\StripTags */ - $message = $filter->filter($e->getMessage()); - $result['errorMessage'] = __($message); + $message = __($e->getMessage()); + $result['errorMessage'] = $this->tagFilter->filter($message); } /** @var \Magento\Framework\Controller\Result\Json $resultJson */ diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php index d916fb2b74360..f7bc76c257ad2 100644 --- a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php @@ -36,6 +36,11 @@ class TestConnectionTest extends \PHPUnit_Framework_TestCase */ private $resultJsonFactory; + /** + * @var \Magento\Framework\Filter\StripTags|\PHPUnit_Framework_MockObject_MockObject + */ + private $tagFilterMock; + /** * @var TestConnection */ @@ -81,7 +86,12 @@ protected function setUp() ->setMethods(['create']) ->getMock(); - $this->controller = new TestConnection($context, $this->clientResolverMock, $this->resultJsonFactory); + $this->tagFilterMock = $this->getMockBuilder('Magento\Framework\Filter\StripTags') + ->disableOriginalConstructor() + ->setMethods(['filter']) + ->getMock(); + + $this->controller = new TestConnection($context, $this->clientResolverMock, $this->resultJsonFactory, $this->tagFilterMock); } public function testExecuteEmptyEngine() From a4c28d7d2b4d2d5f044c86456622f88df2f0d874 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 13 Nov 2015 18:34:40 +0100 Subject: [PATCH 106/616] PRD-76 replaced factory class by auto-generated classes --- Model/Client/ElasticsearchFactory.php | 41 --------------------------- etc/di.xml | 5 ++++ 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 Model/Client/ElasticsearchFactory.php diff --git a/Model/Client/ElasticsearchFactory.php b/Model/Client/ElasticsearchFactory.php deleted file mode 100644 index 09e0118931772..0000000000000 --- a/Model/Client/ElasticsearchFactory.php +++ /dev/null @@ -1,41 +0,0 @@ -objectManager = $objectManager; - } - - /** - * {@inheritdoc} - */ - public function create(array $options = []) - { - return $this->objectManager->create( - 'Magento\Elasticsearch\Model\Client\Elasticsearch', - ['options' => $options] - ); - } -} diff --git a/etc/di.xml b/etc/di.xml index dcddb29a7ae52..4ca299ec3c2f6 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -23,4 +23,9 @@ + + + Magento\Elasticsearch\Model\Client\Elasticsearch + + From 76e8f70642f5f8e7adef4c80af1d6fb1102da986 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Fri, 13 Nov 2015 18:34:40 +0100 Subject: [PATCH 107/616] PRD-76 replaced factory class by auto-generated classes --- .../Search/System/Config/TestConnection.php | 1 + Model/Client/ClientFactory.php | 48 +++++++++++++++++++ ...terface.php => ClientFactoryInterface.php} | 2 +- Model/Client/ClientResolver.php | 4 +- Test/Unit/Model/Client/ClientResolverTest.php | 2 +- etc/di.xml | 1 + 6 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 Model/Client/ClientFactory.php rename Model/Client/{FactoryInterface.php => ClientFactoryInterface.php} (90%) diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index 93c36ff63b9f7..3995c6035eb19 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -28,6 +28,7 @@ class TestConnection extends Action */ private $tagFilter; + /** * @param Action\Context $context * @param ClientResolver $clientResolver diff --git a/Model/Client/ClientFactory.php b/Model/Client/ClientFactory.php new file mode 100644 index 0000000000000..383092e93ed48 --- /dev/null +++ b/Model/Client/ClientFactory.php @@ -0,0 +1,48 @@ +objectManager = $objectManager; + $this->clientClass = $clientClass; + } + + /** + * Return search client + * + * @param array $options + * @return ClientInterface + */ + public function create(array $options = []) + { + return $this->objectManager->create( + $this->clientClass, + ['options' => $options] + ); + } +} diff --git a/Model/Client/FactoryInterface.php b/Model/Client/ClientFactoryInterface.php similarity index 90% rename from Model/Client/FactoryInterface.php rename to Model/Client/ClientFactoryInterface.php index 209c5d8845cf0..74da5ede3d331 100644 --- a/Model/Client/FactoryInterface.php +++ b/Model/Client/ClientFactoryInterface.php @@ -5,7 +5,7 @@ */ namespace Magento\AdvancedSearch\Model\Client; -interface FactoryInterface +interface ClientFactoryInterface { /** * Return search client diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index 55590c992171a..6486a5ad2cd30 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -98,9 +98,9 @@ public function create($engine = '', array $data = []) } $factoryClass = $this->clientFactoryPool[$engine]; $factory = $this->objectManager->create($factoryClass); - if (!($factory instanceof FactoryInterface)) { + if (!($factory instanceof ClientFactoryInterface)) { throw new \InvalidArgumentException( - 'Client factory must implement \Magento\AdvancedSearch\Model\Client\FactoryInterface' + 'Client factory must implement \Magento\AdvancedSearch\Model\Client\ClientFactoryInterface' ); } diff --git a/Test/Unit/Model/Client/ClientResolverTest.php b/Test/Unit/Model/Client/ClientResolverTest.php index 07c508cb4ec97..6e1a68e73df8b 100644 --- a/Test/Unit/Model/Client/ClientResolverTest.php +++ b/Test/Unit/Model/Client/ClientResolverTest.php @@ -59,7 +59,7 @@ public function testCreate() ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) ->will($this->returnValue('engineName')); - $factoryMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\FactoryInterface'); + $factoryMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface'); $clientMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientInterface'); diff --git a/etc/di.xml b/etc/di.xml index f71730d254d02..a1ed57a02d888 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -6,6 +6,7 @@ --> + Magento\AdvancedSearch\Model\Recommendations\DataProvider From 9ad2c74b38dcd90fade4a4809d73057a6bae0cd8 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Sat, 14 Nov 2015 01:24:34 +0100 Subject: [PATCH 108/616] PRD-76 fixed broken class references --- SearchAdapter/ConnectionManager.php | 10 +++++----- .../Unit/Model/SearchAdapter/ConnectionManagerTest.php | 10 +++++----- etc/adminhtml/system.xml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php index c4a1a22179c27..53bc50a4c0949 100644 --- a/SearchAdapter/ConnectionManager.php +++ b/SearchAdapter/ConnectionManager.php @@ -5,8 +5,8 @@ */ namespace Magento\Elasticsearch\SearchAdapter; -use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\AdvancedSearch\Model\Client\FactoryInterface; +use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; +use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface; use Psr\Log\LoggerInterface; use Magento\Elasticsearch\Model\Client\Elasticsearch; @@ -23,7 +23,7 @@ class ConnectionManager private $logger; /** - * @var FactoryInterface + * @var ClientFactoryInterface */ private $clientFactory; @@ -33,12 +33,12 @@ class ConnectionManager private $clientConfig; /** - * @param FactoryInterface $clientFactory + * @param ClientFactoryInterface $clientFactory * @param ClientOptionsInterface $clientConfig * @param LoggerInterface $logger */ public function __construct( - FactoryInterface $clientFactory, + ClientFactoryInterface $clientFactory, ClientOptionsInterface $clientConfig, LoggerInterface $logger ) { diff --git a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php index ab82c189dbeb5..95df8aa57c49a 100644 --- a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php +++ b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php @@ -5,8 +5,8 @@ */ namespace Magento\Elasticsearch\Test\Unit\Model\SearchAdapter; -use Magento\AdvancedSearch\Model\ClientOptionsInterface; -use Magento\AdvancedSearch\Model\Client\FactoryInterface; +use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; +use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface; use Psr\Log\LoggerInterface; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; @@ -26,7 +26,7 @@ class ConnectionManagerTest extends \PHPUnit_Framework_TestCase private $logger; /** - * @var FactoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var ClientFactoryInterface|\PHPUnit_Framework_MockObject_MockObject */ private $clientFactory; @@ -45,7 +45,7 @@ public function setUp() $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') ->disableOriginalConstructor() ->getMock(); - $this->clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\FactoryInterface') + $this->clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface') ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); @@ -70,7 +70,7 @@ public function setUp() /** * Test getConnection() method without errors */ - public function testGetConnectionSuccessfull() + public function testGetConnectionSuccessful() { $client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') ->disableOriginalConstructor() diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 3b5539bcc4ad8..8271964c98c7d 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -55,7 +55,7 @@ - + 

' . print_r($queryResult, true) . '
'; + die;*/ + return []; } @@ -68,4 +257,18 @@ public function loadNext($data, $rightIndex, $upper = null) { return []; } + + /** + * @param array $documents + * @return float[] + */ + private function arrayValuesToFloat($hits) + { + $returnPrices = []; + foreach ($hits as $hit) { + $returnPrices[] = (float) $hit['sort'][0]; + } + + return $returnPrices; + } } From 9cf05b865661135bb8fac6c1111eebf6f326e0d8 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 7 Dec 2015 13:12:57 +0200 Subject: [PATCH 192/616] PRD-74: Search Interfaces Implementation 3 - Price Layered Navigation --- SearchAdapter/Dynamic/DataProvider.php | 43 +++++++++++++++++++++----- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 4e1d8ba47f302..83fc512776d53 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -187,15 +187,41 @@ public function getInterval( array $dimensions, EntityStorage $entityStorage ) { - $query = []; - $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); -// $mergedEntityIds = implode(' ' . Query::QUERY_OPERATOR_OR . ' ', $entityStorage->getSource()); -// $this->dimensionsBuilder->build($dimensions, $query); -// $query->addField($fieldName) -// ->createFilterQuery('interval') -// ->setQuery('id:(%1%)', [$mergedEntityIds]); + $entityIds = $entityStorage->getSource(); + $fieldName = $this->fieldMapper->getFieldName('price'); + $customerGroupId = $this->customerSession->getCustomerGroupId(); + $websiteId = $this->storeManager->getStore()->getWebsiteId(); + $storeId = $this->storeManager->getStore()->getId(); + $requestQuery = [ + 'index' => $this->clientConfig->getIndexName(), + 'type' => $this->clientConfig->getEntityType(), + 'body' => [ + 'fields' => [ + '_id', + '_score', + ], + 'query' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'store_id' => $storeId, + ], + ], + [ + 'terms' => [ + '_id' => $entityIds, + ], + ], + ], + ], + ], + ], + ]; - return $this->intervalFactory->create(['query' => $query, 'fieldName' => $fieldName]); + $queryResult = $this->connectionManager->getConnection() + ->query($requestQuery); + return $this->intervalFactory->create(['query' => $queryResult, 'fieldName' => $fieldName]); } /** @@ -203,6 +229,7 @@ public function getInterval( */ public function getAggregation( BucketInterface $bucket, + array $dimensions, $range, EntityStorage $entityStorage From 17d11b069dcf32950b1bf7e0ebaac0b31019b22c Mon Sep 17 00:00:00 2001 From: Michael Logvin Date: Mon, 7 Dec 2015 16:15:05 +0200 Subject: [PATCH 193/616] MAGETWO-46472: Prepare pull request --- .../System/Config/TestConnection.php | 31 ++ LICENSE_EE.txt | 437 ++++++++++++++++++ Model/Client/Elasticsearch.php | 105 +++++ Model/Config.php | 80 ++++ README.md | 2 + SearchAdapter/ConnectionManager.php | 80 ++++ Test/Unit/Model/Client/ElasticsearchTest.php | 89 ++++ Test/Unit/Model/ConfigTest.php | 70 +++ .../SearchAdapter/ConnectionManagerTest.php | 95 ++++ composer.json | 21 + config/esconfig.xml | 26 ++ config/esconfig.xsd | 26 ++ config/protwords.txt | 21 + config/protwords_en_US.txt | 0 config/stopwords.txt | 57 +++ config/stopwords_en_US.txt | 0 config/synonyms.txt | 31 ++ config/synonyms_en_US.txt | 0 etc/adminhtml/system.xml | 68 +++ etc/config.xml | 20 + etc/di.xml | 31 ++ etc/module.xml | 16 + registration.php | 11 + 23 files changed, 1317 insertions(+) create mode 100644 Block/Adminhtml/System/Config/TestConnection.php create mode 100644 LICENSE_EE.txt create mode 100644 Model/Client/Elasticsearch.php create mode 100644 Model/Config.php create mode 100644 README.md create mode 100644 SearchAdapter/ConnectionManager.php create mode 100644 Test/Unit/Model/Client/ElasticsearchTest.php create mode 100644 Test/Unit/Model/ConfigTest.php create mode 100644 Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php create mode 100644 composer.json create mode 100644 config/esconfig.xml create mode 100644 config/esconfig.xsd create mode 100644 config/protwords.txt create mode 100644 config/protwords_en_US.txt create mode 100644 config/stopwords.txt create mode 100644 config/stopwords_en_US.txt create mode 100644 config/synonyms.txt create mode 100644 config/synonyms_en_US.txt create mode 100644 etc/adminhtml/system.xml create mode 100644 etc/config.xml create mode 100644 etc/di.xml create mode 100644 etc/module.xml create mode 100644 registration.php diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php new file mode 100644 index 0000000000000..a49b75d6e694c --- /dev/null +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -0,0 +1,31 @@ + 'catalog_search_engine', + 'hostname' => 'catalog_search_elasticsearch_server_hostname', + 'port' => 'catalog_search_elasticsearch_server_port', + 'index' => 'catalog_search_elasticsearch_index_name', + 'enableAuth' => 'catalog_search_elasticsearch_enable_auth', + 'username' => 'catalog_search_elasticsearch_username', + 'password' => 'catalog_search_elasticsearch_password', + 'timeout' => 'catalog_search_elasticsearch_server_timeout', + ]; + return array_merge(parent::_getFieldMapping(), $fields); + } +} diff --git a/LICENSE_EE.txt b/LICENSE_EE.txt new file mode 100644 index 0000000000000..2bddf5feda6ba --- /dev/null +++ b/LICENSE_EE.txt @@ -0,0 +1,437 @@ +MAGENTO(tm) ENTERPRISE EDITION +END USER LICENSE AGREEMENT + +This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. +through its Magento division ("Magento"), and the Licensee executing the Magento Order Form +(defined below). The parties agree as follows: + +TERMS AND CONDITIONS + +1. License + 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with + other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, + non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of + installing and using it on a computer and solely for internal purposes, in accordance with the + Software's technical documentation and solely during the periods and on the maximum number + of Designated Servers specified in one or more applicable Magento or Magento-authorized + reseller ordering schedules (the "Magento Order Form") executed with Licensee. + + 1.2. In the event that Licensee's actual number of Servers of a particular Software license + exceeds the licensed number of Designated Servers on such license, Licensee shall promptly + provide Magento with written notice and pay Magento the fees required to license such + additional Server(s) in accordance with the commercial terms set out in the Magento Order + Form. + + 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the + maximum number of licensed Servers of the Software. Magento reserves the right to audit + Licensee's use of the Software during normal business hours and with reasonable notice and to + include means within the Software to limit Licensee's use of the Software to the licensed + number of Servers. + + 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated + technical documentation, for use by Licensee in accordance with this Agreement. Subject to + Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server + copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights + under this Agreement. + + 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a + temporary basis without charge any time a Designated Server is inoperative due to a + malfunction beyond the control of Licensee. Licensee may transfer the Software on a + permanent basis to a single replacement Server without charge. Licensee agrees to provide + Magento with written notice, including the Server type and operating system, of any such + transfer to a backup or replacement Server within five (5) days thereafter. + + 1.6. Licensee acknowledges that portions of the Software are also freely available to the public + under Magento's open source version of the Software, known as Magento Community Edition, + subject to certain conditions, with limited warranties and other limited assurances, and without + service or support. As an express condition for the license granted hereunder, Licensee agrees + that any use during the term of this Agreement of such open source versions of the Software, + whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed + use of the Software for purposes of the calculation of fees payable under the Agreement. + + 1.7. Magento also grants Licensee the right to modify and create derivative works of the + Software. Licensee may contribute the rights in any of those derivative works back to Magento. + Licensee may contact Magento for more information regarding contributions of derivative + works rights to Magento. Regardless of whether Licensee contributes such derivative works + rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of + the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and + royalty-free license to reproduce, create derivative works of, distribute, perform, and display + any derivative works of the Software developed by or for Licensee, and to use, make, have + made, sell, offer to sell, import, export, and otherwise exploit any product based on any such + derivative works. + +2. License Exclusions + 2.1 Except as expressly authorized herein, Licensee shall not: + a. use or deploy the Software on any Server in excess of the number of Designated Servers + specified in the applicable Magento Order Form; + + b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, + networking, batch processing or transfer of, the Software to any third party, or permit any + person or entity to have access to the Software by means of a time sharing, remote + computing services, networking, batch processing, service bureau or time sharing + arrangement; + + c. export the Software in violation of U.S. Department of Commerce export administration + regulations. + + 2.2. No license, right or interest in any Magento trademark, trade name or service mark is + granted hereunder. + +3. Fees and Payment Terms + Licensee agrees to the fees and payment terms that are described in each Magento Order Form + executed by Licensee. + +4. Title and Protection + 4.1. Magento (or its third party providers) retains title to all portions of the Software and other + Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable + proprietary information, and Licensee shall not disclose them to anyone other than those of its + employees or consultants under written nondisclosure obligations at least as restrictive as + those contained in this Agreement, having a need to know for purposes consistent with this + Agreement. Licensee shall be responsible for the compliance of such employees or consultants. + Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright + and proprietary information notices as were affixed to the original. The obligations set forth in + this Section shall survive termination of this Agreement. + + 4.2. Licensee acknowledges that the Software includes certain open source software which is + governed by the applicable license terms thereof. A list of such open source software, as + amended from time to time, including the links applicable to such open source software is + specified in the product software bundled within the Software, and the Software is subject to + the provisions of such license agreements, and in the event of any contradiction between the + provisions of this Agreement and the provisions of such applicable license agreement, the + provisions of the applicable open source license agreement shall prevail solely with respect to + such open source software products. + + 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the + "Government"), the Government agrees that such Product is "commercial computer software" + or "commercial computer software documentation" and that, absent a written agreement to + the contrary, the Government's rights with respect thereto are limited by the terms of this + Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. + +5. Patent and Copyright Indemnity + Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support + Services (as defined below), Magento shall indemnify and defend Licensee against any claims made + by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section + 5, means the Software as delivered by Magento, excluding the open source software programs + described in Section 4.2) as permitted in this Agreement directly infringes such third party's United + States patent or copyright, provided that Licensee complies with the requirements of this Section. + Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any + intellectual property rights, (b) provide Magento with all information and assistance requested of it + with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or + settle any and all such claims. + + In the event that a court holds that the Software, or if Magento believes a court may hold that the + Software, infringes the intellectual property rights of any third party, Magento may (but is not + obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue + using the Software, replace or modify the Software so that it becomes non-infringing while providing + substantially equivalent performance or, accept return of the Software, terminate this Agreement, + and refund Licensee an amount equal to the license fees paid to Magento multiplied by the + percentage of the term of the license for the Software that Licensee did not enjoy due to the early + termination by Magento. + + Magento shall have no liability or obligation under this Agreement to the extent the alleged + infringement is based on (i) a modification or derivative work of the Software developed by anyone + other than Magento; (ii), a combination of the Software with any product or service not provided by + Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) + use of the Software other than in accordance with this Agreement or the documentation; (iv) + indirect or willful infringement; or (v) any open source code, as described in Section 4.2. + + This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement + related to the Software. + +6. Default and Termination + 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its + obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) + Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in + Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party + fails to perform any other material obligation under this Agreement and such failure remains + uncured for more than thirty (30) days after receipt of written notice thereof. + + 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights + available to it under the law, may terminate this Agreement and all licenses granted hereunder + by written notice to the defaulting party. + + 6.3. Within thirty (30) days after termination of the Software license or this Agreement or + expiration of the license term as specified in the Magento Order Form, Licensee shall certify in + writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that + all copies or embodiments thereof in any form, including partial copies within modified + versions, have been destroyed. + +7. Warranty + 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days + commencing upon Magento's electronic delivery of the Software to Licensee that the Software, + as delivered, will in all material respects perform the functions described in the specifications + contained in the documentation provided with the Software. In the event that the Software + does not, in all material respects, perform the functions therein described, Magento or its + authorized reseller will undertake to correct any reported error in accordance with the Support + Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire + liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant + that the Software will meet Licensee's requirements, that the Software will operate in the + combinations which Licensee may select for use, that the operation of the Software will be + uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED + IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". + + 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY + WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. + MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR + TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, + ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR + AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING + TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. + +8. Limitation of Liability + 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS + OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE + USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; + LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; + OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES + (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A + CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR + UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING + OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER + TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, + FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. + + 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN + WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH + RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE + LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, + THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE + SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. + +9. Support Services Terms and Conditions + For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide + support services and Updates for the Software as described in Magento's standard Support Services + Terms and Conditions, which follow. Magento will have no obligation to provide support for any + modifications or derivative works of the Software developed by anyone other than Magento. + +10. Customer References + Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer + lists and other related marketing materials. The parties shall cooperate to undertake mutually- + agreed joint marketing activities. + +11. Notices + All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by + facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order + Form, or such other address as either party may indicate by at least ten (10) days prior written + notice to the other party. Notices to Magento shall be sent to the Contracts Administration + Department. + +12. Assignment + Licensee may not assign this Agreement without the prior written consent of Magento; provided + that such consent shall not be required for assignment to a purchaser of all or substantially all of the + assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and + conditions of this Agreement. Any prohibited assignment shall be null and void. + +13. Entire Agreement + Along with Magento's standard Support Services Terms and Conditions, which follow, and the + Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, + which supersedes all proposals or prior agreements, oral or written, including any online (click- + through) agreement which Licensee may have accepted in conjunction with the downloading of the + Software, and all other communications between the parties relating to the subject matter hereof. + No purchase order, other ordering document or any hand written or typewritten text which purports + to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the + terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both + parties, all such proposed variations or additions are objected to and shall have no force or effect. + +14. General + This Agreement is made in and shall be governed by the laws of the State of California, without + giving effect to any principles that provide for the application of the law of another jurisdiction. All + proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, + California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. + The United Nations Convention for the International Sale of Goods shall not apply. The section + headings herein are provided for convenience only and have no substantive effect on the + construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall + be liable for any failure to perform due to causes beyond its reasonable control. If any provision of + this Agreement is held to be unenforceable, this Agreement shall be construed without such + provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such + party's right to exercise such right or any other right in the future. This Agreement may be amended + only by a written document executed by a duly authorized representative of each of the parties. The + parties agree to receive electronic documents and accept electronic signatures (information + attached or logically associated with such document and clicked or otherwise adopted with an intent + to sign) including in counterparts which shall be valid substitutes for paper-based documents and + signatures, and the legal validity of a transaction will not be denied on the ground that it is not in + writing. + +15. Definitions + "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a + particular Software license. Such Server may be that of a third-party under nondisclosure obligations + that will host the Software for the benefit of Licensee. + + "Modifications" means any code developed by Licensee or any third party, including without + limitation, configuration, integrations, implementations, or localizations to the external layer of the + core, baseline Software product. The term "Modifications" excludes Updates. + + "Proprietary Material" means the Software, related documentation, and all parts, copies and + modifications thereof, and any other information, in whatever form, received by Licensee + hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is + or becomes a part of the public domain through no act or omission of Licensee; or (b) was in + Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from + Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or + (d) is independently developed by Licensee without reference to or use of Magento's Proprietary + Material. + + "Server" means each physical or virtual server from which a single instance of the Software is + accessed and used either for production purposes ("Production Server Instance") or for non- + production purposes, such as development, testing, training and other non-operational business + transactions ("Non-Production Server Instance"). For example, if one server contains two (2) + instances of the Software, i.e., one Production Server Instance and one Non-Production Server + Instance, then a Server license is required for each of such instances; development in-house and by + third-party consultants requires licenses for two Non-Production Server Instances. + + "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) + Enterprise Edition, provided solely in source code, including associated technical documentation, + and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise + specified herein, the term Software includes certain open source software programs described in + Section 4.2. "Software" does not include any Modifications. + + "Updates" means all published revisions and corrections to the printed documentation and + corrections and new releases of the Software which are generally made available to Magento's + supported customers at no additional cost or for media and handling charges only. Updates shall not + include any options or future products which Magento sells separately. + + +SUPPORT SERVICES TERMS AND CONDITIONS + +Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the +Agreement. + +1. "Support Services" consists of: + a. Advice regarding the downloading, installation and configuration of the Software (including + Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to + the Software), when used by Licensee on systems that meet the Software's "System + Requirements" specified on Magento's website at www.magentocommerce.com/system- + requirements. + + b. Facilities for bug tracking, escalation of problems for priority attention, and access to + community-supported FAQs and Forums relating to the Software. + + c. Assistance with troubleshooting to diagnose and fix errors in the Software. + + d. Access to Magento documentation relating to the Software, including authorization to make + copies of that documentation for internal use as specified in the Agreement. + +2. Exclusions from Support Services. + Magento shall have no obligation to support (i) versions of the + Software other than the then-current and immediately previous releases, which are operated on a + supported hardware/operating system platform specified in the release notes for the Software; (ii) + altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by + Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with + Magento's instructions. Magento is not responsible for hardware changes necessitated by changes + to the Software. Support Services does not include: + a. Assistance in the development or debugging of Licensee's system, including the operating + system and support tools. + + b. Information and assistance on technical issues related to the installation, administration, and + use of enabling technologies such as databases, computer networks, and communications. + + c. Assistance with the installation and configuration of hardware including, but not limited to + computers, hard disks, networks, and printers. + +3. Subcontractors. + Magento or its authorized resellers reserve the right to subcontract any or all of + the work to be performed under these Support Terms, and Magento retains responsibility for any + work so subcontracted. + +4. Licensee Responsibilities. + Licensee shall provide commercially reasonable cooperation and full + information to Magento or its authorized resellers with respect to the furnishing of Support Services + under this Agreement. + +5. Support Contacts. + Licensee shall designate one or more support contacts that are authorized to + submit Software problems. If Licensee has purchased the license from a Magento-authorized + reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license + directly from Magento, Licensee may contact Magento on the www.magentocommere.com website + or at its toll-free Support telephone number. + +6. Problem Priority. + Upon receipt of a properly submitted Software problem, as specified on + Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall + prioritize it in accordance with the guidelines below: + + a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely + impacts the Licensee's Production Server Instance, or because of which Licensee's Production + Server Instance is down or not functioning, or that results in a loss of production data and no + work around exists. P1 problems must be reported on Magento's toll-free support telephone + number in order to expedite resolution. Magento will use continuous efforts during its normal + hours of operation, with appropriate escalation to senior management, to provide a resolution + for any P1 problem as soon as is commercially reasonable. + + b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is + functioning but in a reduced capacity, or the Problem is causing significant impact to portions of + the Licensee's business operations and productivity, or the Software is exposed to potential loss + or interruption of service. Problems existing in a non-production environment that would + otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P2 + problem as soon as is commercially reasonable. + + c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- + critical loss of functionality, or that impairs some operations but allows Licensee's operations to + continue to function. Problems for which there is limited or no loss or functionality or impact to + Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P3 + problem in time for the next minor release of the Software. + + d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature + or documentation related, but the Software works without normal hours of operation to + provide a resolution for any P4 problem in time for the next major release of the Software. + + e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or + modification to add official support and documentation for unsupported or undocumented + feature, or features that do not exist in the Software. Magento will take ERs into consideration + in the product management process, but has no obligation to deliver enhancements based on + any ER. + +7. Response Times. + Magento or its authorized reseller shall exercise commercially reasonable efforts + to meet the response times specified below for Gold Support (unless Licensee has upgraded to + Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem + properly submitted by Licensee: + + Magento GOLD Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + North American Telephone Support Hours M-F 08:00 - 17:00 (PT) + European Telephone Support Hours M-F 08:30 - 17:30 (CET) + Telephone Response Time P1 Issues* 4 business hours + Response Time P2-P4 Issues* 24 business hours + *From initial contact + + + Magento PLATINUM Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + Telephone Support Hours 24 hours + Telephone Response Time P1 Issues* Up to 2 hours + Response Time P2-P4 Issues* 4 business hours + *From initial contact + + +8. Prohibited Use. + As a condition of Licensee's use of the Forums, Licensee will not use (and will + prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or + regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, + defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software + viruses or any other computer code, files or programs that may interrupt, destroy or limit the + functionality of any computer software or hardware or telecommunications equipment; (iv) to + infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any + third party; or (v) use the Forums for any purpose other than their intended use. + +9. Term and Termination. + Magento will provide Support Services and any Updates to Licensee + during the periods identified in the Magento Order Form, subject to Licensee's payment of the + applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee + materially breaches the Support Services provisions and does not cure such breach within thirty (30) + days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. + +10. General. + Magento shall not be liable for any failure or delay in performance under these Support + Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be + severed from these Support Terms. Licensee agrees that any information received pursuant to these + Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the + License Agreement. Licensee's obligation of payment of moneys due under these Support Terms + shall survive termination of these Support Terms or the License Agreement. These Support Terms + state the entire agreement regarding provision of Support Services to Licensee and may be amended + only by a written amendment set forth on a separate document executed by authorized + representatives of both parties. diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php new file mode 100644 index 0000000000000..e4473acbbd8b7 --- /dev/null +++ b/Model/Client/Elasticsearch.php @@ -0,0 +1,105 @@ +buildConfig($options); + $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config); + } + $this->client = $elasticsearchClient; + $this->clientOptions = $options; + } + + /** + * Ping the Elasticsearch client + * + * @return bool + */ + public function ping() + { + return $this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]); + } + + /** + * Validate connection params + * + * @return bool + */ + public function testConnection() + { + if (!empty($this->clientOptions['index'])) { + return $this->client->indices()->exists(['index' => $this->clientOptions['index']]); + } else { + // if no index is given simply perform a ping + $this->ping(); + } + return true; + } + + /** + * @param array $options + * @return array + */ + private function buildConfig($options = []) + { + $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']); + $protocol = parse_url($options['hostname'], PHP_URL_SCHEME); + if (!$protocol) { + $protocol = 'http'; + } + if (!empty($options['port'])) { + $host .= ':' . $options['port']; + } + if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) { + $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host); + } + $config = [ + 'hosts' => [ + $host + ] + ]; + return $config; + } +} diff --git a/Model/Config.php b/Model/Config.php new file mode 100644 index 0000000000000..255e557d1ba1c --- /dev/null +++ b/Model/Config.php @@ -0,0 +1,80 @@ +scopeConfig = $scopeConfig; + $this->encryptor = $encryptor; + } + + /** + * {@inheritdoc} + */ + public function prepareClientOptions($options = []) + { + $defaultOptions = [ + 'hostname' => $this->getElasticsearchConfigData('server_hostname'), + 'port' => $this->getElasticsearchConfigData('server_port'), + 'index' => $this->getElasticsearchConfigData('index_name'), + 'enableAuth' => $this->getElasticsearchConfigData('enable_auth'), + 'username' => $this->getElasticsearchConfigData('username'), + 'password' => $this->getElasticsearchConfigData('password'), + 'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT, + ]; + $options = array_merge($defaultOptions, $options); + return $options; + } + + /** + * Retrieve information from Elasticsearch search engine configuration + * + * @param string $field + * @return string|int + */ + public function getElasticsearchConfigData($field) + { + $path = 'catalog/search/elasticsearch_' . $field; + return $this->scopeConfig->getValue($path); + } +} diff --git a/README.md b/README.md new file mode 100644 index 0000000000000..280ca29f8337b --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +Magento\Elasticsearch module allows to use Elastic search engine for product searching capabilities. +The module implements Magento\Search library interfaces. \ No newline at end of file diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php new file mode 100644 index 0000000000000..53bc50a4c0949 --- /dev/null +++ b/SearchAdapter/ConnectionManager.php @@ -0,0 +1,80 @@ +logger = $logger; + $this->clientFactory = $clientFactory; + $this->clientConfig = $clientConfig; + } + + /** + * Get shared connection + * + * @throws \RuntimeException + * @return Elasticsearch + */ + public function getConnection() + { + if (!$this->client) { + $this->connect(); + } + + return $this->client; + } + + /** + * Connect to Elasticsearch client with default options + * + * @throws \RuntimeException + * @return void + */ + private function connect() + { + try { + $this->client = $this->clientFactory->create($this->clientConfig->prepareClientOptions()); + } catch (\Exception $e) { + $this->logger->critical($e); + throw new \RuntimeException('Elasticsearch client is not set.'); + } + } +} diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php new file mode 100644 index 0000000000000..3341add618ab3 --- /dev/null +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -0,0 +1,89 @@ +elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + ->setMethods(['ping', 'indices']) + ->disableOriginalConstructor() + ->getMock(); + $this->model = new ElasticsearchClient($this->getOptions(), $this->elasticsearchClientMock); + } + + /** + * @expectedException \Magento\Framework\Exception\LocalizedException + */ + public function testConstructorOptionsException() + { + new ElasticsearchClient([]); + } + + /** + * Test client creation from the list of options + */ + public function testConstructorWithOptions() + { + new ElasticsearchClient($this->getOptions()); + } + + /** + * Test ping functionality + */ + public function testPing() + { + $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true); + $this->assertEquals(true, $this->model->ping()); + } + + /** + * Test validation of connection parameters + */ + public function testTestConnection() + { + $indicesMock = $this->getMock('\Elasticsearch\Namespaces\IndicesNamespace', ['exists'], [], '', false); + $this->elasticsearchClientMock->expects($this->once())->method('indices')->willReturn($indicesMock); + $indicesMock->expects($this->once())->method('exists')->willReturn(true); + $this->assertEquals(true, $this->model->testConnection()); + } + + /** + * Get elasticsearch client options + * + * @return array + */ + protected function getOptions() + { + return [ + 'hostname' => 'localhost', + 'port' => '9200', + 'timeout' => 15, + 'index' => 'magento2', + 'enableAuth' => 1, + 'username' => 'user', + 'password' => 'passwd', + ]; + } +} diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php new file mode 100644 index 0000000000000..7eb6ee9e75528 --- /dev/null +++ b/Test/Unit/Model/ConfigTest.php @@ -0,0 +1,70 @@ +scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->encryptor = $this->getMockBuilder('Magento\Framework\Encryption\EncryptorInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->scopeConfig->expects($this->any()) + ->method('getValue') + ->willReturn(''); + $this->model = new Config( + $this->scopeConfig, + $this->encryptor + ); + } + + /** + * Test prepareClientOptions() method + */ + public function testPrepareClientOptions() + { + $options = [ + 'hostname' => 'localhost', + 'port' => '9200', + 'index' => 'magento2', + 'enableAuth' => '1', + 'username' => 'user', + 'password' => 'pass', + 'timeout' => 1, + ]; + $this->assertEquals($options, $this->model->prepareClientOptions($options)); + } +} diff --git a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php new file mode 100644 index 0000000000000..95df8aa57c49a --- /dev/null +++ b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php @@ -0,0 +1,95 @@ +logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $this->clientConfig = $this->getMockBuilder(ClientOptionsInterface::class) + ->disableOriginalConstructor() + ->setMethods( + [ + 'prepareClientOptions' + ] + ) + ->getMock(); + $this->clientConfig->expects($this->any()) + ->method('prepareClientOptions') + ->willReturn([]); + $this->model = new ConnectionManager( + $this->clientFactory, + $this->clientConfig, + $this->logger + ); + } + + /** + * Test getConnection() method without errors + */ + public function testGetConnectionSuccessful() + { + $client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') + ->disableOriginalConstructor() + ->getMock(); + $this->clientFactory->expects($this->any()) + ->method('create') + ->willReturn($client); + $this->model->getConnection(); + } + + /** + * Test getConnection() method with errors + * @expectedException \RuntimeException + */ + public function testGetConnectionFailure() + { + $this->clientFactory->expects($this->any()) + ->method('create') + ->willThrowException(new \Exception('Something went wrong')); + $this->model->getConnection(); + } +} diff --git a/composer.json b/composer.json new file mode 100644 index 0000000000000..b2941dc17469f --- /dev/null +++ b/composer.json @@ -0,0 +1,21 @@ +{ + "name": "magento/module-elasticsearch", + "description": "N/A", + "require": { + "php": "~5.5.0|~5.6.0|~7.0.0", + "magento/module-advanced-search": "100.0.*", + "magento/framework": "100.0.*", + "elasticsearch/elasticsearch": "~2.0" + }, + "type": "magento2-module", + "version": "100.0.0", + "license": [ + "proprietary" + ], + "autoload": { + "files": [ "registration.php" ], + "psr-4": { + "Magento\\Elasticsearch\\": "" + } + } +} diff --git a/config/esconfig.xml b/config/esconfig.xml new file mode 100644 index 0000000000000..5647f3db26ff2 --- /dev/null +++ b/config/esconfig.xml @@ -0,0 +1,26 @@ + + + + + synonyms.txt + synonyms_en_US.txt + + + stopwords.txt + stopwords_en_US.txt + + + english + english + + + stopwords.txt + stopwords_en_US.txt + + diff --git a/config/esconfig.xsd b/config/esconfig.xsd new file mode 100644 index 0000000000000..7b04569b8d4de --- /dev/null +++ b/config/esconfig.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/protwords.txt b/config/protwords.txt new file mode 100644 index 0000000000000..1dfc0abecbf8d --- /dev/null +++ b/config/protwords.txt @@ -0,0 +1,21 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# Use a protected word file to protect against the stemmer reducing two +# unrelated words to the same base word. + +# Some non-words that normally won't be encountered, +# just to test that they won't be stemmed. +dontstems +zwhacky + diff --git a/config/protwords_en_US.txt b/config/protwords_en_US.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/config/stopwords.txt b/config/stopwords.txt new file mode 100644 index 0000000000000..63559b35dd521 --- /dev/null +++ b/config/stopwords.txt @@ -0,0 +1,57 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# a couple of test stopwords to test that the words are really being +# configured from this file: +stopworda +stopwordb + +#Standard english stop words taken from Lucene's StopAnalyzer +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with \ No newline at end of file diff --git a/config/stopwords_en_US.txt b/config/stopwords_en_US.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/config/synonyms.txt b/config/synonyms.txt new file mode 100644 index 0000000000000..b0e31cb7ec83a --- /dev/null +++ b/config/synonyms.txt @@ -0,0 +1,31 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +#some test synonym mappings unlikely to appear in real input text +aaa => aaaa +bbb => bbbb1 bbbb2 +ccc => cccc1,cccc2 +a\=>a => b\=>b +a\,a => b\,b +fooaaa,baraaa,bazaaa + +# Some synonym groups specific to this example +GB,gib,gigabyte,gigabytes +MB,mib,megabyte,megabytes +Television, Televisions, TV, TVs +#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming +#after us won't split it into two words. + +# Synonym mappings can be used for spelling correction too +pixima => pixma + diff --git a/config/synonyms_en_US.txt b/config/synonyms_en_US.txt new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml new file mode 100644 index 0000000000000..8271964c98c7d --- /dev/null +++ b/etc/adminhtml/system.xml @@ -0,0 +1,68 @@ + + + + +
+ + + + + elasticsearch + + + + + + elasticsearch + + + + + + elasticsearch + + + + + Magento\Config\Model\Config\Source\Yesno + + elasticsearch + + + + + + elasticsearch + 1 + + + + + + elasticsearch + 1 + + + + + + elasticsearch + + + + + +
+ + diff --git a/etc/config.xml b/etc/config.xml new file mode 100644 index 0000000000000..729d78bb131f1 --- /dev/null +++ b/etc/config.xml @@ -0,0 +1,20 @@ + + + + + + + localhost + 9200 + magento2 + 0 + 15 + + + + diff --git a/etc/di.xml b/etc/di.xml new file mode 100644 index 0000000000000..4ca299ec3c2f6 --- /dev/null +++ b/etc/di.xml @@ -0,0 +1,31 @@ + + + + + + + Elasticsearch + + + + + + + \Magento\Elasticsearch\Model\Client\ElasticsearchFactory + + + \Magento\Elasticsearch\Model\Config + + + + + + Magento\Elasticsearch\Model\Client\Elasticsearch + + + diff --git a/etc/module.xml b/etc/module.xml new file mode 100644 index 0000000000000..4b9df19c41fec --- /dev/null +++ b/etc/module.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/registration.php b/registration.php new file mode 100644 index 0000000000000..ad24de6daa497 --- /dev/null +++ b/registration.php @@ -0,0 +1,11 @@ + Date: Mon, 7 Dec 2015 16:15:05 +0200 Subject: [PATCH 194/616] MAGETWO-46472: Prepare pull request --- .../System/Config/TestConnection.php | 69 ++++++++ .../Search/System/Config/TestConnection.php | 85 +++++++++ Model/Client/ClientFactory.php | 48 ++++++ Model/Client/ClientFactoryInterface.php | 17 ++ Model/Client/ClientInterface.php | 16 ++ Model/Client/ClientOptionsInterface.php | 17 ++ Model/Client/ClientResolver.php | 124 +++++++++++++ Model/ResourceModel/Recommendations.php | 2 - .../System/Config/TestConnectionTest.php | 163 ++++++++++++++++++ Test/Unit/Model/Client/ClientResolverTest.php | 118 +++++++++++++ composer.json | 3 +- etc/adminhtml/routes.xml | 14 ++ etc/di.xml | 10 ++ view/adminhtml/requirejs-config.js | 12 ++ .../system/config/testconnection.phtml | 15 ++ view/adminhtml/web/js/testconnection.js | 69 ++++++++ 16 files changed, 779 insertions(+), 3 deletions(-) create mode 100644 Block/Adminhtml/System/Config/TestConnection.php create mode 100644 Controller/Adminhtml/Search/System/Config/TestConnection.php create mode 100644 Model/Client/ClientFactory.php create mode 100644 Model/Client/ClientFactoryInterface.php create mode 100644 Model/Client/ClientInterface.php create mode 100644 Model/Client/ClientOptionsInterface.php create mode 100644 Model/Client/ClientResolver.php create mode 100644 Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php create mode 100644 Test/Unit/Model/Client/ClientResolverTest.php create mode 100644 etc/adminhtml/routes.xml create mode 100644 view/adminhtml/requirejs-config.js create mode 100644 view/adminhtml/templates/system/config/testconnection.phtml create mode 100644 view/adminhtml/web/js/testconnection.js diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php new file mode 100644 index 0000000000000..4b46828805284 --- /dev/null +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -0,0 +1,69 @@ +setTemplate('Magento_AdvancedSearch::system/config/testconnection.phtml'); + return $this; + } + + /** + * Unset some non-related element parameters + * + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) + { + $element = clone $element; + $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue(); + return parent::render($element); + } + + /** + * Get the button and scripts contents + * + * @param \Magento\Framework\Data\Form\Element\AbstractElement $element + * @return string + */ + protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) + { + $originalData = $element->getOriginalData(); + $this->addData( + [ + 'button_label' => __($originalData['button_label']), + 'html_id' => $element->getHtmlId(), + 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config/testconnection'), + 'field_mapping' => $this->escapeJsQuote(json_encode($this->_getFieldMapping()), '"') + ] + ); + + return $this->_toHtml(); + } + + /** + * Returns configuration fields required to perform the ping request + * + * @return array + */ + protected function _getFieldMapping() + { + return ['engine' => 'catalog_search_engine']; + } +} diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php new file mode 100644 index 0000000000000..d46d596882d5b --- /dev/null +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -0,0 +1,85 @@ +clientResolver = $clientResolver; + $this->resultJsonFactory = $resultJsonFactory; + $this->tagFilter = $tagFilter; + } + + /** + * Check for connection to server + * + * @return \Magento\Framework\Controller\Result\Json + */ + public function execute() + { + $result = [ + 'success' => false, + 'errorMessage' => '', + ]; + $options = $this->getRequest()->getParams(); + + try { + if (empty($options['engine'])) { + throw new \Magento\Framework\Exception\LocalizedException( + __('Missing search engine parameter.') + ); + } + $response = $this->clientResolver->create($options['engine'], $options)->testConnection(); + if ($response) { + $result['success'] = true; + } + } catch (\Magento\Framework\Exception\LocalizedException $e) { + $result['errorMessage'] = $e->getMessage(); + } catch (\Exception $e) { + $message = __($e->getMessage()); + $result['errorMessage'] = $this->tagFilter->filter($message); + } + + /** @var \Magento\Framework\Controller\Result\Json $resultJson */ + $resultJson = $this->resultJsonFactory->create(); + return $resultJson->setData($result); + } +} diff --git a/Model/Client/ClientFactory.php b/Model/Client/ClientFactory.php new file mode 100644 index 0000000000000..383092e93ed48 --- /dev/null +++ b/Model/Client/ClientFactory.php @@ -0,0 +1,48 @@ +objectManager = $objectManager; + $this->clientClass = $clientClass; + } + + /** + * Return search client + * + * @param array $options + * @return ClientInterface + */ + public function create(array $options = []) + { + return $this->objectManager->create( + $this->clientClass, + ['options' => $options] + ); + } +} diff --git a/Model/Client/ClientFactoryInterface.php b/Model/Client/ClientFactoryInterface.php new file mode 100644 index 0000000000000..74da5ede3d331 --- /dev/null +++ b/Model/Client/ClientFactoryInterface.php @@ -0,0 +1,17 @@ +objectManager = $objectManager; + $this->scopeConfig = $scopeConfig; + $this->clientFactoryPool = $clientFactories; + $this->clientOptionsPool = $clientOptions; + $this->path = $path; + $this->scope = $scopeType; + } + + /** + * Returns configured search engine + * + * @return string + */ + public function getCurrentEngine() + { + return $this->scopeConfig->getValue($this->path, $this->scope); + } + + /** + * Create client instance + * + * @param string $engine + * @param array $data + * @return ClientInterface + */ + public function create($engine = '', array $data = []) + { + $engine = $engine ?: $this->getCurrentEngine(); + + if (!isset($this->clientFactoryPool[$engine])) { + throw new \LogicException( + 'There is no such client factory: ' . $engine + ); + } + $factoryClass = $this->clientFactoryPool[$engine]; + $factory = $this->objectManager->create($factoryClass); + if (!($factory instanceof ClientFactoryInterface)) { + throw new \InvalidArgumentException( + 'Client factory must implement \Magento\AdvancedSearch\Model\Client\ClientFactoryInterface' + ); + } + + $optionsClass = $this->clientOptionsPool[$engine]; + $clientOptions = $this->objectManager->create($optionsClass); + if (!($clientOptions instanceof ClientOptionsInterface)) { + throw new \InvalidArgumentException( + 'Client options must implement \Magento\AdvancedSearch\Model\Client\ClientInterface' + ); + } + + $client = $factory->create($clientOptions->prepareClientOptions($data)); + + return $client; + } +} diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index 8f45c73b684ad..b476510eedd1d 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -5,8 +5,6 @@ */ namespace Magento\AdvancedSearch\Model\ResourceModel; -use Magento\Framework\Model\ResourceModel\Db\AbstractDb; - /** * Catalog search recommendations resource model * diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php new file mode 100644 index 0000000000000..e1db479d7894b --- /dev/null +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php @@ -0,0 +1,163 @@ +requestMock = $this->getMock('Magento\Framework\App\Request\Http', ['getParams'], [], '', false); + $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); + + $context = $this->getMock( + 'Magento\Backend\App\Action\Context', + ['getRequest', 'getResponse', 'getMessageManager', 'getSession'], + $helper->getConstructArguments( + 'Magento\Backend\App\Action\Context', + [ + 'request' => $this->requestMock + ] + ) + ); + $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->requestMock)); + $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock)); + + $this->clientResolverMock = $this->getMockBuilder('Magento\AdvancedSearch\Model\Client\ClientResolver') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->clientMock = $this->getMock('Magento\AdvancedSearch\Model\Client\ClientInterface'); + + $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json') + ->disableOriginalConstructor() + ->getMock(); + + $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->tagFilterMock = $this->getMockBuilder('Magento\Framework\Filter\StripTags') + ->disableOriginalConstructor() + ->setMethods(['filter']) + ->getMock(); + + $this->controller = new TestConnection( + $context, + $this->clientResolverMock, + $this->resultJsonFactory, + $this->tagFilterMock + ); + } + + public function testExecuteEmptyEngine() + { + $this->requestMock->expects($this->once())->method('getParams') + ->will($this->returnValue(['engine' => ''])); + + $this->resultJsonFactory->expects($this->once())->method('create') + ->will($this->returnValue($this->resultJson)); + + $result = ['success' => false, 'errorMessage' => 'Missing search engine parameter.']; + + $this->resultJson->expects($this->once())->method('setData') + ->with($this->equalTo($result)); + + $this->controller->execute(); + } + + public function testExecute() + { + $this->requestMock->expects($this->once())->method('getParams') + ->will($this->returnValue(['engine' => 'engineName'])); + + $this->clientResolverMock->expects($this->once())->method('create') + ->with($this->equalTo('engineName')) + ->will($this->returnValue($this->clientMock)); + + $this->clientMock->expects($this->once())->method('testConnection') + ->will($this->returnValue(true)); + + $this->resultJsonFactory->expects($this->once())->method('create') + ->will($this->returnValue($this->resultJson)); + + $result = ['success' => true, 'errorMessage' => '']; + + $this->resultJson->expects($this->once())->method('setData') + ->with($this->equalTo($result)); + + $this->controller->execute(); + } + + public function testExecutePingFailed() + { + $this->requestMock->expects($this->once())->method('getParams') + ->will($this->returnValue(['engine' => 'engineName'])); + + $this->clientResolverMock->expects($this->once())->method('create') + ->with($this->equalTo('engineName')) + ->will($this->returnValue($this->clientMock)); + + $this->clientMock->expects($this->once())->method('testConnection') + ->will($this->returnValue(false)); + + $this->resultJsonFactory->expects($this->once())->method('create') + ->will($this->returnValue($this->resultJson)); + + $result = ['success' => false, 'errorMessage' => '']; + + $this->resultJson->expects($this->once())->method('setData') + ->with($this->equalTo($result)); + + $this->controller->execute(); + } +} diff --git a/Test/Unit/Model/Client/ClientResolverTest.php b/Test/Unit/Model/Client/ClientResolverTest.php new file mode 100644 index 0000000000000..6e1a68e73df8b --- /dev/null +++ b/Test/Unit/Model/Client/ClientResolverTest.php @@ -0,0 +1,118 @@ +helper = new ObjectManager($this); + + $this->scopeConfig = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface'); + + $this->model= $this->helper->getObject( + '\Magento\AdvancedSearch\Model\Client\ClientResolver', + [ + 'objectManager' => $this->objectManager, + 'scopeConfig' => $this->scopeConfig, + 'clientFactories' => ['engineName' => 'engineFactoryClass'], + 'clientOptions' => ['engineName' => 'engineOptionClass'], + 'path' => 'some_path', + 'scopeType' => 'some_scopeType' + ] + ); + } + + public function testCreate() + { + $this->scopeConfig->expects($this->once())->method('getValue') + ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) + ->will($this->returnValue('engineName')); + + $factoryMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface'); + + $clientMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientInterface'); + + $clientOptionsMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientOptionsInterface'); + + $this->objectManager->expects($this->exactly(2))->method('create') + ->withConsecutive( + [$this->equalTo('engineFactoryClass')], + [$this->equalTo('engineOptionClass')] + ) + ->willReturnOnConsecutiveCalls( + $factoryMock, + $clientOptionsMock + ); + + $clientOptionsMock->expects($this->once())->method('prepareClientOptions') + ->with([]) + ->will($this->returnValue(['parameters'])); + + $factoryMock->expects($this->once())->method('create') + ->with($this->equalTo(['parameters'])) + ->will($this->returnValue($clientMock)); + + $result = $this->model->create(); + $this->assertInstanceOf('\Magento\AdvancedSearch\Model\Client\ClientInterface', $result); + } + + /** + * @expectedException \InvalidArgumentException + */ + public function testCreateExceptionThrown() + { + $this->objectManager->expects($this->once())->method('create') + ->with($this->equalTo('engineFactoryClass')) + ->will($this->returnValue('t')); + + $this->model->create('engineName'); + } + + /** + * @expectedException LogicException + */ + public function testCreateLogicException() + { + $this->model->create('input'); + } + + public function testGetCurrentEngine() + { + $this->scopeConfig->expects($this->once())->method('getValue') + ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) + ->will($this->returnValue('engineName')); + + $this->assertEquals('engineName', $this->model->getCurrentEngine()); + } +} diff --git a/composer.json b/composer.json index c9142641be2d0..04ba23cb5be62 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,8 @@ "magento/module-backend": "100.0.*", "magento/module-store": "100.0.*", "magento/module-catalog": "100.0.*", - "magento/module-catalog-search": "100.0.*" + "magento/module-catalog-search": "100.0.*", + "magento/module-config": "100.0.*" }, "type": "magento2-module", "version": "100.0.2", diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml new file mode 100644 index 0000000000000..87215b5e43f0e --- /dev/null +++ b/etc/adminhtml/routes.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/etc/di.xml b/etc/di.xml index 647d191ef5f6d..a1ed57a02d888 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -6,6 +6,7 @@ --> + Magento\AdvancedSearch\Model\Recommendations\DataProvider @@ -18,4 +19,13 @@ Did you mean + + + + Magento\Framework\Search\Adapter\Mysql\Adapter + + Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + + diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js new file mode 100644 index 0000000000000..2fec1520c73eb --- /dev/null +++ b/view/adminhtml/requirejs-config.js @@ -0,0 +1,12 @@ +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +var config = { + map: { + '*': { + testConnection: 'Magento_AdvancedSearch/js/testconnection' + } + } +}; diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/view/adminhtml/templates/system/config/testconnection.phtml new file mode 100644 index 0000000000000..ddab7edf78b33 --- /dev/null +++ b/view/adminhtml/templates/system/config/testconnection.phtml @@ -0,0 +1,15 @@ + + \ No newline at end of file diff --git a/view/adminhtml/web/js/testconnection.js b/view/adminhtml/web/js/testconnection.js new file mode 100644 index 0000000000000..daf2b651ee390 --- /dev/null +++ b/view/adminhtml/web/js/testconnection.js @@ -0,0 +1,69 @@ +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +define([ + 'jquery', + 'Magento_Ui/js/modal/alert', + 'jquery/ui' +], function ($, alert) { + 'use strict'; + + $.widget('mage.testConnection', { + options: { + url: '', + elementId: '', + successText: '', + failedText: '', + fieldMapping: '' + }, + + /** + * Bind handlers to events + */ + _create: function () { + this._on({ + 'click': $.proxy(this._connect, this) + }); + }, + + /** + * Method triggers an AJAX request to check search engine connection + * @private + */ + _connect: function () { + var result = this.options.failedText, + element = $('#' + this.options.elementId), + self = this, + params = {}, + msg = ''; + + element.removeClass('success').addClass('fail'); + $.each($.parseJSON(this.options.fieldMapping), function (key, el) { + params[key] = $('#' + el).val(); + }); + $.ajax({ + url: this.options.url, + showLoader: true, + data: params + }).done(function (response) { + if (response.success) { + element.removeClass('fail').addClass('success'); + result = self.options.successText; + } else { + msg = response.errorMessage; + + if (msg) { + alert({ + content: $.mage.__(msg) + }); + } + } + }).always(function () { + $('#' + self.options.elementId + '_result').text(result); + }); + } + }); + + return $.mage.testConnection; +}); From f7df7af92d667e6208674a21a3a33141034af63e Mon Sep 17 00:00:00 2001 From: PhoenixDev - AP Date: Mon, 7 Dec 2015 17:20:41 +0200 Subject: [PATCH 195/616] PRD-74: Search Interfaces Implementation 3 - Price Layered Navigation --- SearchAdapter/Dynamic/DataProvider.php | 40 +-- .../Dynamic/DataProviderTest.php | 282 ++++++++++++++++++ Test/Unit/SearchAdapter/MapperTest.php | 3 + 3 files changed, 292 insertions(+), 33 deletions(-) create mode 100644 Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 83fc512776d53..f49eb5a9d073f 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -189,39 +189,14 @@ public function getInterval( ) { $entityIds = $entityStorage->getSource(); $fieldName = $this->fieldMapper->getFieldName('price'); - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $storeId = $this->storeManager->getStore()->getId(); - $requestQuery = [ - 'index' => $this->clientConfig->getIndexName(), - 'type' => $this->clientConfig->getEntityType(), - 'body' => [ - 'fields' => [ - '_id', - '_score', - ], - 'query' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'store_id' => $storeId, - ], - ], - [ - 'terms' => [ - '_id' => $entityIds, - ], - ], - ], - ], - ], - ], - ]; + $dimension = current($dimensions); + $storeId = $dimension->getValue(); - $queryResult = $this->connectionManager->getConnection() - ->query($requestQuery); - return $this->intervalFactory->create(['query' => $queryResult, 'fieldName' => $fieldName]); + return $this->intervalFactory->create([ + 'entityIds' => $entityIds, + 'storeId' => $storeId, + 'fieldName' => $fieldName + ]); } /** @@ -229,7 +204,6 @@ public function getInterval( */ public function getAggregation( BucketInterface $bucket, - array $dimensions, $range, EntityStorage $entityStorage diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php new file mode 100644 index 0000000000000..d6a935ac5ee46 --- /dev/null +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -0,0 +1,282 @@ +connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->setMethods(['getConnection']) + ->disableOriginalConstructor() + ->getMock(); + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->range = $this->getMockBuilder('Magento\Catalog\Model\Layer\Filter\Price\Range') + ->setMethods(['getPriceRange']) + ->disableOriginalConstructor() + ->getMock(); + $this->intervalFactory = $this->getMockBuilder('Magento\Framework\Search\Dynamic\IntervalFactory') + ->disableOriginalConstructor() + ->getMock(); + $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + ->setMethods([ + 'getIndexName', + 'getEntityType', + ]) + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->customerSession = $this->getMockBuilder('Magento\Customer\Model\Session') + ->setMethods(['getCustomerGroupId']) + ->disableOriginalConstructor() + ->getMock(); + + $this->entityStorage = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorage') + ->setMethods(['getSource']) + ->disableOriginalConstructor() + ->getMock(); + $this->entityStorage->expects($this->any()) + ->method('getSource') + ->willReturn([1]); + $this->fieldMapper->expects($this->any()) + ->method('getFieldName') + ->willReturn('price'); + $this->customerSession->expects($this->any()) + ->method('getCustomerGroupId') + ->willReturn(1); + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + $this->storeMock->expects($this->any()) + ->method('getId') + ->willReturn(1); + $this->clientConfig->expects($this->any()) + ->method('getIndexName') + ->willReturn('indexName'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('product'); + $this->clientMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + ->setMethods(['query']) + ->disableOriginalConstructor() + ->getMock(); + $this->connectionManager->expects($this->any()) + ->method('getConnection') + ->willReturn($this->clientMock); + + $objectManagerHelper = new ObjectManagerHelper($this); + $this->model = $objectManagerHelper->getObject( + '\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider', + [ + 'connectionManager' => $this->connectionManager, + 'fieldMapper' => $this->fieldMapper, + 'range' => $this->range, + 'intervalFactory' => $this->intervalFactory, + 'clientConfig' => $this->clientConfig, + 'storeManager' => $this->storeManager, + 'customerSession' => $this->customerSession + ] + ); + } + + /** + * Test getRange() method + */ + public function testGetRange() + { + $this->range->expects($this->once()) + ->method('getPriceRange') + ->willReturn([]); + $this->assertEquals( + [], + $this->model->getRange() + ); + } + + /** + * Test getAggregations() method + */ + public function testGetAggregations() + { + $expectedResult = [ + 'count' => 1, + 'max' => 1, + 'min' => 1, + 'std' => 1, + ]; + $this->clientMock->expects($this->once()) + ->method('query') + ->willReturn([ + 'aggregations' => [ + 'prices' => [ + 'price_filter' => [ + 'price_stats' => [ + 'count' => 1, + 'max' => 1, + 'min' => 1, + 'std_deviation' => 1, + ], + ], + ], + ], + ]); + $this->assertEquals( + $expectedResult, + $this->model->getAggregations($this->entityStorage) + ); + } + + /** + * Test getInterval() method + */ + public function testGetInterval() + { + $bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->disableOriginalConstructor() + ->getMock(); + $interval = $this->getMockBuilder('Magento\Framework\Search\Dynamic\IntervalInterface') + ->disableOriginalConstructor() + ->getMock(); + $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + ->setMethods(['getValue']) + ->disableOriginalConstructor() + ->getMock(); + $dimension->expects($this->once()) + ->method('getValue') + ->willReturn(1); + $this->intervalFactory->expects($this->once()) + ->method('create') + ->willReturn($interval); + + $this->assertEquals( + $interval, + $this->model->getInterval( + $bucket, + [$dimension], + $this->entityStorage + ) + ); + } + + /** + * Test getAggregation() method + */ + public function testGetAggregation() + { + + } + + /** + * Test prepareData() method + */ + public function testPrepareData() + { + $expectedResult = [ + [ + 'from' => '', + 'to' => 10, + 'count' => 1, + ], + [ + 'from' => 10, + 'to' => '', + 'count' => 1, + ], + ]; + $this->assertEquals( + $expectedResult, + $this->model->prepareData( + 10, + [ + 1 => 1, + 2 => 1, + ] + ) + ); + } +} diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index ce60578002f71..4c9e4381a0793 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -185,6 +185,9 @@ public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMo $filterQuery->expects($this->any()) ->method('getType') ->willReturn('matchQuery'); + $this->filterBuilder->expects(($this->any())) + ->method('build') + ->willReturn([]); $this->model->buildQuery($request); } From 8033a2b55577dbb54a80759ac0637dbf93ade28d Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 7 Dec 2015 18:06:15 +0200 Subject: [PATCH 196/616] PRD-74: Search Interfaces Implementation 3 - Price Layered Navigation --- SearchAdapter/Dynamic/DataProvider.php | 3 +- .../Dynamic/DataProviderTest.php | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index f49eb5a9d073f..57f9eb4cffad9 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -213,7 +213,8 @@ public function getAggregation( $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); $customerGroupId = $this->customerSession->getCustomerGroupId(); $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $storeId = $this->storeManager->getStore()->getId(); + $dimension = current($dimensions); + $storeId = $dimension->getValue(); $requestQuery = [ 'index' => $this->clientConfig->getIndexName(), 'type' => $this->clientConfig->getEntityType(), diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index d6a935ac5ee46..ec0e887bed0b1 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -248,7 +248,48 @@ public function testGetInterval() */ public function testGetAggregation() { + $expectedResult = [ + 1 => 1, + ]; + $bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->disableOriginalConstructor() + ->getMock(); + $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + ->setMethods(['getValue']) + ->disableOriginalConstructor() + ->getMock(); + $dimension->expects($this->once()) + ->method('getValue') + ->willReturn(1); + $this->clientMock->expects($this->once()) + ->method('query') + ->willReturn([ + 'aggregations' => [ + 'prices' => [ + 'price_filter' => [ + 'price_stats' => [ + 'buckets' => [ + [ + 'key' => 1, + 'doc_count' => 1, + ], + ], + ], + ], + ], + ], + ]); + + $this->assertEquals( + $expectedResult, + $this->model->getAggregation( + $bucket, + [$dimension], + 10, + $this->entityStorage + ) + ); } /** From c6e4e285ac20f26c8f1c1d4bdec0806ef2e42d90 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 7 Dec 2015 18:59:02 +0200 Subject: [PATCH 197/616] PRD-74: Search Interfaces Implementation 3 - Price Layered Navigation --- SearchAdapter/Aggregation/Interval.php | 317 ++++++++++++++++++++----- 1 file changed, 256 insertions(+), 61 deletions(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index fe8f3f76537bb..88efcc3454e4c 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -19,11 +19,6 @@ class Interval implements IntervalInterface */ const DELTA = 0.005; - /** - * Price field name - */ - const PRICE = 'price'; - /** * @var ConnectionManager */ @@ -49,6 +44,21 @@ class Interval implements IntervalInterface */ protected $clientConfig; + /** + * @var string + */ + private $fieldName; + + /** + * @var string + */ + private $storeId; + + /** + * @var array + */ + private $entityIds; + /** * @param array $query * @param ConnectionManager $connectionManager @@ -62,13 +72,19 @@ public function __construct( FieldMapperInterface $fieldMapper, StoreManagerInterface $storeManager, CustomerSession $customerSession, - Config $clientConfig + Config $clientConfig, + $fieldName, + $storeId, + $entityIds ) { $this->connectionManager = $connectionManager; $this->fieldMapper = $fieldMapper; $this->storeManager = $storeManager; $this->customerSession = $customerSession; $this->clientConfig = $clientConfig; + $this->fieldName = $fieldName; + $this->storeId = $storeId; + $this->entityIds = $entityIds; } /** @@ -79,13 +95,12 @@ public function load($limit, $offset = null, $lower = null, $upper = null) $requestQuery = $from = $to = []; $customerGroupId = $this->customerSession->getCustomerGroupId(); $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $storeId = $this->storeManager->getStore()->getId(); if ($lower) { $from = ['gte' => $lower - self::DELTA]; } if ($upper) { - $to = ['lte' => $upper - self::DELTA]; + $to = ['lt' => $upper - self::DELTA]; } $requestQuery = [ @@ -105,12 +120,17 @@ public function load($limit, $offset = null, $lower = null, $upper = null) 'must' => [ [ 'term' => [ - 'store_id' => $storeId, + 'store_id' => $this->storeId, + ], + ], + [ + 'terms' => [ + '_id' => $this->entityIds, ], ], [ 'nested' => [ - 'path' => 'price', + 'path' => $this->fieldName, 'filter' => [ 'bool' => [ 'must' => [ @@ -126,7 +146,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null) ], [ 'range' => [ - 'price.price' => array_merge($from, $to), + $this->fieldName.'.price' => array_merge($from, $to), ], ], ], @@ -145,7 +165,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null) 'mode' => 'min', 'nested_filter' => [ 'range' => [ - 'price.price' => array_merge($from, $to), + $this->fieldName.'.price' => array_merge($from, $to), ] ] ] @@ -169,69 +189,66 @@ public function load($limit, $offset = null, $lower = null, $upper = null) */ public function loadPrevious($data, $index, $lower = null) { - /*$fieldName = $this->fieldMapper->getFieldName('price'); $customerGroupId = $this->customerSession->getCustomerGroupId(); $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $storeId = $this->storeManager->getStore()->getId(); if ($lower) { $from = ['gte' => $lower - self::DELTA]; } if ($data) { - $to = ['lte' => $upper - self::DELTA]; + $to = ['lt' => $data - self::DELTA]; } $requestQuery = [ 'index' => $this->clientConfig->getIndexName(), 'type' => $this->clientConfig->getEntityType(), + 'search_type' => 'count', 'body' => [ 'fields' => [ - '_id', - '_score', + '_id' ], 'query' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'store_id' => $storeId, - ], - ], - ], - ], - ], - 'aggregations' => [ - 'prices' => [ - 'nested' => [ - 'path' => $fieldName, + 'filtered' => [ + 'query' => [ + 'match_all' => [], ], - 'aggregations' => [ - 'price_filter' => [ - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - [ - 'range' => [ - 'price.price' => array_merge($from, $to), - ], - ], + 'filter' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'store_id' => $this->storeId, ], ], - ], - 'aggregations' => [ - 'price_stats' => [ - 'extended_stats' => [ - 'field' => $fieldName . '.price', + [ + 'terms' => [ + '_id' => $this->entityIds, + ], + ], + [ + 'nested' => [ + 'path' => $this->fieldName, + 'filter' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'price.customer_group_id' => $customerGroupId, + ], + ], + [ + 'term' => [ + 'price.website_id' => $websiteId, + ], + ], + [ + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), + ], + ], + ], + ], + ], ], ], ], @@ -239,15 +256,28 @@ public function loadPrevious($data, $index, $lower = null) ], ], ], - ], + 'sort' => [ + 'price.price' => [ + 'order' => 'asc', + 'mode' => 'min', + 'nested_filter' => [ + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), + ] + ] + ] + ] + ] ]; $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - print '
' . print_r($queryResult, true) . '
'; - die;*/ + $offset = $queryResult['hits']['total']; + if (!$offset) { + return false; + } - return []; + return $this->load($index - $offset + 1, $offset - 1, $lower); } /** @@ -255,7 +285,172 @@ public function loadPrevious($data, $index, $lower = null) */ public function loadNext($data, $rightIndex, $upper = null) { - return []; + $customerGroupId = $this->customerSession->getCustomerGroupId(); + $websiteId = $this->storeManager->getStore()->getWebsiteId(); + + $from = ['gt' => $data + self::DELTA]; + $to = ['lt' => $data - self::DELTA]; + + + $requestCountQuery = [ + 'index' => $this->clientConfig->getIndexName(), + 'type' => $this->clientConfig->getEntityType(), + 'search_type' => 'count', + 'body' => [ + 'fields' => [ + '_id' + ], + 'query' => [ + 'filtered' => [ + 'query' => [ + 'match_all' => [], + ], + 'filter' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'store_id' => $this->storeId, + ], + ], + [ + 'terms' => [ + '_id' => $this->entityIds, + ], + ], + [ + 'nested' => [ + 'path' => $this->fieldName, + 'filter' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'price.customer_group_id' => $customerGroupId, + ], + ], + [ + 'term' => [ + 'price.website_id' => $websiteId, + ], + ], + [ + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), + ], + ], + ], + ], + ], + ], + ], + ], + ], + ], + ], + ], + 'sort' => [ + 'price.price' => [ + 'order' => 'asc', + 'mode' => 'min', + 'nested_filter' => [ + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), + ] + ] + ] + ] + ] + ]; + $queryCountResult = $this->connectionManager->getConnection() + ->query($requestCountQuery); + + $offset = $queryCountResult['hits']['total']; + if (!$offset) { + return false; + } + + $from = ['gte' => $data - self::DELTA]; + if ($upper !== null) { + $to = ['lt' => $data - self::DELTA]; + } + + $requestQuery = [ + 'index' => $this->clientConfig->getIndexName(), + 'type' => $this->clientConfig->getEntityType(), + 'search_type' => 'count', + 'body' => [ + 'fields' => [ + '_id' + ], + 'query' => [ + 'filtered' => [ + 'query' => [ + 'match_all' => [], + ], + 'filter' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'store_id' => $this->storeId, + ], + ], + [ + 'terms' => [ + '_id' => $this->entityIds, + ], + ], + [ + 'nested' => [ + 'path' => $this->fieldName, + 'filter' => [ + 'bool' => [ + 'must' => [ + [ + 'term' => [ + 'price.customer_group_id' => $customerGroupId, + ], + ], + [ + 'term' => [ + 'price.website_id' => $websiteId, + ], + ], + [ + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), + ], + ], + ], + ], + ], + ], + ], + ], + ], + ], + ], + ], + 'sort' => [ + 'price.price' => [ + 'order' => 'asc', + 'mode' => 'min', + 'nested_filter' => [ + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), + ] + ] + ] + ], + 'from' => $offset - 1, + 'size' => $rightIndex - $offset + 1, + ] + ]; + $queryResult = $this->connectionManager->getConnection() + ->query($requestQuery); + + return array_reverse($this->arrayValuesToFloat($queryResult)); } /** From 315fe8639fcb85d775b84472f20f699a45f24d6e Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 7 Dec 2015 19:00:12 +0200 Subject: [PATCH 198/616] PRD-74: Search Interfaces Implementation 3 - Price Layered Navigation --- SearchAdapter/Aggregation/Interval.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 88efcc3454e4c..7524bf7f3c728 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -454,7 +454,8 @@ public function loadNext($data, $rightIndex, $upper = null) } /** - * @param array $documents + * @param array $hits + * * @return float[] */ private function arrayValuesToFloat($hits) From 165e2bec1033a2bf52cafb72d89692ae851aebe7 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 7 Dec 2015 19:10:54 +0200 Subject: [PATCH 199/616] PRD-74: Search Interfaces Implementation 3 - Price Layered Navigation --- .../Aggregation/Builder/DynamicTest.php | 175 ++++++++++++++++++ .../Aggregation/Builder/TermTest.php | 116 ++++++++++++ 2 files changed, 291 insertions(+) create mode 100644 Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php create mode 100644 Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php b/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php new file mode 100644 index 0000000000000..37279673d2c2d --- /dev/null +++ b/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php @@ -0,0 +1,175 @@ +requestBuckedInterface = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->dataProviderContainer = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider') + ->disableOriginalConstructor() + ->getMock(); + + $this->algorithmRepository = $this->getMockBuilder('Magento\Framework\Search\Dynamic\Algorithm\Repository') + ->disableOriginalConstructor() + ->getMock(); + + $this->entityStorageFactory = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorageFactory') + ->disableOriginalConstructor() + ->getMock(); + + $this->algorithmInterface = $this->getMockBuilder('Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\Aggregation\DynamicBucket') + ->setMethods(['getMethod']) + ->disableOriginalConstructor() + ->getMock(); + + $this->entityStorage = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorage') + ->disableOriginalConstructor() + ->getMock(); + + $this->entityStorageFactory->expects($this->any()) + ->method('create') + ->willReturn($this->entityStorage); + + $objectManagerHelper = new ObjectManagerHelper($this); + + $this->model = $objectManagerHelper->getObject( + '\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic', + [ + 'algorithmRepository' => $this->algorithmRepository, + 'entityStorageFactory' => $this->entityStorageFactory, + ] + ); + } + + /** + * Test build() method + */ + public function testBuild() + { + $dimensions = [ + 'scope' => [ + 'name' => 'scope', + 'value' => 1, + ], + ]; + + $queryResult = [ + 'took' => 1, + 'timed_out' => false, + '_shards' => [], + 'hits' => [ + 'total' => 1, + 'max_score' => 1, + 'hits' => [ + [ + '_id' => 1, + ] + ], + ], + 'aggregations' => [], + ]; + + $this->bucket->expects($this->once()) + ->method('getMethod') + ->willReturn('auto'); + + $this->algorithmRepository->expects($this->any()) + ->method('get') + ->with('auto', ['dataProvider' => $this->dataProviderContainer]) + ->willReturn($this->algorithmInterface); + + $this->algorithmInterface->expects($this->once()) + ->method('getItems') + ->with( + $this->bucket, + $dimensions, + $this->entityStorage + ) + ->willReturn([ + 0 => [ + 'from' => '', + 'to' => 22, + 'count' => 2, + ], + 1 => [ + 'from' => 22, + 'to' => 24, + 'count' => 4, + ], + 2 => [ + 'from' => 24, + 'to' => '', + 'count' => 6, + ], + ]); + + $this->model->build( + $this->bucket, + $dimensions, + $queryResult, + $this->dataProviderContainer + ); + + } +} + diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php b/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php new file mode 100644 index 0000000000000..c60c6f21ae82f --- /dev/null +++ b/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php @@ -0,0 +1,116 @@ +requestBuckedInterface = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + ->disableOriginalConstructor() + ->getMock(); + +// $this->dataProviderContainer = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider') +// ->disableOriginalConstructor() +// ->getMock(); + + $this->dataProviderContainer = $this->getMockBuilder('Magento\Framework\Search\Dynamic\DataProviderInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\Aggregation\TermBucket') + ->setMethods(['getName']) + ->disableOriginalConstructor() + ->getMock(); + + $objectManagerHelper = new ObjectManagerHelper($this); + + $this->model = $objectManagerHelper->getObject( + '\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term', + [] + ); + } + + /** + * Test build() method + */ + public function testBuild() + { + $dimensions = [ + 'scope' => [ + 'name' => 'scope', + 'value' => 1, + ], + ]; + + $queryResult = [ + 'took' => 1, + 'timed_out' => false, + '_shards' => [], + 'hits' => [ + 'total' => 1, + 'max_score' => 1, + 'hits' => [], + ], + 'aggregations' => [ + 'category_bucket' => [ + 'buckets' => [ + [ + 'key' => '23', + 'doc_count' => 12, + ], + ], + ], + ], + ]; + + $this->bucket->expects($this->once()) + ->method('getName') + ->willReturn('category_bucket'); + + $this->model->build( + $this->bucket, + $dimensions, + $queryResult, + $this->dataProviderContainer + ); + } +} + From 702d9318803671682f0e2c0ef0e6c322ad6ea73c Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Mon, 7 Dec 2015 22:42:53 +0100 Subject: [PATCH 200/616] PRD-71 replaced Reader.php with virtualType --- Model/Adapter/Index/Config/EsConfig.php | 5 ++- Model/Adapter/Index/Config/Reader.php | 50 ------------------------- etc/di.xml | 8 ++++ 3 files changed, 11 insertions(+), 52 deletions(-) delete mode 100644 Model/Adapter/Index/Config/Reader.php diff --git a/Model/Adapter/Index/Config/EsConfig.php b/Model/Adapter/Index/Config/EsConfig.php index ab1cf5b884fb2..6b089db3d51e8 100644 --- a/Model/Adapter/Index/Config/EsConfig.php +++ b/Model/Adapter/Index/Config/EsConfig.php @@ -7,16 +7,17 @@ use Magento\Framework\Config\Data; use Magento\Framework\Config\CacheInterface; +use Magento\Framework\Config\ReaderInterface; class EsConfig extends Data implements EsConfigInterface { /** - * @param Reader $reader + * @param ReaderInterface $reader * @param CacheInterface $cache * @param string $cacheId */ public function __construct( - Reader $reader, + ReaderInterface $reader, CacheInterface $cache, $cacheId ) { diff --git a/Model/Adapter/Index/Config/Reader.php b/Model/Adapter/Index/Config/Reader.php deleted file mode 100644 index aada76e0ed357..0000000000000 --- a/Model/Adapter/Index/Config/Reader.php +++ /dev/null @@ -1,50 +0,0 @@ -Magento\Elasticsearch\Model\Config + + + Magento\Elasticsearch\Model\Adapter\Index\Config\Converter + Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator + esconfig.xml + + + Magento\Elasticsearch\Model\Adapter\Index\Config\Reader elasticsearch_index_config From 8ae3ffbb9053ac0b6c9be08ae6ccf875f180ee73 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Mon, 7 Dec 2015 23:28:39 +0100 Subject: [PATCH 201/616] PRD-71 fixed constructor dependency --- Model/Adapter/Elasticsearch.php | 6 +++--- etc/di.xml | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 2e5886f4e4108..2ebad361d46a1 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -8,7 +8,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; +use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\Elasticsearch\Model\ResourceModel\Index; @@ -88,7 +88,7 @@ class Elasticsearch * @param AttributeContainer $attributeContainer * @param DocumentDataMapper $documentDataMapper * @param FieldMapper $fieldMapper - * @param ClientOptionsInterface $clientConfig + * @param Config $clientConfig * @param BuilderInterface $indexBuilder * @param LoggerInterface $logger * @param array $options @@ -101,7 +101,7 @@ public function __construct( AttributeContainer $attributeContainer, DocumentDataMapper $documentDataMapper, FieldMapper $fieldMapper, - ClientOptionsInterface $clientConfig, + Config $clientConfig, BuilderInterface $indexBuilder, LoggerInterface $logger, $options = [] diff --git a/etc/di.xml b/etc/di.xml index 0d336c47f91eb..721057714c742 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -63,11 +63,6 @@ Magento\Elasticsearch\Model\Config - - - Magento\Elasticsearch\Model\Config - - Magento\Elasticsearch\Model\Adapter\Index\Config\Converter From 8313e2a21ae0ef745860f7106fa4f165b52c63ef Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 8 Dec 2015 10:33:25 +0200 Subject: [PATCH 202/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- SearchAdapter/AdapterTest.php | 389 +++++++++++++++++++++ SearchAdapter/_files/products.php | 11 + SearchAdapter/_files/products_rollback.php | 11 + SearchAdapter/_files/requests.xml | 323 +++++++++++++++++ 4 files changed, 734 insertions(+) create mode 100644 SearchAdapter/AdapterTest.php create mode 100644 SearchAdapter/_files/products.php create mode 100644 SearchAdapter/_files/products_rollback.php create mode 100644 SearchAdapter/_files/requests.xml diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php new file mode 100644 index 0000000000000..9aa53e9ef0c19 --- /dev/null +++ b/SearchAdapter/AdapterTest.php @@ -0,0 +1,389 @@ +objectManager = Bootstrap::getObjectManager(); + + /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ + $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter'); + $document = new \DOMDocument(); + $document->load(__DIR__ . '/_files/requests.xml'); + $requestConfig = $converter->convert($document); + + /** @var \Magento\Framework\Search\Request\Config $config */ + $config = $this->objectManager->create('Magento\Framework\Search\Request\Config'); + $config->merge($requestConfig); + + $this->requestBuilder = $this->objectManager->create( + 'Magento\Framework\Search\Request\Builder', + ['config' => $config] + ); + + $this->adapter = $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); + } + + /** + * @return \Magento\Framework\Search\Response\QueryResponse + */ + private function executeQuery() + { + $this->reindexAll(); + /** @var \Magento\Framework\Search\RequestInterface $queryRequest */ + $queryRequest = $this->requestBuilder->create(); + $queryResponse = $this->adapter->query($queryRequest); + return $queryResponse; + } + + /** + * @throws \Exception + * @return void + */ + private function reindexAll() + { + /** @var \Magento\Indexer\Model\Indexer[] $indexerList */ + $indexerList = $this->objectManager->get('Magento\Indexer\Model\Indexer\CollectionFactory') + ->create() + ->getItems(); + foreach ($indexerList as $indexer) { + $indexer->reindexAll(); + } + } + + /** + * Test match query + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testMatchQuery() + { + $this->requestBuilder->bind('fulltext_search_query', 'socks'); + $this->requestBuilder->setRequestName('one_match'); + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + } + + /** + * Test query with aggregations + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testAggregationsQuery() + { + $this->markTestSkipped('Range query does not implemented.'); + $this->requestBuilder->bind('fulltext_search_query', 'peoples'); + $this->requestBuilder->setRequestName('one_aggregations'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(2, $queryResponse->count()); + $this->assertEquals( + ['weight_bucket', 'price_bucket', 'dynamic_price'], + $queryResponse->getAggregations() + ->getBucketNames() + ); + } + + /** + * Test query with filters + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testMatchQueryFilters() + { + $this->requestBuilder->bind('fulltext_search_query', 'socks'); + $this->requestBuilder->bind('pidm_from', 11); + $this->requestBuilder->bind('pidm_to', 17); + $this->requestBuilder->bind('pidsh', 18); + $this->requestBuilder->setRequestName('one_match_filters'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + } + + /** + * Range filter test with all fields filled + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testRangeFilterWithAllFields() + { + $this->requestBuilder->bind('range_filter_from', 11); + $this->requestBuilder->bind('range_filter_to', 16); + $this->requestBuilder->setRequestName('range_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(3, $queryResponse->count()); + } + + /** + * Range filter test with all fields filled + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testRangeFilterWithoutFromField() + { + $this->requestBuilder->bind('range_filter_to', 18); + $this->requestBuilder->setRequestName('range_filter_without_from_field'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(4, $queryResponse->count()); + } + + /** + * Range filter test with all fields filled + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testRangeFilterWithoutToField() + { + $this->requestBuilder->bind('range_filter_from', 14); + $this->requestBuilder->setRequestName('range_filter_without_to_field'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(4, $queryResponse->count()); + } + + /** + * Term filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testTermFilter() + { + $this->requestBuilder->bind('request.price', 18); + $this->requestBuilder->setRequestName('term_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + $this->assertEquals( + 4, + $queryResponse->getIterator() + ->offsetGet(0) + ->getId() + ); + } + + /** + * Term filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testTermFilterArray() + { + $this->requestBuilder->bind('request.price', [16, 18]); + $this->requestBuilder->setRequestName('term_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(2, $queryResponse->count()); + } + + /** + * Term filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testWildcardFilter() + { + $this->requestBuilder->bind('wildcard_filter', 'un'); + $this->requestBuilder->setRequestName('one_wildcard'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + } + + /** + * Bool filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testBoolFilter() + { + $expectedIds = [2, 3]; + $this->requestBuilder->bind('must_range_filter1_from', 12); + $this->requestBuilder->bind('must_range_filter1_to', 22); + $this->requestBuilder->bind('should_term_filter1', 12); + $this->requestBuilder->bind('should_term_filter2', 14); + $this->requestBuilder->bind('should_term_filter3', 16); + $this->requestBuilder->bind('should_term_filter4', 18); + $this->requestBuilder->bind('not_term_filter1', 12); + $this->requestBuilder->bind('not_term_filter2', 18); + $this->requestBuilder->setRequestName('bool_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(count($expectedIds), $queryResponse->count()); + $actualIds = []; + foreach ($queryResponse as $document) { + /** @var \Magento\Framework\Search\Document $document */ + $actualIds[] = $document->getId(); + } + $this->assertEquals($expectedIds, $actualIds); + } + + /** + * Test bool filter with nested negative bool filter + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testBoolFilterWithNestedNegativeBoolFilter() + { + $expectedIds = [1]; + $this->requestBuilder->bind('not_range_filter_from', 14); + $this->requestBuilder->bind('not_range_filter_to', 20); + $this->requestBuilder->bind('nested_not_term_filter', 12); + $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(count($expectedIds), $queryResponse->count()); + $actualIds = []; + foreach ($queryResponse as $document) { + /** @var \Magento\Framework\Search\Document $document */ + $actualIds[] = $document->getId(); + } + $this->assertEquals($expectedIds, $actualIds); + } + + /** + * Test range inside nested negative bool filter + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testBoolFilterWithNestedRangeInNegativeBoolFilter() + { + $expectedIds = [1, 5]; + $this->requestBuilder->bind('nested_must_range_filter_from', 14); + $this->requestBuilder->bind('nested_must_range_filter_to', 18); + $this->requestBuilder->setRequestName('bool_filter_with_range_in_nested_negative_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(count($expectedIds), $queryResponse->count()); + $actualIds = []; + foreach ($queryResponse as $document) { + /** @var \Magento\Framework\Search\Document $document */ + $actualIds[] = $document->getId(); + } + sort($actualIds); + $this->assertEquals($expectedIds, $actualIds); + } + + /** + * Sample Advanced search request test + * + * @dataProvider advancedSearchDataProvider + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testSimpleAdvancedSearch( + $nameQuery, + $descriptionQuery, + $rangeFilter, + $expectedRecordsCount + ) { + $this->requestBuilder->bind('name_query', $nameQuery); + $this->requestBuilder->bind('description_query', $descriptionQuery); + $this->requestBuilder->bind('request.from_price', $rangeFilter['from']); + $this->requestBuilder->bind('request.to_price', $rangeFilter['to']); + $this->requestBuilder->setRequestName('advanced_search_test'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals($expectedRecordsCount, $queryResponse->count()); + } + + /** + * @return array + */ + public function advancedSearchDataProvider() + { + return [ + ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], + ['white', 'shorts', ['from' => '12', 'to' => '18'], 1], + ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], + ['peoples', 'green', ['from' => '12', 'to' => '22'], 2], + ]; + } + + /** + * Request limits test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php + */ + public function testSearchLimit() + { + $this->requestBuilder->bind('wildcard_filter', '*'); + $this->requestBuilder->setFrom(2); + $this->requestBuilder->setSize(2); + $this->requestBuilder->setRequestName('one_wildcard'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(2, $queryResponse->count()); + } +} diff --git a/SearchAdapter/_files/products.php b/SearchAdapter/_files/products.php new file mode 100644 index 0000000000000..0add1055fc1f7 --- /dev/null +++ b/SearchAdapter/_files/products.php @@ -0,0 +1,11 @@ +getMessage(); +} diff --git a/SearchAdapter/_files/products_rollback.php b/SearchAdapter/_files/products_rollback.php new file mode 100644 index 0000000000000..53696ae096b2a --- /dev/null +++ b/SearchAdapter/_files/products_rollback.php @@ -0,0 +1,11 @@ +getMessage(); +} diff --git a/SearchAdapter/_files/requests.xml b/SearchAdapter/_files/requests.xml new file mode 100644 index 0000000000000..1f0252e6c7729 --- /dev/null +++ b/SearchAdapter/_files/requests.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + From 7ba792f1a6aab1027e7825d3c2a26fd2bb77b2c8 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 8 Dec 2015 12:01:29 +0200 Subject: [PATCH 203/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- SearchAdapter/Aggregation/Builder/Range.php | 24 --------------------- etc/di.xml | 1 - 2 files changed, 25 deletions(-) delete mode 100644 SearchAdapter/Aggregation/Builder/Range.php diff --git a/SearchAdapter/Aggregation/Builder/Range.php b/SearchAdapter/Aggregation/Builder/Range.php deleted file mode 100644 index 92717810e7b87..0000000000000 --- a/SearchAdapter/Aggregation/Builder/Range.php +++ /dev/null @@ -1,24 +0,0 @@ - Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term - Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Range Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic From 075692d986fd6035d56f61261599a1d0fdc092fb Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 8 Dec 2015 13:38:12 +0200 Subject: [PATCH 204/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- Model/Indexer/IndexHandlerTest.php | 57 +++ SearchAdapter/AdapterTest.php | 389 --------------------- SearchAdapter/_files/products.php | 11 - SearchAdapter/_files/products_rollback.php | 11 - SearchAdapter/_files/requests.xml | 323 ----------------- _files/products.php | 88 +++++ _files/products_rollback.php | 23 ++ 7 files changed, 168 insertions(+), 734 deletions(-) create mode 100755 Model/Indexer/IndexHandlerTest.php delete mode 100644 SearchAdapter/AdapterTest.php delete mode 100644 SearchAdapter/_files/products.php delete mode 100644 SearchAdapter/_files/products_rollback.php delete mode 100644 SearchAdapter/_files/requests.xml create mode 100644 _files/products.php create mode 100644 _files/products_rollback.php diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php new file mode 100755 index 0000000000000..5fdf669083026 --- /dev/null +++ b/Model/Indexer/IndexHandlerTest.php @@ -0,0 +1,57 @@ +indexer = Bootstrap::getObjectManager()->create( + 'Magento\Indexer\Model\Indexer' + ); + $this->indexer->load('catalogsearch_fulltext'); + } + + /** + * Test reindex process + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + */ + public function testReindexAll() + { + $this->indexer->reindexAll(); + } + + /** + * Return product by SKU + * + * @param string $sku + * @return Product + */ + protected function getProductBySku($sku) + { + /** @var Product $product */ + $product = Bootstrap::getObjectManager()->get( + 'Magento\Catalog\Model\Product' + ); + return $product->loadByAttribute('sku', $sku); + } +} diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php deleted file mode 100644 index 9aa53e9ef0c19..0000000000000 --- a/SearchAdapter/AdapterTest.php +++ /dev/null @@ -1,389 +0,0 @@ -objectManager = Bootstrap::getObjectManager(); - - /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ - $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter'); - $document = new \DOMDocument(); - $document->load(__DIR__ . '/_files/requests.xml'); - $requestConfig = $converter->convert($document); - - /** @var \Magento\Framework\Search\Request\Config $config */ - $config = $this->objectManager->create('Magento\Framework\Search\Request\Config'); - $config->merge($requestConfig); - - $this->requestBuilder = $this->objectManager->create( - 'Magento\Framework\Search\Request\Builder', - ['config' => $config] - ); - - $this->adapter = $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); - } - - /** - * @return \Magento\Framework\Search\Response\QueryResponse - */ - private function executeQuery() - { - $this->reindexAll(); - /** @var \Magento\Framework\Search\RequestInterface $queryRequest */ - $queryRequest = $this->requestBuilder->create(); - $queryResponse = $this->adapter->query($queryRequest); - return $queryResponse; - } - - /** - * @throws \Exception - * @return void - */ - private function reindexAll() - { - /** @var \Magento\Indexer\Model\Indexer[] $indexerList */ - $indexerList = $this->objectManager->get('Magento\Indexer\Model\Indexer\CollectionFactory') - ->create() - ->getItems(); - foreach ($indexerList as $indexer) { - $indexer->reindexAll(); - } - } - - /** - * Test match query - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testMatchQuery() - { - $this->requestBuilder->bind('fulltext_search_query', 'socks'); - $this->requestBuilder->setRequestName('one_match'); - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); - } - - /** - * Test query with aggregations - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testAggregationsQuery() - { - $this->markTestSkipped('Range query does not implemented.'); - $this->requestBuilder->bind('fulltext_search_query', 'peoples'); - $this->requestBuilder->setRequestName('one_aggregations'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(2, $queryResponse->count()); - $this->assertEquals( - ['weight_bucket', 'price_bucket', 'dynamic_price'], - $queryResponse->getAggregations() - ->getBucketNames() - ); - } - - /** - * Test query with filters - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testMatchQueryFilters() - { - $this->requestBuilder->bind('fulltext_search_query', 'socks'); - $this->requestBuilder->bind('pidm_from', 11); - $this->requestBuilder->bind('pidm_to', 17); - $this->requestBuilder->bind('pidsh', 18); - $this->requestBuilder->setRequestName('one_match_filters'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); - } - - /** - * Range filter test with all fields filled - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testRangeFilterWithAllFields() - { - $this->requestBuilder->bind('range_filter_from', 11); - $this->requestBuilder->bind('range_filter_to', 16); - $this->requestBuilder->setRequestName('range_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(3, $queryResponse->count()); - } - - /** - * Range filter test with all fields filled - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testRangeFilterWithoutFromField() - { - $this->requestBuilder->bind('range_filter_to', 18); - $this->requestBuilder->setRequestName('range_filter_without_from_field'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(4, $queryResponse->count()); - } - - /** - * Range filter test with all fields filled - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testRangeFilterWithoutToField() - { - $this->requestBuilder->bind('range_filter_from', 14); - $this->requestBuilder->setRequestName('range_filter_without_to_field'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(4, $queryResponse->count()); - } - - /** - * Term filter test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testTermFilter() - { - $this->requestBuilder->bind('request.price', 18); - $this->requestBuilder->setRequestName('term_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); - $this->assertEquals( - 4, - $queryResponse->getIterator() - ->offsetGet(0) - ->getId() - ); - } - - /** - * Term filter test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testTermFilterArray() - { - $this->requestBuilder->bind('request.price', [16, 18]); - $this->requestBuilder->setRequestName('term_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(2, $queryResponse->count()); - } - - /** - * Term filter test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testWildcardFilter() - { - $this->requestBuilder->bind('wildcard_filter', 'un'); - $this->requestBuilder->setRequestName('one_wildcard'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); - } - - /** - * Bool filter test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testBoolFilter() - { - $expectedIds = [2, 3]; - $this->requestBuilder->bind('must_range_filter1_from', 12); - $this->requestBuilder->bind('must_range_filter1_to', 22); - $this->requestBuilder->bind('should_term_filter1', 12); - $this->requestBuilder->bind('should_term_filter2', 14); - $this->requestBuilder->bind('should_term_filter3', 16); - $this->requestBuilder->bind('should_term_filter4', 18); - $this->requestBuilder->bind('not_term_filter1', 12); - $this->requestBuilder->bind('not_term_filter2', 18); - $this->requestBuilder->setRequestName('bool_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(count($expectedIds), $queryResponse->count()); - $actualIds = []; - foreach ($queryResponse as $document) { - /** @var \Magento\Framework\Search\Document $document */ - $actualIds[] = $document->getId(); - } - $this->assertEquals($expectedIds, $actualIds); - } - - /** - * Test bool filter with nested negative bool filter - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testBoolFilterWithNestedNegativeBoolFilter() - { - $expectedIds = [1]; - $this->requestBuilder->bind('not_range_filter_from', 14); - $this->requestBuilder->bind('not_range_filter_to', 20); - $this->requestBuilder->bind('nested_not_term_filter', 12); - $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(count($expectedIds), $queryResponse->count()); - $actualIds = []; - foreach ($queryResponse as $document) { - /** @var \Magento\Framework\Search\Document $document */ - $actualIds[] = $document->getId(); - } - $this->assertEquals($expectedIds, $actualIds); - } - - /** - * Test range inside nested negative bool filter - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testBoolFilterWithNestedRangeInNegativeBoolFilter() - { - $expectedIds = [1, 5]; - $this->requestBuilder->bind('nested_must_range_filter_from', 14); - $this->requestBuilder->bind('nested_must_range_filter_to', 18); - $this->requestBuilder->setRequestName('bool_filter_with_range_in_nested_negative_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(count($expectedIds), $queryResponse->count()); - $actualIds = []; - foreach ($queryResponse as $document) { - /** @var \Magento\Framework\Search\Document $document */ - $actualIds[] = $document->getId(); - } - sort($actualIds); - $this->assertEquals($expectedIds, $actualIds); - } - - /** - * Sample Advanced search request test - * - * @dataProvider advancedSearchDataProvider - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testSimpleAdvancedSearch( - $nameQuery, - $descriptionQuery, - $rangeFilter, - $expectedRecordsCount - ) { - $this->requestBuilder->bind('name_query', $nameQuery); - $this->requestBuilder->bind('description_query', $descriptionQuery); - $this->requestBuilder->bind('request.from_price', $rangeFilter['from']); - $this->requestBuilder->bind('request.to_price', $rangeFilter['to']); - $this->requestBuilder->setRequestName('advanced_search_test'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals($expectedRecordsCount, $queryResponse->count()); - } - - /** - * @return array - */ - public function advancedSearchDataProvider() - { - return [ - ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], - ['white', 'shorts', ['from' => '12', 'to' => '18'], 1], - ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], - ['peoples', 'green', ['from' => '12', 'to' => '22'], 2], - ]; - } - - /** - * Request limits test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/SearchAdapter/_files/products.php - */ - public function testSearchLimit() - { - $this->requestBuilder->bind('wildcard_filter', '*'); - $this->requestBuilder->setFrom(2); - $this->requestBuilder->setSize(2); - $this->requestBuilder->setRequestName('one_wildcard'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(2, $queryResponse->count()); - } -} diff --git a/SearchAdapter/_files/products.php b/SearchAdapter/_files/products.php deleted file mode 100644 index 0add1055fc1f7..0000000000000 --- a/SearchAdapter/_files/products.php +++ /dev/null @@ -1,11 +0,0 @@ -getMessage(); -} diff --git a/SearchAdapter/_files/products_rollback.php b/SearchAdapter/_files/products_rollback.php deleted file mode 100644 index 53696ae096b2a..0000000000000 --- a/SearchAdapter/_files/products_rollback.php +++ /dev/null @@ -1,11 +0,0 @@ -getMessage(); -} diff --git a/SearchAdapter/_files/requests.xml b/SearchAdapter/_files/requests.xml deleted file mode 100644 index 1f0252e6c7729..0000000000000 --- a/SearchAdapter/_files/requests.xml +++ /dev/null @@ -1,323 +0,0 @@ - - - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 10 - - diff --git a/_files/products.php b/_files/products.php new file mode 100644 index 0000000000000..bc8d543959d17 --- /dev/null +++ b/_files/products.php @@ -0,0 +1,88 @@ +create('Magento\Catalog\Model\Product'); +$productFirst->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Apple') + ->setSku('fulltext-1') + ->setPrice(10) + ->setMetaTitle('first meta title') + ->setMetaKeyword('first meta keyword') + ->setMetaDescription('first meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productSecond = $objectManager->create('Magento\Catalog\Model\Product'); +$productSecond->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Banana') + ->setSku('fulltext-2') + ->setPrice(20) + ->setMetaTitle('second meta title') + ->setMetaKeyword('second meta keyword') + ->setMetaDescription('second meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productThird = $objectManager->create('Magento\Catalog\Model\Product'); +$productThird->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Orange') + ->setSku('fulltext-3') + ->setPrice(20) + ->setMetaTitle('third meta title') + ->setMetaKeyword('third meta keyword') + ->setMetaDescription('third meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productFourth = $objectManager->create('Magento\Catalog\Model\Product'); +$productFourth->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Papaya') + ->setSku('fulltext-4') + ->setPrice(20) + ->setMetaTitle('fourth meta title') + ->setMetaKeyword('fourth meta keyword') + ->setMetaDescription('fourth meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productFifth = $objectManager->create('Magento\Catalog\Model\Product'); +$productFifth->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Cherry') + ->setSku('fulltext-5') + ->setPrice(20) + ->setMetaTitle('fifth meta title') + ->setMetaKeyword('fifth meta keyword') + ->setMetaDescription('fifth meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); diff --git a/_files/products_rollback.php b/_files/products_rollback.php new file mode 100644 index 0000000000000..d64275f0fd73f --- /dev/null +++ b/_files/products_rollback.php @@ -0,0 +1,23 @@ +get('Magento\Framework\Registry'); +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */ +$collection = $objectManager->create('Magento\Catalog\Model\ResourceModel\Product\Collection'); +$collection->addAttributeToSelect('id')->load(); +if ($collection->count() > 0) { + $collection->delete(); +} + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); From ac460003a5d72c8643da47bab1a977e9c302074b Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Tue, 8 Dec 2015 14:40:06 +0100 Subject: [PATCH 205/616] PRD-71 refactored Elasticsearch adapter to reduce object dependencies --- Model/Adapter/DocumentDataMapper.php | 35 ++-- Model/Adapter/Elasticsearch.php | 115 +++--------- .../Model/Adapter/DocumentDataMapperTest.php | 169 +++++++++--------- Test/Unit/Model/Adapter/ElasticsearchTest.php | 79 +------- .../Adapter/Index/Config/EsConfigTest.php | 2 +- 5 files changed, 132 insertions(+), 268 deletions(-) diff --git a/Model/Adapter/DocumentDataMapper.php b/Model/Adapter/DocumentDataMapper.php index aa40fafb74d65..6c675d17ec326 100644 --- a/Model/Adapter/DocumentDataMapper.php +++ b/Model/Adapter/DocumentDataMapper.php @@ -58,6 +58,11 @@ class DocumentDataMapper */ private $attributeContainer; + /** + * @var \Magento\Elasticsearch\Model\ResourceModel\Index + */ + private $resourceIndex; + /** * @var FieldMapper */ @@ -91,8 +96,11 @@ class DocumentDataMapper protected $mediaGalleryRoles; /** + * Construction for DocumentDataMapper + * * @param Builder $builder * @param AttributeContainer $attributeContainer + * @param \Magento\Elasticsearch\Model\ResourceModel\Index $resourceIndex * @param FieldMapper $fieldMapper * @param DateTime $dateTime * @param TimezoneInterface $localeDate @@ -102,6 +110,7 @@ class DocumentDataMapper public function __construct( Builder $builder, AttributeContainer $attributeContainer, + \Magento\Elasticsearch\Model\ResourceModel\Index $resourceIndex, FieldMapper $fieldMapper, DateTime $dateTime, TimezoneInterface $localeDate, @@ -110,6 +119,7 @@ public function __construct( ) { $this->builder = $builder; $this->attributeContainer = $attributeContainer; + $this->resourceIndex = $resourceIndex; $this->fieldMapper = $fieldMapper; $this->dateTime = $dateTime; $this->localeDate = $localeDate; @@ -127,27 +137,30 @@ public function __construct( /** * Prepare index data for using in search engine metadata. * - * @param array $productIndexData * @param int $productId + * @param array $productIndexData * @param int $storeId - * @param array $productPriceIndexData - * @param array $productCategoryIndexData * @return array|false * @throws \Magento\Framework\Exception\LocalizedException * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function map( - array $productIndexData, - $productId, - $storeId, - array $productPriceIndexData, - array $productCategoryIndexData - ) { + public function map($productId, array $productIndexData, $storeId) + { $this->builder->addField('store_id', $storeId); $mediaGalleryRoles = array_fill_keys($this->mediaGalleryRoles, ''); - foreach ($productIndexData as $attributeCode => $value) { + + $productPriceIndexData = $this->attributeContainer->getAttribute('price') + ? $this->resourceIndex->getPriceIndexData([$productId], $storeId) + : []; + $productCategoryIndexData = $this->resourceIndex->getFullCategoryProductIndexData( + $storeId, + [$productId => $productId] + ); + $productIndexData = $this->resourceIndex->getFullProductIndexData([$productId]); + + foreach ($productIndexData[$productId] as $attributeCode => $value) { // Prepare processing attribute info if (strpos($attributeCode, '_value') !== false) { $this->builder->addField($attributeCode, $value); diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 2ebad361d46a1..b7d62835be5e3 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -5,21 +5,11 @@ */ namespace Magento\Elasticsearch\Model\Adapter; -/** - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - */ -use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\Model\ResourceModel\Index; -use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer; -use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface; -use Magento\Framework\Exception\LocalizedException; -use Psr\Log\LoggerInterface; /** * Elasticsearch adapter - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Elasticsearch { @@ -37,16 +27,6 @@ class Elasticsearch */ protected $connectionManager; - /** - * @var Index - */ - protected $resourceIndex; - - /** - * @var AttributeContainer - */ - protected $attributeContainer; - /** * @var DocumentDataMapper */ @@ -58,7 +38,7 @@ class Elasticsearch protected $fieldMapper; /** - * @var ClientOptionsInterface + * @var \Magento\Elasticsearch\Model\Config */ protected $clientConfig; @@ -68,12 +48,12 @@ class Elasticsearch protected $client; /** - * @var BuilderInterface + * @var \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface */ protected $indexBuilder; /** - * @var LoggerInterface + * @var \Psr\Log\LoggerInterface */ protected $logger; @@ -83,32 +63,28 @@ class Elasticsearch protected $preparedIndex = []; /** + * Constructor for Elasticsearch adapter. + * * @param ConnectionManager $connectionManager - * @param Index $resourceIndex - * @param AttributeContainer $attributeContainer * @param DocumentDataMapper $documentDataMapper * @param FieldMapper $fieldMapper - * @param Config $clientConfig - * @param BuilderInterface $indexBuilder - * @param LoggerInterface $logger + * @param \Magento\Elasticsearch\Model\Config $clientConfig + * @param \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder + * @param \Psr\Log\LoggerInterface $logger * @param array $options * - * @throws LocalizedException + * @throws \Magento\Framework\Exception\LocalizedException */ public function __construct( ConnectionManager $connectionManager, - Index $resourceIndex, - AttributeContainer $attributeContainer, DocumentDataMapper $documentDataMapper, FieldMapper $fieldMapper, - Config $clientConfig, - BuilderInterface $indexBuilder, - LoggerInterface $logger, + \Magento\Elasticsearch\Model\Config $clientConfig, + \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder, + \Psr\Log\LoggerInterface $logger, $options = [] ) { $this->connectionManager = $connectionManager; - $this->resourceIndex = $resourceIndex; - $this->attributeContainer = $attributeContainer; $this->documentDataMapper = $documentDataMapper; $this->fieldMapper = $fieldMapper; $this->clientConfig = $clientConfig; @@ -116,47 +92,27 @@ public function __construct( $this->logger = $logger; try { - $this->connect($options); + $this->client = $this->connectionManager->getConnection($options); } catch (\Exception $e) { $this->logger->critical($e); - throw new LocalizedException( + throw new \Magento\Framework\Exception\LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); } } - /** - * Connect to Search Engine Client by specified options. - * - * @param array $options - * @return ElasticsearchClient - * - * @throws \RuntimeException - */ - protected function connect($options = []) - { - try { - $this->client = $this->connectionManager->getConnection($options); - } catch (\Exception $e) { - $this->logger->critical($e); - throw new \RuntimeException('Elasticsearch client is not set.'); - } - - return $this->client; - } - /** * Retrieve Elasticsearch server status * * @return bool - * @throws LocalizedException + * @throws \Magento\Framework\Exception\LocalizedException */ public function ping() { try { $response = $this->client->ping(); } catch (\Exception $e) { - throw new LocalizedException( + throw new \Magento\Framework\Exception\LocalizedException( __('Could not ping search engine: %1', $e->getMessage()) ); } @@ -172,29 +128,17 @@ public function ping() */ public function prepareDocsPerStore(array $documentData, $storeId) { - if (0 === count($documentData)) { - return []; - } - $documents = []; - $productIds = array_keys($documentData); - $priceIndexData = $this->attributeContainer->getAttribute('price') - ? $this->resourceIndex->getPriceIndexData($productIds, $storeId) - : []; - $categoryIndexData = $this->resourceIndex->getFullCategoryProductIndexData($storeId, $productIds); - $fullProductIndexData = $this->resourceIndex->getFullProductIndexData($productIds); - - foreach ($fullProductIndexData as $productId => $productIndexData) { - $document = $this->documentDataMapper->map( - $productIndexData, - $productId, - $storeId, - $priceIndexData, - $categoryIndexData - ); - $documents[$productId] = $document; + if (count($documentData)) { + foreach ($documentData as $documentId => $data) { + $document = $this->documentDataMapper->map( + $documentId, + $data, + $storeId + ); + $documents[$documentId] = $document; + } } - return $documents; } @@ -350,7 +294,6 @@ protected function checkIndex($storeId, $checkAlias = true) * Update Elasticsearch alias for new index. * * @param int $storeId - * * @return $this */ public function updateAlias($storeId) @@ -382,16 +325,12 @@ public function updateAlias($storeId) * * @param int $storeId * @param string $indexName - * * @return $this */ protected function prepareIndex($storeId, $indexName) { $this->indexBuilder->setStoreId($storeId); - $this->client->createIndex( - $indexName, - ['settings' => $this->indexBuilder->build()] - ); + $this->client->createIndex($indexName, ['settings' => $this->indexBuilder->build()]); $this->client->addFieldsMapping( $this->fieldMapper->getAllAttributesTypes(), $indexName, @@ -434,7 +373,6 @@ protected function getIndexName($storeId) * Returns index pattern. * * @param int $storeId - * * @return string */ protected function getIndexPattern($storeId) @@ -446,7 +384,6 @@ protected function getIndexPattern($storeId) * Returns index for store in alias definition. * * @param int $storeId - * * @return string */ protected function getIndexFromAlias($storeId) diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index 262355475f8da..c7bc525925876 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -36,6 +36,11 @@ class DocumentDataMapperTest extends \PHPUnit_Framework_TestCase */ private $attributeContainerMock; + /** + * @var Index|\PHPUnit_Framework_MockObject_MockObject + */ + private $resourceIndex; + /** * @var FieldMapper|\PHPUnit_Framework_MockObject_MockObject */ @@ -76,6 +81,21 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->resourceIndex = $this->getMockBuilder('Magento\Elasticsearch\Model\ResourceModel\Index') + ->disableOriginalConstructor() + ->setMethods([ + 'getPriceIndexData', + 'getFullCategoryProductIndexData', + 'getFullProductIndexData', + ]) + ->getMock(); + $this->resourceIndex->expects($this->any()) + ->method('getPriceIndexData') + ->willReturn([]); + $this->resourceIndex->expects($this->any()) + ->method('getFullCategoryProductIndexData') + ->willReturn([]); + $this->fieldMapperMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapper') ->setMethods(['getFieldName']) ->disableOriginalConstructor() @@ -104,6 +124,7 @@ protected function setUp() [ 'builder' => $this->builderMock, 'attributeContainer' => $this->attributeContainerMock, + 'resourceIndex' => $this->resourceIndex, 'fieldMapper' => $this->fieldMapperMock, 'dateTime' => $this->dateTimeMock, 'localeDate' => $this->localeDateMock, @@ -117,16 +138,13 @@ protected function setUp() * Tests modules data returns array * * @dataProvider mapProvider - * @param array $productData * @param int $productId + * @param array $productData * @param int $storeId - * @param array $productPriceData - * @param array $productCategoryData - * @param bool $emptyData * * @return array */ - public function testGetMap($productData, $productId, $storeId, $productPriceData, $productCategoryData, $emptyData) + public function testGetMap($productId, $productData, $storeId) { $this->attributeContainerMock->expects($this->any())->method('getAttribute')->will( $this->returnValue($this->attributeContainerMock) @@ -143,9 +161,6 @@ public function testGetMap($productData, $productId, $storeId, $productPriceData $this->scopeConfigMock->expects($this->any())->method('getValue')->will( $this->returnValue('Europe/London') ); - $this->dateTimeMock->expects($this->any())->method('isEmptyDate')->will( - $this->returnValue($emptyData) - ); $this->builderMock->expects($this->any())->method('addField')->will( $this->returnValue([]) ); @@ -156,17 +171,14 @@ public function testGetMap($productData, $productId, $storeId, $productPriceData $this->returnValue([]) ); - $store = $this->getMockBuilder('\Magento\Store\Model\Store') - ->disableOriginalConstructor() - ->setMethods(['getWebsiteId']) - ->getMock(); - - $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($store); - $store->expects($this->once())->method('getWebsiteId')->willReturn('website_id'); + $data = [$productId => $productData]; + $this->resourceIndex->expects($this->once()) + ->method('getFullProductIndexData') + ->willReturn($data); $this->assertInternalType( 'array', - $this->model->map($productData, $productId, $storeId, $productPriceData, $productCategoryData) + $this->model->map($productId, $productData, $storeId) ); } @@ -178,42 +190,34 @@ public static function mapProvider() { return [ [ - ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'], - '1', '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - true + ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'], + '1' ], [ + '1', [ 'tier_price'=> [[ - 'price_id'=>'1', - 'website_id'=>'1', - 'all_groups'=>'1', - 'cust_group'=>'1', - 'price_qty'=>'1', - 'website_price'=>'1', - 'price'=>'1' - ]], - 'created_at'=>'00-00-00 00:00:00' + 'price_id'=>'1', + 'website_id'=>'1', + 'all_groups'=>'1', + 'cust_group'=>'1', + 'price_qty'=>'1', + 'website_price'=>'1', + 'price'=>'1' + ]], + 'created_at'=>'00-00-00 00:00:00' ], - '1', - '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - true + '1' ], [ - ['image'=>'11','created_at'=>'00-00-00 00:00:00'], - '1', '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - true + ['image'=>'11','created_at'=>'00-00-00 00:00:00'], + '1' ], [ + '1', [ 'image' => '1', 'small_image' => '1', @@ -222,29 +226,26 @@ public static function mapProvider() 'media_gallery'=> [ 'images' => - [[ - 'file'=>'1', - 'media_type'=>'image', - 'position'=>'1', - 'disabled'=>'1', - 'label'=>'1', - 'title'=>'1', - 'base_image'=>'1', - 'small_image'=>'1', - 'thumbnail'=>'1', - 'swatch_image'=>'1' - ]] + [[ + 'file'=>'1', + 'media_type'=>'image', + 'position'=>'1', + 'disabled'=>'1', + 'label'=>'1', + 'title'=>'1', + 'base_image'=>'1', + 'small_image'=>'1', + 'thumbnail'=>'1', + 'swatch_image'=>'1' + ]] ] - , + , 'created_at'=>'00-00-00 00:00:00' ], - '1', - '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - true + '1' ], [ + '1', [ 'image' => '1', 'small_image' => '1', @@ -254,47 +255,37 @@ public static function mapProvider() [ 'images' => [[ - 'file'=>'1', - 'media_type'=>'video', - 'position'=>'1', - 'disabled'=>'1', - 'label'=>'1', - 'title'=>'1', - 'base_image'=>'1', - 'small_image'=>'1', - 'thumbnail'=>'1', - 'swatch_image'=>'1', - 'video_title'=>'1', - 'video_url'=>'1', - 'video_description'=>'1', - 'video_metadata'=>'1', - 'video_provider'=>'1' - ]] + 'file'=>'1', + 'media_type'=>'video', + 'position'=>'1', + 'disabled'=>'1', + 'label'=>'1', + 'title'=>'1', + 'base_image'=>'1', + 'small_image'=>'1', + 'thumbnail'=>'1', + 'swatch_image'=>'1', + 'video_title'=>'1', + 'video_url'=>'1', + 'video_description'=>'1', + 'video_metadata'=>'1', + 'video_provider'=>'1' + ]] ] , 'created_at'=>'00-00-00 00:00:00' ], - '1', - '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - true + '1' ], [ - ['quantity_and_stock_status'=>'11','created_at'=>'00-00-00 00:00:00'], - '1', '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - true + ['quantity_and_stock_status'=>'11','created_at'=>'00-00-00 00:00:00'], + '1' ], [ - ['price'=>'11','created_at'=>'1995-12-31 23:59:59','options'=>['value1','value2']], '1', - '1', - ['1'=>['11','11','11','11']], - ['1' => ['2','1']], - false + ['price'=>'11','created_at'=>'1995-12-31 23:59:59','options'=>['value1','value2']], + '1' ] ]; } diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 246ad29846377..5e818239d89f8 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -8,8 +8,6 @@ use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\Model\ResourceModel\Index; -use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer; use Magento\Elasticsearch\Model\Adapter\DocumentDataMapper; use Magento\Elasticsearch\Model\Adapter\FieldMapper; use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface; @@ -34,16 +32,6 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase */ protected $connectionManager; - /** - * @var Index|\PHPUnit_Framework_MockObject_MockObject - */ - protected $resourceIndex; - - /** - * @var AttributeContainer|\PHPUnit_Framework_MockObject_MockObject - */ - protected $attributeContainer; - /** * @var DocumentDataMapper|\PHPUnit_Framework_MockObject_MockObject */ @@ -95,20 +83,6 @@ public function setUp() 'getConnection', ]) ->getMock(); - $this->resourceIndex = $this->getMockBuilder('Magento\Elasticsearch\Model\ResourceModel\Index') - ->disableOriginalConstructor() - ->setMethods([ - 'getPriceIndexData', - 'getFullCategoryProductIndexData', - 'getFullProductIndexData', - ]) - ->getMock(); - $this->attributeContainer = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Container\Attribute') - ->disableOriginalConstructor() - ->setMethods([ - 'getAttribute', - ]) - ->getMock(); $this->documentDataMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\DocumentDataMapper') ->disableOriginalConstructor() ->setMethods([ @@ -186,39 +160,6 @@ public function setUp() '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', [ 'connectionManager' => $this->connectionManager, - 'resourceIndex' => $this->resourceIndex, - 'attributeContainer' => $this->attributeContainer, - 'documentDataMapper' => $this->documentDataMapper, - 'fieldMapper' => $this->fieldMapper, - 'clientConfig' => $this->clientConfig, - 'indexBuilder' => $this->indexBuilder, - 'logger' => $this->logger - ] - ); - } - - /** - * @expectedException \Magento\Framework\Exception\LocalizedException - */ - public function testConnectException() - { - $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') - ->disableOriginalConstructor() - ->setMethods([ - 'getConnection', - ]) - ->getMock(); - - $connectionManager->expects($this->any()) - ->method('getConnection') - ->willThrowException(new \Exception('Something went wrong')); - - $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', - [ - 'connectionManager' => $connectionManager, - 'resourceIndex' => $this->resourceIndex, - 'attributeContainer' => $this->attributeContainer, 'documentDataMapper' => $this->documentDataMapper, 'fieldMapper' => $this->fieldMapper, 'clientConfig' => $this->clientConfig, @@ -264,22 +205,6 @@ public function testPrepareDocsPerStoreEmpty() */ public function testPrepareDocsPerStore() { - $this->attributeContainer->expects($this->once()) - ->method('getAttribute') - ->willReturn(1); - $this->resourceIndex->expects($this->once()) - ->method('getPriceIndexData') - ->willReturn([]); - $this->resourceIndex->expects($this->once()) - ->method('getFullCategoryProductIndexData') - ->willReturn([]); - $this->resourceIndex->expects($this->once()) - ->method('getFullProductIndexData') - ->willReturn([ - '1' => [ - 'name' => 'Product Name', - ], - ]); $this->documentDataMapper->expects($this->once()) ->method('map') ->willReturn([ @@ -408,8 +333,6 @@ public function testUpdateAliasEmpty() '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', [ 'connectionManager' => $this->connectionManager, - 'resourceIndex' => $this->resourceIndex, - 'attributeContainer' => $this->attributeContainer, 'documentDataMapper' => $this->documentDataMapper, 'fieldMapper' => $this->fieldMapper, 'clientConfig' => $this->clientConfig, @@ -486,7 +409,7 @@ protected function getClientOptions() 'index' => 'magento2', 'enableAuth' => 1, 'username' => 'user', - 'password' => 'passwd', + 'password' => 'my-password', ]; } } diff --git a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php b/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php index be87b3f3e814a..0154efb9c3f3a 100644 --- a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php +++ b/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php @@ -34,7 +34,7 @@ class EsConfigTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->reader = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\Config\Reader') + $this->reader = $this->getMockBuilder('Magento\Framework\Config\ReaderInterface') ->disableOriginalConstructor() ->getMock(); From 399d6aad5e4f7f566817c8703337d59061d0636d Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Tue, 8 Dec 2015 15:01:22 +0100 Subject: [PATCH 206/616] PRD-71 code beautification --- Model/Adapter/DocumentDataMapper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Model/Adapter/DocumentDataMapper.php b/Model/Adapter/DocumentDataMapper.php index 6c675d17ec326..2f7a9818e83de 100644 --- a/Model/Adapter/DocumentDataMapper.php +++ b/Model/Adapter/DocumentDataMapper.php @@ -158,7 +158,9 @@ public function map($productId, array $productIndexData, $storeId) $storeId, [$productId => $productId] ); - $productIndexData = $this->resourceIndex->getFullProductIndexData([$productId]); + if (count($productIndexData[$productId])) { + $productIndexData = $this->resourceIndex->getFullProductIndexData([$productId]); + } foreach ($productIndexData[$productId] as $attributeCode => $value) { // Prepare processing attribute info From 14ff0d8ad7b37ddd450f0eebf402ec0adf6d4a11 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 8 Dec 2015 16:01:40 +0200 Subject: [PATCH 207/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- Model/Indexer/IndexHandlerTest.php | 116 +++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 5fdf669083026..790a6b0250a3d 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -8,6 +8,10 @@ use Magento\Catalog\Model\Product; use Magento\TestFramework\Helper\Bootstrap; use Magento\Framework\Indexer\IndexerInterface; +use Magento\Elasticsearch\SearchAdapter\ConnectionManager; +use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; +use Magento\Framework\Search\Request\Dimension; +use Magento\Elasticsearch\Model\Config; /** * @magentoDbIsolation disabled @@ -20,6 +24,51 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase */ protected $indexer; + /** + * @var ConnectionManager + */ + protected $connectionManager; + + /** + * @var ElasticsearchClient + */ + protected $client; + + /** + * @var Dimension + */ + protected $dimension; + + /** + * @var Config + */ + protected $clientConfig; + + /** + * @var Product + */ + protected $productApple; + + /** + * @var Product + */ + protected $productBanana; + + /** + * @var Product + */ + protected $productOrange; + + /** + * @var Product + */ + protected $productPapaya; + + /** + * @var Product + */ + protected $productCherry; + /** * Setup method */ @@ -29,6 +78,27 @@ protected function setUp() 'Magento\Indexer\Model\Indexer' ); $this->indexer->load('catalogsearch_fulltext'); + + $this->connectionManager = Bootstrap::getObjectManager()->create( + 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' + ); + + $this->client = $this->connectionManager->getConnection(); + + $this->dimension = Bootstrap::getObjectManager()->create( + '\Magento\Framework\Search\Request\Dimension', + ['name' => 'scope', 'value' => '1'] + ); + + $this->clientConfig = Bootstrap::getObjectManager()->create( + 'Magento\Elasticsearch\Model\Config' + ); + + $this->productApple = $this->getProductBySku('fulltext-1'); + $this->productBanana = $this->getProductBySku('fulltext-2'); + $this->productOrange = $this->getProductBySku('fulltext-3'); + $this->productPapaya = $this->getProductBySku('fulltext-4'); + $this->productCherry = $this->getProductBySku('fulltext-5'); } /** @@ -38,6 +108,52 @@ protected function setUp() public function testReindexAll() { $this->indexer->reindexAll(); + + $products = $this->searchByName('Apple'); + $this->assertCount(1, $products); + $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + + $products = $this->searchByName('Simple Product'); + $this->assertCount(5, $products); + } + + /** + * Search docs in Elasticsearch by name + * + * @param string $text + * @return array + */ + protected function searchByName($text) + { + $storeId = $this->dimension->getValue(); + $searchQuery = [ + 'index' => $this->clientConfig->getIndexName(), + 'type' => $this->clientConfig->getEntityType(), + 'body' => [ + 'query' => [ + 'bool' => [ + 'minimum_should_match' => 1, + 'must' => [ + [ + 'term' => [ + 'store_id' => $storeId, + ] + ], + ], + 'should' => [ + [ + 'match' => [ + 'name' => $text, + ], + ], + ], + ], + ], + ], + ]; + $queryResult = $this->client->query($searchQuery); + $products = isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : []; + return $products; } /** From b678673d3bc3a6b4a0beec498878f65f89d9c1dd Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 8 Dec 2015 16:13:46 +0200 Subject: [PATCH 208/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- SearchAdapter/Aggregation/Interval.php | 6 +- .../Aggregation/IntervalTest.php | 320 ++++++++++++++++++ 2 files changed, 324 insertions(+), 2 deletions(-) create mode 100644 Test/Unit/SearchAdapter/Aggregation/IntervalTest.php diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 7524bf7f3c728..67b9323c938d6 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -60,12 +60,14 @@ class Interval implements IntervalInterface private $entityIds; /** - * @param array $query * @param ConnectionManager $connectionManager * @param FieldMapperInterface $fieldMapper * @param StoreManagerInterface $storeManager * @param CustomerSession $customerSession * @param Config $clientConfig + * @param string $fieldName + * @param string $storeId + * @param array $entityIds */ public function __construct( ConnectionManager $connectionManager, @@ -450,7 +452,7 @@ public function loadNext($data, $rightIndex, $upper = null) $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - return array_reverse($this->arrayValuesToFloat($queryResult)); + return array_reverse($this->arrayValuesToFloat($queryResult['hits']['hits'])); } /** diff --git a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php new file mode 100644 index 0000000000000..e05ce7ea77975 --- /dev/null +++ b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php @@ -0,0 +1,320 @@ +connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->setMethods(['getConnection']) + ->disableOriginalConstructor() + ->getMock(); + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + ->setMethods([ + 'getIndexName', + 'getEntityType', + ]) + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->customerSession = $this->getMockBuilder('Magento\Customer\Model\Session') + ->setMethods(['getCustomerGroupId']) + ->disableOriginalConstructor() + ->getMock(); + $this->customerSession->expects($this->any()) + ->method('getCustomerGroupId') + ->willReturn(1); + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + $this->storeMock->expects($this->any()) + ->method('getId') + ->willReturn(1); + $this->clientConfig->expects($this->any()) + ->method('getIndexName') + ->willReturn('indexName'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('product'); + $this->clientMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + ->setMethods(['query']) + ->disableOriginalConstructor() + ->getMock(); + $this->connectionManager->expects($this->any()) + ->method('getConnection') + ->willReturn($this->clientMock); + + $objectManagerHelper = new ObjectManagerHelper($this); + $this->model = $objectManagerHelper->getObject( + '\Magento\Elasticsearch\SearchAdapter\Aggregation\Interval', + [ + 'connectionManager' => $this->connectionManager, + 'fieldMapper' => $this->fieldMapper, + 'storeManager' => $this->storeManager, + 'customerSession' => $this->customerSession, + 'clientConfig' => $this->clientConfig + ] + ); + } + + /** + * @dataProvider loadParamsProvider + * @param string $limit + * @param string $offset + * @param string $lower + * @param string $upper + * Test load() method + */ + public function testLoad($limit, $offset, $lower, $upper) + { + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + + $expectedResult = ['25', '26']; + + $this->clientMock->expects($this->once()) + ->method('query') + ->willReturn([ + 'hits' => [ + 'hits' => [ + [ + 'sort' => ['25'], + ], + [ + 'sort' => ['26'], + ] + ], + ], + ]); + $this->assertEquals( + $expectedResult, + $this->model->load($limit, $offset, $lower, $upper) + ); + } + + /** + * @dataProvider loadPrevParamsProvider + * @param string $data + * @param string $index + * @param string $lower + * Test loadPrevious() method with offset + */ + public function testLoadPrevArray($data, $index, $lower) + { + $queryResult = ['hits' => ['total'=> '1','hits' => [['sort' => '25'],['sort' =>'26']]]]; + + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + + $expectedResult = ['2.0', '2.0']; + + $this->clientMock->expects($this->any()) + ->method('query') + ->willReturn($queryResult); + $this->assertEquals( + $expectedResult, + $this->model->loadPrevious($data, $index, $lower) + ); + } + + /** + * @dataProvider loadPrevParamsProvider + * @param string $data + * @param string $index + * @param string $lower + * Test loadPrevious() method without offset + */ + public function testLoadPrevFalse($data, $index, $lower) + { + $queryResult = ['hits' => ['total'=> '0']]; + + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + + $this->clientMock->expects($this->any()) + ->method('query') + ->willReturn($queryResult); + $this->assertFalse( + $this->model->loadPrevious($data, $index, $lower) + ); + } + + /** + * @dataProvider loadNextParamsProvider + * @param string $data + * @param string $rightIndex + * @param string $upper + * Test loadNext() method with offset + */ + public function testLoadNextArray($data, $rightIndex, $upper) + { + $queryResult = ['hits' => ['total'=> '1','hits' => [['sort' => '25'],['sort' =>'26']]]]; + + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + + $expectedResult = ['2.0', '2.0']; + + $this->clientMock->expects($this->any()) + ->method('query') + ->willReturn($queryResult); + $this->assertEquals( + $expectedResult, + $this->model->loadNext($data, $rightIndex, $upper) + ); + } + + /** + * @dataProvider loadNextParamsProvider + * @param string $data + * @param string $rightIndex + * @param string $upper + * Test loadNext() method without offset + */ + public function testLoadNextFalse($data, $rightIndex, $upper) + { + $queryResult = ['hits' => ['total'=> '0']]; + + $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeMock); + $this->storeMock->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); + + $this->clientMock->expects($this->any()) + ->method('query') + ->willReturn($queryResult); + $this->assertFalse( + $this->model->loadNext($data, $rightIndex, $upper) + ); + } + + /** + * @return array + */ + public static function loadParamsProvider() + { + return [ + ['6', '2', '24', '42'], + ]; + } + + /** + * @return array + */ + public static function loadPrevParamsProvider() + { + return [ + ['24', '1', '24'], + ]; + } + + /** + * @return array + */ + public static function loadNextParamsProvider() + { + return [ + ['24', '2', '42'], + ]; + } +} From efcab78c3ac880281999ac7a2b991c728dcd5a92 Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Tue, 8 Dec 2015 15:31:30 +0100 Subject: [PATCH 209/616] PRD-71 fixed DocumentDataMapperTest --- Test/Unit/Model/Adapter/DocumentDataMapperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index c7bc525925876..16bf937c33642 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -178,7 +178,7 @@ public function testGetMap($productId, $productData, $storeId) $this->assertInternalType( 'array', - $this->model->map($productId, $productData, $storeId) + $this->model->map($productId, $data, $storeId) ); } From 318112ac7ee621e592e56cf427880063153efa1d Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Tue, 8 Dec 2015 15:31:30 +0100 Subject: [PATCH 210/616] PRD-71 fixed DocumentDataMapperTest --- Test/Unit/Model/Adapter/DocumentDataMapperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index c7bc525925876..16bf937c33642 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -178,7 +178,7 @@ public function testGetMap($productId, $productData, $storeId) $this->assertInternalType( 'array', - $this->model->map($productId, $productData, $storeId) + $this->model->map($productId, $data, $storeId) ); } From fec67b0c8f835f390b980abac3358e9404d160fd Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Tue, 8 Dec 2015 15:39:36 +0100 Subject: [PATCH 211/616] PRD-71 fixed PHP notice after refactoring --- Model/Adapter/DocumentDataMapper.php | 2 +- Test/Unit/Model/Adapter/DocumentDataMapperTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/Adapter/DocumentDataMapper.php b/Model/Adapter/DocumentDataMapper.php index 2f7a9818e83de..829ced36ad11e 100644 --- a/Model/Adapter/DocumentDataMapper.php +++ b/Model/Adapter/DocumentDataMapper.php @@ -158,7 +158,7 @@ public function map($productId, array $productIndexData, $storeId) $storeId, [$productId => $productId] ); - if (count($productIndexData[$productId])) { + if (count($productIndexData)) { $productIndexData = $this->resourceIndex->getFullProductIndexData([$productId]); } diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index 16bf937c33642..c7bc525925876 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -178,7 +178,7 @@ public function testGetMap($productId, $productData, $storeId) $this->assertInternalType( 'array', - $this->model->map($productId, $data, $storeId) + $this->model->map($productId, $productData, $storeId) ); } From 7086fd22713a772894569580600d2f41662510bf Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Tue, 8 Dec 2015 17:41:22 +0100 Subject: [PATCH 212/616] PRD-71 fixed phpcs new line issue --- Test/Unit/Model/ResourceModel/EngineTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Test/Unit/Model/ResourceModel/EngineTest.php b/Test/Unit/Model/ResourceModel/EngineTest.php index 39bc4b47f7222..8d4f3c6ca8c41 100644 --- a/Test/Unit/Model/ResourceModel/EngineTest.php +++ b/Test/Unit/Model/ResourceModel/EngineTest.php @@ -8,7 +8,6 @@ use Magento\Elasticsearch\Model\ResourceModel\Engine; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; - class EngineTest extends \PHPUnit_Framework_TestCase { /** From 6b3ffda32043367ada8134b0da787027bd63e3f2 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 9 Dec 2015 10:28:34 +0200 Subject: [PATCH 213/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- Model/Indexer/IndexHandlerTest.php | 70 ++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 790a6b0250a3d..78bc641901b45 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -117,6 +117,76 @@ public function testReindexAll() $this->assertCount(5, $products); } + /** + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + */ + public function testReindexRowAfterEdit() + { + $this->indexer->reindexAll(); + + $this->productApple->setData('name', 'Simple Product Cucumber'); + $this->productApple->save(); + + $products = $this->searchByName('Apple'); + $this->assertCount(0, $products); + + $products = $this->searchByName('Cucumber'); + $this->assertCount(1, $products); + $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + + $products = $this->searchByName('Simple Product'); + $this->assertCount(5, $products); + } + + /** + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + */ + public function testReindexRowAfterMassAction() + { + $this->indexer->reindexAll(); + + $productIds = [ + $this->productApple->getId(), + $this->productBanana->getId(), + ]; + $attrData = [ + 'name' => 'Simple Product Common', + ]; + + /** @var \Magento\Catalog\Model\Product\Action $action */ + $action = Bootstrap::getObjectManager()->get( + 'Magento\Catalog\Model\Product\Action' + ); + $action->updateAttributes($productIds, $attrData, 1); + + $products = $this->searchByName('Apple'); + $this->assertCount(0, $products); + + $products = $this->searchByName('Banana'); + $this->assertCount(0, $products); + + $products = $this->searchByName('Unknown'); + $this->assertCount(0, $products); + + $products = $this->searchByName('Common'); + $this->assertCount(2, $products); + + $products = $this->searchByName('Simple Product'); + $this->assertCount(5, $products); + } + + /** + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoAppArea adminhtml + */ + public function testReindexRowAfterDelete() + { + $this->indexer->reindexAll(); + $this->productBanana->delete(); + $products = $this->searchByName('Simple Product'); + $this->assertCount(4, $products); + } + /** * Search docs in Elasticsearch by name * From 02197f92a2b678834a9a5c8755b5f3c528e244cf Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 9 Dec 2015 11:53:47 +0200 Subject: [PATCH 214/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- Model/Indexer/IndexHandlerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 78bc641901b45..18bed98c4763c 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\CatalogSearch\Model\Indexer; +namespace Magento\Elasticsearch\Model\Indexer; use Magento\Catalog\Model\Product; use Magento\TestFramework\Helper\Bootstrap; From c26084b0456aa6ab5a5918923cf2266851326d19 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 10 Dec 2015 11:09:41 +0200 Subject: [PATCH 215/616] PRD-32: Stopwords Implementation --- SearchAdapter/Query/Builder/Match.php | 17 +++++++++++-- .../Preprocessor/PreprocessorInterface.php | 15 ++++++++++++ .../Query/Preprocessor/Stopwords.php | 24 +++++++++++++++++++ etc/di.xml | 7 ++++++ 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 SearchAdapter/Query/Preprocessor/PreprocessorInterface.php create mode 100644 SearchAdapter/Query/Preprocessor/Stopwords.php diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 409137e08871c..270396c0776b7 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -8,6 +8,7 @@ use Magento\Framework\Search\Request\Query\BoolExpression; use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface; use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface as PreprocessorInterface; class Match implements QueryInterface { @@ -21,12 +22,21 @@ class Match implements QueryInterface */ private $fieldMapper; + /** + * @var PreprocessorInterface[] + */ + protected $preprocessorContainer; + /** * @param FieldMapperInterface $fieldMapper + * @param PreprocessorInterface[] $preprocessorContainer */ - public function __construct(FieldMapperInterface $fieldMapper) - { + public function __construct( + FieldMapperInterface $fieldMapper, + array $preprocessorContainer + ) { $this->fieldMapper = $fieldMapper; + $this->preprocessorContainer = $preprocessorContainer; } /** @@ -50,6 +60,9 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $ protected function prepareQuery($queryValue, $conditionType) { $queryValue = $this->escape($queryValue); + foreach ($this->preprocessorContainer as $preprocessor) { + $queryValue = $preprocessor->process($queryValue); + } $condition = $conditionType === BoolExpression::QUERY_CONDITION_NOT ? self::QUERY_CONDITION_MUST_NOT : $conditionType; return [ diff --git a/SearchAdapter/Query/Preprocessor/PreprocessorInterface.php b/SearchAdapter/Query/Preprocessor/PreprocessorInterface.php new file mode 100644 index 0000000000000..ac4bf5a35a4b6 --- /dev/null +++ b/SearchAdapter/Query/Preprocessor/PreprocessorInterface.php @@ -0,0 +1,15 @@ + + + + + Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords + + + Magento\Elasticsearch\Model\Adapter\Index\Config\Converter From 56c71ab8018034d4c3fcc8879f2b24a692fdd23e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 10 Dec 2015 13:56:06 +0200 Subject: [PATCH 216/616] PRD-32: Stopwords Implementation --- Model/Adapter/Index/Config/Converter.php | 24 ++++++++++--- Model/Adapter/Index/Config/EsConfig.php | 10 +++++- .../Index/Config/EsConfigInterface.php | 5 +++ etc/esconfig.xml | 4 +++ etc/esconfig.xsd | 1 + etc/stopwords/stopwords.csv | 35 +++++++++++++++++++ etc/stopwords/stopwords_en_US.csv | 35 +++++++++++++++++++ 7 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 etc/stopwords/stopwords.csv create mode 100644 etc/stopwords/stopwords_en_US.csv diff --git a/Model/Adapter/Index/Config/Converter.php b/Model/Adapter/Index/Config/Converter.php index a0cdfd66fdcf8..cc7d90e40c172 100644 --- a/Model/Adapter/Index/Config/Converter.php +++ b/Model/Adapter/Index/Config/Converter.php @@ -14,12 +14,26 @@ class Converter implements ConverterInterface */ public function convert($source) { - $output = []; - foreach ($source->getElementsByTagName('*') as $node) { - if (!in_array($node->nodeName, ['config', 'stemmer'])) { - $output[$node->nodeName]= $node->textContent; + $stemmer = $source->getElementsByTagName('stemmer'); + $stemmerInfo = []; + foreach ($stemmer as $stemmerItem) { + foreach ($stemmerItem->childNodes as $childNode) { + if ($childNode->nodeType === XML_ELEMENT_NODE) { + $stemmerInfo[$childNode->localName]= $childNode->textContent; + } } } - return $output; + + $stopwords = $source->getElementsByTagName('stopwords_file'); + $stopwordsInfo = []; + foreach ($stopwords as $stopwordsItem) { + foreach ($stopwordsItem->childNodes as $childNode) { + if ($childNode->nodeType === XML_ELEMENT_NODE) { + $stopwordsInfo[$childNode->localName]= $childNode->textContent;; + } + } + } + + return ['stemmerInfo' => $stemmerInfo, 'stopwordsInfo' => $stopwordsInfo]; } } diff --git a/Model/Adapter/Index/Config/EsConfig.php b/Model/Adapter/Index/Config/EsConfig.php index 6b089db3d51e8..3be4ae796a407 100644 --- a/Model/Adapter/Index/Config/EsConfig.php +++ b/Model/Adapter/Index/Config/EsConfig.php @@ -29,6 +29,14 @@ public function __construct( */ public function getStemmerInfo() { - return $this->get(); + return $this->get('stemmerInfo'); + } + + /** + * {@inheritdoc} + */ + public function getStopwordsInfo() + { + return $this->get('stopwordsInfo'); } } diff --git a/Model/Adapter/Index/Config/EsConfigInterface.php b/Model/Adapter/Index/Config/EsConfigInterface.php index 856582eaf32e3..1fd243bad5da9 100644 --- a/Model/Adapter/Index/Config/EsConfigInterface.php +++ b/Model/Adapter/Index/Config/EsConfigInterface.php @@ -11,4 +11,9 @@ interface EsConfigInterface * @return array */ public function getStemmerInfo(); + + /** + * @return array + */ + public function getStopwordsInfo(); } diff --git a/etc/esconfig.xml b/etc/esconfig.xml index 0406804de8063..c020bf3d60b1c 100644 --- a/etc/esconfig.xml +++ b/etc/esconfig.xml @@ -13,4 +13,8 @@ english german + + stopwords.csv + stopwords_en_US.csv + diff --git a/etc/esconfig.xsd b/etc/esconfig.xsd index 08899e307de71..e9e0a62f35f60 100644 --- a/etc/esconfig.xsd +++ b/etc/esconfig.xsd @@ -12,6 +12,7 @@ + diff --git a/etc/stopwords/stopwords.csv b/etc/stopwords/stopwords.csv new file mode 100644 index 0000000000000..2d59246d51aa9 --- /dev/null +++ b/etc/stopwords/stopwords.csv @@ -0,0 +1,35 @@ +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with \ No newline at end of file diff --git a/etc/stopwords/stopwords_en_US.csv b/etc/stopwords/stopwords_en_US.csv new file mode 100644 index 0000000000000..2d59246d51aa9 --- /dev/null +++ b/etc/stopwords/stopwords_en_US.csv @@ -0,0 +1,35 @@ +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with \ No newline at end of file From cf6efba3be2f763ad52399b8e6996516e1e2c922 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Thu, 10 Dec 2015 15:26:49 +0200 Subject: [PATCH 217/616] PRD-99: Merging PR from sprint 4 --- .../System/Config/TestConnection.php | 2 +- Model/Adapter/Elasticsearch.php | 105 ++++----------- Model/Adapter/Index/IndexNameResolver.php | 126 ++++++++++++++++++ Model/Indexer/IndexerHandler.php | 16 ++- SearchAdapter/Mapper.php | 19 ++- Test/Unit/Model/Adapter/ElasticsearchTest.php | 4 +- Test/Unit/Model/ConfigTest.php | 8 +- Test/Unit/SearchAdapter/MapperTest.php | 9 +- etc/adminhtml/system.xml | 4 +- etc/config.xml | 2 +- etc/di.xml | 33 +++++ 11 files changed, 229 insertions(+), 99 deletions(-) create mode 100644 Model/Adapter/Index/IndexNameResolver.php diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index a49b75d6e694c..cd732ab95e89c 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -20,7 +20,7 @@ protected function _getFieldMapping() 'engine' => 'catalog_search_engine', 'hostname' => 'catalog_search_elasticsearch_server_hostname', 'port' => 'catalog_search_elasticsearch_server_port', - 'index' => 'catalog_search_elasticsearch_index_name', + 'index' => 'catalog_search_elasticsearch_indexer_prefix', 'enableAuth' => 'catalog_search_elasticsearch_enable_auth', 'username' => 'catalog_search_elasticsearch_username', 'password' => 'catalog_search_elasticsearch_password', diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index b7d62835be5e3..7801f9eefd72d 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -32,6 +32,11 @@ class Elasticsearch */ protected $documentDataMapper; + /** + * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + */ + protected $indexNameResolver; + /** * @var FieldMapper */ @@ -71,6 +76,7 @@ class Elasticsearch * @param \Magento\Elasticsearch\Model\Config $clientConfig * @param \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder * @param \Psr\Log\LoggerInterface $logger + * @param \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver * @param array $options * * @throws \Magento\Framework\Exception\LocalizedException @@ -82,6 +88,7 @@ public function __construct( \Magento\Elasticsearch\Model\Config $clientConfig, \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder, \Psr\Log\LoggerInterface $logger, + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver, $options = [] ) { $this->connectionManager = $connectionManager; @@ -90,6 +97,7 @@ public function __construct( $this->clientConfig = $clientConfig; $this->indexBuilder = $indexBuilder; $this->logger = $logger; + $this->indexNameResolve = $indexNameResolver; try { $this->client = $this->connectionManager->getConnection($options); @@ -147,16 +155,16 @@ public function prepareDocsPerStore(array $documentData, $storeId) * * @param array $documents * @param int $storeId + * @param string $entityType * @return $this * @throws \Exception */ - public function addDocs(array $documents, $storeId) + public function addDocs(array $documents, $storeId, $entityType) { if (count($documents)) { try { $this->checkIndex($storeId, false); - $indexName = $this->getIndexName($storeId); - $entityType = $this->clientConfig->getEntityType(); + $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName, $entityType); $this->client->bulkQuery($bulkIndexDocuments); } catch (\Exception $e) { @@ -172,19 +180,20 @@ public function addDocs(array $documents, $storeId) * Removes all documents from Elasticsearch index * * @param int $storeId + * @param string $entityType * @return $this */ - public function cleanIndex($storeId) + public function cleanIndex($storeId, $entityType) { $this->checkIndex($storeId); - $indexName = $this->getIndexName($storeId); + $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); if ($this->client->isEmptyIndex($indexName)) { // use existing index if empty return $this; } // prepare new index name and increase version - $indexPattern = $this->getIndexPattern($storeId); + $indexPattern = $this->indexNameResolve->getIndexPattern($storeId, $entityType); $version = intval(str_replace($indexPattern, '', $indexName)); $newIndexName = $indexPattern . ++$version; @@ -204,15 +213,15 @@ public function cleanIndex($storeId) * * @param array $documentIds * @param int $storeId + * @param string $entityType * @return $this * @throws \Exception */ - public function deleteDocs(array $documentIds, $storeId) + public function deleteDocs(array $documentIds, $storeId, $entityType) { try { $this->checkIndex($storeId, false); - $indexName = $this->getIndexName($storeId); - $entityType = $this->clientConfig->getEntityType(); + $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkDeleteDocuments = $this->getDocsArrayInBulkIndexFormat( $documentIds, $indexName, @@ -270,19 +279,20 @@ protected function getDocsArrayInBulkIndexFormat( * * @param int $storeId * @param bool $checkAlias + * @param string $entityType * @return $this */ - protected function checkIndex($storeId, $checkAlias = true) + protected function checkIndex($storeId, $checkAlias = true, $entityType) { // create new index for store - $indexName = $this->getIndexName($storeId); + $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); if (!$this->client->indexExists($indexName)) { $this->prepareIndex($storeId, $indexName); } // add index to alias if ($checkAlias) { - $namespace = $this->getIndexNamespace(); + $namespace = $this->indexNameResolve->getIndexNamespace(); if (!$this->client->existsAlias($namespace, $indexName)) { $this->client->updateAlias($namespace, $indexName); } @@ -294,20 +304,21 @@ protected function checkIndex($storeId, $checkAlias = true) * Update Elasticsearch alias for new index. * * @param int $storeId + * @param string $entityType * @return $this */ - public function updateAlias($storeId) + public function updateAlias($storeId, $entityType) { if (!isset($this->preparedIndex[$storeId])) { return $this; } - $oldIndex = $this->getIndexFromAlias($storeId); + $oldIndex = $this->indexNameResolve->getIndexFromAlias($storeId, $entityType); if ($oldIndex == $this->preparedIndex[$storeId]) { $oldIndex = ''; } $this->client->updateAlias( - $this->getIndexNamespace(), + $this->indexNameResolve->getIndexNamespace(), $this->preparedIndex[$storeId], $oldIndex ); @@ -339,68 +350,4 @@ protected function prepareIndex($storeId, $indexName) $this->preparedIndex[$storeId] = $indexName; return $this; } - - /** - * Get index namespace from config. - * - * @return string - */ - protected function getIndexNamespace() - { - return $this->clientConfig->getIndexName(); - } - - /** - * Returns the index name. - * - * @param int $storeId - * @return string - */ - protected function getIndexName($storeId) - { - if (isset($this->preparedIndex[$storeId])) { - return $this->preparedIndex[$storeId]; - } else { - $indexName = $this->getIndexFromAlias($storeId); - if (empty($indexName)) { - $indexName = $this->getIndexPattern($storeId) . 1; - } - } - return $indexName; - } - - /** - * Returns index pattern. - * - * @param int $storeId - * @return string - */ - protected function getIndexPattern($storeId) - { - return $this->getIndexNamespace() . '_' . $storeId . '_v'; - } - - /** - * Returns index for store in alias definition. - * - * @param int $storeId - * @return string - */ - protected function getIndexFromAlias($storeId) - { - $storeIndex = ''; - $indexPattern = $this->getIndexPattern($storeId); - $namespace = $this->getIndexNamespace(); - if ($this->client->existsAlias($namespace)) { - $alias = $this->client->getAlias($namespace); - $indices = array_keys($alias); - foreach ($indices as $index) { - if (strpos($index, $indexPattern) === 0) { - $storeIndex = $index; - break; - } - } - } - return $storeIndex; - } } diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php new file mode 100644 index 0000000000000..ae886bbbbf2e1 --- /dev/null +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -0,0 +1,126 @@ +connectionManager = $connectionManager; + $this->clientConfig = $clientConfig; + $this->logger = $logger; + + try { + $this->client = $this->connectionManager->getConnection($options); + } catch (\Exception $e) { + $this->logger->critical($e); + throw new \Magento\Framework\Exception\LocalizedException( + __('We were unable to perform the search because of a search engine misconfiguration.') + ); + } + } + + /** + * Get index namespace from config. + * + * @return string + */ + public function getIndexNamespace() + { + return $this->clientConfig->getIndexerPrefix(); + } + + /** + * Returns the index name. + * + * @param int $storeId + * @param string $entityType + * @param array $preparedIndex + * @return string + */ + public function getIndexName($storeId, $entityType, array $preparedIndex) + { + if (isset($preparedIndex[$storeId])) { + return $preparedIndex[$storeId]; + } else { + $indexName = $this->getIndexFromAlias($storeId, $entityType); + if (empty($indexName)) { + $indexName = $this->getIndexPattern($storeId, $entityType) . 1; + } + } + return $indexName; + } + + /** + * Returns index pattern. + * + * @param int $storeId + * @param string $entityType + * @return string + */ + public function getIndexPattern($storeId, $entityType) + { + return $this->getIndexNamespace() .'_'. $entityType . '_' . $storeId . '_v'; + } + + /** + * Returns index for store in alias definition. + * + * @param int $storeId + * @param string $entityType + * @return string + */ + public function getIndexFromAlias($storeId, $entityType) + { + $storeIndex = ''; + $indexPattern = $this->getIndexPattern($storeId, $entityType); + $namespace = $this->getIndexNamespace(); + if ($this->client->existsAlias($namespace)) { + $alias = $this->client->getAlias($namespace); + $indices = array_keys($alias); + foreach ($indices as $index) { + if (strpos($index, $indexPattern) === 0) { + $storeIndex = $index; + break; + } + } + } + return $storeIndex; + }} \ No newline at end of file diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 38340b3c0e626..4201600492adf 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -43,21 +43,29 @@ class IndexerHandler implements IndexerInterface */ protected $batchSize; + /** + * @var string + */ + protected $entityType; + /** * @param ElasticsearchFactory $adapterFactory * @param Batch $batch + * @param string $entityType * @param array $data * @param int $batchSize */ public function __construct( ElasticsearchFactory $adapterFactory, Batch $batch, + $entityType, array $data = [], $batchSize = self::DEFAULT_BATCH_SIZE ) { $this->adapter = $adapterFactory->create(); $this->data = $data; $this->batch = $batch; + $this->entityType = $entityType; $this->batchSize = $batchSize; } @@ -70,9 +78,9 @@ public function saveIndex($dimensions, \Traversable $documents) $storeId = $dimension->getValue(); foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) { $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $storeId); - $this->adapter->addDocs($docs, $storeId); + $this->adapter->addDocs($docs, $storeId, $this->entityType); } - $this->adapter->updateAlias($storeId); + $this->adapter->updateAlias($storeId, $this->entityType); return $this; } @@ -88,7 +96,7 @@ public function deleteIndex($dimensions, \Traversable $documents) foreach ($documents as $entityId => $document) { $documentIds[$entityId] = $entityId; } - $this->adapter->deleteDocs($documentIds, $storeId); + $this->adapter->deleteDocs($documentIds, $storeId, $this->entityType); return $this; } @@ -99,7 +107,7 @@ public function cleanIndex($dimensions) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $this->adapter->cleanIndex($storeId); + $this->adapter->cleanIndex($storeId, $this->entityType); return $this; } diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index d766194d2c00b..2308c6bcc0c02 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -12,6 +12,7 @@ use Magento\Framework\Search\Request\Query\Match as MatchQuery; use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; +use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; /** @@ -34,19 +35,27 @@ class Mapper */ protected $filterBuilder; + /** + * @var AggregationBuilder + */ + protected $aggregationBuilder; + /** * @param Config $clientConfig * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder + * @param AggregationBuilder $aggregationBuilder */ public function __construct( Config $clientConfig, MatchQueryBuilder $matchQueryBuilder, - FilterBuilder $filterBuilder + FilterBuilder $filterBuilder, + AggregationBuilder $aggregationBuilder ) { $this->clientConfig = $clientConfig; $this->matchQueryBuilder = $matchQueryBuilder; $this->filterBuilder = $filterBuilder; + $this->aggregationBuilder = $aggregationBuilder; } /** @@ -60,7 +69,7 @@ public function buildQuery(RequestInterface $request) $dimension = current($request->getDimensions()); $storeId = $dimension->getValue(); $searchQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->clientConfig->getIndexerPrefix(), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'from' => $request->getFrom(), @@ -79,6 +88,7 @@ public function buildQuery(RequestInterface $request) 'store_id' => $storeId, ] ]; + $searchQuery = $this->aggregationBuilder->build($request, $searchQuery); return $searchQuery; } @@ -190,7 +200,10 @@ private function processFilterQuery( $selectQuery = $this->processQuery($query->getReference(), $selectQuery, $conditionType); break; case FilterQuery::REFERENCE_FILTER: - $selectQuery['bool']['filter'][]= $this->filterBuilder->build($query->getReference(), $conditionType); + $selectQuery['bool']['must']= array_merge( + isset($selectQuery['bool']['must']) ? $selectQuery['bool']['must'] : [], + $this->filterBuilder->build($query->getReference(), $conditionType) + ); break; } diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 5e818239d89f8..2b4746aebfe05 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -96,7 +96,7 @@ public function setUp() $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->disableOriginalConstructor() ->setMethods([ - 'getIndexName', + 'getIndexerPrefix', 'getEntityType', 'getIndexSettings', ]) @@ -150,7 +150,7 @@ public function setUp() 'name' => 'string', ]); $this->clientConfig->expects($this->any()) - ->method('getIndexName') + ->method('getIndexerPrefix') ->willReturn('indexName'); $this->clientConfig->expects($this->any()) ->method('getEntityType') diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index 9e86e7e041d3d..268a7bfab0e8b 100644 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -86,14 +86,14 @@ public function testPrepareClientOptions() } /** - * Test getIndexName() method + * Test getIndexerPrefix() method */ - public function testGetIndexName() + public function testGetIndexerPrefix() { $this->scopeConfig->expects($this->any()) ->method('getValue') - ->willReturn('indexName'); - $this->assertEquals('indexName', $this->model->getIndexName()); + ->willReturn('indexerPrefix'); + $this->assertEquals('indexerPrefix', $this->model->getIndexerPrefix()); } /** diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index ce60578002f71..34e1b13df05ce 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -41,7 +41,7 @@ public function setUp() { $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->setMethods([ - 'getIndexName', + 'getIndexerPrefix', 'getEntityType', ]) ->disableOriginalConstructor() @@ -55,8 +55,8 @@ public function setUp() ->getMock(); $this->clientConfig->expects($this->any()) - ->method('getIndexName') - ->willReturn('indexName'); + ->method('getIndexerPrefix') + ->willReturn('indexerPrefix'); $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); @@ -185,6 +185,9 @@ public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMo $filterQuery->expects($this->any()) ->method('getType') ->willReturn('matchQuery'); + $this->filterBuilder->expects(($this->any())) + ->method('build') + ->willReturn([]); $this->model->buildQuery($request); } diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 8271964c98c7d..1b1e1f04ea1e4 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -21,8 +21,8 @@ elasticsearch - - + + elasticsearch diff --git a/etc/config.xml b/etc/config.xml index 729d78bb131f1..d59faeb5be0c0 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -11,7 +11,7 @@ localhost 9200 - magento2 + magento2 0 15 diff --git a/etc/di.xml b/etc/di.xml index 721057714c742..bc99b502a13ce 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -30,6 +30,7 @@ Magento\Elasticsearch\Model\Indexer\IndexerHandler + product @@ -63,6 +64,31 @@ Magento\Elasticsearch\Model\Config + + + + Magento\Elasticsearch\SearchAdapter\Aggregation\Interval + + + + + + + Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider + + + + + + + Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider + + + Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term + Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic + + + Magento\Elasticsearch\Model\Adapter\Index\Config\Converter @@ -81,4 +107,11 @@ Magento\Elasticsearch\Model\Client\Elasticsearch + + + + Magento\Elasticsearch\Model\DataProvider\Suggestions + + + From d372682f2766537445776310a73b06415a8ede21 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Thu, 10 Dec 2015 15:48:48 +0200 Subject: [PATCH 218/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 6 +++--- etc/di.xml | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 7801f9eefd72d..663287e315fd8 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -163,7 +163,7 @@ public function addDocs(array $documents, $storeId, $entityType) { if (count($documents)) { try { - $this->checkIndex($storeId, false); + $this->checkIndex($storeId, false, $entityType); $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName, $entityType); $this->client->bulkQuery($bulkIndexDocuments); @@ -185,7 +185,7 @@ public function addDocs(array $documents, $storeId, $entityType) */ public function cleanIndex($storeId, $entityType) { - $this->checkIndex($storeId); + $this->checkIndex($storeId, true, $entityType); $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); if ($this->client->isEmptyIndex($indexName)) { // use existing index if empty @@ -220,7 +220,7 @@ public function cleanIndex($storeId, $entityType) public function deleteDocs(array $documentIds, $storeId, $entityType) { try { - $this->checkIndex($storeId, false); + $this->checkIndex($storeId, false, $entityType); $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkDeleteDocuments = $this->getDocsArrayInBulkIndexFormat( $documentIds, diff --git a/etc/di.xml b/etc/di.xml index bc99b502a13ce..26a3d7d6f9449 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -34,6 +34,11 @@ + + + product + + From 832b30913570e2ad2830d76b758664a57b987992 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Thu, 10 Dec 2015 16:33:07 +0200 Subject: [PATCH 219/616] PRD-99: Merging PR from sprint 4 --- Model/Config.php | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/Model/Config.php b/Model/Config.php index 32456d91ca0b8..6bcd6739f4877 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -7,6 +7,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Framework\Encryption\EncryptorInterface; +use Magento\Store\Model\ScopeInterface; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; @@ -15,6 +16,11 @@ */ class Config implements ClientOptionsInterface { + /** + * Search engine name + */ + const ENGINE_NAME = 'elasticsearch'; + /** * Elasticsearch Entity type for product */ @@ -65,7 +71,7 @@ public function prepareClientOptions($options = []) $defaultOptions = [ 'hostname' => $this->getElasticsearchConfigData('server_hostname'), 'port' => $this->getElasticsearchConfigData('server_port'), - 'index' => $this->getElasticsearchConfigData('index_name'), + 'index' => $this->getElasticsearchConfigData('indexer_prefix'), 'enableAuth' => $this->getElasticsearchConfigData('enable_auth'), 'username' => $this->getElasticsearchConfigData('username'), 'password' => $this->getElasticsearchConfigData('password'), @@ -79,22 +85,45 @@ public function prepareClientOptions($options = []) * Retrieve information from Elasticsearch search engine configuration * * @param string $field + * @param int $storeId * @return string|int */ - public function getElasticsearchConfigData($field) + public function getElasticsearchConfigData($field, $storeId = null) + { + return $this->getSearchConfigData('elasticsearch_' . $field, $storeId); + } + + /** + * Retrieve information from search engine configuration + * + * @param string $field + * @param int|null $storeId + * @return string|int + */ + public function getSearchConfigData($field, $storeId = null) + { + $path = 'catalog/search/' . $field; + return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId); + } + + /** + * Return true if third party search engine is used + * + * @return bool + */ + public function isElasticsearchEnabled() { - $path = 'catalog/search/elasticsearch_' . $field; - return $this->scopeConfig->getValue($path); + return $this->getSearchConfigData('engine') == self::ENGINE_NAME; } /** - * Get Elasticsearch index name + * Get Elasticsearch indexer prefix * * @return string */ - public function getIndexName() + public function getIndexerPrefix() { - return $this->getElasticsearchConfigData('index_name'); + return $this->getElasticsearchConfigData('indexer_prefix'); } /** From 0de850d674e992574e068199390719ea9ac550e9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 10 Dec 2015 17:52:31 +0200 Subject: [PATCH 220/616] PRD-32: Stopwords Implementation --- Model/Adapter/Index/Builder.php | 35 ++----- .../Query/Preprocessor/Stopwords.php | 93 +++++++++++++++++-- etc/di.xml | 5 + 3 files changed, 98 insertions(+), 35 deletions(-) diff --git a/Model/Adapter/Index/Builder.php b/Model/Adapter/Index/Builder.php index e065038a8f682..10a57736a4d62 100644 --- a/Model/Adapter/Index/Builder.php +++ b/Model/Adapter/Index/Builder.php @@ -5,21 +5,15 @@ */ namespace Magento\Elasticsearch\Model\Adapter\Index; -use Magento\Store\Api\StoreRepositoryInterface; -use Magento\Store\Api\StoreConfigManagerInterface; +use Magento\Framework\Locale\Resolver as LocaleResolver; use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; class Builder implements BuilderInterface { /** - * @var StoreRepositoryInterface + * @var LocaleResolver */ - protected $storeRepository; - - /** - * @var StoreConfigManagerInterface - */ - protected $storeConfig; + protected $localeResolver; /** * @var EsConfigInterface @@ -34,17 +28,14 @@ class Builder implements BuilderInterface protected $storeId; /** - * @param StoreRepositoryInterface $storeRepository - * @param StoreConfigManagerInterface $storeConfig + * @param LocaleResolver $localeResolver * @param EsConfigInterface $esConfig */ public function __construct( - StoreRepositoryInterface $storeRepository, - StoreConfigManagerInterface $storeConfig, + LocaleResolver $localeResolver, EsConfigInterface $esConfig ) { - $this->storeRepository = $storeRepository; - $this->storeConfig = $storeConfig; + $this->localeResolver = $localeResolver; $this->esConfig = $esConfig; } @@ -124,24 +115,14 @@ protected function getCharFilter() return $charFilter; } - /** - * @return string - */ - protected function getStoreLocale() - { - $store = $this->storeRepository->getById($this->storeId); - $storeConfigs = $this->storeConfig->getStoreConfigs([$store->getCode()]); - $storeConfig = array_shift($storeConfigs); - return $storeConfig->getLocale(); - } - /** * @return array */ protected function getStemmerConfig() { $stemmerInfo = $this->esConfig->getStemmerInfo(); - $locale = $this->getStoreLocale(); + $this->localeResolver->emulate($this->storeId); + $locale = $this->localeResolver->getLocale(); if (isset($stemmerInfo[$locale])) { return [ 'type' => $stemmerInfo['type'], diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index d74aaee673166..b05290e073c3b 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -5,20 +5,97 @@ */ namespace Magento\Elasticsearch\SearchAdapter\Query\Preprocessor; +use Magento\Store\Model\StoreManagerInterface; +use Magento\Framework\Locale\Resolver as LocaleResolver; +use Magento\Framework\Filesystem\Directory\ReadFactory; +use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; + class Stopwords implements PreprocessorInterface { + /** + * @var StoreManagerInterface + */ + protected $storeManager; + + /** + * @var LocaleResolver + */ + protected $localeResolver; + + /** + * @var ReadFactory + */ + protected $readFactory; + + /** + * @var EsConfigInterface + */ + protected $esConfig; + + /** + * @var string + */ + protected $fileDir; + + /** + * @param StoreManagerInterface $storeManager + * @param LocaleResolver $localeResolver + * @param ReadFactory $readFactory + * @param EsConfigInterface $esConfig + * @param string $fileDir + */ + public function __construct( + StoreManagerInterface $storeManager, + LocaleResolver $localeResolver, + ReadFactory $readFactory, + EsConfigInterface $esConfig, + $fileDir = '' + ) { + $this->storeManager = $storeManager; + $this->localeResolver = $localeResolver; + $this->readFactory = $readFactory; + $this->esConfig = $esConfig; + $this->fileDir = $fileDir; + } + /** * {@inheritdoc} */ public function process($query) { - $stopwords = ['and', 'or', 'the']; - return trim( - str_replace( - $stopwords, - '', - $query - ) - ); + $stopwords = $this->getStopwordsList(); + $queryParts = explode(' ', $query); + $query = implode(' ', array_diff($queryParts, $stopwords)); + return trim($query); + } + + /** + * Get stopwords list for current locale + * + * return array + */ + protected function getStopwordsList() + { + $filename = $this->getStopwordsFile(); + $source = $this->readFactory->create($this->fileDir); + //$fileStats = $source->stat($filename); + $fileContent = $source->readFile($filename); + $stopwords = explode("\n", $fileContent); + return $stopwords; + } + + /** + * Get stopwords file for current locale + * + * return string + */ + protected function getStopwordsFile() + { + $stopwordsInfo = $this->esConfig->getStopwordsInfo(); + $storeId = $this->storeManager->getStore()->getId(); + $this->localeResolver->emulate($storeId); + $locale = $this->localeResolver->getLocale(); + $stopwordsFile = isset( $stopwordsInfo[$locale]) ? $stopwordsInfo[$locale] : $stopwordsInfo['default']; + return $stopwordsFile; } } diff --git a/etc/di.xml b/etc/di.xml index e294b606fc7e0..e8c1054e2f05f 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -95,6 +95,11 @@ + + + app/code/Magento/Elasticsearch/etc/stopwords + + Magento\Elasticsearch\Model\Adapter\Index\Config\Converter From 1e04afd2ce686bdc118704fab6b0f5115dad4b1a Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 10 Dec 2015 18:26:27 +0200 Subject: [PATCH 221/616] PRD-32: Stopwords Implementation --- .../Query/Preprocessor/Stopwords.php | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index b05290e073c3b..b455fd99a80ac 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -8,10 +8,21 @@ use Magento\Store\Model\StoreManagerInterface; use Magento\Framework\Locale\Resolver as LocaleResolver; use Magento\Framework\Filesystem\Directory\ReadFactory; +use Magento\Framework\App\Cache\Type\Config as ConfigCache; use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; class Stopwords implements PreprocessorInterface { + /** + * Cache id for elasticsearch stopwords + */ + const CACHE_ID = 'elasticsearch_stopwords'; + + /** + * Stopwords file modification time gap, seconds + */ + const STOPWORDS_FILE_MODIFICATION_TIME_GAP = 900; + /** * @var StoreManagerInterface */ @@ -27,6 +38,11 @@ class Stopwords implements PreprocessorInterface */ protected $readFactory; + /** + * @var ConfigCache + */ + protected $configCache; + /** * @var EsConfigInterface */ @@ -41,6 +57,7 @@ class Stopwords implements PreprocessorInterface * @param StoreManagerInterface $storeManager * @param LocaleResolver $localeResolver * @param ReadFactory $readFactory + * @param ConfigCache $configCache * @param EsConfigInterface $esConfig * @param string $fileDir */ @@ -48,12 +65,14 @@ public function __construct( StoreManagerInterface $storeManager, LocaleResolver $localeResolver, ReadFactory $readFactory, + ConfigCache $configCache, EsConfigInterface $esConfig, $fileDir = '' ) { $this->storeManager = $storeManager; $this->localeResolver = $localeResolver; $this->readFactory = $readFactory; + $this->configCache = $configCache; $this->esConfig = $esConfig; $this->fileDir = $fileDir; } @@ -78,9 +97,15 @@ protected function getStopwordsList() { $filename = $this->getStopwordsFile(); $source = $this->readFactory->create($this->fileDir); - //$fileStats = $source->stat($filename); - $fileContent = $source->readFile($filename); - $stopwords = explode("\n", $fileContent); + $fileStats = $source->stat($filename); + if (((time() - $fileStats['mtime']) > self::STOPWORDS_FILE_MODIFICATION_TIME_GAP) + && ($cachedValue = $this->configCache->load(self::CACHE_ID))) { + $stopwords = unserialize($cachedValue); + } else { + $fileContent = $source->readFile($filename); + $stopwords = explode("\n", $fileContent); + $this->configCache->save(serialize($stopwords), self::CACHE_ID); + } return $stopwords; } From c0103fd78059df53077b2c0d45214d4f5c3b4776 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Thu, 10 Dec 2015 22:49:59 -0600 Subject: [PATCH 222/616] MAGETWO-46811: Elasticsearch version number inconsistency between module composer.json and root composer.json - Reset elasticsearch's composer.json version to 100.0.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 42caf48b3d345..62c160324fcb7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.0.1", + "version": "100.0.0", "license": [ "proprietary" ], From 3ac276ad4ac050fb9528cc96ad2edb8af93d1ec8 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 11 Dec 2015 11:18:48 +0200 Subject: [PATCH 223/616] PRD-32: Stopwords Implementation --- SearchAdapter/Query/Builder/Match.php | 2 +- Test/Unit/Model/Adapter/Index/BuilderTest.php | 42 +++++-------------- .../SearchAdapter/Query/Builder/MatchTest.php | 26 ++++++++++-- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 270396c0776b7..8226fd676b0a4 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -8,7 +8,7 @@ use Magento\Framework\Search\Request\Query\BoolExpression; use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface; use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; -use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface as PreprocessorInterface; +use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface; class Match implements QueryInterface { diff --git a/Test/Unit/Model/Adapter/Index/BuilderTest.php b/Test/Unit/Model/Adapter/Index/BuilderTest.php index 07b331ca27cda..43cbd7357aa46 100644 --- a/Test/Unit/Model/Adapter/Index/BuilderTest.php +++ b/Test/Unit/Model/Adapter/Index/BuilderTest.php @@ -6,8 +6,7 @@ namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index; use Magento\Elasticsearch\Model\Adapter\Index\Builder; -use Magento\Store\Api\StoreRepositoryInterface; -use Magento\Store\Api\StoreConfigManagerInterface; +use Magento\Framework\Locale\Resolver as LocaleResolver; use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; @@ -19,14 +18,9 @@ class BuilderTest extends \PHPUnit_Framework_TestCase protected $model; /** - * @var StoreRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var LocaleResolver|\PHPUnit_Framework_MockObject_MockObject */ - protected $storeRepository; - - /** - * @var StoreConfigManagerInterface|\PHPUnit_Framework_MockObject_MockObject - */ - protected $storeConfig; + protected $localeResolver; /** * @var EsConfigInterface|\PHPUnit_Framework_MockObject_MockObject @@ -39,11 +33,12 @@ class BuilderTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->storeRepository = $this->getMockBuilder('Magento\Store\Api\StoreRepositoryInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->storeConfig = $this->getMockBuilder('Magento\Store\Api\StoreConfigManagerInterface') + $this->localeResolver = $this->getMockBuilder('Magento\Framework\Locale\Resolver') ->disableOriginalConstructor() + ->setMethods([ + 'emulate', + 'getLocale' + ]) ->getMock(); $this->esConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface') ->disableOriginalConstructor() @@ -53,8 +48,7 @@ public function setUp() $this->model = $objectManager->getObject( '\Magento\Elasticsearch\Model\Adapter\Index\Builder', [ - 'storeRepository' => $this->storeRepository, - 'storeConfig' => $this->storeConfig, + 'localeResolver' => $this->localeResolver, 'esConfig' => $this->esConfig ] ); @@ -68,24 +62,10 @@ public function setUp() */ public function testBuild($locale) { - $store = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') - ->disableOriginalConstructor() - ->getMock(); - $storeConfig = $this->getMockBuilder('Magento\Store\Api\Data\StoreConfigInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->storeRepository->expects($this->once()) - ->method('getById') - ->willReturn($store); - $store->expects($this->once()) - ->method('getCode') - ->willReturn('code'); - $this->storeConfig->expects($this->once()) - ->method('getStoreConfigs') - ->willReturn([$storeConfig]); - $storeConfig->expects($this->once()) + $this->localeResolver->expects($this->once()) ->method('getLocale') ->willReturn($locale); + $this->esConfig->expects($this->once()) ->method('getStemmerInfo') ->willReturn([ diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 2d1e317b98f1e..62663a2813550 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -6,7 +6,10 @@ namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match; +use Magento\Framework\Search\Request\QueryInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface; class MatchTest extends \PHPUnit_Framework_TestCase { @@ -16,15 +19,20 @@ class MatchTest extends \PHPUnit_Framework_TestCase protected $model; /** - * @var \Magento\Elasticsearch\SearchAdapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; /** - * @var \Magento\Framework\Search\Request\QueryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var QueryInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $queryInterface; + /** + * @var PreprocessorInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $preprocessorInterface; + /** * Set up test environment. * @@ -40,11 +48,17 @@ public function setUp() ->disableOriginalConstructor() ->getMock(); + $this->preprocessorInterface = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface') + ->disableOriginalConstructor() + ->getMock(); + $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Query\Builder\Match', [ - 'fieldMapper' => $this->fieldMapper + 'fieldMapper' => $this->fieldMapper, + 'preprocessorContainer' => [$this->preprocessorInterface], ] ); @@ -62,6 +76,12 @@ public function testBuild() $query->expects($this->once())->method('getValue')->willReturn('query_value'); $query->expects($this->once())->method('getMatches')->willReturn([['field' => 'some_field'], ]); + + $this->preprocessorInterface->expects($this->any()) + ->method('process') + ->with('query_value') + ->willReturn('query_value'); + $this->model->build([], $query, 'not'); } } From 7a84c6ecb685e002bb0df8a7bda1f2e1dcb0011c Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Fri, 11 Dec 2015 11:24:52 +0200 Subject: [PATCH 224/616] PRD-99: Merging PR from sprint 4 --- Test/Unit/Model/Adapter/ElasticsearchTest.php | 129 +++++++++++++++--- Test/Unit/Model/ConfigTest.php | 8 ++ 2 files changed, 116 insertions(+), 21 deletions(-) diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 2b4746aebfe05..5665b81003309 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -67,6 +67,21 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase */ protected $objectManager; + /** + * @var string + */ + protected $entityType; + + /** + * @var int + */ + protected $storeId; + + /** + * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver|\PHPUnit_Framework_MockObject_MockObject + */ + protected $indexNameResolver; + /** * Setup * @@ -155,6 +170,17 @@ public function setUp() $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); + $this->entityType = 'product'; + $this->storeId = 1; + + $this->indexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver') + ->setMethods([ + 'getIndexName', + 'getIndexNamespace', + 'getIndexFromAlias', + ]) + ->disableOriginalConstructor() + ->getMock(); $this->model = $this->objectManager->getObject( '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', @@ -164,7 +190,10 @@ public function setUp() 'fieldMapper' => $this->fieldMapper, 'clientConfig' => $this->clientConfig, 'indexBuilder' => $this->indexBuilder, - 'logger' => $this->logger + 'logger' => $this->logger, + 'indexNameResolver' => $this->indexNameResolver, + 'options' => [], + ] ); } @@ -208,7 +237,7 @@ public function testPrepareDocsPerStore() $this->documentDataMapper->expects($this->once()) ->method('map') ->willReturn([ - 'name' => 'Product Name', + 'name' => 'Product Name', ]); $this->assertInternalType( 'array', @@ -238,7 +267,8 @@ public function testAddDocs() 'name' => 'Product Name', ], ], - 1 + 1, + $this->entityType ) ); } @@ -258,7 +288,8 @@ public function testAddDocsFailure() 'name' => 'Product Name', ], ], - 1 + 1, + $this->entityType ); } @@ -267,19 +298,24 @@ public function testAddDocsFailure() */ public function testCleanIndex() { + $this->indexNameResolver->expects($this->any()) + ->method('getIndexName') + ->with(1, 'product', []) + ->willReturn('indexName_product_1_v'); + $this->client->expects($this->once()) ->method('isEmptyIndex') - ->with('indexName_1_v1') + ->with('indexName_product_1_v') ->willReturn(false); $this->client->expects($this->atLeastOnce()) ->method('indexExists') ->willReturn(true); $this->client->expects($this->once()) ->method('deleteIndex') - ->with('indexName_1_v2'); + ->with('_product_1_v1'); $this->assertSame( $this->model, - $this->model->cleanIndex(1) + $this->model->cleanIndex(1, $this->entityType) ); } @@ -288,14 +324,22 @@ public function testCleanIndex() */ public function testCleanIndexTrue() { + $this->indexNameResolver->expects($this->once()) + ->method('getIndexNamespace') + ->willReturn(''); + + $this->indexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('indexName_product_1_v'); + $this->client->expects($this->once()) ->method('isEmptyIndex') - ->with('indexName_1_v1') + ->with('indexName_product_1_v') ->willReturn(true); $this->assertSame( $this->model, - $this->model->cleanIndex(1) + $this->model->cleanIndex(1, $this->entityType) ); } @@ -308,7 +352,7 @@ public function testDeleteDocs() ->method('bulkQuery'); $this->assertSame( $this->model, - $this->model->deleteDocs(['1' => 1], 1) + $this->model->deleteDocs(['1' => 1], 1, $this->entityType) ); } @@ -321,7 +365,7 @@ public function testDeleteDocsFailure() $this->client->expects($this->once()) ->method('bulkQuery') ->willThrowException(new \Exception('Something went wrong')); - $this->model->deleteDocs(['1' => 1], 1); + $this->model->deleteDocs(['1' => 1], 1, $this->entityType); } /** @@ -337,13 +381,47 @@ public function testUpdateAliasEmpty() 'fieldMapper' => $this->fieldMapper, 'clientConfig' => $this->clientConfig, 'indexBuilder' => $this->indexBuilder, - 'logger' => $this->logger + 'logger' => $this->logger, + 'indexNameResolver' => $this->indexNameResolver, + 'options' => [] ] ); $this->client->expects($this->never()) ->method('updateAlias'); - $this->assertEquals($model, $model->updateAlias(1)); + + $this->assertEquals($model, $model->updateAlias(1, $this->entityType)); + } + + /** + * @expectedException \Magento\Framework\Exception\LocalizedException + */ + public function testConnectException() + { + $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->disableOriginalConstructor() + ->setMethods([ + 'getConnection', + ]) + ->getMock(); + + $connectionManager->expects($this->any()) + ->method('getConnection') + ->willThrowException(new \Exception('Something went wrong')); + + $this->objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', + [ + 'connectionManager' => $connectionManager, + 'documentDataMapper' => $this->documentDataMapper, + 'fieldMapper' => $this->fieldMapper, + 'clientConfig' => $this->clientConfig, + 'indexBuilder' => $this->indexBuilder, + 'logger' => $this->logger, + 'indexNameResolver' => $this->indexNameResolver, + 'options' => [] + ] + ); } /** @@ -353,8 +431,12 @@ public function testUpdateAlias() { $this->client->expects($this->atLeastOnce()) ->method('updateAlias'); - $this->model->cleanIndex(1); - $this->assertEquals($this->model, $this->model->updateAlias(1)); + $this->indexNameResolver->expects($this->any()) + ->method('getIndexFromAlias') + ->willReturn('_product_1_v1'); + + $this->model->cleanIndex(1, $this->entityType); + $this->assertEquals($this->model, $this->model->updateAlias(1, $this->entityType)); } /** @@ -362,7 +444,12 @@ public function testUpdateAlias() */ public function testUpdateAliasWithOldIndex() { - $this->model->cleanIndex(1); + $this->model->cleanIndex(1, $this->entityType); + + $this->indexNameResolver->expects($this->any()) + ->method('getIndexFromAlias') + ->willReturn('_product_1_v2'); + $this->client->expects($this->any()) ->method('existsAlias') ->with('indexName') @@ -371,9 +458,9 @@ public function testUpdateAliasWithOldIndex() $this->client->expects($this->any()) ->method('getAlias') ->with('indexName') - ->willReturn(['indexName_1_v'=>'indexName_1_v']); + ->willReturn(['indexName_product_1_v'=>'indexName_product_1_v']); - $this->assertEquals($this->model, $this->model->updateAlias(1)); + $this->assertEquals($this->model, $this->model->updateAlias(1, $this->entityType)); } /** @@ -381,7 +468,7 @@ public function testUpdateAliasWithOldIndex() */ public function testUpdateAliasWithoutOldIndex() { - $this->model->cleanIndex(1); + $this->model->cleanIndex(1, $this->entityType); $this->client->expects($this->any()) ->method('existsAlias') ->with('indexName') @@ -390,9 +477,9 @@ public function testUpdateAliasWithoutOldIndex() $this->client->expects($this->any()) ->method('getAlias') ->with('indexName') - ->willReturn(['indexName_1_v2'=>'indexName_1_v2']); + ->willReturn(['indexName_product_1_v2'=>'indexName_product_1_v2']); - $this->assertEquals($this->model, $this->model->updateAlias(1)); + $this->assertEquals($this->model, $this->model->updateAlias(1, $this->entityType)); } /** diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index 268a7bfab0e8b..83dc540629f59 100644 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -103,4 +103,12 @@ public function testGetEntityType() { $this->assertInternalType('string', $this->model->getEntityType()); } + + /** + * Test getEntityType() method + */ + public function testIsElasticsearchEnabled() + { + $this->assertFalse($this->model->isElasticsearchEnabled()); + } } From 2173ded039dc39e6eb1351919ffa09c43c08c599 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 11 Dec 2015 12:21:45 +0200 Subject: [PATCH 225/616] PRD-32: Stopwords Implementation --- .../Query/Preprocessor/Stopwords.php | 2 +- .../SearchAdapter/Query/Builder/MatchTest.php | 1 - .../Query/Preprocessor/StopwordsTest.php | 181 ++++++++++++++++++ 3 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index b455fd99a80ac..7a2062f06aee7 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -120,7 +120,7 @@ protected function getStopwordsFile() $storeId = $this->storeManager->getStore()->getId(); $this->localeResolver->emulate($storeId); $locale = $this->localeResolver->getLocale(); - $stopwordsFile = isset( $stopwordsInfo[$locale]) ? $stopwordsInfo[$locale] : $stopwordsInfo['default']; + $stopwordsFile = isset($stopwordsInfo[$locale]) ? $stopwordsInfo[$locale] : $stopwordsInfo['default']; return $stopwordsFile; } } diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 62663a2813550..9b2b8030cef59 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -61,7 +61,6 @@ public function setUp() 'preprocessorContainer' => [$this->preprocessorInterface], ] ); - } /** diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php new file mode 100644 index 0000000000000..5ff26ed3ca78a --- /dev/null +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php @@ -0,0 +1,181 @@ +storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->localeResolver = $this->getMockBuilder('Magento\Framework\Locale\Resolver') + ->disableOriginalConstructor() + ->setMethods([ + 'emulate', + 'getLocale', + ]) + ->getMock(); + $this->readFactory = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\ReadFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $this->configCache = $this->getMockBuilder('Magento\Framework\App\Cache\Type\Config') + ->disableOriginalConstructor() + ->getMock(); + $this->esConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + + $objectManagerHelper = new ObjectManagerHelper($this); + $this->model = $objectManagerHelper->getObject( + 'Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords', + [ + 'storeManager' => $this->storeManager, + 'localeResolver' => $this->localeResolver, + 'readFactory' => $this->readFactory, + 'configCache' => $this->configCache, + 'esConfig' => $this->esConfig, + 'fileDir' => '', + ] + ); + } + + /** + * Test process() method + */ + public function testProcess() + { + $this->esConfig->expects($this->once()) + ->method('getStopwordsInfo') + ->willReturn([ + 'default' => 'default.csv', + ]); + $storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->once()) + ->method('getStore') + ->willReturn($storeInterface); + $storeInterface->expects($this->once()) + ->method('getId') + ->willReturn(1); + $this->localeResolver->expects($this->once()) + ->method('getLocale') + ->willReturn('en_US'); + + $read = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\Read') + ->disableOriginalConstructor() + ->getMock(); + $this->readFactory->expects($this->once()) + ->method('create') + ->willReturn($read); + $read->expects($this->once()) + ->method('stat') + ->willReturn([ + 'mtime' => 0, + ]); + $this->configCache->expects($this->once()) + ->method('load') + ->willReturn(''); + + $read->expects($this->once()) + ->method('readFile') + ->willReturn("a\nthe\nof"); + + $this->assertEquals( + 'test query', + $this->model->process('the test of a query') + ); + } + + /** + * Test process() method, load stopwords from cache + */ + public function testProcessFromCache() + { + $this->esConfig->expects($this->once()) + ->method('getStopwordsInfo') + ->willReturn([ + 'default' => 'default.csv', + ]); + $storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->storeManager->expects($this->once()) + ->method('getStore') + ->willReturn($storeInterface); + $storeInterface->expects($this->once()) + ->method('getId') + ->willReturn(1); + $this->localeResolver->expects($this->once()) + ->method('getLocale') + ->willReturn('en_US'); + + $read = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\Read') + ->disableOriginalConstructor() + ->getMock(); + $this->readFactory->expects($this->once()) + ->method('create') + ->willReturn($read); + $read->expects($this->once()) + ->method('stat') + ->willReturn([ + 'mtime' => 0, + ]); + $this->configCache->expects($this->once()) + ->method('load') + ->willReturn('a:3:{i:0;s:1:"a";i:1;s:3:"the";i:2;s:2:"of";}'); + + $this->assertEquals( + 'test query', + $this->model->process('the test of a query') + ); + } +} From 33854e8d8ffbd0dc903b0868d43d4a2d24668a45 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Fri, 11 Dec 2015 13:52:20 +0200 Subject: [PATCH 226/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 5 +++-- Model/Adapter/Index/IndexNameResolver.php | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 663287e315fd8..7d186a0020dc5 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -292,7 +292,7 @@ protected function checkIndex($storeId, $checkAlias = true, $entityType) // add index to alias if ($checkAlias) { - $namespace = $this->indexNameResolve->getIndexNamespace(); + $namespace = $this->indexNameResolve->getIndexNameForAlias($storeId, $entityType); if (!$this->client->existsAlias($namespace, $indexName)) { $this->client->updateAlias($namespace, $indexName); } @@ -317,8 +317,9 @@ public function updateAlias($storeId, $entityType) if ($oldIndex == $this->preparedIndex[$storeId]) { $oldIndex = ''; } + $this->client->updateAlias( - $this->indexNameResolve->getIndexNamespace(), + $this->indexNameResolve->getIndexNameForAlias($storeId, $entityType), $this->preparedIndex[$storeId], $oldIndex ); diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index ae886bbbbf2e1..8eb2babbcbf0c 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -62,11 +62,24 @@ public function __construct( * * @return string */ - public function getIndexNamespace() + protected function getIndexNamespace() { return $this->clientConfig->getIndexerPrefix(); } + /** + * Get index namespace from config. + * + * @param int $storeId + * @param string $entityType + * + * @return string + */ + public function getIndexNameForAlias($storeId, $entityType) + { + return $this->clientConfig->getIndexerPrefix() . '_' . $storeId . '_' . $entityType; + } + /** * Returns the index name. * From e15bc60e6b8201c407148e358397aadfeaa15625 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 11 Dec 2015 14:12:25 +0200 Subject: [PATCH 227/616] PRD-32: Stopwords Implementation --- Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php | 8 ++++++++ .../Model/Adapter/Index/Config/_files/esconfig_test.xml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php b/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php index 0154efb9c3f3a..e8417339d3666 100644 --- a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php +++ b/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php @@ -63,4 +63,12 @@ public function testGetStemmerInfo() { $this->config->getStemmerInfo(); } + + /** + * @return array|mixed|null + */ + public function testGetStopwordsInfo() + { + $this->config->getStopwordsInfo(); + } } diff --git a/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml b/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml index 0406804de8063..c020bf3d60b1c 100644 --- a/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml +++ b/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml @@ -13,4 +13,8 @@ english german + + stopwords.csv + stopwords_en_US.csv + From d47a2b3eb00de57210a85c6ebcb679cacd30aa02 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 11 Dec 2015 14:21:42 +0200 Subject: [PATCH 228/616] PRD-32: Stopwords Implementation --- Model/Adapter/Index/Config/Converter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Adapter/Index/Config/Converter.php b/Model/Adapter/Index/Config/Converter.php index cc7d90e40c172..83b34ef677c2d 100644 --- a/Model/Adapter/Index/Config/Converter.php +++ b/Model/Adapter/Index/Config/Converter.php @@ -29,7 +29,7 @@ public function convert($source) foreach ($stopwords as $stopwordsItem) { foreach ($stopwordsItem->childNodes as $childNode) { if ($childNode->nodeType === XML_ELEMENT_NODE) { - $stopwordsInfo[$childNode->localName]= $childNode->textContent;; + $stopwordsInfo[$childNode->localName]= $childNode->textContent; } } } From 0a770b3225168498427bcaf14a9c142223f66daf Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Fri, 11 Dec 2015 15:24:07 +0200 Subject: [PATCH 229/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 7d186a0020dc5..e3bf990dc2423 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -97,7 +97,7 @@ public function __construct( $this->clientConfig = $clientConfig; $this->indexBuilder = $indexBuilder; $this->logger = $logger; - $this->indexNameResolve = $indexNameResolver; + $this->indexNameResolver = $indexNameResolver; try { $this->client = $this->connectionManager->getConnection($options); @@ -164,7 +164,7 @@ public function addDocs(array $documents, $storeId, $entityType) if (count($documents)) { try { $this->checkIndex($storeId, false, $entityType); - $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); + $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName, $entityType); $this->client->bulkQuery($bulkIndexDocuments); } catch (\Exception $e) { @@ -186,14 +186,14 @@ public function addDocs(array $documents, $storeId, $entityType) public function cleanIndex($storeId, $entityType) { $this->checkIndex($storeId, true, $entityType); - $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); + $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); if ($this->client->isEmptyIndex($indexName)) { // use existing index if empty return $this; } // prepare new index name and increase version - $indexPattern = $this->indexNameResolve->getIndexPattern($storeId, $entityType); + $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $entityType); $version = intval(str_replace($indexPattern, '', $indexName)); $newIndexName = $indexPattern . ++$version; @@ -221,7 +221,7 @@ public function deleteDocs(array $documentIds, $storeId, $entityType) { try { $this->checkIndex($storeId, false, $entityType); - $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); + $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkDeleteDocuments = $this->getDocsArrayInBulkIndexFormat( $documentIds, $indexName, @@ -285,14 +285,14 @@ protected function getDocsArrayInBulkIndexFormat( protected function checkIndex($storeId, $checkAlias = true, $entityType) { // create new index for store - $indexName = $this->indexNameResolve->getIndexName($storeId, $entityType, $this->preparedIndex); + $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); if (!$this->client->indexExists($indexName)) { $this->prepareIndex($storeId, $indexName); } // add index to alias if ($checkAlias) { - $namespace = $this->indexNameResolve->getIndexNameForAlias($storeId, $entityType); + $namespace = $this->indexNameResolver->getIndexNameForAlias($storeId, $entityType); if (!$this->client->existsAlias($namespace, $indexName)) { $this->client->updateAlias($namespace, $indexName); } @@ -313,13 +313,13 @@ public function updateAlias($storeId, $entityType) return $this; } - $oldIndex = $this->indexNameResolve->getIndexFromAlias($storeId, $entityType); + $oldIndex = $this->indexNameResolver->getIndexFromAlias($storeId, $entityType); if ($oldIndex == $this->preparedIndex[$storeId]) { $oldIndex = ''; } $this->client->updateAlias( - $this->indexNameResolve->getIndexNameForAlias($storeId, $entityType), + $this->indexNameResolver->getIndexNameForAlias($storeId, $entityType), $this->preparedIndex[$storeId], $oldIndex ); From e74075b78510ed6c9c771788ade33087ab2b2e6f Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Fri, 11 Dec 2015 16:32:15 +0200 Subject: [PATCH 230/616] PRD-99: Merging PR from sprint 4 --- .../Adapter/Index/IndexNameResolverTest.php | 261 ++++++++++++++++++ 1 file changed, 261 insertions(+) create mode 100644 Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php new file mode 100644 index 0000000000000..e2fe384d8ac46 --- /dev/null +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -0,0 +1,261 @@ +objectManager = new ObjectManagerHelper($this); + + $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->disableOriginalConstructor() + ->setMethods([ + 'getConnection', + ]) + ->getMock(); + + $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + ->disableOriginalConstructor() + ->setMethods([ + 'getIndexerPrefix', + 'getEntityType', + 'getIndexSettings', + ]) + ->getMock(); + + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + ->disableOriginalConstructor() + ->getMock(); + + $elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + ->setMethods([ + 'indices', + 'ping', + 'bulk', + 'search', + 'scroll', + ]) + ->disableOriginalConstructor() + ->getMock(); + + $indicesMock = $this->getMockBuilder('\Elasticsearch\Namespaces\IndicesNamespace') + ->setMethods([ + 'exists', + 'getSettings', + 'create', + 'putMapping', + 'deleteMapping', + 'existsAlias', + 'updateAliases', + 'stats' + ]) + ->disableOriginalConstructor() + ->getMock(); + $elasticsearchClientMock->expects($this->any()) + ->method('indices') + ->willReturn($indicesMock); + $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + ->setConstructorArgs([ + 'options' => $this->getClientOptions(), + 'elasticsearchClient' => $elasticsearchClientMock + ]) + ->getMock(); + + $this->connectionManager->expects($this->any()) + ->method('getConnection') + ->willReturn($this->client); + + $this->clientConfig->expects($this->any()) + ->method('getIndexerPrefix') + ->willReturn('indexName'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('product'); + $this->entityType = 'product'; + $this->storeId = 1; + + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver', + [ + 'connectionManager' => $this->connectionManager, + 'clientConfig' => $this->clientConfig, + 'logger' => $this->logger, + 'options' => [], + ] + ); + } + + /** + * Test getIndexNameForAlias() method + */ + public function testGetIndexNameForAlias() + { + $this->clientConfig->expects($this->any()) + ->method('getIndexerPrefix') + ->willReturn('indexName'); + + $this->assertEquals( + 'indexName_1_product', + $this->model->getIndexNameForAlias($this->storeId, $this->entityType) + ); + } + + /** + * Test getIndexName() method with prepared index + */ + public function testGetIndexNameWithPreparedIndex() + { + $preparedIndex = ['1' => 'product']; + + $this->assertEquals( + 'product', + $this->model->getIndexName($this->storeId, $this->entityType, $preparedIndex) + ); + } + + /** + * Test getIndexName() method without prepared index + */ + public function testGetIndexNameWithoutPreparedIndexWithIndexName() + { + $preparedIndex = []; + + $this->assertEquals( + 'indexName_product_1_v1', + $this->model->getIndexName($this->storeId, $this->entityType, $preparedIndex) + ); + } + + /** + * Test getIndexPattern() method + */ + public function testGetIndexPattern() + { + $this->assertEquals( + 'indexName_product_1_v', + $this->model->getIndexPattern($this->storeId, $this->entityType) + ); + } + + /** + * Test getIndexFromAlias() method + */ + public function testUpdateAliasWithOldIndex() + { + $this->client->expects($this->any()) + ->method('existsAlias') + ->with('indexName') + ->willReturn(true); + + $this->client->expects($this->any()) + ->method('getAlias') + ->with('indexName') + ->willReturn(['indexName_product_1_v'=>'indexName_product_1_v']); + + $this->assertEquals( + 'indexName_product_1_v', + $this->model->getIndexFromAlias($this->storeId, $this->entityType) + ); + } + + /** + * @expectedException \Magento\Framework\Exception\LocalizedException + */ + public function testConnectException() + { + $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->disableOriginalConstructor() + ->setMethods([ + 'getConnection', + ]) + ->getMock(); + + $connectionManager->expects($this->any()) + ->method('getConnection') + ->willThrowException(new \Exception('Something went wrong')); + + $this->objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver', + [ + 'connectionManager' => $connectionManager, + 'clientConfig' => $this->clientConfig, + 'logger' => $this->logger, + 'options' => [] + ] + ); + } + + /** + * Get elasticsearch client options + * + * @return array + */ + protected function getClientOptions() + { + return [ + 'hostname' => 'localhost', + 'port' => '9200', + 'timeout' => 15, + 'index' => 'magento2', + 'enableAuth' => 1, + 'username' => 'user', + 'password' => 'my-password', + ]; + } +} From 64f3d910a01806388ee67a8dce44f4fb267265f6 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Fri, 11 Dec 2015 18:19:08 +0200 Subject: [PATCH 231/616] PRD-99: Merging PR from sprint 4 --- .../Model/Adapter/DocumentDataMapperTest.php | 178 +++++++++++++----- Test/Unit/Model/Adapter/ElasticsearchTest.php | 9 +- 2 files changed, 131 insertions(+), 56 deletions(-) diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index c7bc525925876..e6ea1f29bc9cb 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -15,6 +15,9 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapper; use Magento\Store\Model\StoreManagerInterface; use Magento\Elasticsearch\Model\Adapter\DocumentDataMapper; +use Magento\Elasticsearch\Model\ResourceModel\Index; +use Magento\AdvancedSearch\Model\ResourceModel\Index as AdvancedSearchIndex; +use Magento\Store\Api\Data\StoreInterface; /** * Class DocumentDataMapperTest @@ -36,11 +39,21 @@ class DocumentDataMapperTest extends \PHPUnit_Framework_TestCase */ private $attributeContainerMock; + /** + * @var Attribute|\PHPUnit_Framework_MockObject_MockObject + */ + private $attribute; + /** * @var Index|\PHPUnit_Framework_MockObject_MockObject */ private $resourceIndex; + /** + * @var AdvancedSearchIndex|\PHPUnit_Framework_MockObject_MockObject + */ + private $advancedSearchIndex; + /** * @var FieldMapper|\PHPUnit_Framework_MockObject_MockObject */ @@ -66,6 +79,11 @@ class DocumentDataMapperTest extends \PHPUnit_Framework_TestCase */ private $storeManagerMock; + /** + * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $storeInterface; + /** * Set up test environment. */ @@ -89,12 +107,6 @@ protected function setUp() 'getFullProductIndexData', ]) ->getMock(); - $this->resourceIndex->expects($this->any()) - ->method('getPriceIndexData') - ->willReturn([]); - $this->resourceIndex->expects($this->any()) - ->method('getFullCategoryProductIndexData') - ->willReturn([]); $this->fieldMapperMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapper') ->setMethods(['getFieldName']) @@ -118,6 +130,18 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->advancedSearchIndex = $this->getMockBuilder('Magento\AdvancedSearch\Model\ResourceModel\Index') + ->disableOriginalConstructor() + ->getMock(); + + $this->attribute = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + ->disableOriginalConstructor() + ->getMock(); + + $this->storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( '\Magento\Elasticsearch\Model\Adapter\DocumentDataMapper', @@ -144,17 +168,53 @@ protected function setUp() * * @return array */ - public function testGetMap($productId, $productData, $storeId) + public function testGetMap($productId, $productData, $storeId, $emptyDate) { $this->attributeContainerMock->expects($this->any())->method('getAttribute')->will( - $this->returnValue($this->attributeContainerMock) + $this->returnValue($this->attribute) ); + $this->resourceIndex->expects($this->any()) + ->method('getPriceIndexData') + ->with([1, ], 1) + ->willReturn([ + 1 => [1] + ]); + $this->resourceIndex->expects($this->any()) + ->method('getFullCategoryProductIndexData') + ->willReturn([ + 1 => [ + 0 => [ + 'id' => 2, + 'name' => 'Default Category', + 'position' => '1', + ], + 1 => [ + 'id' => 3, + 'name' => 'Gear', + 'position' => '1', + ], + 2 => [ + 'id' => 4, + 'name' => 'Bags', + 'position' => '1', + ], + ], + ]); + $this->storeManagerMock->expects($this->any()) + ->method('getStore') + ->willReturn($this->storeInterface); + $this->storeInterface->expects($this->any()) + ->method('getWebsiteId') + ->willReturn(1); $this->attributeContainerMock->expects($this->any())->method('setStoreId')->will( $this->returnValue($this->attributeContainerMock) ); - $this->attributeContainerMock->expects($this->any())->method('getBackendType')->will( + $this->attribute->expects($this->any())->method('getBackendType')->will( $this->returnValue('datetime') ); + $this->dateTimeMock->expects($this->any())->method('isEmptyDate')->will( + $this->returnValue($emptyDate) + ); $this->attributeContainerMock->expects($this->any())->method('getFrontendInput')->will( $this->returnValue('date') ); @@ -192,29 +252,38 @@ public static function mapProvider() [ '1', ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'], - '1' + '1', + false, + ], + [ + '1', + ['price'=>'11','created_at'=>null,'color_value'=>'11', ], + '1', + true, ], [ '1', [ 'tier_price'=> [[ - 'price_id'=>'1', - 'website_id'=>'1', - 'all_groups'=>'1', - 'cust_group'=>'1', - 'price_qty'=>'1', - 'website_price'=>'1', - 'price'=>'1' - ]], + 'price_id'=>'1', + 'website_id'=>'1', + 'all_groups'=>'1', + 'cust_group'=>'1', + 'price_qty'=>'1', + 'website_price'=>'1', + 'price'=>'1' + ]], 'created_at'=>'00-00-00 00:00:00' ], - '1' + '1', + false, ], [ '1', ['image'=>'11','created_at'=>'00-00-00 00:00:00'], - '1' + '1', + false, ], [ '1', @@ -227,22 +296,23 @@ public static function mapProvider() [ 'images' => [[ - 'file'=>'1', - 'media_type'=>'image', - 'position'=>'1', - 'disabled'=>'1', - 'label'=>'1', - 'title'=>'1', - 'base_image'=>'1', - 'small_image'=>'1', - 'thumbnail'=>'1', - 'swatch_image'=>'1' - ]] + 'file'=>'1', + 'media_type'=>'image', + 'position'=>'1', + 'disabled'=>'1', + 'label'=>'1', + 'title'=>'1', + 'base_image'=>'1', + 'small_image'=>'1', + 'thumbnail'=>'1', + 'swatch_image'=>'1' + ]] ] , 'created_at'=>'00-00-00 00:00:00' ], - '1' + '1', + false, ], [ '1', @@ -255,38 +325,42 @@ public static function mapProvider() [ 'images' => [[ - 'file'=>'1', - 'media_type'=>'video', - 'position'=>'1', - 'disabled'=>'1', - 'label'=>'1', - 'title'=>'1', - 'base_image'=>'1', - 'small_image'=>'1', - 'thumbnail'=>'1', - 'swatch_image'=>'1', - 'video_title'=>'1', - 'video_url'=>'1', - 'video_description'=>'1', - 'video_metadata'=>'1', - 'video_provider'=>'1' - ]] + 'file'=>'1', + 'media_type'=>'video', + 'position'=>'1', + 'disabled'=>'1', + 'label'=>'1', + 'title'=>'1', + 'base_image'=>'1', + 'small_image'=>'1', + 'thumbnail'=>'1', + 'swatch_image'=>'1', + 'video_title'=>'1', + 'video_url'=>'1', + 'video_description'=>'1', + 'video_metadata'=>'1', + 'video_provider'=>'1' + ]] ] , 'created_at'=>'00-00-00 00:00:00' ], - '1' + '1', + false, ], [ '1', ['quantity_and_stock_status'=>'11','created_at'=>'00-00-00 00:00:00'], - '1' + '1', + false, ], [ '1', ['price'=>'11','created_at'=>'1995-12-31 23:59:59','options'=>['value1','value2']], - '1' - ] + '1', + false, + ], ]; } } + diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 5665b81003309..f14b6b860f87e 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -178,6 +178,7 @@ public function setUp() 'getIndexName', 'getIndexNamespace', 'getIndexFromAlias', + 'getIndexNameForAlias', ]) ->disableOriginalConstructor() ->getMock(); @@ -324,10 +325,6 @@ public function testCleanIndex() */ public function testCleanIndexTrue() { - $this->indexNameResolver->expects($this->once()) - ->method('getIndexNamespace') - ->willReturn(''); - $this->indexNameResolver->expects($this->any()) ->method('getIndexName') ->willReturn('indexName_product_1_v'); @@ -450,6 +447,10 @@ public function testUpdateAliasWithOldIndex() ->method('getIndexFromAlias') ->willReturn('_product_1_v2'); + $this->indexNameResolver->expects($this->any()) + ->method('getIndexNameForAlias') + ->willReturn('_product_1_v2'); + $this->client->expects($this->any()) ->method('existsAlias') ->with('indexName') From 672f6d25fb1fdcd7b3238762143358cf49aa0f54 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 14 Dec 2015 10:02:06 +0200 Subject: [PATCH 232/616] PRD-32: Stopwords Implementation --- etc/esconfig.xml | 12 +- etc/stopwords/stopwords_de_DE.csv | 129 ++++++++++++++++++ etc/stopwords/stopwords_es_ES.csv | 178 +++++++++++++++++++++++++ etc/stopwords/stopwords_fr_FR.csv | 116 ++++++++++++++++ etc/stopwords/stopwords_nl_NL.csv | 104 +++++++++++++++ etc/stopwords/stopwords_pt_BR.csv | 147 ++++++++++++++++++++ etc/stopwords/stopwords_zh_Hans_CN.csv | 125 +++++++++++++++++ 7 files changed, 810 insertions(+), 1 deletion(-) create mode 100644 etc/stopwords/stopwords_de_DE.csv create mode 100644 etc/stopwords/stopwords_es_ES.csv create mode 100644 etc/stopwords/stopwords_fr_FR.csv create mode 100644 etc/stopwords/stopwords_nl_NL.csv create mode 100644 etc/stopwords/stopwords_pt_BR.csv create mode 100644 etc/stopwords/stopwords_zh_Hans_CN.csv diff --git a/etc/esconfig.xml b/etc/esconfig.xml index c020bf3d60b1c..d6700a45e4317 100644 --- a/etc/esconfig.xml +++ b/etc/esconfig.xml @@ -10,11 +10,21 @@ stemmer english - english german + english + spanish + french + dutch + portuguese stopwords.csv + stopwords_de_DE.csv stopwords_en_US.csv + stopwords_es_ES.csv + stopwords_fr_FR.csv + stopwords_nl_NL.csv + stopwords_pt_BR.csv + stopwords_zh_Hans_CN.csv diff --git a/etc/stopwords/stopwords_de_DE.csv b/etc/stopwords/stopwords_de_DE.csv new file mode 100644 index 0000000000000..4dd6c27dceac4 --- /dev/null +++ b/etc/stopwords/stopwords_de_DE.csv @@ -0,0 +1,129 @@ +aber +als +am +an +auch +auf +aus +bei +bin +bis +bist +da +dadurch +daher +darum +das +daß +dass +dein +deine +dem +den +der +des +dessen +deshalb +die +dies +dieser +dieses +doch +dort +du +durch +ein +eine +einem +einen +einer +eines +er +es +euer +eure +für +hatte +hatten +hattest +hattet +hier +hinter +ich +ihr +ihre +im +in +ist +ja +jede +jedem +jeden +jeder +jedes +jener +jenes +jetzt +kann +kannst +können +könnt +machen +mein +meine +mit +muß +mußt +musst +müssen +müßt +nach +nachdem +nein +nicht +nun +oder +seid +sein +seine +sich +sie +sind +soll +sollen +sollst +sollt +sonst +soweit +sowie +und +unser +unsere +unter +vom +von +vor +wann +warum +was +weiter +weitere +wenn +wer +werde +werden +werdet +weshalb +wie +wieder +wieso +wir +wird +wirst +wo +woher +wohin +zu +zum +zur +über \ No newline at end of file diff --git a/etc/stopwords/stopwords_es_ES.csv b/etc/stopwords/stopwords_es_ES.csv new file mode 100644 index 0000000000000..c369aaa3a686e --- /dev/null +++ b/etc/stopwords/stopwords_es_ES.csv @@ -0,0 +1,178 @@ +un +una +unas +unos +uno +sobre +todo +también +tras +otro +algún +alguno +alguna +algunos +algunas +ser +es +soy +eres +somos +sois +estoy +esta +estamos +estais +estan +como +en +para +atras +porque +por qué +estado +estaba +ante +antes +siendo +ambos +pero +por +poder +puede +puedo +podemos +podeis +pueden +fui +fue +fuimos +fueron +hacer +hago +hace +hacemos +haceis +hacen +cada +fin +incluso +primero +desde +conseguir +consigo +consigue +consigues +conseguimos +consiguen +ir +voy +va +vamos +vais +van +vaya +gueno +ha +tener +tengo +tiene +tenemos +teneis +tienen +el +la +lo +las +los +su +aqui +mio +tuyo +ellos +ellas +nos +nosotros +vosotros +vosotras +si +dentro +solo +solamente +saber +sabes +sabe +sabemos +sabeis +saben +ultimo +largo +bastante +haces +muchos +aquellos +aquellas +sus +entonces +tiempo +verdad +verdadero +verdadera +cierto +ciertos +cierta +ciertas +intentar +intento +intenta +intentas +intentamos +intentais +intentan +dos +bajo +arriba +encima +usar +uso +usas +usa +usamos +usais +usan +emplear +empleo +empleas +emplean +ampleamos +empleais +valor +muy +era +eras +eramos +eran +modo +bien +cual +cuando +donde +mientras +quien +con +entre +sin +trabajo +trabajar +trabajas +trabaja +trabajamos +trabajais +trabajan +podria +podrias +podriamos +podrian +podriais +yo +aquel \ No newline at end of file diff --git a/etc/stopwords/stopwords_fr_FR.csv b/etc/stopwords/stopwords_fr_FR.csv new file mode 100644 index 0000000000000..f01d72c2606ef --- /dev/null +++ b/etc/stopwords/stopwords_fr_FR.csv @@ -0,0 +1,116 @@ +alors +au +aucuns +aussi +autre +avant +avec +avoir +bon +car +ce +cela +ces +ceux +chaque +ci +comme +comment +dans +des +du +dedans +dehors +depuis +devrait +doit +donc +dos +début +elle +elles +en +encore +essai +est +et +eu +fait +faites +fois +font +hors +ici +il +ils +je +juste +la +le +les +leur +là +ma +maintenant +mais +mes +mine +moins +mon +mot +même +ni +nommés +notre +nous +ou +où +par +parce +pas +peut +peu +plupart +pour +pourquoi +quand +que +quel +quelle +quelles +quels +qui +sa +sans +ses +seulement +si +sien +son +sont +sous +soyez +sujet +sur +ta +tandis +tellement +tels +tes +ton +tous +tout +trop +très +tu +voient +vont +votre +vous +vu +ça +étaient +état +étions +été +être \ No newline at end of file diff --git a/etc/stopwords/stopwords_nl_NL.csv b/etc/stopwords/stopwords_nl_NL.csv new file mode 100644 index 0000000000000..50839d97dea60 --- /dev/null +++ b/etc/stopwords/stopwords_nl_NL.csv @@ -0,0 +1,104 @@ +aan +af +al +alles +als +altijd +andere +ben +bij +daar +dan +dat +de +der +deze +die +dit +doch +doen +door +dus +een +eens +en +er +ge +geen +geweest +haar +had +heb +hebben +heeft +hem +het +hier +hij +hoe +hun +iemand +iets +ik +in +is +ja +je +kan +kon +kunnen +maar +me +meer +men +met +mij +mijn +moet +na +naar +niet +niets +nog +nu +of +om +omdat +ons +ook +op +over +reeds +te +tegen +toch +toen +tot +u +uit +uw +van +veel +voor +want +waren +was +wat +we +wel +werd +wezen +wie +wij +wil +worden +zal +ze +zei +zelf +zich +zij +zijn +zo +zonder +zou \ No newline at end of file diff --git a/etc/stopwords/stopwords_pt_BR.csv b/etc/stopwords/stopwords_pt_BR.csv new file mode 100644 index 0000000000000..d926132e62891 --- /dev/null +++ b/etc/stopwords/stopwords_pt_BR.csv @@ -0,0 +1,147 @@ +último +é +acerca +agora +algmas +alguns +ali +ambos +antes +apontar +aquela +aquelas +aquele +aqueles +aqui +atrás +bem +bom +cada +caminho +cima +com +como +comprido +conhecido +corrente +das +debaixo +dentro +desde +desligado +deve +devem +deverá +direita +diz +dizer +dois +dos +e +ela +ele +eles +em +enquanto +então +está +estão +estado +estar +estará +este +estes +esteve +estive +estivemos +estiveram +eu +fará +faz +fazer +fazia +fez +fim +foi +fora +horas +iniciar +inicio +ir +irá +ista +iste +isto +ligado +maioria +maiorias +mais +mas +mesmo +meu +muito +muitos +nós +não +nome +nosso +novo +o +onde +os +ou +outro +para +parte +pegar +pelo +pessoas +pode +poderá +podia +por +porque +povo +promeiro +quê +qual +qualquer +quando +quem +quieto +são +saber +sem +ser +seu +somente +têm +tal +também +tem +tempo +tenho +tentar +tentaram +tente +tentei +teu +teve +tipo +tive +todos +trabalhar +trabalho +tu +um +uma +umas +uns +usa +usar +valor +veja +ver +verdade +verdadeiro +você \ No newline at end of file diff --git a/etc/stopwords/stopwords_zh_Hans_CN.csv b/etc/stopwords/stopwords_zh_Hans_CN.csv new file mode 100644 index 0000000000000..0b3ef8f89fb35 --- /dev/null +++ b/etc/stopwords/stopwords_zh_Hans_CN.csv @@ -0,0 +1,125 @@ +的 +一 +不 +在 +人 +有 +是 +为 +以 +于 +上 +他 +而 +后 +之 +来 +及 +了 +因 +下 +可 +到 +由 +这 +与 +也 +此 +但 +并 +个 +其 +已 +无 +小 +我 +们 +起 +最 +再 +今 +去 +好 +只 +又 +或 +很 +亦 +某 +把 +那 +你 +乃 +它 +吧 +被 +比 +别 +趁 +当 +从 +到 +得 +打 +凡 +儿 +尔 +该 +各 +给 +跟 +和 +何 +还 +即 +几 +既 +看 +据 +距 +靠 +啦 +了 +另 +么 +每 +们 +嘛 +拿 +哪 +那 +您 +凭 +且 +却 +让 +仍 +啥 +如 +若 +使 +谁 +虽 +随 +同 +所 +她 +哇 +嗡 +往 +哪 +些 +向 +沿 +哟 +用 +于 +咱 +则 +怎 +曾 +至 +致 +着 +诸 +自 \ No newline at end of file From 3adf54d2b3649c3397a325322cb49844fd8f4374 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 14 Dec 2015 15:09:02 +0200 Subject: [PATCH 233/616] PRD-99: Merging PR from sprint 4 --- Model/Indexer/IndexerHandler.php | 34 +++++++++++++------ .../Unit/Model/Indexer/IndexerHandlerTest.php | 1 + etc/di.xml | 5 --- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 4201600492adf..6d6b932f24a16 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -10,6 +10,7 @@ use Magento\Elasticsearch\Model\Adapter\Elasticsearch; use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; use Magento\Store\Model\Store; +use Magento\CatalogSearch\Model\Indexer\Fulltext; class IndexerHandler implements IndexerInterface { @@ -43,11 +44,6 @@ class IndexerHandler implements IndexerInterface */ protected $batchSize; - /** - * @var string - */ - protected $entityType; - /** * @param ElasticsearchFactory $adapterFactory * @param Batch $batch @@ -58,14 +54,12 @@ class IndexerHandler implements IndexerInterface public function __construct( ElasticsearchFactory $adapterFactory, Batch $batch, - $entityType, array $data = [], $batchSize = self::DEFAULT_BATCH_SIZE ) { $this->adapter = $adapterFactory->create(); $this->data = $data; $this->batch = $batch; - $this->entityType = $entityType; $this->batchSize = $batchSize; } @@ -76,11 +70,12 @@ public function saveIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); + $indexName = $this->getIndexMapping($this->data['indexer_id']); foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) { $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $storeId); - $this->adapter->addDocs($docs, $storeId, $this->entityType); + $this->adapter->addDocs($docs, $storeId, $indexName); } - $this->adapter->updateAlias($storeId, $this->entityType); + $this->adapter->updateAlias($storeId, $indexName); return $this; } @@ -92,11 +87,12 @@ public function deleteIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); + $indexName = $this->getIndexMapping($this->data['indexer_id']); $documentIds = []; foreach ($documents as $entityId => $document) { $documentIds[$entityId] = $entityId; } - $this->adapter->deleteDocs($documentIds, $storeId, $this->entityType); + $this->adapter->deleteDocs($documentIds, $storeId, $indexName); return $this; } @@ -107,7 +103,8 @@ public function cleanIndex($dimensions) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $this->adapter->cleanIndex($storeId, $this->entityType); + $indexName = $this->getIndexMapping($this->data['indexer_id']); + $this->adapter->cleanIndex($storeId, $indexName); return $this; } @@ -118,4 +115,19 @@ public function isAvailable() { return $this->adapter->ping(); } + + /** + * Taking index name by indexer ID + * + * @param string $indexerId + * + * @return string + */ + private function getIndexMapping($indexerId) + { + if ($indexerId == Fulltext::INDEXER_ID) { + $indexName = 'product'; + } + return $indexName; + } } diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/Test/Unit/Model/Indexer/IndexerHandlerTest.php index 516fb8e12c9f9..bfeedaac506ea 100644 --- a/Test/Unit/Model/Indexer/IndexerHandlerTest.php +++ b/Test/Unit/Model/Indexer/IndexerHandlerTest.php @@ -53,6 +53,7 @@ protected function setUp() [ 'adapterFactory' => $adapterFactory, 'batch' => $this->batch, + 'data' => ['indexer_id' => 'catalogsearch_fulltext'], ] ); } diff --git a/etc/di.xml b/etc/di.xml index 26a3d7d6f9449..bc99b502a13ce 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -34,11 +34,6 @@ - - - product - - From a60d19df0a9a9894a84fe3ea33ad9f773a0d1d94 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 14 Dec 2015 15:16:47 +0200 Subject: [PATCH 234/616] PRD-32: Stopwords Implementation --- etc/esconfig.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/esconfig.xml b/etc/esconfig.xml index d6700a45e4317..9969d7c536de7 100644 --- a/etc/esconfig.xml +++ b/etc/esconfig.xml @@ -16,6 +16,7 @@ french dutch portuguese + cjk stopwords.csv From 1c8d9647c204faa7ee99302873035048ca8d4740 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 15 Dec 2015 09:42:06 +0200 Subject: [PATCH 235/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Index/IndexNameResolver.php | 3 +- .../Adapter/Index/SearchIndexNameResolver.php | 72 +++++++++++++++++++ SearchAdapter/Mapper.php | 13 +++- 3 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 Model/Adapter/Index/SearchIndexNameResolver.php diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 8eb2babbcbf0c..c33809cc973fc 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -136,4 +136,5 @@ public function getIndexFromAlias($storeId, $entityType) } } return $storeIndex; - }} \ No newline at end of file + } +} diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php new file mode 100644 index 0000000000000..ea0c262f3bdf4 --- /dev/null +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -0,0 +1,72 @@ +connectionManager = $connectionManager; + $this->clientConfig = $clientConfig; + $this->logger = $logger; + + try { + $this->client = $this->connectionManager->getConnection($options); + } catch (\Exception $e) { + $this->logger->critical($e); + throw new \Magento\Framework\Exception\LocalizedException( + __('We were unable to perform the search because of a search engine misconfiguration.') + ); + } + } + + /** + * Returns the index name. + * + * @param int $storeId + * @param string $entityType + * @return string + */ + public function getIndexName($storeId, $entityType) + { + return $this->clientConfig->getIndexerPrefix() . '_' . $storeId . '_' . $entityType; + } +} diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 2308c6bcc0c02..f4a5ee6892f4c 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -14,6 +14,7 @@ use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; +use Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver; /** * Mapper class @@ -40,22 +41,30 @@ class Mapper */ protected $aggregationBuilder; + /** + * @var SearchIndexNameResolver + */ + protected $searchIndexNameResolver; + /** * @param Config $clientConfig * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder * @param AggregationBuilder $aggregationBuilder + * @param SearchIndexNameResolver $searchIndexNameResolver */ public function __construct( Config $clientConfig, MatchQueryBuilder $matchQueryBuilder, FilterBuilder $filterBuilder, - AggregationBuilder $aggregationBuilder + AggregationBuilder $aggregationBuilder, + SearchIndexNameResolver $searchIndexNameResolver ) { $this->clientConfig = $clientConfig; $this->matchQueryBuilder = $matchQueryBuilder; $this->filterBuilder = $filterBuilder; $this->aggregationBuilder = $aggregationBuilder; + $this->searchIndexNameResolver = $searchIndexNameResolver; } /** @@ -69,7 +78,7 @@ public function buildQuery(RequestInterface $request) $dimension = current($request->getDimensions()); $storeId = $dimension->getValue(); $searchQuery = [ - 'index' => $this->clientConfig->getIndexerPrefix(), + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'from' => $request->getFrom(), From e8284050abe0b2884c6ac0c59e9372414a8112fa Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 15 Dec 2015 10:21:24 +0200 Subject: [PATCH 236/616] PRD-99: Merging PR from sprint 4 --- SearchAdapter/Mapper.php | 10 ---------- etc/di.xml | 34 +--------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index f4a5ee6892f4c..4231a824625e4 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -12,7 +12,6 @@ use Magento\Framework\Search\Request\Query\Match as MatchQuery; use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; -use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; use Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver; @@ -36,11 +35,6 @@ class Mapper */ protected $filterBuilder; - /** - * @var AggregationBuilder - */ - protected $aggregationBuilder; - /** * @var SearchIndexNameResolver */ @@ -50,20 +44,17 @@ class Mapper * @param Config $clientConfig * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder - * @param AggregationBuilder $aggregationBuilder * @param SearchIndexNameResolver $searchIndexNameResolver */ public function __construct( Config $clientConfig, MatchQueryBuilder $matchQueryBuilder, FilterBuilder $filterBuilder, - AggregationBuilder $aggregationBuilder, SearchIndexNameResolver $searchIndexNameResolver ) { $this->clientConfig = $clientConfig; $this->matchQueryBuilder = $matchQueryBuilder; $this->filterBuilder = $filterBuilder; - $this->aggregationBuilder = $aggregationBuilder; $this->searchIndexNameResolver = $searchIndexNameResolver; } @@ -97,7 +88,6 @@ public function buildQuery(RequestInterface $request) 'store_id' => $storeId, ] ]; - $searchQuery = $this->aggregationBuilder->build($request, $searchQuery); return $searchQuery; } diff --git a/etc/di.xml b/etc/di.xml index bc99b502a13ce..bfddc888ecdb5 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -30,7 +30,7 @@ Magento\Elasticsearch\Model\Indexer\IndexerHandler - product + product @@ -64,31 +64,6 @@ Magento\Elasticsearch\Model\Config - - - - Magento\Elasticsearch\SearchAdapter\Aggregation\Interval - - - - - - - Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider - - - - - - - Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider - - - Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term - Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic - - - Magento\Elasticsearch\Model\Adapter\Index\Config\Converter @@ -107,11 +82,4 @@ Magento\Elasticsearch\Model\Client\Elasticsearch - - - - Magento\Elasticsearch\Model\DataProvider\Suggestions - - - From f81b96c31f03e98a3af07d78867afdc22e94df4a Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 15 Dec 2015 11:09:49 +0200 Subject: [PATCH 237/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Index/IndexNameResolver.php | 2 +- .../Adapter/Index/SearchIndexNameResolver.php | 27 ++++++++++++++++--- Model/Indexer/IndexerHandler.php | 2 ++ .../Adapter/Index/IndexNameResolverTest.php | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index c33809cc973fc..3a50763d391d7 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -77,7 +77,7 @@ protected function getIndexNamespace() */ public function getIndexNameForAlias($storeId, $entityType) { - return $this->clientConfig->getIndexerPrefix() . '_' . $storeId . '_' . $entityType; + return $this->clientConfig->getIndexerPrefix() . '_' . $entityType . '_' . $storeId; } /** diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php index ea0c262f3bdf4..6c792a0b82b5a 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -7,6 +7,7 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; +use Magento\CatalogSearch\Model\Indexer\Fulltext; /** * Alias name resolver @@ -59,14 +60,32 @@ public function __construct( } /** - * Returns the index name. + * Returns the index (alias) name. * * @param int $storeId - * @param string $entityType + * @param string $indexerId * @return string */ - public function getIndexName($storeId, $entityType) + public function getIndexName($storeId, $indexerId) { - return $this->clientConfig->getIndexerPrefix() . '_' . $storeId . '_' . $entityType; + $indexName = $this->getIndexMapping($indexerId); + return $this->clientConfig->getIndexerPrefix() . '_' . $indexName . '_' . $storeId; + } + + /** + * Taking index name by indexer ID + * + * @param string $indexerId + * + * @return string + */ + protected function getIndexMapping($indexerId) + { + if ($indexerId == Fulltext::INDEXER_ID) { + $indexName = 'product'; + } else { + $indexName = $indexerId; + } + return $indexName; } } diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 6d6b932f24a16..0d26a3a8e21fd 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -127,6 +127,8 @@ private function getIndexMapping($indexerId) { if ($indexerId == Fulltext::INDEXER_ID) { $indexName = 'product'; + } else { + $indexName = $indexerId; } return $indexName; } diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index e2fe384d8ac46..39724199be009 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -151,7 +151,7 @@ public function testGetIndexNameForAlias() ->willReturn('indexName'); $this->assertEquals( - 'indexName_1_product', + 'indexName_product_1', $this->model->getIndexNameForAlias($this->storeId, $this->entityType) ); } From 2d24182cb291905aaf6e0a80da0e3b7ec4b8fee4 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 15 Dec 2015 11:58:27 +0200 Subject: [PATCH 238/616] PRD-99: Merging PR from sprint 4 --- Block/Adminhtml/System/Config/TestConnection.php | 2 +- Model/Adapter/Index/IndexNameResolver.php | 4 ++-- Model/Adapter/Index/SearchIndexNameResolver.php | 2 +- Model/Config.php | 8 ++++---- Test/Unit/Model/Adapter/ElasticsearchTest.php | 4 ++-- Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php | 6 +++--- Test/Unit/Model/ConfigTest.php | 8 ++++---- Test/Unit/SearchAdapter/MapperTest.php | 6 +++--- etc/adminhtml/system.xml | 4 ++-- etc/config.xml | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index cd732ab95e89c..1e8b29fe848d5 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -20,7 +20,7 @@ protected function _getFieldMapping() 'engine' => 'catalog_search_engine', 'hostname' => 'catalog_search_elasticsearch_server_hostname', 'port' => 'catalog_search_elasticsearch_server_port', - 'index' => 'catalog_search_elasticsearch_indexer_prefix', + 'index' => 'catalog_search_elasticsearch_index_prefix', 'enableAuth' => 'catalog_search_elasticsearch_enable_auth', 'username' => 'catalog_search_elasticsearch_username', 'password' => 'catalog_search_elasticsearch_password', diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 3a50763d391d7..b4ceee0c03cde 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -64,7 +64,7 @@ public function __construct( */ protected function getIndexNamespace() { - return $this->clientConfig->getIndexerPrefix(); + return $this->clientConfig->getIndexPrefix(); } /** @@ -77,7 +77,7 @@ protected function getIndexNamespace() */ public function getIndexNameForAlias($storeId, $entityType) { - return $this->clientConfig->getIndexerPrefix() . '_' . $entityType . '_' . $storeId; + return $this->clientConfig->getIndexPrefix() . '_' . $entityType . '_' . $storeId; } /** diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php index 6c792a0b82b5a..75e92a09c4ebf 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -69,7 +69,7 @@ public function __construct( public function getIndexName($storeId, $indexerId) { $indexName = $this->getIndexMapping($indexerId); - return $this->clientConfig->getIndexerPrefix() . '_' . $indexName . '_' . $storeId; + return $this->clientConfig->getIndexPrefix() . '_' . $indexName . '_' . $storeId; } /** diff --git a/Model/Config.php b/Model/Config.php index 6bcd6739f4877..5ae2103a9b1a8 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -71,7 +71,7 @@ public function prepareClientOptions($options = []) $defaultOptions = [ 'hostname' => $this->getElasticsearchConfigData('server_hostname'), 'port' => $this->getElasticsearchConfigData('server_port'), - 'index' => $this->getElasticsearchConfigData('indexer_prefix'), + 'index' => $this->getElasticsearchConfigData('index_prefix'), 'enableAuth' => $this->getElasticsearchConfigData('enable_auth'), 'username' => $this->getElasticsearchConfigData('username'), 'password' => $this->getElasticsearchConfigData('password'), @@ -117,13 +117,13 @@ public function isElasticsearchEnabled() } /** - * Get Elasticsearch indexer prefix + * Get Elasticsearch index prefix * * @return string */ - public function getIndexerPrefix() + public function getIndexPrefix() { - return $this->getElasticsearchConfigData('indexer_prefix'); + return $this->getElasticsearchConfigData('index_prefix'); } /** diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index f14b6b860f87e..167ac5556666a 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -111,7 +111,7 @@ public function setUp() $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->disableOriginalConstructor() ->setMethods([ - 'getIndexerPrefix', + 'getIndexPrefix', 'getEntityType', 'getIndexSettings', ]) @@ -165,7 +165,7 @@ public function setUp() 'name' => 'string', ]); $this->clientConfig->expects($this->any()) - ->method('getIndexerPrefix') + ->method('getIndexPrefix') ->willReturn('indexName'); $this->clientConfig->expects($this->any()) ->method('getEntityType') diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index 39724199be009..8facedc199835 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -72,7 +72,7 @@ public function setUp() $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->disableOriginalConstructor() ->setMethods([ - 'getIndexerPrefix', + 'getIndexPrefix', 'getEntityType', 'getIndexSettings', ]) @@ -121,7 +121,7 @@ public function setUp() ->willReturn($this->client); $this->clientConfig->expects($this->any()) - ->method('getIndexerPrefix') + ->method('getIndexPrefix') ->willReturn('indexName'); $this->clientConfig->expects($this->any()) ->method('getEntityType') @@ -147,7 +147,7 @@ public function setUp() public function testGetIndexNameForAlias() { $this->clientConfig->expects($this->any()) - ->method('getIndexerPrefix') + ->method('getIndexPrefix') ->willReturn('indexName'); $this->assertEquals( diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index 83dc540629f59..ca562d15f7840 100644 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -86,14 +86,14 @@ public function testPrepareClientOptions() } /** - * Test getIndexerPrefix() method + * Test getIndexPrefix() method */ - public function testGetIndexerPrefix() + public function testGetIndexPrefix() { $this->scopeConfig->expects($this->any()) ->method('getValue') - ->willReturn('indexerPrefix'); - $this->assertEquals('indexerPrefix', $this->model->getIndexerPrefix()); + ->willReturn('indexPrefix'); + $this->assertEquals('indexPrefix', $this->model->getIndexPrefix()); } /** diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index 34e1b13df05ce..6135df55ab573 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -41,7 +41,7 @@ public function setUp() { $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->setMethods([ - 'getIndexerPrefix', + 'getIndexPrefix', 'getEntityType', ]) ->disableOriginalConstructor() @@ -55,8 +55,8 @@ public function setUp() ->getMock(); $this->clientConfig->expects($this->any()) - ->method('getIndexerPrefix') - ->willReturn('indexerPrefix'); + ->method('getIndexPrefix') + ->willReturn('indexPrefix'); $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 1b1e1f04ea1e4..13e314a268095 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -21,8 +21,8 @@ elasticsearch - - + + elasticsearch diff --git a/etc/config.xml b/etc/config.xml index d59faeb5be0c0..8a3c1e49bd0ab 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -11,7 +11,7 @@ localhost 9200 - magento2 + magento2 0 15 From f74eb49d43d2ef6055db464fdc8d49eb1da72fd0 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 15 Dec 2015 12:13:44 +0200 Subject: [PATCH 239/616] PRD-99: Merging PR from sprint 4 --- etc/di.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/di.xml b/etc/di.xml index bfddc888ecdb5..721057714c742 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -30,7 +30,6 @@ Magento\Elasticsearch\Model\Indexer\IndexerHandler - product From 1b1fcc8b9c02029ab9e4c25dcdf1b6d69fdae6ad Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 15 Dec 2015 12:26:07 +0200 Subject: [PATCH 240/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Index/IndexNameResolver.php | 9 ++-- .../Adapter/Index/SearchIndexNameResolver.php | 9 ++-- .../Model/Adapter/DocumentDataMapperTest.php | 1 - .../Unit/Model/Indexer/IndexerHandlerTest.php | 49 ++++++++++++++++--- 4 files changed, 55 insertions(+), 13 deletions(-) diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 3a50763d391d7..a73b9dba5f5e5 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -7,6 +7,9 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; +use Magento\Elasticsearch\Model\Config; +use Psr\Log\LoggerInterface; +use Magento\Framework\Exception\LocalizedException; /** * Index name resolver @@ -39,8 +42,8 @@ class IndexNameResolver */ public function __construct( ConnectionManager $connectionManager, - \Magento\Elasticsearch\Model\Config $clientConfig, - \Psr\Log\LoggerInterface $logger, + Config $clientConfig, + LoggerInterface $logger, $options = [] ) { $this->connectionManager = $connectionManager; @@ -51,7 +54,7 @@ public function __construct( $this->client = $this->connectionManager->getConnection($options); } catch (\Exception $e) { $this->logger->critical($e); - throw new \Magento\Framework\Exception\LocalizedException( + throw new LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); } diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php index 6c792a0b82b5a..d3b705b3b3f4e 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -8,6 +8,9 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\CatalogSearch\Model\Indexer\Fulltext; +use Magento\Elasticsearch\Model\Config; +use Psr\Log\LoggerInterface; +use Magento\Framework\Exception\LocalizedException; /** * Alias name resolver @@ -40,8 +43,8 @@ class SearchIndexNameResolver */ public function __construct( ConnectionManager $connectionManager, - \Magento\Elasticsearch\Model\Config $clientConfig, - \Psr\Log\LoggerInterface $logger, + Config $clientConfig, + LoggerInterface $logger, $options = [] ) { @@ -53,7 +56,7 @@ public function __construct( $this->client = $this->connectionManager->getConnection($options); } catch (\Exception $e) { $this->logger->critical($e); - throw new \Magento\Framework\Exception\LocalizedException( + throw new LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); } diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index e6ea1f29bc9cb..d32ae12623de1 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -363,4 +363,3 @@ public static function mapProvider() ]; } } - diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/Test/Unit/Model/Indexer/IndexerHandlerTest.php index bfeedaac506ea..24cc4a721fc6d 100644 --- a/Test/Unit/Model/Indexer/IndexerHandlerTest.php +++ b/Test/Unit/Model/Indexer/IndexerHandlerTest.php @@ -5,7 +5,7 @@ */ namespace Magento\Elasticsearch\Test\Unit\Model\Indexer; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Elasticsearch\Model\Indexer\IndexerHandler; class IndexerHandlerTest extends \PHPUnit_Framework_TestCase @@ -25,6 +25,11 @@ class IndexerHandlerTest extends \PHPUnit_Framework_TestCase */ private $batch; + /** + * @var \Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory|\PHPUnit_Framework_MockObject_MockObject + */ + private $adapterFactory; + /** * Set up test environment. * @@ -36,11 +41,11 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $adapterFactory = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory') + $this->adapterFactory = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory') ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); - $adapterFactory->expects($this->any()) + $this->adapterFactory->expects($this->any()) ->method('create') ->willReturn($this->adapter); @@ -48,10 +53,11 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->model = (new ObjectManager($this))->getObject( + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( 'Magento\Elasticsearch\Model\Indexer\IndexerHandler', [ - 'adapterFactory' => $adapterFactory, + 'adapterFactory' => $this->adapterFactory, 'batch' => $this->batch, 'data' => ['indexer_id' => 'catalogsearch_fulltext'], ] @@ -121,7 +127,7 @@ public function testSaveIndex() /** * Test cleanIndex() method. */ - public function testCleanIndex() + public function testCleanIndexCatalogSearchFullText() { $dimensionValue = 'SomeDimension'; @@ -139,4 +145,35 @@ public function testCleanIndex() $this->assertEquals($this->model, $result); } + + /** + * Test cleanIndex() method. + */ + public function testCleanIndex() + { + $objectManager = new ObjectManagerHelper($this); + $model = $objectManager->getObject( + 'Magento\Elasticsearch\Model\Indexer\IndexerHandler', + [ + 'adapterFactory' => $this->adapterFactory, + 'batch' => $this->batch, + 'data' => ['indexer_id' => 'else_indexer_id'], + ] + ); + $dimensionValue = 'SomeDimension'; + + $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + ->disableOriginalConstructor() + ->getMock(); + $dimension->expects($this->any()) + ->method('getValue') + ->willReturn($dimensionValue); + + $this->adapter->expects($this->once()) + ->method('cleanIndex'); + + $result = $model->cleanIndex([$dimension]); + + $this->assertEquals($model, $result); + } } From ab004f73dcda9e63d35b2e89d06f76fe3414b1ea Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 15 Dec 2015 16:04:29 +0200 Subject: [PATCH 241/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 13 +- .../Adapter/Index/SearchIndexNameResolver.php | 3 +- .../Index/SearchIndexNameResolverTest.php | 210 ++++++++++++++++++ 3 files changed, 219 insertions(+), 7 deletions(-) create mode 100644 Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index e3bf990dc2423..5eac97a03ca35 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -163,7 +163,7 @@ public function addDocs(array $documents, $storeId, $entityType) { if (count($documents)) { try { - $this->checkIndex($storeId, false, $entityType); + $this->checkIndex($storeId, $entityType, false); $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName, $entityType); $this->client->bulkQuery($bulkIndexDocuments); @@ -185,7 +185,7 @@ public function addDocs(array $documents, $storeId, $entityType) */ public function cleanIndex($storeId, $entityType) { - $this->checkIndex($storeId, true, $entityType); + $this->checkIndex($storeId, $entityType, true); $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); if ($this->client->isEmptyIndex($indexName)) { // use existing index if empty @@ -220,7 +220,7 @@ public function cleanIndex($storeId, $entityType) public function deleteDocs(array $documentIds, $storeId, $entityType) { try { - $this->checkIndex($storeId, false, $entityType); + $this->checkIndex($storeId, $entityType, false); $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); $bulkDeleteDocuments = $this->getDocsArrayInBulkIndexFormat( $documentIds, @@ -282,8 +282,11 @@ protected function getDocsArrayInBulkIndexFormat( * @param string $entityType * @return $this */ - protected function checkIndex($storeId, $checkAlias = true, $entityType) - { + protected function checkIndex( + $storeId, + $entityType, + $checkAlias = true + ) { // create new index for store $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); if (!$this->client->indexExists($indexName)) { diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php index 9354bb8bb4d01..fa97243437be2 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -46,8 +46,7 @@ public function __construct( Config $clientConfig, LoggerInterface $logger, $options = [] - ) - { + ) { $this->connectionManager = $connectionManager; $this->clientConfig = $clientConfig; $this->logger = $logger; diff --git a/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php new file mode 100644 index 0000000000000..03f1dec2cee11 --- /dev/null +++ b/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php @@ -0,0 +1,210 @@ +objectManager = new ObjectManagerHelper($this); + + $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->disableOriginalConstructor() + ->setMethods([ + 'getConnection', + ]) + ->getMock(); + + $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + ->disableOriginalConstructor() + ->setMethods([ + 'getIndexPrefix', + 'getEntityType', + 'getIndexSettings', + ]) + ->getMock(); + + $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + ->disableOriginalConstructor() + ->getMock(); + + $elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + ->setMethods([ + 'indices', + 'ping', + 'bulk', + 'search', + 'scroll', + ]) + ->disableOriginalConstructor() + ->getMock(); + + $indicesMock = $this->getMockBuilder('\Elasticsearch\Namespaces\IndicesNamespace') + ->setMethods([ + 'exists', + 'getSettings', + 'create', + 'putMapping', + 'deleteMapping', + 'existsAlias', + 'updateAliases', + 'stats' + ]) + ->disableOriginalConstructor() + ->getMock(); + $elasticsearchClientMock->expects($this->any()) + ->method('indices') + ->willReturn($indicesMock); + $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + ->setConstructorArgs([ + 'options' => $this->getClientOptions(), + 'elasticsearchClient' => $elasticsearchClientMock + ]) + ->getMock(); + + $this->connectionManager->expects($this->any()) + ->method('getConnection') + ->willReturn($this->client); + + $this->clientConfig->expects($this->any()) + ->method('getIndexPrefix') + ->willReturn('indexName'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('product'); + $this->entityType = 'catalogsearch_fulltext'; + $this->storeId = 1; + + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver', + [ + 'connectionManager' => $this->connectionManager, + 'clientConfig' => $this->clientConfig, + 'logger' => $this->logger, + 'options' => [], + ] + ); + } + + /** + * @expectedException \Magento\Framework\Exception\LocalizedException + */ + public function testConnectException() + { + $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->disableOriginalConstructor() + ->setMethods([ + 'getConnection', + ]) + ->getMock(); + + $connectionManager->expects($this->any()) + ->method('getConnection') + ->willThrowException(new \Exception('Something went wrong')); + + $this->objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver', + [ + 'connectionManager' => $connectionManager, + 'clientConfig' => $this->clientConfig, + 'logger' => $this->logger, + 'options' => [] + ] + ); + } + + /** + * Test getIndexName() indexerId 'catalogsearch_fulltext' + */ + public function testGetIndexNameCatalogSearchFullText() + { + $this->assertEquals( + 'indexName_product_1', + $this->model->getIndexName($this->storeId, $this->entityType) + ); + } + + /** + * Test getIndexName() with any ndex + */ + public function testGetIndexName() + { + $this->assertEquals( + 'indexName_else_index_id_1', + $this->model->getIndexName($this->storeId, 'else_index_id') + ); + } + + /** + * Get elasticsearch client options + * + * @return array + */ + protected function getClientOptions() + { + return [ + 'hostname' => 'localhost', + 'port' => '9200', + 'timeout' => 15, + 'index' => 'magento2', + 'enableAuth' => 1, + 'username' => 'user', + 'password' => 'my-password', + ]; + } +} From ff42f8b9b95fc88f6e0cb4126086403430ebb5fb Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 15 Dec 2015 18:37:33 +0200 Subject: [PATCH 242/616] PRD-99: Merging PR from sprint 4 --- .../Adapter/Index/SearchIndexNameResolver.php | 17 ---- .../Index/SearchIndexNameResolverTest.php | 99 +------------------ 2 files changed, 1 insertion(+), 115 deletions(-) diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php index fa97243437be2..0896b9f4954eb 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -6,11 +6,8 @@ namespace Magento\Elasticsearch\Model\Adapter\Index; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; -use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\CatalogSearch\Model\Indexer\Fulltext; use Magento\Elasticsearch\Model\Config; -use Psr\Log\LoggerInterface; -use Magento\Framework\Exception\LocalizedException; /** * Alias name resolver @@ -36,29 +33,15 @@ class SearchIndexNameResolver * Constructor for Index Name Resolver. * * @param \Magento\Elasticsearch\Model\Config $clientConfig - * @param \Psr\Log\LoggerInterface $logger * @param array $options * * @throws \Magento\Framework\Exception\LocalizedException */ public function __construct( - ConnectionManager $connectionManager, Config $clientConfig, - LoggerInterface $logger, $options = [] ) { - $this->connectionManager = $connectionManager; $this->clientConfig = $clientConfig; - $this->logger = $logger; - - try { - $this->client = $this->connectionManager->getConnection($options); - } catch (\Exception $e) { - $this->logger->critical($e); - throw new LocalizedException( - __('We were unable to perform the search because of a search engine misconfiguration.') - ); - } } /** diff --git a/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php index 03f1dec2cee11..94096a65c80aa 100644 --- a/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php @@ -19,26 +19,11 @@ class SearchIndexNameResolverTest extends \PHPUnit_Framework_TestCase */ protected $model; - /** - * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject - */ - protected $connectionManager; - /** * @var ClientOptionsInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $clientConfig; - /** - * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject - */ - protected $logger; - - /** - * @var ElasticsearchClient|\PHPUnit_Framework_MockObject_MockObject - */ - protected $client; - /** * @var ObjectManagerHelper */ @@ -60,15 +45,6 @@ class SearchIndexNameResolverTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->objectManager = new ObjectManagerHelper($this); - - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') - ->disableOriginalConstructor() - ->setMethods([ - 'getConnection', - ]) - ->getMock(); - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->disableOriginalConstructor() ->setMethods([ @@ -78,54 +54,10 @@ public function setUp() ]) ->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') - ->disableOriginalConstructor() - ->getMock(); - - $elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') - ->setMethods([ - 'indices', - 'ping', - 'bulk', - 'search', - 'scroll', - ]) - ->disableOriginalConstructor() - ->getMock(); - - $indicesMock = $this->getMockBuilder('\Elasticsearch\Namespaces\IndicesNamespace') - ->setMethods([ - 'exists', - 'getSettings', - 'create', - 'putMapping', - 'deleteMapping', - 'existsAlias', - 'updateAliases', - 'stats' - ]) - ->disableOriginalConstructor() - ->getMock(); - $elasticsearchClientMock->expects($this->any()) - ->method('indices') - ->willReturn($indicesMock); - $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') - ->setConstructorArgs([ - 'options' => $this->getClientOptions(), - 'elasticsearchClient' => $elasticsearchClientMock - ]) - ->getMock(); - - $this->connectionManager->expects($this->any()) - ->method('getConnection') - ->willReturn($this->client); - $this->clientConfig->expects($this->any()) ->method('getIndexPrefix') ->willReturn('indexName'); - $this->clientConfig->expects($this->any()) - ->method('getEntityType') - ->willReturn('product'); + $this->entityType = 'catalogsearch_fulltext'; $this->storeId = 1; @@ -133,41 +65,12 @@ public function setUp() $this->model = $objectManager->getObject( '\Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver', [ - 'connectionManager' => $this->connectionManager, 'clientConfig' => $this->clientConfig, - 'logger' => $this->logger, 'options' => [], ] ); } - /** - * @expectedException \Magento\Framework\Exception\LocalizedException - */ - public function testConnectException() - { - $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') - ->disableOriginalConstructor() - ->setMethods([ - 'getConnection', - ]) - ->getMock(); - - $connectionManager->expects($this->any()) - ->method('getConnection') - ->willThrowException(new \Exception('Something went wrong')); - - $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver', - [ - 'connectionManager' => $connectionManager, - 'clientConfig' => $this->clientConfig, - 'logger' => $this->logger, - 'options' => [] - ] - ); - } - /** * Test getIndexName() indexerId 'catalogsearch_fulltext' */ From 62155e57b9d8c4515aa655800a235d48aa1801a9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 16 Dec 2015 09:53:28 +0200 Subject: [PATCH 243/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Index/IndexNameResolver.php | 25 +++++++++++------- .../Adapter/Index/SearchIndexNameResolver.php | 26 +++++++------------ SearchAdapter/Mapper.php | 5 ---- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 58c2b517005d1..0857ef12fa922 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -17,7 +17,12 @@ class IndexNameResolver { /** - * @var \Magento\Elasticsearch\Model\Config + * @var ConnectionManager + */ + protected $connectionManager; + + /** + * @var Config */ protected $clientConfig; @@ -27,18 +32,18 @@ class IndexNameResolver protected $client; /** - * @var \Psr\Log\LoggerInterface + * @var LoggerInterface */ protected $logger; /** - * Constructor for Index Name Resolver. + * Constructor for Index Name Resolver * - * @param \Magento\Elasticsearch\Model\Config $clientConfig - * @param \Psr\Log\LoggerInterface $logger + * @param ConnectionManager $connectionManager + * @param Config $clientConfig + * @param LoggerInterface $logger * @param array $options - * - * @throws \Magento\Framework\Exception\LocalizedException + * @throws LocalizedException */ public function __construct( ConnectionManager $connectionManager, @@ -61,7 +66,7 @@ public function __construct( } /** - * Get index namespace from config. + * Get index namespace from config * * @return string */ @@ -71,7 +76,7 @@ protected function getIndexNamespace() } /** - * Get index namespace from config. + * Get index namespace from config * * @param int $storeId * @param string $entityType @@ -84,7 +89,7 @@ public function getIndexNameForAlias($storeId, $entityType) } /** - * Returns the index name. + * Returns the index name * * @param int $storeId * @param string $entityType diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/Model/Adapter/Index/SearchIndexNameResolver.php index 0896b9f4954eb..1c033eb79d494 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/Model/Adapter/Index/SearchIndexNameResolver.php @@ -8,6 +8,7 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\CatalogSearch\Model\Indexer\Fulltext; use Magento\Elasticsearch\Model\Config; +use Magento\Framework\Exception\LocalizedException; /** * Alias name resolver @@ -15,7 +16,7 @@ class SearchIndexNameResolver { /** - * @var \Magento\Elasticsearch\Model\Config + * @var Config */ protected $clientConfig; @@ -24,18 +25,12 @@ class SearchIndexNameResolver */ protected $client; - /** - * @var \Psr\Log\LoggerInterface - */ - protected $logger; - /** * Constructor for Index Name Resolver. * - * @param \Magento\Elasticsearch\Model\Config $clientConfig + * @param Config $clientConfig * @param array $options - * - * @throws \Magento\Framework\Exception\LocalizedException + * @throws LocalizedException */ public function __construct( Config $clientConfig, @@ -53,24 +48,23 @@ public function __construct( */ public function getIndexName($storeId, $indexerId) { - $indexName = $this->getIndexMapping($indexerId); - return $this->clientConfig->getIndexPrefix() . '_' . $indexName . '_' . $storeId; + $entityType = $this->getIndexMapping($indexerId); + return $this->clientConfig->getIndexPrefix() . '_' . $entityType . '_' . $storeId; } /** - * Taking index name by indexer ID + * Get index name by indexer ID * * @param string $indexerId - * * @return string */ protected function getIndexMapping($indexerId) { if ($indexerId == Fulltext::INDEXER_ID) { - $indexName = 'product'; + $entityType = 'product'; } else { - $indexName = $indexerId; + $entityType = $indexerId; } - return $indexName; + return $entityType; } } diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 4231a824625e4..14b959deed573 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -83,11 +83,6 @@ public function buildQuery(RequestInterface $request) ], ]; $searchQuery['body']['query']['bool']['minimum_should_match'] = 1; - $searchQuery['body']['query']['bool']['must'][]= [ - 'term' => [ - 'store_id' => $storeId, - ] - ]; return $searchQuery; } From 32ed49c7c1fc4f3ddffa1185a2adcbef646226f0 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 16 Dec 2015 10:05:28 +0200 Subject: [PATCH 244/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Index/IndexNameResolver.php | 4 ++-- Model/Indexer/IndexerHandler.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 0857ef12fa922..b1a11add03a88 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -118,7 +118,7 @@ public function getIndexName($storeId, $entityType, array $preparedIndex) */ public function getIndexPattern($storeId, $entityType) { - return $this->getIndexNamespace() .'_'. $entityType . '_' . $storeId . '_v'; + return $this->getIndexNamespace() . '_' . $entityType . '_' . $storeId . '_v'; } /** @@ -132,7 +132,7 @@ public function getIndexFromAlias($storeId, $entityType) { $storeIndex = ''; $indexPattern = $this->getIndexPattern($storeId, $entityType); - $namespace = $this->getIndexNamespace(); + $namespace = $this->getIndexNamespace() . '_' . $entityType . '_' . $storeId; if ($this->client->existsAlias($namespace)) { $alias = $this->client->getAlias($namespace); $indices = array_keys($alias); diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 0d26a3a8e21fd..0312ca49b33cd 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -47,7 +47,6 @@ class IndexerHandler implements IndexerInterface /** * @param ElasticsearchFactory $adapterFactory * @param Batch $batch - * @param string $entityType * @param array $data * @param int $batchSize */ @@ -81,7 +80,6 @@ public function saveIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} - * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ public function deleteIndex($dimensions, \Traversable $documents) { @@ -120,7 +118,6 @@ public function isAvailable() * Taking index name by indexer ID * * @param string $indexerId - * * @return string */ private function getIndexMapping($indexerId) From 56246a2d5e9c00a25d28375a76fdc0b3a45306f2 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Wed, 16 Dec 2015 12:22:24 +0200 Subject: [PATCH 245/616] PRD-99: Merging PR from sprint 4 --- .../Adapter/Index/IndexNameResolverTest.php | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index 8facedc199835..8747ffc7e8fb9 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -199,17 +199,25 @@ public function testGetIndexPattern() public function testUpdateAliasWithOldIndex() { $this->client->expects($this->any()) - ->method('existsAlias') - ->with('indexName') - ->willReturn(true); + ->method('getAlias') + ->with('indexName_product_1') + ->willReturn( + [ + 'indexName_product_1_v2' => [ + 'aliases' => [ + 'indexName_product_1' => [], + ], + ], + ] + ); $this->client->expects($this->any()) - ->method('getAlias') - ->with('indexName') - ->willReturn(['indexName_product_1_v'=>'indexName_product_1_v']); + ->method('existsAlias') + ->with('indexName_product_1') + ->willReturn(true); $this->assertEquals( - 'indexName_product_1_v', + 'indexName_product_1_v2', $this->model->getIndexFromAlias($this->storeId, $this->entityType) ); } From 46a7c69df1834e078887e324d426581882459612 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Wed, 16 Dec 2015 12:56:02 +0200 Subject: [PATCH 246/616] PRD-99: Merging PR from sprint 4 --- Model/Client/Elasticsearch.php | 6 ------ Test/Unit/Model/Client/ElasticsearchTest.php | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index cf2e0537c484a..f2033aeb2e2ed 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -76,12 +76,6 @@ public function ping() */ public function testConnection() { - if (!empty($this->clientOptions['index'])) { - if ($this->client->indices()->exists(['index' => $this->clientOptions['index']])) { - return true; - } - } - // if no index is given or does not yet exist simply perform a ping return $this->ping(); } diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 47c4795ed91ed..e5c960bb59765 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -119,7 +119,7 @@ public function testPing() */ public function testTestConnection() { - $this->indicesMock->expects($this->once())->method('exists')->willReturn(true); + $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(true); $this->assertEquals(true, $this->model->testConnection()); } @@ -128,7 +128,7 @@ public function testTestConnection() */ public function testTestConnectionFalse() { - $this->indicesMock->expects($this->once())->method('exists')->willReturn(false); + $this->elasticsearchClientMock->expects($this->once())->method('ping')->willReturn(false); $this->assertEquals(true, $this->model->testConnection()); } From a81144b05cbf09041ffee4d492b8b986c20c2b90 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Wed, 16 Dec 2015 14:30:27 +0200 Subject: [PATCH 247/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- SearchAdapter/Dynamic/DataProvider.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 57f9eb4cffad9..2ef41e2805c5a 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -15,6 +15,7 @@ use Magento\Elasticsearch\Model\Config; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Model\Session as CustomerSession; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; class DataProvider implements DataProviderInterface { @@ -53,6 +54,11 @@ class DataProvider implements DataProviderInterface */ protected $customerSession; + /** + * @var SearchIndexNameResolver + */ + protected $searchIndexNameResolver; + /** * @param ConnectionManager $connectionManager * @param FieldMapperInterface $fieldMapper @@ -61,6 +67,7 @@ class DataProvider implements DataProviderInterface * @param Config $clientConfig * @param StoreManagerInterface $storeManager * @param CustomerSession $customerSession + * @param SearchIndexNameResolver $searchIndexNameResolver */ public function __construct( ConnectionManager $connectionManager, @@ -69,7 +76,8 @@ public function __construct( IntervalFactory $intervalFactory, Config $clientConfig, StoreManagerInterface $storeManager, - CustomerSession $customerSession + CustomerSession $customerSession, + SearchIndexNameResolver $searchIndexNameResolver ) { $this->connectionManager = $connectionManager; $this->fieldMapper = $fieldMapper; @@ -78,6 +86,7 @@ public function __construct( $this->clientConfig = $clientConfig; $this->storeManager = $storeManager; $this->customerSession = $customerSession; + $this->searchIndexNameResolver = $searchIndexNameResolver; } /** @@ -105,7 +114,7 @@ public function getAggregations(EntityStorage $entityStorage) $websiteId = $this->storeManager->getStore()->getWebsiteId(); $storeId = $this->storeManager->getStore()->getId(); $requestQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->clientConfig->getEntityType()), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ @@ -216,7 +225,7 @@ public function getAggregation( $dimension = current($dimensions); $storeId = $dimension->getValue(); $requestQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->clientConfig->getEntityType()), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ From 67e039c52b28ac916e6e4522beca2a44b1604907 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Wed, 16 Dec 2015 15:30:52 +0200 Subject: [PATCH 248/616] PRD-99: Merging PR from sprint 4 --- SearchAdapter/Mapper.php | 1 - .../Index => SearchAdapter}/SearchIndexNameResolver.php | 2 +- .../SearchIndexNameResolverTest.php | 9 +++------ 3 files changed, 4 insertions(+), 8 deletions(-) rename {Model/Adapter/Index => SearchAdapter}/SearchIndexNameResolver.php (96%) rename Test/Unit/{Model/Adapter/Index => SearchAdapter}/SearchIndexNameResolverTest.php (86%) diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 14b959deed573..73a6de92399dd 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -13,7 +13,6 @@ use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; -use Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver; /** * Mapper class diff --git a/Model/Adapter/Index/SearchIndexNameResolver.php b/SearchAdapter/SearchIndexNameResolver.php similarity index 96% rename from Model/Adapter/Index/SearchIndexNameResolver.php rename to SearchAdapter/SearchIndexNameResolver.php index 1c033eb79d494..d3b78300b7358 100644 --- a/Model/Adapter/Index/SearchIndexNameResolver.php +++ b/SearchAdapter/SearchIndexNameResolver.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Adapter\Index; +namespace Magento\Elasticsearch\SearchAdapter; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\CatalogSearch\Model\Indexer\Fulltext; diff --git a/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php similarity index 86% rename from Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php rename to Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php index 94096a65c80aa..e3bb27e42ee46 100644 --- a/Test/Unit/Model/Adapter/Index/SearchIndexNameResolverTest.php +++ b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php @@ -3,13 +3,10 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\Index; +namespace Magento\Elasticsearch\Test\Unit\SearchAdapter; -use Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver; -use Psr\Log\LoggerInterface; -use Magento\Elasticsearch\SearchAdapter\ConnectionManager; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; -use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class SearchIndexNameResolverTest extends \PHPUnit_Framework_TestCase @@ -63,7 +60,7 @@ public function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\SearchIndexNameResolver', + '\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver', [ 'clientConfig' => $this->clientConfig, 'options' => [], From 62377b7d9bbdd0f6dd8ee9602c0c5dc53cdebde8 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Wed, 16 Dec 2015 18:21:30 +0200 Subject: [PATCH 249/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 51 +++++++++++------------ Model/Adapter/Index/IndexNameResolver.php | 17 ++++++++ Model/Indexer/IndexerHandler.php | 31 +++++--------- 3 files changed, 52 insertions(+), 47 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 5eac97a03ca35..8f88e5a5d693d 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -155,17 +155,17 @@ public function prepareDocsPerStore(array $documentData, $storeId) * * @param array $documents * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @return $this * @throws \Exception */ - public function addDocs(array $documents, $storeId, $entityType) + public function addDocs(array $documents, $storeId, $mappedIndexerId) { if (count($documents)) { try { - $this->checkIndex($storeId, $entityType, false); - $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); - $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName, $entityType); + $this->checkIndex($storeId, $mappedIndexerId, false); + $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex); + $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName); $this->client->bulkQuery($bulkIndexDocuments); } catch (\Exception $e) { $this->logger->critical($e); @@ -180,20 +180,20 @@ public function addDocs(array $documents, $storeId, $entityType) * Removes all documents from Elasticsearch index * * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @return $this */ - public function cleanIndex($storeId, $entityType) + public function cleanIndex($storeId, $mappedIndexerId) { - $this->checkIndex($storeId, $entityType, true); - $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); + $this->checkIndex($storeId, $mappedIndexerId, true); + $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex); if ($this->client->isEmptyIndex($indexName)) { // use existing index if empty return $this; } // prepare new index name and increase version - $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $entityType); + $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $mappedIndexerId); $version = intval(str_replace($indexPattern, '', $indexName)); $newIndexName = $indexPattern . ++$version; @@ -213,19 +213,18 @@ public function cleanIndex($storeId, $entityType) * * @param array $documentIds * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @return $this * @throws \Exception */ - public function deleteDocs(array $documentIds, $storeId, $entityType) + public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId) { try { - $this->checkIndex($storeId, $entityType, false); - $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); + $this->checkIndex($storeId, $mappedIndexerId, false); + $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex); $bulkDeleteDocuments = $this->getDocsArrayInBulkIndexFormat( $documentIds, $indexName, - $entityType, self::BULK_ACTION_DELETE ); $this->client->bulkQuery($bulkDeleteDocuments); @@ -242,19 +241,17 @@ public function deleteDocs(array $documentIds, $storeId, $entityType) * * @param array $documents * @param string $indexName - * @param string $entityType * @param string $action * @return array */ protected function getDocsArrayInBulkIndexFormat( $documents, $indexName, - $entityType, $action = self::BULK_ACTION_INDEX ) { $bulkArray = [ 'index' => $indexName, - 'type' => $entityType, + 'type' => $this->clientConfig->getEntityType(), 'body' => [], ]; @@ -262,7 +259,7 @@ protected function getDocsArrayInBulkIndexFormat( $bulkArray['body'][] = [ $action => [ '_id' => $id, - '_type' => $entityType, + '_type' => $this->clientConfig->getEntityType(), '_index' => $indexName ] ]; @@ -279,23 +276,23 @@ protected function getDocsArrayInBulkIndexFormat( * * @param int $storeId * @param bool $checkAlias - * @param string $entityType + * @param string $mappedIndexerId * @return $this */ protected function checkIndex( $storeId, - $entityType, + $mappedIndexerId, $checkAlias = true ) { // create new index for store - $indexName = $this->indexNameResolver->getIndexName($storeId, $entityType, $this->preparedIndex); + $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex); if (!$this->client->indexExists($indexName)) { $this->prepareIndex($storeId, $indexName); } // add index to alias if ($checkAlias) { - $namespace = $this->indexNameResolver->getIndexNameForAlias($storeId, $entityType); + $namespace = $this->indexNameResolver->getIndexNameForAlias($storeId, $mappedIndexerId); if (!$this->client->existsAlias($namespace, $indexName)) { $this->client->updateAlias($namespace, $indexName); } @@ -307,22 +304,22 @@ protected function checkIndex( * Update Elasticsearch alias for new index. * * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @return $this */ - public function updateAlias($storeId, $entityType) + public function updateAlias($storeId, $mappedIndexerId) { if (!isset($this->preparedIndex[$storeId])) { return $this; } - $oldIndex = $this->indexNameResolver->getIndexFromAlias($storeId, $entityType); + $oldIndex = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId); if ($oldIndex == $this->preparedIndex[$storeId]) { $oldIndex = ''; } $this->client->updateAlias( - $this->indexNameResolver->getIndexNameForAlias($storeId, $entityType), + $this->indexNameResolver->getIndexNameForAlias($storeId, $mappedIndexerId), $this->preparedIndex[$storeId], $oldIndex ); diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index b1a11add03a88..6c1340576b702 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -10,6 +10,7 @@ use Magento\Elasticsearch\Model\Config; use Psr\Log\LoggerInterface; use Magento\Framework\Exception\LocalizedException; +use Magento\CatalogSearch\Model\Indexer\Fulltext; /** * Index name resolver @@ -145,4 +146,20 @@ public function getIndexFromAlias($storeId, $entityType) } return $storeIndex; } + + /** + * Taking index name by indexer ID + * + * @param string $indexerId + * @return string + */ + public function getIndexMapping($indexerId) + { + if ($indexerId == Fulltext::INDEXER_ID) { + $indexName = 'product'; + } else { + $indexName = $indexerId; + } + return $indexName; + } } diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 0312ca49b33cd..0f357835d2dfd 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -10,7 +10,6 @@ use Magento\Elasticsearch\Model\Adapter\Elasticsearch; use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; use Magento\Store\Model\Store; -use Magento\CatalogSearch\Model\Indexer\Fulltext; class IndexerHandler implements IndexerInterface { @@ -29,6 +28,11 @@ class IndexerHandler implements IndexerInterface */ protected $adapter; + /** + * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + */ + protected $indexNameResolver; + /** * @var array */ @@ -46,17 +50,20 @@ class IndexerHandler implements IndexerInterface /** * @param ElasticsearchFactory $adapterFactory + * @param \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver * @param Batch $batch * @param array $data * @param int $batchSize */ public function __construct( ElasticsearchFactory $adapterFactory, + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver, Batch $batch, array $data = [], $batchSize = self::DEFAULT_BATCH_SIZE ) { $this->adapter = $adapterFactory->create(); + $this->indexNameResolver = $indexNameResolver; $this->data = $data; $this->batch = $batch; $this->batchSize = $batchSize; @@ -69,7 +76,7 @@ public function saveIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $indexName = $this->getIndexMapping($this->data['indexer_id']); + $indexName = $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) { $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $storeId); $this->adapter->addDocs($docs, $storeId, $indexName); @@ -85,7 +92,7 @@ public function deleteIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $indexName = $this->getIndexMapping($this->data['indexer_id']); + $indexName = $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); $documentIds = []; foreach ($documents as $entityId => $document) { $documentIds[$entityId] = $entityId; @@ -101,7 +108,7 @@ public function cleanIndex($dimensions) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $indexName = $this->getIndexMapping($this->data['indexer_id']); + $indexName = $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); $this->adapter->cleanIndex($storeId, $indexName); return $this; } @@ -113,20 +120,4 @@ public function isAvailable() { return $this->adapter->ping(); } - - /** - * Taking index name by indexer ID - * - * @param string $indexerId - * @return string - */ - private function getIndexMapping($indexerId) - { - if ($indexerId == Fulltext::INDEXER_ID) { - $indexName = 'product'; - } else { - $indexName = $indexerId; - } - return $indexName; - } } From 36b545b51e01460b5af3ce7b6672e68f513d845e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 17 Dec 2015 13:21:27 +0200 Subject: [PATCH 250/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 3 +- Model/Adapter/Index/IndexNameResolver.php | 36 ++++++------- Model/Indexer/IndexStructure.php | 52 +++++++++++++++++++ Model/Indexer/IndexerHandler.php | 63 ++++++++++++++--------- SearchAdapter/SearchIndexNameResolver.php | 22 +++----- etc/di.xml | 7 +++ 6 files changed, 124 insertions(+), 59 deletions(-) create mode 100644 Model/Indexer/IndexStructure.php diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 8f88e5a5d693d..e79233decc6c2 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -163,7 +163,6 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId) { if (count($documents)) { try { - $this->checkIndex($storeId, $mappedIndexerId, false); $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex); $bulkIndexDocuments = $this->getDocsArrayInBulkIndexFormat($documents, $indexName); $this->client->bulkQuery($bulkIndexDocuments); @@ -279,7 +278,7 @@ protected function getDocsArrayInBulkIndexFormat( * @param string $mappedIndexerId * @return $this */ - protected function checkIndex( + public function checkIndex( $storeId, $mappedIndexerId, $checkAlias = true diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 6c1340576b702..ea6bd6d5409f3 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -71,7 +71,7 @@ public function __construct( * * @return string */ - protected function getIndexNamespace() + private function getIndexNamespace() { return $this->clientConfig->getIndexPrefix(); } @@ -80,31 +80,31 @@ protected function getIndexNamespace() * Get index namespace from config * * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * * @return string */ - public function getIndexNameForAlias($storeId, $entityType) + public function getIndexNameForAlias($storeId, $mappedIndexerId) { - return $this->clientConfig->getIndexPrefix() . '_' . $entityType . '_' . $storeId; + return $this->clientConfig->getIndexPrefix() . '_' . $mappedIndexerId . '_' . $storeId; } /** * Returns the index name * * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @param array $preparedIndex * @return string */ - public function getIndexName($storeId, $entityType, array $preparedIndex) + public function getIndexName($storeId, $mappedIndexerId, array $preparedIndex) { if (isset($preparedIndex[$storeId])) { return $preparedIndex[$storeId]; } else { - $indexName = $this->getIndexFromAlias($storeId, $entityType); + $indexName = $this->getIndexFromAlias($storeId, $mappedIndexerId); if (empty($indexName)) { - $indexName = $this->getIndexPattern($storeId, $entityType) . 1; + $indexName = $this->getIndexPattern($storeId, $mappedIndexerId) . 1; } } return $indexName; @@ -114,26 +114,26 @@ public function getIndexName($storeId, $entityType, array $preparedIndex) * Returns index pattern. * * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @return string */ - public function getIndexPattern($storeId, $entityType) + public function getIndexPattern($storeId, $mappedIndexerId) { - return $this->getIndexNamespace() . '_' . $entityType . '_' . $storeId . '_v'; + return $this->getIndexNamespace() . '_' . $mappedIndexerId . '_' . $storeId . '_v'; } /** * Returns index for store in alias definition. * * @param int $storeId - * @param string $entityType + * @param string $mappedIndexerId * @return string */ - public function getIndexFromAlias($storeId, $entityType) + public function getIndexFromAlias($storeId, $mappedIndexerId) { $storeIndex = ''; - $indexPattern = $this->getIndexPattern($storeId, $entityType); - $namespace = $this->getIndexNamespace() . '_' . $entityType . '_' . $storeId; + $indexPattern = $this->getIndexPattern($storeId, $mappedIndexerId); + $namespace = $this->getIndexNamespace() . '_' . $mappedIndexerId . '_' . $storeId; if ($this->client->existsAlias($namespace)) { $alias = $this->client->getAlias($namespace); $indices = array_keys($alias); @@ -156,10 +156,10 @@ public function getIndexFromAlias($storeId, $entityType) public function getIndexMapping($indexerId) { if ($indexerId == Fulltext::INDEXER_ID) { - $indexName = 'product'; + $mappedIndexerId = 'product'; } else { - $indexName = $indexerId; + $mappedIndexerId = $indexerId; } - return $indexName; + return $mappedIndexerId; } } diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php new file mode 100644 index 0000000000000..93dd0b0c5f699 --- /dev/null +++ b/Model/Indexer/IndexStructure.php @@ -0,0 +1,52 @@ +adapter = $adapter; + } + + /** + * {@inheritdoc} + */ + public function delete( + $indexerId, + array $dimensions = [] + ) { + $dimension = current($dimensions); + $storeId = $dimension->getValue(); + $this->adapter->cleanIndex($storeId, $indexerId); + } + + /** + * {@inheritdoc} + * + */ + public function create( + $indexerId, + array $fields, + array $dimensions = [] + ) { + $dimension = current($dimensions); + $storeId = $dimension->getValue(); + $this->adapter->checkIndex($storeId, $indexerId, false); + } +} diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 0f357835d2dfd..31bb524fc31c1 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -7,8 +7,9 @@ use Magento\Framework\Indexer\SaveHandler\IndexerInterface; use Magento\Framework\Indexer\SaveHandler\Batch; -use Magento\Elasticsearch\Model\Adapter\Elasticsearch; -use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; +use Magento\Framework\Indexer\IndexStructureInterface; +use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; +use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; use Magento\Store\Model\Store; class IndexerHandler implements IndexerInterface @@ -24,48 +25,56 @@ class IndexerHandler implements IndexerInterface const SCOPE_FIELD_NAME = 'scope'; /** - * @var Elasticsearch + * @var IndexStructureInterface */ - protected $adapter; + private $indexStructure; /** - * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + * @var ElasticsearchAdapter */ - protected $indexNameResolver; + private $adapter; /** - * @var array + * @var IndexNameResolver */ - protected $data; + private $indexNameResolver; /** * @var Batch */ - protected $batch; + private $batch; + + /** + * @var array + */ + private $data; /** * @var int */ - protected $batchSize; + private $batchSize; /** - * @param ElasticsearchFactory $adapterFactory - * @param \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + * @param IndexStructureInterface $indexStructure + * @param ElasticsearchAdapter $adapter + * @param IndexNameResolver $indexNameResolver * @param Batch $batch * @param array $data * @param int $batchSize */ public function __construct( - ElasticsearchFactory $adapterFactory, - \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver, + IndexStructureInterface $indexStructure, + ElasticsearchAdapter $adapter, + IndexNameResolver $indexNameResolver, Batch $batch, array $data = [], $batchSize = self::DEFAULT_BATCH_SIZE ) { - $this->adapter = $adapterFactory->create(); + $this->indexStructure = $indexStructure; + $this->adapter = $adapter; $this->indexNameResolver = $indexNameResolver; - $this->data = $data; $this->batch = $batch; + $this->data = $data; $this->batchSize = $batchSize; } @@ -76,12 +85,11 @@ public function saveIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $indexName = $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) { $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $storeId); - $this->adapter->addDocs($docs, $storeId, $indexName); + $this->adapter->addDocs($docs, $storeId, $this->getIndexerId()); } - $this->adapter->updateAlias($storeId, $indexName); + $this->adapter->updateAlias($storeId, $this->getIndexerId()); return $this; } @@ -92,12 +100,11 @@ public function deleteIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); - $indexName = $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); $documentIds = []; foreach ($documents as $entityId => $document) { $documentIds[$entityId] = $entityId; } - $this->adapter->deleteDocs($documentIds, $storeId, $indexName); + $this->adapter->deleteDocs($documentIds, $storeId, $this->getIndexerId()); return $this; } @@ -106,10 +113,8 @@ public function deleteIndex($dimensions, \Traversable $documents) */ public function cleanIndex($dimensions) { - $dimension = current($dimensions); - $storeId = $dimension->getValue(); - $indexName = $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); - $this->adapter->cleanIndex($storeId, $indexName); + $this->indexStructure->delete($this->getIndexerId(), $dimensions); + $this->indexStructure->create($this->getIndexerId(), [], $dimensions); return $this; } @@ -120,4 +125,12 @@ public function isAvailable() { return $this->adapter->ping(); } + + /** + * @return string + */ + private function getIndexerId() + { + return $this->indexNameResolver->getIndexMapping($this->data['indexer_id']); + } } diff --git a/SearchAdapter/SearchIndexNameResolver.php b/SearchAdapter/SearchIndexNameResolver.php index d3b78300b7358..b2185be5ae8cc 100644 --- a/SearchAdapter/SearchIndexNameResolver.php +++ b/SearchAdapter/SearchIndexNameResolver.php @@ -5,7 +5,6 @@ */ namespace Magento\Elasticsearch\SearchAdapter; -use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\CatalogSearch\Model\Indexer\Fulltext; use Magento\Elasticsearch\Model\Config; use Magento\Framework\Exception\LocalizedException; @@ -21,12 +20,7 @@ class SearchIndexNameResolver protected $clientConfig; /** - * @var ElasticsearchClient - */ - protected $client; - - /** - * Constructor for Index Name Resolver. + * Constructor for Index Name Resolver * * @param Config $clientConfig * @param array $options @@ -40,7 +34,7 @@ public function __construct( } /** - * Returns the index (alias) name. + * Returns the index (alias) name * * @param int $storeId * @param string $indexerId @@ -48,8 +42,8 @@ public function __construct( */ public function getIndexName($storeId, $indexerId) { - $entityType = $this->getIndexMapping($indexerId); - return $this->clientConfig->getIndexPrefix() . '_' . $entityType . '_' . $storeId; + $mappedIndexerId = $this->getIndexMapping($indexerId); + return $this->clientConfig->getIndexPrefix() . '_' . $mappedIndexerId . '_' . $storeId; } /** @@ -58,13 +52,13 @@ public function getIndexName($storeId, $indexerId) * @param string $indexerId * @return string */ - protected function getIndexMapping($indexerId) + private function getIndexMapping($indexerId) { if ($indexerId == Fulltext::INDEXER_ID) { - $entityType = 'product'; + $mappedIndexerId = 'product'; } else { - $entityType = $indexerId; + $mappedIndexerId = $indexerId; } - return $entityType; + return $mappedIndexerId; } } diff --git a/etc/di.xml b/etc/di.xml index 721057714c742..e6958054ec814 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -33,6 +33,13 @@ + + + + Magento\Elasticsearch\Model\Indexer\IndexStructure + + + From 337017e3bc3110e0606da0ca7b3d07c3d27dc03e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 17 Dec 2015 15:29:40 +0200 Subject: [PATCH 251/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../ProductDataMapper.php} | 4 ++-- Model/Adapter/DataMapperInterface.php | 19 +++++++++++++++++++ .../ProductFieldMapper.php} | 8 ++++---- .../Adapter}/FieldMapperInterface.php | 2 +- SearchAdapter/Filter/Builder/Range.php | 2 +- SearchAdapter/Filter/Builder/Term.php | 2 +- SearchAdapter/Filter/Builder/Wildcard.php | 2 +- SearchAdapter/Query/Builder/Match.php | 2 +- etc/di.xml | 3 ++- 9 files changed, 32 insertions(+), 12 deletions(-) rename Model/Adapter/{DocumentDataMapper.php => DataMapper/ProductDataMapper.php} (99%) create mode 100644 Model/Adapter/DataMapperInterface.php rename Model/Adapter/{FieldMapper.php => FieldMapper/ProductFieldMapper.php} (95%) rename {SearchAdapter => Model/Adapter}/FieldMapperInterface.php (91%) diff --git a/Model/Adapter/DocumentDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php similarity index 99% rename from Model/Adapter/DocumentDataMapper.php rename to Model/Adapter/DataMapper/ProductDataMapper.php index 829ced36ad11e..a1fb3ce25bf8d 100644 --- a/Model/Adapter/DocumentDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Adapter; +namespace Magento\Elasticsearch\Model\Adapter\DataMapper; use Magento\Catalog\Model\ResourceModel\Eav\Attribute; use Magento\Framework\App\Config\ScopeConfigInterface; @@ -19,7 +19,7 @@ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ -class DocumentDataMapper +class ProductDataMapper implements DataMapperInterface { /** * Attribute code for image. diff --git a/Model/Adapter/DataMapperInterface.php b/Model/Adapter/DataMapperInterface.php new file mode 100644 index 0000000000000..3f43165f6cc04 --- /dev/null +++ b/Model/Adapter/DataMapperInterface.php @@ -0,0 +1,19 @@ + - + + From 20a0f825ce0716f29e007a889f2db2a78877c751 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Thu, 17 Dec 2015 16:55:32 +0200 Subject: [PATCH 252/616] PRD-99: Merging PR from sprint 4 --- Model/Config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Model/Config.php b/Model/Config.php index 5ae2103a9b1a8..2bb90eae2cbf5 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -22,9 +22,9 @@ class Config implements ClientOptionsInterface const ENGINE_NAME = 'elasticsearch'; /** - * Elasticsearch Entity type for product + * Elasticsearch Entity type */ - const ELASTICSEARCH_TYPE_PRODUCT = 'product'; + const ELASTICSEARCH_TYPE_DOCUMENT = 'document'; /** * Default Elasticsearch server timeout @@ -133,6 +133,6 @@ public function getIndexPrefix() */ public function getEntityType() { - return self::ELASTICSEARCH_TYPE_PRODUCT; + return self::ELASTICSEARCH_TYPE_DOCUMENT; } } From c19d4cfe1b74b15279d0ee45e01fbae65232ce44 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 17 Dec 2015 17:22:40 +0200 Subject: [PATCH 253/616] PRD-99: Merging PR from sprint 4 --- SearchAdapter/SearchIndexNameResolver.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/SearchIndexNameResolver.php b/SearchAdapter/SearchIndexNameResolver.php index b2185be5ae8cc..a1088fdbe3852 100644 --- a/SearchAdapter/SearchIndexNameResolver.php +++ b/SearchAdapter/SearchIndexNameResolver.php @@ -7,7 +7,6 @@ use Magento\CatalogSearch\Model\Indexer\Fulltext; use Magento\Elasticsearch\Model\Config; -use Magento\Framework\Exception\LocalizedException; /** * Alias name resolver @@ -17,18 +16,13 @@ class SearchIndexNameResolver /** * @var Config */ - protected $clientConfig; + private $clientConfig; /** - * Constructor for Index Name Resolver - * * @param Config $clientConfig - * @param array $options - * @throws LocalizedException */ public function __construct( - Config $clientConfig, - $options = [] + Config $clientConfig ) { $this->clientConfig = $clientConfig; } From df03ad879e461b462cc09e558e29e050ec504485 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Thu, 17 Dec 2015 18:02:07 +0200 Subject: [PATCH 254/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Index/IndexNameResolver.php | 2 +- .../Adapter/Index/IndexNameResolverTest.php | 22 ++++++ .../Unit/Model/Indexer/IndexStructureTest.php | 67 +++++++++++++++++++ .../Unit/Model/Indexer/IndexerHandlerTest.php | 45 +++++++++++-- .../SearchIndexNameResolverTest.php | 7 +- 5 files changed, 134 insertions(+), 9 deletions(-) create mode 100644 Test/Unit/Model/Indexer/IndexStructureTest.php diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index ea6bd6d5409f3..9c41cb065face 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -71,7 +71,7 @@ public function __construct( * * @return string */ - private function getIndexNamespace() + protected function getIndexNamespace() { return $this->clientConfig->getIndexPrefix(); } diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index 8747ffc7e8fb9..2ff218acd2e22 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -249,6 +249,28 @@ public function testConnectException() ); } + /** + * Test getIndexName() indexerId 'catalogsearch_fulltext' + */ + public function testGetIndexNameCatalogSearchFullText() + { + $this->assertEquals( + 'product', + $this->model->getIndexMapping('catalogsearch_fulltext') + ); + } + + /** + * Test getIndexName() with any ndex + */ + public function testGetIndexName() + { + $this->assertEquals( + 'else_index_id', + $this->model->getIndexMapping('else_index_id') + ); + } + /** * Get elasticsearch client options * diff --git a/Test/Unit/Model/Indexer/IndexStructureTest.php b/Test/Unit/Model/Indexer/IndexStructureTest.php new file mode 100644 index 0000000000000..d7d78d371389e --- /dev/null +++ b/Test/Unit/Model/Indexer/IndexStructureTest.php @@ -0,0 +1,67 @@ +adapter = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Elasticsearch') + ->disableOriginalConstructor() + ->getMock(); + + $objectManager = new ObjectManagerHelper($this); + + $this->model = $objectManager->getObject( + 'Magento\Elasticsearch\Model\Indexer\IndexStructure', + [ + 'adapter' => $this->adapter, + ] + ); + } + + public function testDelete() + { + $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + ->disableOriginalConstructor() + ->getMock(); + + $this->adapter->expects($this->any()) + ->method('cleanIndex'); + + $this->model->delete('product', [$dimension]); + } + + public function testCreate() + { + $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + ->disableOriginalConstructor() + ->getMock(); + $this->adapter->expects($this->any()) + ->method('checkIndex'); + + $this->model->create('product', [], [$dimension]); + } +} diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/Test/Unit/Model/Indexer/IndexerHandlerTest.php index 24cc4a721fc6d..e830a00e188b2 100644 --- a/Test/Unit/Model/Indexer/IndexerHandlerTest.php +++ b/Test/Unit/Model/Indexer/IndexerHandlerTest.php @@ -30,6 +30,21 @@ class IndexerHandlerTest extends \PHPUnit_Framework_TestCase */ private $adapterFactory; + /** + * @var \Magento\Framework\Indexer\IndexStructureInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $indexStructure; + + /** + * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver|\PHPUnit_Framework_MockObject_MockObject + */ + private $indexNameResolver; + + /** + * @var \Magento\Elasticsearch\Model\Client\Elasticsearch|\PHPUnit_Framework_MockObject_MockObject + */ + private $client; + /** * Set up test environment. * @@ -45,6 +60,7 @@ protected function setUp() ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); + $this->adapterFactory->expects($this->any()) ->method('create') ->willReturn($this->adapter); @@ -53,20 +69,41 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->indexStructure = $this->getMockBuilder('Magento\Framework\Indexer\IndexStructureInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->indexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver') + ->disableOriginalConstructor() + ->getMock(); + + $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + ->setMethods(['ping']) + ->disableOriginalConstructor() + ->getMock(); + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( 'Magento\Elasticsearch\Model\Indexer\IndexerHandler', [ - 'adapterFactory' => $this->adapterFactory, + 'indexStructure' => $this->indexStructure, + 'adapter' => $this->adapter, + 'indexNameResolver' => $this->indexNameResolver, 'batch' => $this->batch, 'data' => ['indexer_id' => 'catalogsearch_fulltext'], + 500, ] ); } public function testIsAvailable() { - $this->adapter->expects($this->once()) + $this->adapter->expects($this->any()) + ->method('ping') + ->willReturn(true); + + $this->client->expects($this->any()) ->method('ping') ->willReturn(true); @@ -138,7 +175,7 @@ public function testCleanIndexCatalogSearchFullText() ->method('getValue') ->willReturn($dimensionValue); - $this->adapter->expects($this->once()) + $this->adapter->expects($this->any()) ->method('cleanIndex'); $result = $this->model->cleanIndex([$dimension]); @@ -169,7 +206,7 @@ public function testCleanIndex() ->method('getValue') ->willReturn($dimensionValue); - $this->adapter->expects($this->once()) + $this->adapter->expects($this->any()) ->method('cleanIndex'); $result = $model->cleanIndex([$dimension]); diff --git a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php index e3bb27e42ee46..05e120e750377 100644 --- a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php +++ b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php @@ -29,7 +29,7 @@ class SearchIndexNameResolverTest extends \PHPUnit_Framework_TestCase /** * @var string */ - protected $entityType; + protected $indexId; /** * @var int @@ -55,7 +55,7 @@ public function setUp() ->method('getIndexPrefix') ->willReturn('indexName'); - $this->entityType = 'catalogsearch_fulltext'; + $this->indexId = 'catalogsearch_fulltext'; $this->storeId = 1; $objectManager = new ObjectManagerHelper($this); @@ -63,7 +63,6 @@ public function setUp() '\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver', [ 'clientConfig' => $this->clientConfig, - 'options' => [], ] ); } @@ -75,7 +74,7 @@ public function testGetIndexNameCatalogSearchFullText() { $this->assertEquals( 'indexName_product_1', - $this->model->getIndexName($this->storeId, $this->entityType) + $this->model->getIndexName($this->storeId, $this->indexId) ); } From f74eecf45af232158328c0474f79778ab873e8c2 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 17 Dec 2015 18:49:55 +0200 Subject: [PATCH 255/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/DataMapperResolver.php | 86 +++++++++++++++++++ Model/Adapter/DataMapperInterface.php | 3 +- .../FieldMapper/ProductFieldMapper.php | 1 + Model/Adapter/FieldMapperInterface.php | 2 +- etc/di.xml | 9 +- 5 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 Model/Adapter/DataMapper/DataMapperResolver.php diff --git a/Model/Adapter/DataMapper/DataMapperResolver.php b/Model/Adapter/DataMapper/DataMapperResolver.php new file mode 100644 index 0000000000000..8f03039082def --- /dev/null +++ b/Model/Adapter/DataMapper/DataMapperResolver.php @@ -0,0 +1,86 @@ +objectManager = $objectManager; + $this->dataMappers = $dataMappers; + } + + /** + * {@inheritdoc} + */ + public function map( + $entityId, + array $entityIndexData, + $storeId, + $context = [] + ) { + return $this->getEntity($context['entityType'])->map($entityId, $entityIndexData, $storeId, $context); + } + + /** + * Get instance of current data mapper + * + * @param string $entityType + * @return DataMapperInterface + * @throws \Exception + */ + private function getEntity($entityType = '') + { + if (empty($this->dataMapperEntity)) { + if (empty($entityType)) { + throw new \Exception( + 'No entity type given' + ); + } + if (!isset($this->dataMappers[$entityType])) { + throw new \LogicException( + 'There is no such data mapper: ' . $entityType + ); + } + $dataMapperClass = $this->dataMappers[$entityType]; + $this->dataMapperEntity = $this->objectManager->create($dataMapperClass); + if (!($this->dataMapperEntity instanceof DataMapperInterface)) { + throw new \InvalidArgumentException( + 'Data mapper must implement \Magento\Elasticsearch\Model\Adapter\DataMapperInterface' + ); + } + } + return $this->dataMapperEntity; + } +} diff --git a/Model/Adapter/DataMapperInterface.php b/Model/Adapter/DataMapperInterface.php index 3f43165f6cc04..ea0555392ce00 100644 --- a/Model/Adapter/DataMapperInterface.php +++ b/Model/Adapter/DataMapperInterface.php @@ -13,7 +13,8 @@ interface DataMapperInterface * @param int $entityId * @param array $entityIndexData * @param int $storeId + * @param array $context * @return array */ - public function map($entityId, array $entityIndexData, $storeId); + public function map($entityId, array $entityIndexData, $storeId, $context = []); } diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 06f4f462ed283..943864af77011 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -8,6 +8,7 @@ use Magento\Catalog\Api\Data\ProductAttributeInterface; use Magento\Eav\Model\Config; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldType; /** * Class ProductFieldMapper diff --git a/Model/Adapter/FieldMapperInterface.php b/Model/Adapter/FieldMapperInterface.php index 2134320a199e7..d9fd885f5af95 100644 --- a/Model/Adapter/FieldMapperInterface.php +++ b/Model/Adapter/FieldMapperInterface.php @@ -20,7 +20,7 @@ interface FieldMapperInterface * * @param string $attributeCode * @param array $context - * @return mixed + * @return string */ public function getFieldName($attributeCode, $context = []); } diff --git a/etc/di.xml b/etc/di.xml index 4bbf5224872a3..a98e89a666f2d 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -7,7 +7,14 @@ --> - + + + + + Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper + + + From 22b20b6a736db1b1fa860008d1fb5bd974f8ef14 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Thu, 17 Dec 2015 19:18:18 +0200 Subject: [PATCH 256/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../FieldMapper/FieldMapperResolver.php | 82 +++++++++++++++++++ etc/di.xml | 9 +- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Model/Adapter/FieldMapper/FieldMapperResolver.php diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/Model/Adapter/FieldMapper/FieldMapperResolver.php new file mode 100644 index 0000000000000..919512b512519 --- /dev/null +++ b/Model/Adapter/FieldMapper/FieldMapperResolver.php @@ -0,0 +1,82 @@ +objectManager = $objectManager; + $this->$fieldMappers = fieldMappers; + } + + /** + * {@inheritdoc} + */ + public function getFieldName($attributeCode, $context = []) + { + return $this->getEntity($context['entityType'])->getFieldName($attributeCode, $context); + } + + /** + * Get instance of current field mapper + * + * @param string $entityType + * @return FieldMapperInterface + * @throws \Exception + */ + private function getEntity($entityType = '') + { + if (empty($this->fieldMapperEntity)) { + if (empty($entityType)) { + throw new \Exception( + 'No entity type given' + ); + } + if (!isset($this->fieldMappers[$entityType])) { + throw new \LogicException( + 'There is no such field mapper: ' . $entityType + ); + } + $fieldMapperClass = $this->fieldMappers[$entityType]; + $this->fieldMapperEntity = $this->objectManager->create($fieldMapperClass); + if (!($this->fieldMapperEntity instanceof FieldMapperInterface)) { + throw new \InvalidArgumentException( + 'Field mapper must implement \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface' + ); + } + } + return $this->fieldMapperEntity; + } +} diff --git a/etc/di.xml b/etc/di.xml index a98e89a666f2d..3a5a2d76265ee 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -6,7 +6,14 @@ */ --> - + + + + + Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper + + + From 72c0e5b3a141898c4e6392a108c4d7653e307f1e Mon Sep 17 00:00:00 2001 From: PhoenixPM - BK Date: Thu, 17 Dec 2015 22:52:45 +0100 Subject: [PATCH 257/616] PRD-33 use in situ stemming to allow meaningful suggestions for stemmed terms --- Model/Adapter/Index/Builder.php | 10 ++++-- Model/DataProvider/Suggestions.php | 32 ++++++++++++++++--- Model/Indexer/IndexerHandler.php | 1 - .../Model/Adapter/DocumentDataMapperTest.php | 2 +- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/Model/Adapter/Index/Builder.php b/Model/Adapter/Index/Builder.php index e065038a8f682..2c3478b0449a7 100644 --- a/Model/Adapter/Index/Builder.php +++ b/Model/Adapter/Index/Builder.php @@ -64,11 +64,11 @@ public function build() 'type' => 'custom', 'tokenizer' => key($tokenizer), 'filter' => array_merge( - ['lowercase'], + ['lowercase', 'keyword_repeat'], array_keys($filter) ), - 'char_filter' => array_keys($charFilter), - ], + 'char_filter' => array_keys($charFilter) + ] ], 'tokenizer' => $tokenizer, 'filter' => $filter, @@ -107,6 +107,10 @@ protected function getFilter() { $filter = [ 'default_stemmer' => $this->getStemmerConfig(), + 'unique_stem' => [ + 'type' => 'unique', + 'only_on_same_position' => true + ] ]; return $filter; } diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 7d59c282fd6cc..359d2ec19cf8e 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -97,7 +97,7 @@ public function getItems(QueryInterface $query, $limit = null, $additionalFilter foreach ($this->getSuggestions($query) as $suggestion) { $count = null; if ($isResultsCountEnabled) { - $count = $suggestion['freq']; + $count = isset($suggestion['freq']) ? $suggestion['freq'] : null; } $result[] = $this->queryResultFactory->create( [ @@ -134,11 +134,33 @@ private function getSuggestions(QueryInterface $query) $suggestRequest = [ 'index' => $this->config->getIndexName(), 'body' => [ - 'magento-suggest' => [ + 'suggestions' => [ 'text' => $query->getQueryText(), - 'term' => [ + 'phrase' => [ 'field' => '_all', - 'size' => $searchSuggestionsCount + 'analyzer' => 'standard', + 'size' => $searchSuggestionsCount, + 'max_errors' => 2, + 'collate' => [ + 'query' => [ + 'bool' => [ + 'must' => [ + 'match' => [ + '{{field_name}}' => '{{suggestion}}' + ], + ], + ], + ], + 'params' => [ 'field_name' => '_all' ], + 'prune' => true + ], + 'direct_generator' => [ + [ + 'field' => '_all', + 'min_word_length' => 3, + 'min_doc_freq' => 1 + ] + ], ] ] ] @@ -147,7 +169,7 @@ private function getSuggestions(QueryInterface $query) $result = $this->fetchQuery($suggestRequest); if (is_array($result)) { - foreach ($result['magento-suggest'] as $token) { + foreach ($result['suggestions'] as $token) { foreach ($token['options'] as $key => $suggestion) { $suggestions[$suggestion['score'] . '_' . $key] = $suggestion; } diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 38340b3c0e626..18b854dc81a7a 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -9,7 +9,6 @@ use Magento\Framework\Indexer\SaveHandler\Batch; use Magento\Elasticsearch\Model\Adapter\Elasticsearch; use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; -use Magento\Store\Model\Store; class IndexerHandler implements IndexerInterface { diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php index 16bf937c33642..c7bc525925876 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DocumentDataMapperTest.php @@ -178,7 +178,7 @@ public function testGetMap($productId, $productData, $storeId) $this->assertInternalType( 'array', - $this->model->map($productId, $data, $storeId) + $this->model->map($productId, $productData, $storeId) ); } From ee033d70872928a01c8a433cfa124604677110aa Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 18 Dec 2015 12:30:31 +0200 Subject: [PATCH 258/616] PRD-99: Merging PR from sprint 4 --- Model/Indexer/IndexerHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 31bb524fc31c1..3f01455886edd 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -95,6 +95,7 @@ public function saveIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} + * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ public function deleteIndex($dimensions, \Traversable $documents) { From 0c7df267e034f70a22508c3f166b7884558c4952 Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 18 Dec 2015 14:58:34 -0600 Subject: [PATCH 259/616] MAGETWO-45161: API Out: RPC Integration - Part 1 - CR fixes --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 42caf48b3d345..62c160324fcb7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.0.1", + "version": "100.0.0", "license": [ "proprietary" ], From a88557846904e35246d73d8fae012d3b991a6eb4 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 21 Dec 2015 09:59:37 +0200 Subject: [PATCH 260/616] PRD-99: Merging PR from sprint 4 --- Model/Adapter/Elasticsearch.php | 37 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index e79233decc6c2..7ffe620f41b90 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -7,6 +7,11 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; +use Psr\Log\LoggerInterface; +use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; +use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface; +use Magento\Framework\Exception\LocalizedException; /** * Elasticsearch adapter @@ -33,7 +38,7 @@ class Elasticsearch protected $documentDataMapper; /** - * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + * @var IndexNameResolver */ protected $indexNameResolver; @@ -43,7 +48,7 @@ class Elasticsearch protected $fieldMapper; /** - * @var \Magento\Elasticsearch\Model\Config + * @var Config */ protected $clientConfig; @@ -53,12 +58,12 @@ class Elasticsearch protected $client; /** - * @var \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface + * @var BuilderInterface */ protected $indexBuilder; /** - * @var \Psr\Log\LoggerInterface + * @var LoggerInterface */ protected $logger; @@ -73,22 +78,22 @@ class Elasticsearch * @param ConnectionManager $connectionManager * @param DocumentDataMapper $documentDataMapper * @param FieldMapper $fieldMapper - * @param \Magento\Elasticsearch\Model\Config $clientConfig - * @param \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder - * @param \Psr\Log\LoggerInterface $logger - * @param \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + * @param Config $clientConfig + * @param BuilderInterface $indexBuilder + * @param LoggerInterface $logger + * @param IndexNameResolver $indexNameResolver * @param array $options * - * @throws \Magento\Framework\Exception\LocalizedException + * @throws LocalizedException */ public function __construct( ConnectionManager $connectionManager, DocumentDataMapper $documentDataMapper, FieldMapper $fieldMapper, - \Magento\Elasticsearch\Model\Config $clientConfig, - \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder, - \Psr\Log\LoggerInterface $logger, - \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver, + Config $clientConfig, + BuilderInterface $indexBuilder, + LoggerInterface $logger, + IndexNameResolver $indexNameResolver, $options = [] ) { $this->connectionManager = $connectionManager; @@ -103,7 +108,7 @@ public function __construct( $this->client = $this->connectionManager->getConnection($options); } catch (\Exception $e) { $this->logger->critical($e); - throw new \Magento\Framework\Exception\LocalizedException( + throw new LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); } @@ -113,14 +118,14 @@ public function __construct( * Retrieve Elasticsearch server status * * @return bool - * @throws \Magento\Framework\Exception\LocalizedException + * @throws LocalizedException */ public function ping() { try { $response = $this->client->ping(); } catch (\Exception $e) { - throw new \Magento\Framework\Exception\LocalizedException( + throw new LocalizedException( __('Could not ping search engine: %1', $e->getMessage()) ); } From c258ce42700a6fa120f8331177ae4a6e41b1922a Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 21 Dec 2015 12:29:28 +0200 Subject: [PATCH 261/616] PRD-40: Synonyms Implementation --- SearchAdapter/Query/Preprocessor/Synonyms.php | 39 +++++++++++++++++++ etc/di.xml | 1 + 2 files changed, 40 insertions(+) create mode 100644 SearchAdapter/Query/Preprocessor/Synonyms.php diff --git a/SearchAdapter/Query/Preprocessor/Synonyms.php b/SearchAdapter/Query/Preprocessor/Synonyms.php new file mode 100644 index 0000000000000..77921119e68d8 --- /dev/null +++ b/SearchAdapter/Query/Preprocessor/Synonyms.php @@ -0,0 +1,39 @@ +synonymsAnalyzer = $synonymsAnalyzer; + } + + /** + * {@inheritdoc} + */ + public function process($query) + { + $synonyms = []; + $synonymsArray = $this->synonymsAnalyzer->getSynonymsForPhrase($query); + foreach ($synonymsArray as $synonymPart) { + $synonyms []= implode(' ', $synonymPart); + } + $queryWithSynonyms = implode(' ', $synonyms); + return $queryWithSynonyms; + } +} diff --git a/etc/di.xml b/etc/di.xml index e8c1054e2f05f..b6a67c94a93c3 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -92,6 +92,7 @@ Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords + Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Synonyms From 856a184c9bd04f32e9039e019d8e8e2c05b8ec87 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 21 Dec 2015 16:15:36 +0200 Subject: [PATCH 262/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 15 +++++++++------ Model/Adapter/Elasticsearch.php | 19 ++++++++++--------- .../FieldMapper/FieldMapperResolver.php | 8 ++++++++ .../FieldMapper/ProductFieldMapper.php | 7 ++----- Model/Adapter/FieldMapperInterface.php | 8 ++++++++ Model/Adapter/FieldType.php | 2 +- 6 files changed, 38 insertions(+), 21 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index a1fb3ce25bf8d..a28567e5983c7 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -14,6 +14,9 @@ use Magento\Store\Model\ScopeInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Api\Data\GroupInterface; +use Magento\Elasticsearch\Model\ResourceModel\Index; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\DataMapperInterface; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -59,12 +62,12 @@ class ProductDataMapper implements DataMapperInterface private $attributeContainer; /** - * @var \Magento\Elasticsearch\Model\ResourceModel\Index + * @var Index */ private $resourceIndex; /** - * @var FieldMapper + * @var FieldMapperInterface */ private $fieldMapper; @@ -100,8 +103,8 @@ class ProductDataMapper implements DataMapperInterface * * @param Builder $builder * @param AttributeContainer $attributeContainer - * @param \Magento\Elasticsearch\Model\ResourceModel\Index $resourceIndex - * @param FieldMapper $fieldMapper + * @param Index $resourceIndex + * @param FieldMapperInterface $fieldMapper * @param DateTime $dateTime * @param TimezoneInterface $localeDate * @param ScopeConfigInterface $scopeConfig @@ -110,8 +113,8 @@ class ProductDataMapper implements DataMapperInterface public function __construct( Builder $builder, AttributeContainer $attributeContainer, - \Magento\Elasticsearch\Model\ResourceModel\Index $resourceIndex, - FieldMapper $fieldMapper, + Index $resourceIndex, + FieldMapperInterface $fieldMapper, DateTime $dateTime, TimezoneInterface $localeDate, ScopeConfigInterface $scopeConfig, diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 7ffe620f41b90..7419e18d591eb 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -33,7 +33,7 @@ class Elasticsearch protected $connectionManager; /** - * @var DocumentDataMapper + * @var DataMapperInterface */ protected $documentDataMapper; @@ -43,7 +43,7 @@ class Elasticsearch protected $indexNameResolver; /** - * @var FieldMapper + * @var FieldMapperInterface */ protected $fieldMapper; @@ -76,8 +76,8 @@ class Elasticsearch * Constructor for Elasticsearch adapter. * * @param ConnectionManager $connectionManager - * @param DocumentDataMapper $documentDataMapper - * @param FieldMapper $fieldMapper + * @param DataMapperInterface $documentDataMapper + * @param FieldMapperInterface $fieldMapper * @param Config $clientConfig * @param BuilderInterface $indexBuilder * @param LoggerInterface $logger @@ -88,8 +88,8 @@ class Elasticsearch */ public function __construct( ConnectionManager $connectionManager, - DocumentDataMapper $documentDataMapper, - FieldMapper $fieldMapper, + DataMapperInterface $documentDataMapper, + FieldMapperInterface $fieldMapper, Config $clientConfig, BuilderInterface $indexBuilder, LoggerInterface $logger, @@ -291,7 +291,7 @@ public function checkIndex( // create new index for store $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex); if (!$this->client->indexExists($indexName)) { - $this->prepareIndex($storeId, $indexName); + $this->prepareIndex($storeId, $indexName, $mappedIndexerId); } // add index to alias @@ -341,14 +341,15 @@ public function updateAlias($storeId, $mappedIndexerId) * * @param int $storeId * @param string $indexName + * @param string $mappedIndexerId * @return $this */ - protected function prepareIndex($storeId, $indexName) + protected function prepareIndex($storeId, $indexName, $mappedIndexerId) { $this->indexBuilder->setStoreId($storeId); $this->client->createIndex($indexName, ['settings' => $this->indexBuilder->build()]); $this->client->addFieldsMapping( - $this->fieldMapper->getAllAttributesTypes(), + $this->fieldMapper->getAllAttributesTypes(['entityType' => $mappedIndexerId]), $indexName, $this->clientConfig->getEntityType() ); diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/Model/Adapter/FieldMapper/FieldMapperResolver.php index 919512b512519..82e2db2f75fc9 100644 --- a/Model/Adapter/FieldMapper/FieldMapperResolver.php +++ b/Model/Adapter/FieldMapper/FieldMapperResolver.php @@ -49,6 +49,14 @@ public function getFieldName($attributeCode, $context = []) return $this->getEntity($context['entityType'])->getFieldName($attributeCode, $context); } + /** + * {@inheritdoc} + */ + public function getAllAttributesTypes($context = []) + { + return $this->getEntity($context['entityType'])->getAllAttributesTypes($context); + } + /** * Get instance of current field mapper * diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 943864af77011..7877ea024f3b0 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -78,12 +78,9 @@ public function getFieldName($attributeCode, $context = []) } /** - * Gives all mapped attribute types - * - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * @return array + * {@inheritdoc} */ - public function getAllAttributesTypes() + public function getAllAttributesTypes($context = []) { $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE); $allAttributes = []; diff --git a/Model/Adapter/FieldMapperInterface.php b/Model/Adapter/FieldMapperInterface.php index d9fd885f5af95..0c0fe14d05bb6 100644 --- a/Model/Adapter/FieldMapperInterface.php +++ b/Model/Adapter/FieldMapperInterface.php @@ -23,4 +23,12 @@ interface FieldMapperInterface * @return string */ public function getFieldName($attributeCode, $context = []); + + /** + * Get all entity attribute types + * + * @param array $context + * @return array + */ + public function getAllAttributesTypes($context = []); } diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 503861cee5b8f..95015b89b8754 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -6,7 +6,7 @@ namespace Magento\Elasticsearch\Model\Adapter; /** - * Class FieldMapper + * Class FieldType */ class FieldType { From 9d4ba453073276b973d0cfb532d889e4e3a35464 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 21 Dec 2015 18:39:05 +0200 Subject: [PATCH 263/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Adapter/DataMapper/DataMapperResolver.php | 4 +++- Model/Adapter/DataMapper/ProductDataMapper.php | 16 +++++++++++++--- .../Adapter/FieldMapper/FieldMapperResolver.php | 11 +++++++---- Model/Config.php | 5 +++++ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Model/Adapter/DataMapper/DataMapperResolver.php b/Model/Adapter/DataMapper/DataMapperResolver.php index 8f03039082def..334df325ba5ad 100644 --- a/Model/Adapter/DataMapper/DataMapperResolver.php +++ b/Model/Adapter/DataMapper/DataMapperResolver.php @@ -7,6 +7,7 @@ use Magento\Framework\ObjectManagerInterface; use Magento\Elasticsearch\Model\Adapter\DataMapperInterface; +use Magento\Elasticsearch\Model\Config; class DataMapperResolver implements DataMapperInterface { @@ -50,7 +51,8 @@ public function map( $storeId, $context = [] ) { - return $this->getEntity($context['entityType'])->map($entityId, $entityIndexData, $storeId, $context); + $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT; + return $this->getEntity($entityType)->map($entityId, $entityIndexData, $storeId, $context); } /** diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index a28567e5983c7..7bf0111e30a97 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -44,6 +44,11 @@ class ProductDataMapper implements DataMapperInterface */ const MEDIA_ROLE_SWATCH_IMAGE = 'swatch_image'; + /** + * Entyity type for product. + */ + const PRODUCT_ENTITY_TYPE = 'product'; + /** * Array of \DateTime objects per store * @@ -143,13 +148,14 @@ public function __construct( * @param int $productId * @param array $productIndexData * @param int $storeId + * @param array $context * @return array|false * @throws \Magento\Framework\Exception\LocalizedException * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function map($productId, array $productIndexData, $storeId) + public function map($productId, array $productIndexData, $storeId, $context = []) { $this->builder->addField('store_id', $storeId); $mediaGalleryRoles = array_fill_keys($this->mediaGalleryRoles, ''); @@ -195,7 +201,9 @@ public function map($productId, array $productIndexData, $storeId) 'qty' => $value ]; } - $this->builder->addField($this->fieldMapper->getFieldName($attributeCode), $value); + $this->builder->addField($this->fieldMapper->getFieldName( + $attributeCode, ['entityType' => self::PRODUCT_ENTITY_TYPE] + ), $value); continue; } if ($attributeCode === 'tier_price') { @@ -211,7 +219,9 @@ public function map($productId, array $productIndexData, $storeId) $value = $this->formatDate($storeId, $value); } - $this->builder->addField($this->fieldMapper->getFieldName($attributeCode), $value); + $this->builder->addField($this->fieldMapper->getFieldName( + $attributeCode, ['entityType' => self::PRODUCT_ENTITY_TYPE] + ), $value); unset($attribute); } diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/Model/Adapter/FieldMapper/FieldMapperResolver.php index 82e2db2f75fc9..38701900249bf 100644 --- a/Model/Adapter/FieldMapper/FieldMapperResolver.php +++ b/Model/Adapter/FieldMapper/FieldMapperResolver.php @@ -7,6 +7,7 @@ use Magento\Framework\ObjectManagerInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Config; class FieldMapperResolver implements FieldMapperInterface { @@ -38,7 +39,7 @@ public function __construct( array $fieldMappers = [] ) { $this->objectManager = $objectManager; - $this->$fieldMappers = fieldMappers; + $this->fieldMappers = $fieldMappers; } /** @@ -46,7 +47,8 @@ public function __construct( */ public function getFieldName($attributeCode, $context = []) { - return $this->getEntity($context['entityType'])->getFieldName($attributeCode, $context); + $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT; + return $this->getEntity($entityType)->getFieldName($attributeCode, $context); } /** @@ -54,7 +56,8 @@ public function getFieldName($attributeCode, $context = []) */ public function getAllAttributesTypes($context = []) { - return $this->getEntity($context['entityType'])->getAllAttributesTypes($context); + $entityType = isset($context['entityType']) ? $context['entityType'] : Config::ELASTICSEARCH_TYPE_DEFAULT; + return $this->getEntity($entityType)->getAllAttributesTypes($context); } /** @@ -64,7 +67,7 @@ public function getAllAttributesTypes($context = []) * @return FieldMapperInterface * @throws \Exception */ - private function getEntity($entityType = '') + private function getEntity($entityType) { if (empty($this->fieldMapperEntity)) { if (empty($entityType)) { diff --git a/Model/Config.php b/Model/Config.php index 2bb90eae2cbf5..04cc6faacbd8f 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -26,6 +26,11 @@ class Config implements ClientOptionsInterface */ const ELASTICSEARCH_TYPE_DOCUMENT = 'document'; + /** + * Elasticsearch default Entity type + */ + const ELASTICSEARCH_TYPE_DEFAULT = 'product'; + /** * Default Elasticsearch server timeout */ From 7673b802bc23a30c0ba52af62484d46335dfc00c Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 22 Dec 2015 13:42:04 +0200 Subject: [PATCH 264/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- Model/Adapter/Elasticsearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 7419e18d591eb..a1195b3670e49 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -207,7 +207,7 @@ public function cleanIndex($storeId, $mappedIndexerId) } // prepare new index - $this->prepareIndex($storeId, $newIndexName); + $this->prepareIndex($storeId, $newIndexName, $mappedIndexerId); return $this; } From 9f8e4ebe952dfcf8ea7838436cd4e11eb7ec9d65 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 22 Dec 2015 14:46:37 +0200 Subject: [PATCH 265/616] PRD-73: Search Interfaces Implementation 2 - Basic Layered Navigation --- Model/Indexer/IndexHandlerTest.php | 105 +++++++++++------- _files/{products.php => indexer.php} | 29 +++++ ...ucts_rollback.php => indexer_rollback.php} | 11 ++ 3 files changed, 103 insertions(+), 42 deletions(-) rename _files/{products.php => indexer.php} (78%) rename _files/{products_rollback.php => indexer_rollback.php} (71%) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 18bed98c4763c..37275c055b979 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -12,10 +12,11 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Framework\Search\Request\Dimension; use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; /** * @magentoDbIsolation disabled - * @magentoDataFixture Magento/Elasticsearch/_files/products.php + * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase { @@ -35,15 +36,20 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase protected $client; /** - * @var Dimension + * @var Dimension[] */ - protected $dimension; + protected $dimensions; /** * @var Config */ protected $clientConfig; + /** + * @var SearchIndexNameResolver + */ + protected $searchIndexNameResolver; + /** * @var Product */ @@ -85,15 +91,24 @@ protected function setUp() $this->client = $this->connectionManager->getConnection(); - $this->dimension = Bootstrap::getObjectManager()->create( + $mainStore = Bootstrap::getObjectManager()->create( '\Magento\Framework\Search\Request\Dimension', ['name' => 'scope', 'value' => '1'] ); + $secondaryStore = Bootstrap::getObjectManager()->create( + '\Magento\Framework\Search\Request\Dimension', + ['name' => 'scope', 'value' => '2'] + ); + $this->dimensions = [$mainStore, $secondaryStore]; $this->clientConfig = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\Model\Config' ); + $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create( + 'Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver' + ); + $this->productApple = $this->getProductBySku('fulltext-1'); $this->productBanana = $this->getProductBySku('fulltext-2'); $this->productOrange = $this->getProductBySku('fulltext-3'); @@ -109,12 +124,16 @@ public function testReindexAll() { $this->indexer->reindexAll(); - $products = $this->searchByName('Apple'); - $this->assertCount(1, $products); - $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + foreach ($this->dimensions as $dimension) { + $storeId = $dimension->getValue(); + + $products = $this->searchByName('Apple', $storeId); + $this->assertCount(1, $products); + $this->assertEquals($this->productApple->getId(), $products[0]['_id']); - $products = $this->searchByName('Simple Product'); - $this->assertCount(5, $products); + $products = $this->searchByName('Simple Product', $storeId); + $this->assertCount(5, $products); + } } /** @@ -122,20 +141,22 @@ public function testReindexAll() */ public function testReindexRowAfterEdit() { - $this->indexer->reindexAll(); - $this->productApple->setData('name', 'Simple Product Cucumber'); $this->productApple->save(); - $products = $this->searchByName('Apple'); - $this->assertCount(0, $products); + foreach ($this->dimensions as $dimension) { + $storeId = $dimension->getValue(); - $products = $this->searchByName('Cucumber'); - $this->assertCount(1, $products); - $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + $products = $this->searchByName('Apple', $storeId); + $this->assertCount(0, $products); - $products = $this->searchByName('Simple Product'); - $this->assertCount(5, $products); + $products = $this->searchByName('Cucumber', $storeId); + $this->assertCount(1, $products); + $this->assertEquals($this->productApple->getId(), $products[0]['_id']); + + $products = $this->searchByName('Simple Product', $storeId); + $this->assertCount(5, $products); + } } /** @@ -143,8 +164,6 @@ public function testReindexRowAfterEdit() */ public function testReindexRowAfterMassAction() { - $this->indexer->reindexAll(); - $productIds = [ $this->productApple->getId(), $this->productBanana->getId(), @@ -159,20 +178,24 @@ public function testReindexRowAfterMassAction() ); $action->updateAttributes($productIds, $attrData, 1); - $products = $this->searchByName('Apple'); - $this->assertCount(0, $products); + foreach ($this->dimensions as $dimension) { + $storeId = $dimension->getValue(); - $products = $this->searchByName('Banana'); - $this->assertCount(0, $products); + $products = $this->searchByName('Apple', $storeId); + $this->assertCount(0, $products); - $products = $this->searchByName('Unknown'); - $this->assertCount(0, $products); + $products = $this->searchByName('Banana', $storeId); + $this->assertCount(0, $products); - $products = $this->searchByName('Common'); - $this->assertCount(2, $products); + $products = $this->searchByName('Unknown', $storeId); + $this->assertCount(0, $products); - $products = $this->searchByName('Simple Product'); - $this->assertCount(5, $products); + $products = $this->searchByName('Common', $storeId); + $this->assertCount(2, $products); + + $products = $this->searchByName('Simple Product', $storeId); + $this->assertCount(5, $products); + } } /** @@ -183,33 +206,31 @@ public function testReindexRowAfterDelete() { $this->indexer->reindexAll(); $this->productBanana->delete(); - $products = $this->searchByName('Simple Product'); - $this->assertCount(4, $products); + + foreach ($this->dimensions as $dimension) { + $storeId = $dimension->getValue(); + + $products = $this->searchByName('Simple Product', $storeId); + $this->assertCount(4, $products); + } } /** * Search docs in Elasticsearch by name * * @param string $text + * @param int $storeId * @return array */ - protected function searchByName($text) + protected function searchByName($text, $storeId) { - $storeId = $this->dimension->getValue(); $searchQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, 'catalogsearch_fulltext'), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'query' => [ 'bool' => [ 'minimum_should_match' => 1, - 'must' => [ - [ - 'term' => [ - 'store_id' => $storeId, - ] - ], - ], 'should' => [ [ 'match' => [ diff --git a/_files/products.php b/_files/indexer.php similarity index 78% rename from _files/products.php rename to _files/indexer.php index bc8d543959d17..1d38e7fdfc0e6 100644 --- a/_files/products.php +++ b/_files/indexer.php @@ -7,6 +7,35 @@ /** @var $objectManager \Magento\Framework\ObjectManagerInterface */ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); +/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */ +$storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface'); + +/** @var \Magento\Store\Model\Store $store */ +$store = $objectManager->create('Magento\Store\Model\Store'); +$storeCode = 'secondary'; + +if (!$store->load($storeCode)->getId()) { + $store->setCode($storeCode) + ->setWebsiteId($storeManager->getWebsite()->getId()) + ->setGroupId($storeManager->getWebsite()->getDefaultGroupId()) + ->setName('Secondary Store View') + ->setSortOrder(10) + ->setIsActive(1); + $store->save(); + + /** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */ + $scopeConfig = $objectManager->get('Magento\Framework\App\MutableScopeConfig'); + $scopeConfig->setValue( + 'general/locale/code', + 'de_DE', + \Magento\Store\Model\ScopeInterface::SCOPE_STORES, + $store->getId() + ); + + /* Refresh stores memory cache */ + $storeManager->reinitStores(); +} + /** @var $productFirst \Magento\Catalog\Model\Product */ $productFirst = $objectManager->create('Magento\Catalog\Model\Product'); $productFirst->setTypeId('simple') diff --git a/_files/products_rollback.php b/_files/indexer_rollback.php similarity index 71% rename from _files/products_rollback.php rename to _files/indexer_rollback.php index d64275f0fd73f..b6d0bba68265e 100644 --- a/_files/products_rollback.php +++ b/_files/indexer_rollback.php @@ -19,5 +19,16 @@ $collection->delete(); } +/** @var \Magento\Store\Model\Store $store */ +$store = $objectManager->create('Magento\Store\Model\Store'); +$storeCode = 'secondary'; +$store->load($storeCode); +if ($store->getId()) { + $store->delete(); +} + $registry->unregister('isSecureArea'); $registry->register('isSecureArea', false); + +/* Refresh stores memory cache */ +$objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); \ No newline at end of file From f991cb900871e05a0125bb668c332f6399df0bb3 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 22 Dec 2015 17:47:05 +0200 Subject: [PATCH 266/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Aggregation/Interval.php | 2 +- SearchAdapter/Dynamic/DataProvider.php | 2 +- SearchAdapter/Query/Builder/Aggregation.php | 2 +- Test/Unit/SearchAdapter/Aggregation/IntervalTest.php | 2 +- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 67b9323c938d6..3dd874869d697 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -7,7 +7,7 @@ use Magento\Framework\Search\Dynamic\IntervalInterface; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Model\Session as CustomerSession; use Magento\Elasticsearch\Model\Config; diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 2ef41e2805c5a..baecffe5fc630 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -11,7 +11,7 @@ use Magento\Framework\Search\Request\BucketInterface; use Magento\Framework\Search\Dynamic\IntervalFactory; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Model\Session as CustomerSession; diff --git a/SearchAdapter/Query/Builder/Aggregation.php b/SearchAdapter/Query/Builder/Aggregation.php index fd86188ea060b..9bd521733c1eb 100644 --- a/SearchAdapter/Query/Builder/Aggregation.php +++ b/SearchAdapter/Query/Builder/Aggregation.php @@ -7,7 +7,7 @@ use Magento\Framework\Search\Request\BucketInterface; use Magento\Framework\Search\RequestInterface; -use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; class Aggregation { diff --git a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php index e05ce7ea77975..c9dfec37f7abc 100644 --- a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php @@ -8,7 +8,7 @@ use Magento\Elasticsearch\SearchAdapter\Aggregation\Interval; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Model\Session as CustomerSession; use Magento\Elasticsearch\Model\Config; diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index ec0e887bed0b1..7f91c13eb8a22 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -9,7 +9,7 @@ use Magento\Catalog\Model\Layer\Filter\Price\Range; use Magento\Framework\Search\Dynamic\IntervalFactory; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\SearchAdapter\FieldMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Model\Session as CustomerSession; From a4f77b3dc89968cfab4f3a2dc55f1e4d26484161 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Wed, 23 Dec 2015 17:32:38 +0200 Subject: [PATCH 267/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Dynamic/DataProvider.php | 14 +++++++++++--- etc/di.xml | 5 +++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index baecffe5fc630..68005992b0108 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -59,6 +59,11 @@ class DataProvider implements DataProviderInterface */ protected $searchIndexNameResolver; + /** + * @var string + */ + protected $indexerId; + /** * @param ConnectionManager $connectionManager * @param FieldMapperInterface $fieldMapper @@ -68,6 +73,7 @@ class DataProvider implements DataProviderInterface * @param StoreManagerInterface $storeManager * @param CustomerSession $customerSession * @param SearchIndexNameResolver $searchIndexNameResolver + * @param string $indexerId */ public function __construct( ConnectionManager $connectionManager, @@ -77,7 +83,8 @@ public function __construct( Config $clientConfig, StoreManagerInterface $storeManager, CustomerSession $customerSession, - SearchIndexNameResolver $searchIndexNameResolver + SearchIndexNameResolver $searchIndexNameResolver, + $indexerId ) { $this->connectionManager = $connectionManager; $this->fieldMapper = $fieldMapper; @@ -87,6 +94,7 @@ public function __construct( $this->storeManager = $storeManager; $this->customerSession = $customerSession; $this->searchIndexNameResolver = $searchIndexNameResolver; + $this->indexerId = $indexerId; } /** @@ -114,7 +122,7 @@ public function getAggregations(EntityStorage $entityStorage) $websiteId = $this->storeManager->getStore()->getWebsiteId(); $storeId = $this->storeManager->getStore()->getId(); $requestQuery = [ - 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->clientConfig->getEntityType()), + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ @@ -225,7 +233,7 @@ public function getAggregation( $dimension = current($dimensions); $storeId = $dimension->getValue(); $requestQuery = [ - 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->clientConfig->getEntityType()), + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ diff --git a/etc/di.xml b/etc/di.xml index 2ca334bf10944..383ba5f9b05c9 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -135,4 +135,9 @@ + + + \Magento\CatalogSearch\Model\Indexer\Fulltext::INDEXER_ID + + From be5be1c767f4a6674d5e61efe9ae3c406008f259 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Fri, 25 Dec 2015 15:36:10 +0200 Subject: [PATCH 268/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 142 +++++++++++------- .../FieldMapper/ProductFieldMapper.php | 32 ++-- Model/Adapter/FieldType.php | 20 +-- 3 files changed, 101 insertions(+), 93 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 0c19968781db2..8be33475067d7 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -187,31 +187,16 @@ public function map($productId, array $productIndexData, $storeId, $context = [] if (in_array($attributeCode, $this->mediaGalleryRoles)) { $mediaGalleryRoles[$attributeCode] = $value; } - if ($attributeCode === 'category_ids') { - $this->builder->addField($attributeCode, implode(' ', $value)); - continue; - } if ($attributeCode === 'media_gallery') { - $this->builder->addField( - 'media_gallery', - $this->getProductMediaGalleryData($value, $mediaGalleryRoles) - ); + $this->builder->addFields($this->getProductMediaGalleryData($value, $mediaGalleryRoles)); continue; } if ($attributeCode === 'quantity_and_stock_status') { - if (!is_array($value)) { - $value = [ - 'is_in_stock' => $value ? 1 : 0, - 'qty' => $value - ]; - } - $this->builder->addField($this->fieldMapper->getFieldName( - $attributeCode, ['entityType' => self::PRODUCT_ENTITY_TYPE] - ), $value); + $this->builder->addFields($this->getQtyAndStatus($value)); continue; } if ($attributeCode === 'tier_price') { - $this->builder->addField('tier_price', $this->getProductTierPriceData($value)); + $this->builder->addFields($this->getProductTierPriceData($value)); continue; } if (is_array($value)) { @@ -230,8 +215,8 @@ public function map($productId, array $productIndexData, $storeId, $context = [] unset($attribute); } - $this->builder->addField('price', $this->getProductPriceData($productId, $storeId, $productPriceIndexData)); - $this->builder->addField('category', $this->getProductCategoryData($productId, $productCategoryIndexData)); + $this->builder->addFields($this->getProductPriceData($productId, $storeId, $productPriceIndexData)); + $this->builder->addFields($this->getProductCategoryData($productId, $productCategoryIndexData)); return $this->builder->build(); } @@ -246,19 +231,20 @@ protected function getProductTierPriceData($data) { $result = []; if (!empty($data)) { + $i = 0; foreach ($data as $tierPrice) { - $result[] = [ - 'price_id' => $tierPrice['price_id'], - 'website_id' => $tierPrice['website_id'], - 'all_groups' => $tierPrice['all_groups'], - 'cust_group' => $tierPrice['cust_group'] == GroupInterface::CUST_GROUP_ALL - ? '' : $tierPrice['cust_group'], - 'price_qty' => $tierPrice['price_qty'], - 'website_price' => $tierPrice['website_price'], - 'price' => $tierPrice['price'], - ]; + $result['tier_price_id_'.$i] = $tierPrice['price_id']; + $result['tier_website_id_'.$i] = $tierPrice['website_id']; + $result['tier_all_groups_'.$i] = $tierPrice['all_groups']; + $result['tier_cust_group_'.$i] = $tierPrice['cust_group'] == GroupInterface::CUST_GROUP_ALL + ? '' : $tierPrice['cust_group']; + $result['tier_price_qty_'.$i] = $tierPrice['price_qty']; + $result['tier_website_price_'.$i] = $tierPrice['website_price']; + $result['tier_price_'.$i] = $tierPrice['price']; + $i++; } } + return $result; } @@ -277,27 +263,38 @@ protected function getProductMediaGalleryData($media, $roles) if (!empty($media['images'])) { $i = 0; foreach ($media['images'] as $data) { - $result[$i] = [ - 'file' => $data['file'], - 'media_type' => $data['media_type'], - 'position' => $data['position'], - 'disabled' => $data['disabled'], - 'label' => $data['label'], - 'title' => $data['label'], - 'base_image' => $data['file'] == $roles[self::MEDIA_ROLE_IMAGE] ? '1' : '0', - 'small_image' => $data['file'] == $roles[self::MEDIA_ROLE_SMALL_IMAGE] ? '1' : '0', - 'thumbnail' => $data['file'] == $roles[self::MEDIA_ROLE_THUMBNAIL] ? '1' : '0', - 'swatch_image' => $data['file'] == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] ? '1' : '0' - ]; - if ($data['media_type'] !== 'image') { - $video = [ - 'video_title' => $data['video_title'], - 'video_url' => $data['video_url'], - 'video_description' => $data['video_description'], - 'video_metadata' => $data['video_metadata'], - 'video_provider' => $data['video_provider'] - ]; - $result[$i] = array_merge($result[$i], $video); + if ($data['media_type'] === 'image') { + $result['image_file_' . $i] = $data['file']; + $result['image_position_' . $i] = $data['position']; + $result['image_disabled_' . $i] = $data['disabled']; + $result['image_label_' . $i] = $data['label']; + $result['image_title_' . $i] = $data['label']; + $result['image_base_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_IMAGE] + ? '1' : '0'; + $result['image_small_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SMALL_IMAGE] + ? '1' : '0'; + $result['image_thumbnail_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_THUMBNAIL] + ? '1' : '0'; + $result['image_swatch_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] + ? '1' : '0'; + } else { + $result['video_file_' . $i] = $data['file']; + $result['video_position_' . $i] = $data['position']; + $result['video_disabled_' . $i] = $data['disabled']; + $result['video_label_' . $i] = $data['label']; + $result['video_title_' . $i] = $data['video_title']; + $result['video_base_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_IMAGE] + ? '1' : '0'; + $result['video_small_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SMALL_IMAGE] + ? '1' : '0'; + $result['video_thumbnail_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_THUMBNAIL] + ? '1' : '0'; + $result['video_swatch_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] + ? '1' : '0'; + $result['video_url_' . $i] = $data['video_url']; + $result['video_description_' . $i] = $data['video_description']; + $result['video_metadata_' . $i] = $data['video_metadata']; + $result['video_provider_' . $i] = $data['video_provider']; } $i++; } @@ -305,6 +302,26 @@ protected function getProductMediaGalleryData($media, $roles) return $result; } + /** + * Prepare quantity and stock status for product + * + * @param array $data + * @return array + */ + protected function getQtyAndStatus($data) + { + $result = []; + + if (!is_array($data)) { + $result['is_in_stock'] = $data ? 1 : 0; + $result['qty'] = $data; + } else { + $result['is_in_stock'] = $data['is_in_stock'] ? 1 : 0; + $result['qty'] = $data['qty']; + } + return $result; + } + /** * Prepare price index for product * @@ -322,11 +339,8 @@ protected function getProductPriceData($productId, $storeId, array $priceIndexDa $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId(); foreach ($productPriceIndexData as $customerGroupId => $price) { - $result[] = [ - 'price' => $price, - 'customer_group_id' => $customerGroupId, - 'website_id' => $websiteId - ]; + $fieldName = 'price_' . $customerGroupId . '_' . $websiteId; + $result[$fieldName] = sprintf('%F', $price); } } return $result; @@ -372,12 +386,28 @@ protected function formatDate($storeId, $date = null) protected function getProductCategoryData($productId, array $categoryIndexData) { $result = []; + $categoryIds = []; if (array_key_exists($productId, $categoryIndexData)) { $indexData = $categoryIndexData[$productId]; $result = $indexData; } + if (array_key_exists($productId, $categoryIndexData)) { + $indexData = $categoryIndexData[$productId]; + + foreach ($indexData as $categoryData) { + $categoryIds[] = $categoryData['id']; + } + if (count($categoryIds)) { + $result = ['category_ids' => implode(' ', $categoryIds)]; + + foreach ($indexData as $data) { + $result['position_category_' . $data['id']] = $data['position']; + $result['name_category_' . $data['id']] = $data['name']; + } + } + } return $result; } } diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 17108a9714fe8..dca3258554cba 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -61,14 +61,14 @@ public function getFieldName($attributeCode, $context = []) array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY]) ); } - $fieldName = in_array($frontendInput, ['select', 'boolean'], true) ? $attributeCode . '_value' : - $attributeCode; + $fieldName = (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'int') + ? $attributeCode . '_value' : $attributeCode; } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) { if ($attributeCode === '*') { $fieldName = '_all'; } else { - $fieldName = in_array($frontendInput, ['select', 'boolean'], true) ? $attributeCode . '_value' : - $attributeCode; + $fieldName = (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'int') + ? $attributeCode . '_value' : $attributeCode; } } else { $fieldName = 'sort_' . $attributeCode; @@ -94,20 +94,10 @@ public function getAllAttributesTypes($context = []) && $attributeCode !=='category_ids') { $notUsedInSearch = ['index' => 'no']; } - if ($attributeCode == 'price') { - $allAttributes[$attributeCode] = [ - 'type' => $this->fieldType->getFieldType($attribute), - 'properties' => [ - 'price' => ['type' => FieldType::ES_DATA_TYPE_FLOAT], - 'customer_group_id' => ['type' => FieldType::ES_DATA_TYPE_INT], - 'website_id' => ['type' => FieldType::ES_DATA_TYPE_STRING] - ] - ]; - } else { - $allAttributes[$attributeCode] = [ - 'type' => $this->fieldType->getFieldType($attribute) - ]; - } + + $allAttributes[$attributeCode] = [ + 'type' => $this->fieldType->getFieldType($attribute) + ]; if ($notUsedInSearch) { $allAttributes[$attributeCode] = array_merge( @@ -115,11 +105,7 @@ public function getAllAttributesTypes($context = []) $notUsedInSearch ); } - if ($attributeCode == 'category_ids') { - $allAttributes['category'] = [ - 'type' => FieldType::ES_DATA_TYPE_NESTED, - ]; - } + if ($frontendInput == 'select') { $allAttributes[$attributeCode . '_value'] = [ 'type' => FieldType::ES_DATA_TYPE_STRING, diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 95015b89b8754..b43b9667401b4 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -18,8 +18,6 @@ class FieldType const ES_DATA_TYPE_INT = 'integer'; const ES_DATA_TYPE_DATE = 'date'; const ES_DATA_TYPE_ARRAY = 'array'; - const ES_DATA_TYPE_NESTED = 'nested'; - const ES_DATA_TYPE_OBJECT = 'object'; /**#@-*/ /** @@ -31,23 +29,17 @@ public function getFieldType($attribute) { $backendType = $attribute->getBackendType(); $frontendInput = $attribute->getFrontendInput(); - $attributeCode = $attribute->getAttributeCode(); - if ($attributeCode === 'price' || $attributeCode === 'media_gallery') { - $fieldType = self::ES_DATA_TYPE_NESTED; - } elseif ($attributeCode === 'quantity_and_stock_status' || $attributeCode === 'tier_price') { - $fieldType = self::ES_DATA_TYPE_OBJECT; - } elseif ($backendType === 'timestamp' || $backendType === 'datetime') { + if (in_array($backendType, ['timestamp', 'datetime'], true)) { $fieldType = self::ES_DATA_TYPE_DATE; - } elseif ($backendType === 'int' || $backendType === 'smallint') { + } elseif ( + in_array($backendType, ['int', 'smallint'], true) + || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar') + ) { $fieldType = self::ES_DATA_TYPE_INT; } elseif ($backendType === 'decimal') { $fieldType = self::ES_DATA_TYPE_FLOAT; - } elseif ($backendType === 'varchar') { - $fieldType = self::ES_DATA_TYPE_STRING; - } elseif (in_array($frontendInput, ['select', 'boolean'], true)) { - $fieldType = self::ES_DATA_TYPE_INT; - } elseif ($frontendInput === 'multiselect') { + } elseif ($frontendInput === 'multiselect' && $backendType !== 'varchar') { $fieldType = self::ES_DATA_TYPE_ARRAY; } else { $fieldType = self::ES_DATA_TYPE_STRING; From 7989a5f995abe2d4d4d3e669167ad0aa1fc1f0f4 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Fri, 25 Dec 2015 17:46:30 +0200 Subject: [PATCH 269/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../FieldMapper/ProductFieldMapper.php | 105 +++++++++++++++--- 1 file changed, 92 insertions(+), 13 deletions(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index dca3258554cba..123c6eb4d474c 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -9,6 +9,9 @@ use Magento\Eav\Model\Config; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Adapter\FieldType; +use Magento\Framework\Registry; +use Magento\Store\Model\StoreManagerInterface as StoreManager; +use \Magento\Customer\Model\Session as CustomerSession; /** * Class ProductFieldMapper @@ -25,6 +28,25 @@ class ProductFieldMapper implements FieldMapperInterface */ protected $fieldType; + /** + * @var CustomerSession + */ + protected $customerSession; + + /** + * Store manager + * + * @var StoreManager + */ + protected $storeManager; + + /** + * Core registry + * + * @var Registry + */ + protected $coreRegistry; + /** * @param Config $eavConfig * @param FieldType $fieldType @@ -39,17 +61,19 @@ public function __construct( /** * {@inheritdoc} - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getFieldName($attributeCode, $context = []) { - if (in_array($attributeCode, ['id', 'sku', 'store_id', 'visibility'], true)) { - return $attributeCode; - } $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode); - if (!$attribute) { + if (!$attribute || in_array($attributeCode, ['id', 'sku', 'store_id', 'visibility'], true)) { return $attributeCode; } + if ($attributeCode === 'price') { + return $this->getPriceFieldName($context); + } + if ($attributeCode === 'position') { + return $this->getPositionFiledName($context); + } $fieldType = $this->fieldType->getFieldType($attribute); $frontendInput = $attribute->getFrontendInput(); if (empty($context['type'])) { @@ -61,15 +85,9 @@ public function getFieldName($attributeCode, $context = []) array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY]) ); } - $fieldName = (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'int') - ? $attributeCode . '_value' : $attributeCode; + $fieldName = $this->getRefinedFieldName($frontendInput, $fieldType, $attributeCode); } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) { - if ($attributeCode === '*') { - $fieldName = '_all'; - } else { - $fieldName = (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'int') - ? $attributeCode . '_value' : $attributeCode; - } + $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode); } else { $fieldName = 'sort_' . $attributeCode; } @@ -126,4 +144,65 @@ protected function isAttributeUsedInAdvancedSearch($attribute) || $attribute->getIsFilterable() || $attribute->getIsFilterableInSearch(); } + + /** + * @param string $frontendInput + * @param string $fieldType + * @param string $attributeCode + * @return string + */ + protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode) { + return (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'int') + ? $attributeCode . '_value' : $attributeCode; + } + + /** + * @param string $frontendInput + * @param string $fieldType + * @param string $attributeCode + * @return string + */ + protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode) { + if ($attributeCode === '*') { + $fieldName = '_all'; + } else { + $fieldName = $this->getRefinedFieldName($frontendInput, $fieldType, $attributeCode); + } + return $fieldName; + } + + /** + * Get "position" field name + * + * @param array $context + * @return string + */ + protected function getPositionFiledName($context) + { + if (isset($context['categoryId'])) { + $category = $context['categoryId']; + } else { + $category = $this->coreRegistry->registry('current_category') + ? $this->coreRegistry->registry('current_category')->getId() + : $this->storeManager->getStore()->getRootCategoryId(); + } + return 'position_category_' . $category; + } + + /** + * Prepare price field name for search engine + * + * @param array $context + * @return string + */ + protected function getPriceFieldName($context) + { + $customerGroupId = !empty($context['customerGroupId']) + ? $context['customerGroupId'] + : $this->customerSession->getCustomerGroupId(); + $websiteId = !empty($context['websiteId']) + ? $context['websiteId'] + : $this->storeManager->getStore()->getWebsiteId(); + return 'price_' . $customerGroupId . '_' . $websiteId; + } } From 017ff3d857bc19cf08979666afbaf15c345f6610 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Fri, 25 Dec 2015 19:01:04 +0200 Subject: [PATCH 270/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Adapter/FieldMapper/ProductFieldMapper.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 123c6eb4d474c..61c4216a44d84 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -50,13 +50,22 @@ class ProductFieldMapper implements FieldMapperInterface /** * @param Config $eavConfig * @param FieldType $fieldType + * @param CustomerSession $customerSession + * @param StoreManager $storeManager + * @param Registry $coreRegistry */ public function __construct( Config $eavConfig, - FieldType $fieldType + FieldType $fieldType, + CustomerSession $customerSession, + StoreManager $storeManager, + Registry $coreRegistry ) { $this->eavConfig = $eavConfig; $this->fieldType = $fieldType; + $this->customerSession = $customerSession; + $this->storeManager = $storeManager; + $this->coreRegistry = $coreRegistry; } /** From bc0684b0bd166a1bd6b960e337670eecc2dbb31f Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Fri, 25 Dec 2015 19:14:20 +0200 Subject: [PATCH 271/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Dynamic/DataProvider.php | 88 ++++++-------------------- 1 file changed, 21 insertions(+), 67 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 68005992b0108..74d013fd94c6a 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -95,6 +95,7 @@ public function __construct( $this->customerSession = $customerSession; $this->searchIndexNameResolver = $searchIndexNameResolver; $this->indexerId = $indexerId; + } /** @@ -117,9 +118,15 @@ public function getAggregations(EntityStorage $entityStorage) 'std' => 0, ]; $entityIds = $entityStorage->getSource(); - $fieldName = $this->fieldMapper->getFieldName('price'); $customerGroupId = $this->customerSession->getCustomerGroupId(); $websiteId = $this->storeManager->getStore()->getWebsiteId(); + $fieldName = $this->fieldMapper->getFieldName( + 'price', + [ + 'customerGroupId' => $customerGroupId, + 'websiteId' => $websiteId, + ] + ); $storeId = $this->storeManager->getStore()->getId(); $requestQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), @@ -147,35 +154,8 @@ public function getAggregations(EntityStorage $entityStorage) ], 'aggregations' => [ 'prices' => [ - 'nested' => [ - 'path' => $fieldName, - ], - 'aggregations' => [ - 'price_filter' => [ - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - ], - ], - ], - 'aggregations' => [ - 'price_stats' => [ - 'extended_stats' => [ - 'field' => $fieldName . '.price', - ], - ], - ], - ], + 'extended_stats' => [ + 'field' => $fieldName, ], ], ], @@ -227,9 +207,15 @@ public function getAggregation( ) { $result = []; $entityIds = $entityStorage->getSource(); - $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); $customerGroupId = $this->customerSession->getCustomerGroupId(); $websiteId = $this->storeManager->getStore()->getWebsiteId(); + $fieldName = $this->fieldMapper->getFieldName( + $bucket->getField(), + [ + 'customerGroupId' => $customerGroupId, + 'websiteId' => $websiteId, + ] + ); $dimension = current($dimensions); $storeId = $dimension->getValue(); $requestQuery = [ @@ -243,11 +229,6 @@ public function getAggregation( 'query' => [ 'bool' => [ 'must' => [ - [ - 'term' => [ - 'store_id' => $storeId, - ], - ], [ 'terms' => [ '_id' => $entityIds, @@ -258,36 +239,9 @@ public function getAggregation( ], 'aggregations' => [ 'prices' => [ - 'nested' => [ - 'path' => $fieldName, - ], - 'aggregations' => [ - 'price_filter' => [ - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - ], - ], - ], - 'aggregations' => [ - 'price_stats' => [ - 'histogram' => [ - 'field' => $fieldName . '.price', - 'interval' => $range, - ], - ], - ], - ], + 'histogram' => [ + 'field' => $fieldName, + 'interval' => $range, ], ], ], @@ -295,7 +249,7 @@ public function getAggregation( ]; $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - foreach ($queryResult['aggregations']['prices']['price_filter']['price_stats']['buckets'] as $bucket) { + foreach ($queryResult['aggregations']['prices']['buckets'] as $bucket) { $result[$bucket['key'] / $range + 1] = $bucket['doc_count']; } return $result; From 24d37358afe8d53dfd8de0148772407f51f51032 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 08:58:39 +0200 Subject: [PATCH 272/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Client/Elasticsearch.php | 40 -------------------------------- Model/Indexer/IndexerHandler.php | 11 ++------- Model/ResourceModel/Engine.php | 7 ------ 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index c6514fd275596..1fe9dbf2905bd 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -112,46 +112,6 @@ public function bulkQuery($query) $this->client->bulk($query); } - /** - * Gets all document ids from specified index - * - * @param string $index - * @param string $entityType - * @return array - */ - public function getAllIds($index, $entityType) - { - $ids = []; - $scrollData = $this->client->search([ - 'search_type' => 'scan', - 'scroll' => '1m', - 'index' => $index, - 'type' => $entityType, - 'body' => [ - 'query' => [ - 'match_all' => [], - ], - 'fields' => [ '_id' ] - ] - ]); - while (true) { - $scrollId = $scrollData['_scroll_id']; - $scrollData = $this->client->scroll([ - 'scroll_id' => $scrollId, - 'scroll' => '1m', - ]); - if (count($scrollData['hits']['hits']) > 0) { - foreach ($scrollData['hits']['hits'] as $hit) { - $ids[$hit['_id']] = $hit['_id']; - } - } else { - break; - } - } - - return $ids; - } - /** * Creates an Elasticsearch index. * diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 3f01455886edd..e7a3efa569782 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -10,7 +10,6 @@ use Magento\Framework\Indexer\IndexStructureInterface; use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; -use Magento\Store\Model\Store; class IndexerHandler implements IndexerInterface { @@ -19,11 +18,6 @@ class IndexerHandler implements IndexerInterface */ const DEFAULT_BATCH_SIZE = 500; - /** - * Scope identifier - */ - const SCOPE_FIELD_NAME = 'scope'; - /** * @var IndexStructureInterface */ @@ -95,15 +89,14 @@ public function saveIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} - * @SuppressWarnings(PHPMD.UnusedLocalVariable) */ public function deleteIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); $storeId = $dimension->getValue(); $documentIds = []; - foreach ($documents as $entityId => $document) { - $documentIds[$entityId] = $entityId; + foreach ($documents as $document) { + $documentIds[$document] = $document; } $this->adapter->deleteDocs($documentIds, $storeId, $this->getIndexerId()); return $this; diff --git a/Model/ResourceModel/Engine.php b/Model/ResourceModel/Engine.php index 90c1dde5d020e..b5a29a5ea1846 100644 --- a/Model/ResourceModel/Engine.php +++ b/Model/ResourceModel/Engine.php @@ -14,13 +14,6 @@ */ class Engine implements EngineInterface { - const ATTRIBUTE_PREFIX = 'attr_'; - - /** - * Scope identifier - */ - const SCOPE_FIELD_NAME = 'scope'; - /** * Catalog product visibility * From 5f5563213b7d0915721c05b8352a5d3ef6049c32 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 10:50:58 +0200 Subject: [PATCH 273/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/DataProvider/Suggestions.php | 57 +++--- .../Model/DataProvider/SuggestionsTest.php | 184 ++++++++++++++++++ 2 files changed, 212 insertions(+), 29 deletions(-) create mode 100644 Test/Unit/Model/DataProvider/SuggestionsTest.php diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 359d2ec19cf8e..464f6b0d6a205 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -10,12 +10,20 @@ use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; +use Magento\Search\Model\QueryResultFactory; +use Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; +use Magento\Store\Model\StoreManagerInterface as StoreManager; class Suggestions implements SuggestedQueriesInterface { + /**#@+ + * Suggestions settings config paths + */ const CONFIG_SUGGESTION_COUNT = 'catalog/search/search_suggestion_count'; const CONFIG_SUGGESTION_COUNT_RESULTS_ENABLED = 'catalog/search/search_suggestion_count_results_enabled'; const CONFIG_SUGGESTION_ENABLED = 'catalog/search/search_suggestion_enabled'; + /**#@-*/ /** * @var Config @@ -23,7 +31,7 @@ class Suggestions implements SuggestedQueriesInterface private $config; /** - * @var \Magento\Search\Model\QueryResultFactory + * @var QueryResultFactory */ private $queryResultFactory; @@ -33,54 +41,42 @@ class Suggestions implements SuggestedQueriesInterface private $connectionManager; /** - * @var \Magento\Solr\Model\QueryFactory - */ - private $queryFactory; - - /** - * @var \Magento\Solr\SearchAdapter\AccessPointMapperInterface - */ - private $accessPointMapper; - - /** - * @var \Magento\Framework\App\Config\ScopeConfigInterface + * @var ScopeConfigInterface */ private $scopeConfig; /** - * @var \Magento\Framework\Search\Request\Builder + * @var SearchIndexNameResolver */ - private $requestBuilder; + private $searchIndexNameResolver; /** - * @var \Magento\Framework\Search\SearchEngineInterface + * @var StoreManager */ - private $searchEngine; + private $storeManager; /** - * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig + * @param ScopeConfigInterface $scopeConfig * @param Config $config - * @param \Magento\Search\Model\QueryResultFactory $queryResultFactory + * @param QueryResultFactory $queryResultFactory * @param ConnectionManager $connectionManager - * @param \Magento\Framework\Search\Request\Builder $requestBuilder - * @param \Magento\Framework\Search\SearchEngineInterface $searchEngine + * @param SearchIndexNameResolver $searchIndexNameResolver + * @param StoreManager $storeManager */ public function __construct( - \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, + ScopeConfigInterface $scopeConfig, Config $config, - \Magento\Search\Model\QueryResultFactory $queryResultFactory, + QueryResultFactory $queryResultFactory, ConnectionManager $connectionManager, - \Magento\Framework\Search\Request\Builder $requestBuilder, - \Magento\Framework\Search\SearchEngineInterface $searchEngine + SearchIndexNameResolver $searchIndexNameResolver, + StoreManager $storeManager ) { - // @TODO $this->queryResultFactory = $queryResultFactory; $this->connectionManager = $connectionManager; - $this->queryResultFactory = $queryResultFactory; $this->scopeConfig = $scopeConfig; $this->config = $config; - $this->requestBuilder = $requestBuilder; - $this->searchEngine = $searchEngine; + $this->searchIndexNameResolver = $searchIndexNameResolver; + $this->storeManager = $storeManager; } /** @@ -132,7 +128,10 @@ private function getSuggestions(QueryInterface $query) $searchSuggestionsCount = $this->getSearchSuggestionsCount(); $suggestRequest = [ - 'index' => $this->config->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName( + $this->storeManager->getStore()->getId(), + Config::ELASTICSEARCH_TYPE_DEFAULT + ), 'body' => [ 'suggestions' => [ 'text' => $query->getQueryText(), diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php new file mode 100644 index 0000000000000..a4cef027469a3 --- /dev/null +++ b/Test/Unit/Model/DataProvider/SuggestionsTest.php @@ -0,0 +1,184 @@ +config = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + ->disableOriginalConstructor() + ->setMethods(['isElasticsearchEnabled']) + ->getMock(); + + $this->queryResultFactory = $this->getMockBuilder('Magento\Search\Model\QueryResultFactory') + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + + $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + ->disableOriginalConstructor() + ->setMethods(['getConnection']) + ->getMock(); + + $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->searchIndexNameResolver = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->disableOriginalConstructor() + ->setMethods(['getIndexName']) + ->getMock(); + + $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->query = $this->getMockBuilder('Magento\Search\Model\QueryInterface') + ->disableOriginalConstructor() + ->getMock(); + + $objectManager = new ObjectManagerHelper($this); + + $this->model = $objectManager->getObject( + 'Magento\Elasticsearch\Model\DataProvider\Suggestions', + [ + 'queryResultFactory' => $this->queryResultFactory, + 'connectionManager' => $this->connectionManager, + 'scopeConfig' => $this->scopeConfig, + 'config' => $this->config, + 'searchIndexNameResolver' => $this->searchIndexNameResolver, + 'storeManager' => $this->storeManager + ] + ); + } + + /** + * Test getItems() method + */ + public function testGetItems() + { + $result = []; + + $this->scopeConfig->expects($this->any()) + ->method('getValue') + ->willReturn(1); + + $this->config->expects($this->any()) + ->method('isElasticsearchEnabled') + ->willReturn(1); + + $store = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($store); + + $store->expects($this->any()) + ->method('getId') + ->willReturn(1); + + $this->searchIndexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('magento2_product_1'); + + $this->query->expects($this->any()) + ->method('getQueryText') + ->willReturn('query'); + + $client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + ->disableOriginalConstructor() + ->getMock(); + + $this->connectionManager->expects($this->any()) + ->method('getConnection') + ->willReturn($client); + + $client->expects($this->any()) + ->method('suggest') + ->willReturn([ + 'suggestions' => [ + [ + 'options' => [ + 'query' => [ + 'text' => 'query', + 'score' => 1, + 'freq' => 1, + ], + ] + ], + ], + ]); + + $query = $this->getMockBuilder('Magento\Search\Model\QueryResult') + ->disableOriginalConstructor() + ->getMock(); + + $this->queryResultFactory->expects($this->any()) + ->method('create') + ->willReturn($query); + + $this->assertInternalType('array', $this->model->getItems($this->query)); + } +} From 1b4fa1a820cc09c524eb7878709d6906fbd70e3a Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 11:14:49 +0200 Subject: [PATCH 274/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Client/Elasticsearch.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 1fe9dbf2905bd..6cd4d2044994e 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -230,6 +230,17 @@ public function addFieldsMapping(array $fields, $index, $entityType) 'type' => 'string' ], 'properties' => [], + 'dynamic_templates' => [ + [ + 'price_mapping' => [ + 'match' => 'price_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'float' + ], + ], + ], + ], ], ], ]; From 9750c3c674c18c42ce396eea31dc2ec8685b6d31 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 13:33:43 +0200 Subject: [PATCH 275/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 121 ++++++++++++------ 1 file changed, 83 insertions(+), 38 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 8be33475067d7..f9ce9b15081ac 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -151,7 +151,6 @@ public function __construct( * @param array $context * @return array|false * @throws \Magento\Framework\Exception\LocalizedException - * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ @@ -179,34 +178,19 @@ public function map($productId, array $productIndexData, $storeId, $context = [] } /* @var Attribute|null $attribute */ $attribute = $this->attributeContainer->getAttribute($attributeCode); - if (!$attribute || $attributeCode === 'price') { + if (!$attribute + || in_array($attributeCode, ['price', 'media_gallery', 'quantity_and_stock_status'], true) + ) { continue; } - $attribute->setStoreId($storeId); - if (in_array($attributeCode, $this->mediaGalleryRoles)) { - $mediaGalleryRoles[$attributeCode] = $value; - } - if ($attributeCode === 'media_gallery') { - $this->builder->addFields($this->getProductMediaGalleryData($value, $mediaGalleryRoles)); - continue; - } - if ($attributeCode === 'quantity_and_stock_status') { - $this->builder->addFields($this->getQtyAndStatus($value)); - continue; - } if ($attributeCode === 'tier_price') { $this->builder->addFields($this->getProductTierPriceData($value)); - continue; - } - if (is_array($value)) { - $value = array_shift($value); } - if ($attribute->getBackendType() === 'datetime' || $attribute->getBackendType() === 'timestamp' - || $attribute->getFrontendInput() === 'date') { - $value = $this->formatDate($storeId, $value); - } + $attribute->setStoreId($storeId); + $mediaGalleryRoles[$attributeCode] = $this->getMediaGalleryRole($attributeCode, $value); + $value = $this->checkValue($value, $attribute, $storeId); $this->builder->addField($this->fieldMapper->getFieldName( $attributeCode, ['entityType' => self::PRODUCT_ENTITY_TYPE] @@ -215,12 +199,45 @@ public function map($productId, array $productIndexData, $storeId, $context = [] unset($attribute); } + $this->builder->addFields($this->getProductMediaGalleryData( + $productIndexData[$productId]['media_gallery'], $mediaGalleryRoles) + ); + + $this->builder->addFields($this->getQtyAndStatus($productIndexData[$productId]['quantity_and_stock_status'])); $this->builder->addFields($this->getProductPriceData($productId, $storeId, $productPriceIndexData)); $this->builder->addFields($this->getProductCategoryData($productId, $productCategoryIndexData)); return $this->builder->build(); } + /** + * @param mixed $value + * @param Attribute $attribute + * @param string $storeId + * @return array|mixed|null|string + */ + protected function checkValue($value, $attribute, $storeId) { + if (is_array($value)) { + return array_shift($value); + } elseif ($attribute->getBackendType() === 'datetime' || $attribute->getBackendType() === 'timestamp' + || $attribute->getFrontendInput() === 'date') { + return $this->formatDate($storeId, $value); + } else { + return $value; + } + } + + /** + * @param string $attributeCode + * @param string $value + * @return mixed + */ + protected function getMediaGalleryRole($attributeCode, $value) { + if (in_array($attributeCode, $this->mediaGalleryRoles)) { + return $value; + } + } + /** * Prepare tier price data for product * @@ -269,28 +286,20 @@ protected function getProductMediaGalleryData($media, $roles) $result['image_disabled_' . $i] = $data['disabled']; $result['image_label_' . $i] = $data['label']; $result['image_title_' . $i] = $data['label']; - $result['image_base_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_IMAGE] - ? '1' : '0'; - $result['image_small_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SMALL_IMAGE] - ? '1' : '0'; - $result['image_thumbnail_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_THUMBNAIL] - ? '1' : '0'; - $result['image_swatch_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] - ? '1' : '0'; + $result['image_base_image_' . $i] = $this->getMediaRoleImage($data['file'], $roles); + $result['image_small_image_' . $i] = $this->getMediaRoleSmallImage($data['file'], $roles); + $result['image_thumbnail_' . $i] = $this->getMediaRoleThumbnail($data['file'], $roles); + $result['image_swatch_image_' . $i] = $this->getMediaRoleSwatchImage($data['file'], $roles); } else { $result['video_file_' . $i] = $data['file']; $result['video_position_' . $i] = $data['position']; $result['video_disabled_' . $i] = $data['disabled']; $result['video_label_' . $i] = $data['label']; $result['video_title_' . $i] = $data['video_title']; - $result['video_base_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_IMAGE] - ? '1' : '0'; - $result['video_small_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SMALL_IMAGE] - ? '1' : '0'; - $result['video_thumbnail_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_THUMBNAIL] - ? '1' : '0'; - $result['video_swatch_image_' . $i] = $data['file'] == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] - ? '1' : '0'; + $result['video_base_image_' . $i] = $this->getMediaRoleImage($data['file'], $roles); + $result['video_small_image_' . $i] = $this->getMediaRoleSmallImage($data['file'], $roles); + $result['video_thumbnail_' . $i] = $this->getMediaRoleThumbnail($data['file'], $roles); + $result['video_swatch_image_' . $i] = $this->getMediaRoleSwatchImage($data['file'], $roles); $result['video_url_' . $i] = $data['video_url']; $result['video_description_' . $i] = $data['video_description']; $result['video_metadata_' . $i] = $data['video_metadata']; @@ -302,6 +311,42 @@ protected function getProductMediaGalleryData($media, $roles) return $result; } + /** + * @param string $file + * @param array $roles + * @return string + */ + protected function getMediaRoleImage($file, $roles) { + return $file == $roles[self::MEDIA_ROLE_IMAGE] ? '1' : '0'; + } + + /** + * @param string $file + * @param array $roles + * @return string + */ + protected function getMediaRoleSmallImage($file, $roles) { + return $file == $roles[self::MEDIA_ROLE_SMALL_IMAGE] ? '1' : '0'; + } + + /** + * @param string $file + * @param array $roles + * @return string + */ + protected function getMediaRoleThumbnail($file, $roles) { + return $file == $roles[self::MEDIA_ROLE_THUMBNAIL] ? '1' : '0'; + } + + /** + * @param string $file + * @param array $roles + * @return string + */ + protected function getMediaRoleSwatchImage($file, $roles) { + return $file == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] ? '1' : '0'; + } + /** * Prepare quantity and stock status for product * From a4187fe2dab919b0ad1caefb8c6888df150f9001 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 14:13:49 +0200 Subject: [PATCH 276/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 30 +++++++++------ Model/Adapter/Elasticsearch.php | 1 + Model/ResourceModel/Index.php | 38 ++++++++++--------- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index f9ce9b15081ac..27e9d44983f6c 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -146,7 +146,7 @@ public function __construct( * Prepare index data for using in search engine metadata. * * @param int $productId - * @param array $productIndexData + * @param array $indexData * @param int $storeId * @param array $context * @return array|false @@ -154,7 +154,7 @@ public function __construct( * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function map($productId, array $productIndexData, $storeId, $context = []) + public function map($productId, array $indexData, $storeId, $context = []) { $this->builder->addField('store_id', $storeId); $mediaGalleryRoles = array_fill_keys($this->mediaGalleryRoles, ''); @@ -166,11 +166,11 @@ public function map($productId, array $productIndexData, $storeId, $context = [] $storeId, [$productId => $productId] ); - if (count($productIndexData)) { - $productIndexData = $this->resourceIndex->getFullProductIndexData([$productId]); + if (count($indexData)) { + $productIndexData = $this->resourceIndex->getFullProductIndexData($productId, $indexData); } - foreach ($productIndexData[$productId] as $attributeCode => $value) { + foreach ($productIndexData as $attributeCode => $value) { // Prepare processing attribute info if (strpos($attributeCode, '_value') !== false) { $this->builder->addField($attributeCode, $value); @@ -179,13 +179,26 @@ public function map($productId, array $productIndexData, $storeId, $context = [] /* @var Attribute|null $attribute */ $attribute = $this->attributeContainer->getAttribute($attributeCode); if (!$attribute - || in_array($attributeCode, ['price', 'media_gallery', 'quantity_and_stock_status'], true) + || in_array($attributeCode, ['price', 'media_gallery'], true) ) { continue; } if ($attributeCode === 'tier_price') { $this->builder->addFields($this->getProductTierPriceData($value)); + continue; + } + + if ($attributeCode === 'quantity_and_stock_status') { + $this->builder->addFields($this->getQtyAndStatus($value)); + continue; + } + + if ($attributeCode === 'media_gallery') { + $this->builder->addFields($this->getProductMediaGalleryData( + $value, $mediaGalleryRoles) + ); + continue; } $attribute->setStoreId($storeId); @@ -199,11 +212,6 @@ public function map($productId, array $productIndexData, $storeId, $context = [] unset($attribute); } - $this->builder->addFields($this->getProductMediaGalleryData( - $productIndexData[$productId]['media_gallery'], $mediaGalleryRoles) - ); - - $this->builder->addFields($this->getQtyAndStatus($productIndexData[$productId]['quantity_and_stock_status'])); $this->builder->addFields($this->getProductPriceData($productId, $storeId, $productPriceIndexData)); $this->builder->addFields($this->getProductCategoryData($productId, $productCategoryIndexData)); diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index a1195b3670e49..be1dbffb4fd03 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -257,6 +257,7 @@ protected function getDocsArrayInBulkIndexFormat( 'index' => $indexName, 'type' => $this->clientConfig->getEntityType(), 'body' => [], + 'refresh' => true, ]; foreach ($documents as $id => $document) { diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 3a3f6e353c3a8..e7e661421b91d 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -57,29 +57,31 @@ public function __construct( /** * Retrieve all attributes for given product ids * - * @param array $productIds + * @param int $productId + * @param array $indexData * @return array */ - public function getFullProductIndexData(array $productIds) + public function getFullProductIndexData($productId, $indexData) { $productAttributes = []; $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE); - foreach ($productIds as $productId) { - $product = $this->productRepository->getById($productId); - $productAttributesWithValues = $product->getData(); - foreach ($productAttributesWithValues as $attributeCode => $value) { - $attribute = $this->eavConfig->getAttribute( - ProductAttributeInterface::ENTITY_TYPE_CODE, - $attributeCode - ); - $frontendInput = $attribute->getFrontendInput(); - if (in_array($attributeCode, $attributeCodes)) { - $productAttributes[$productId][$attributeCode] = $value; - if ($frontendInput == 'select') { - foreach ($attribute->getOptions() as $option) { - if ($option->getValue() == $value) { - $productAttributes[$productId][$attributeCode . '_value'] = $option->getLabel(); - } + $product = $this->productRepository->getById($productId); + $productAttributesWithValues = $product->getData(); + foreach ($productAttributesWithValues as $attributeCode => $value) { + $attribute = $this->eavConfig->getAttribute( + ProductAttributeInterface::ENTITY_TYPE_CODE, + $attributeCode + ); + $frontendInput = $attribute->getFrontendInput(); + if (in_array($attribute->getAttributeId(), array_keys($indexData))) { + $value = $indexData[$attribute->getAttributeId()]; + } + if (in_array($attributeCode, $attributeCodes)) { + $productAttributes[$attributeCode] = $value; + if ($frontendInput == 'select') { + foreach ($attribute->getOptions() as $option) { + if ($option->getValue() == $value) { + $productAttributes[$attributeCode . '_value'] = $option->getLabel(); } } } From bf6cb3ab16a06d70815a3b62197767a4e2cd941a Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 14:13:49 +0200 Subject: [PATCH 277/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Indexer/IndexHandlerTest.php | 69 ++++++++++++++---------------- 1 file changed, 32 insertions(+), 37 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 37275c055b979..87c2dfb5869bc 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -7,10 +7,9 @@ use Magento\Catalog\Model\Product; use Magento\TestFramework\Helper\Bootstrap; -use Magento\Framework\Indexer\IndexerInterface; +use Magento\Store\Model\StoreManagerInterface; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; -use Magento\Framework\Search\Request\Dimension; use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; @@ -20,11 +19,6 @@ */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase { - /** - * @var IndexerInterface - */ - protected $indexer; - /** * @var ConnectionManager */ @@ -36,9 +30,14 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase protected $client; /** - * @var Dimension[] + * @var StoreManagerInterface + */ + protected $storeManager; + + /** + * @var int[] */ - protected $dimensions; + protected $storeIds; /** * @var Config @@ -80,26 +79,16 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->indexer = Bootstrap::getObjectManager()->create( - 'Magento\Indexer\Model\Indexer' - ); - $this->indexer->load('catalogsearch_fulltext'); - $this->connectionManager = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' ); $this->client = $this->connectionManager->getConnection(); - $mainStore = Bootstrap::getObjectManager()->create( - '\Magento\Framework\Search\Request\Dimension', - ['name' => 'scope', 'value' => '1'] + $this->storeManager = Bootstrap::getObjectManager()->create( + 'Magento\Store\Model\StoreManagerInterface' ); - $secondaryStore = Bootstrap::getObjectManager()->create( - '\Magento\Framework\Search\Request\Dimension', - ['name' => 'scope', 'value' => '2'] - ); - $this->dimensions = [$mainStore, $secondaryStore]; + $this->storeIds = array_keys($this->storeManager->getStores()); $this->clientConfig = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\Model\Config' @@ -122,11 +111,8 @@ protected function setUp() */ public function testReindexAll() { - $this->indexer->reindexAll(); - - foreach ($this->dimensions as $dimension) { - $storeId = $dimension->getValue(); - + $this->reindexAll(); + foreach ($this->storeIds as $storeId) { $products = $this->searchByName('Apple', $storeId); $this->assertCount(1, $products); $this->assertEquals($this->productApple->getId(), $products[0]['_id']); @@ -144,9 +130,7 @@ public function testReindexRowAfterEdit() $this->productApple->setData('name', 'Simple Product Cucumber'); $this->productApple->save(); - foreach ($this->dimensions as $dimension) { - $storeId = $dimension->getValue(); - + foreach ($this->storeIds as $storeId) { $products = $this->searchByName('Apple', $storeId); $this->assertCount(0, $products); @@ -176,10 +160,9 @@ public function testReindexRowAfterMassAction() $action = Bootstrap::getObjectManager()->get( 'Magento\Catalog\Model\Product\Action' ); - $action->updateAttributes($productIds, $attrData, 1); - foreach ($this->dimensions as $dimension) { - $storeId = $dimension->getValue(); + foreach ($this->storeIds as $storeId) { + $action->updateAttributes($productIds, $attrData, $storeId); $products = $this->searchByName('Apple', $storeId); $this->assertCount(0, $products); @@ -204,12 +187,10 @@ public function testReindexRowAfterMassAction() */ public function testReindexRowAfterDelete() { - $this->indexer->reindexAll(); + $this->reindexAll(); $this->productBanana->delete(); - foreach ($this->dimensions as $dimension) { - $storeId = $dimension->getValue(); - + foreach ($this->storeIds as $storeId) { $products = $this->searchByName('Simple Product', $storeId); $this->assertCount(4, $products); } @@ -261,4 +242,18 @@ protected function getProductBySku($sku) ); return $product->loadByAttribute('sku', $sku); } + + /** + * Perform full reindex + * + * @return void + */ + private function reindexAll() + { + $indexer = Bootstrap::getObjectManager()->create( + 'Magento\Indexer\Model\Indexer' + ); + $indexer->load('catalogsearch_fulltext'); + $indexer->reindexAll(); + } } From 008847f96ac5dcc67d2faf163b4a088d1683e141 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 14:21:35 +0200 Subject: [PATCH 278/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Client/Elasticsearch.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 6cd4d2044994e..82526e4996ede 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -240,6 +240,16 @@ public function addFieldsMapping(array $fields, $index, $entityType) ], ], ], + [ + 'string_mapping' => [ + 'match' => '*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'string', + 'index' => 'no' + ], + ], + ], ], ], ], From 6da36cc62a085f9455d5070f713fa7188a4ad5c3 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 28 Dec 2015 15:55:11 +0200 Subject: [PATCH 279/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Adapter/FieldMapper/ProductFieldMapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 61c4216a44d84..1e411108d2eb6 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -161,7 +161,7 @@ protected function isAttributeUsedInAdvancedSearch($attribute) * @return string */ protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode) { - return (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'int') + return (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'integer') ? $attributeCode . '_value' : $attributeCode; } From e4a2da073c5da42bd42d6ad4ac5b4f0a3376fafc Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 15:56:13 +0200 Subject: [PATCH 280/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Client/Elasticsearch.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 82526e4996ede..55f5c6757eab2 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -250,6 +250,15 @@ public function addFieldsMapping(array $fields, $index, $entityType) ], ], ], + [ + 'position_mapping' => [ + 'match' => 'position_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'int' + ], + ], + ], ], ], ], From bbb04e3a5182766dc7fcceceab4db43e26002d99 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 16:11:08 +0200 Subject: [PATCH 281/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/DataProvider/Suggestions.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 464f6b0d6a205..4157f56f98d05 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -140,19 +140,6 @@ private function getSuggestions(QueryInterface $query) 'analyzer' => 'standard', 'size' => $searchSuggestionsCount, 'max_errors' => 2, - 'collate' => [ - 'query' => [ - 'bool' => [ - 'must' => [ - 'match' => [ - '{{field_name}}' => '{{suggestion}}' - ], - ], - ], - ], - 'params' => [ 'field_name' => '_all' ], - 'prune' => true - ], 'direct_generator' => [ [ 'field' => '_all', From 3e8d33b68cdaf91889fc7042950a7997f9e59fa0 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 28 Dec 2015 16:15:49 +0200 Subject: [PATCH 282/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/Client/ElasticsearchTest.php | 118 ++++++++++--------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index e5c960bb59765..461988fb9f685 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -160,64 +160,6 @@ public function testBulkQuery() $this->model->bulkQuery([]); } - /** - * Test getAllIds() method - */ - public function testGetAllIds() - { - $index = 'indexName'; - $entityType = 'product'; - - $this->elasticsearchClientMock->expects($this->once()) - ->method('search') - ->with([ - 'search_type' => 'scan', - 'scroll' => '1m', - 'index' => $index, - 'type' => $entityType, - 'body' => [ - 'query' => [ - 'match_all' => [], - ], - 'fields' => [ '_id' ] - ] - ]) - ->willReturn(['_scroll_id' => 'scrollId1']); - $this->elasticsearchClientMock->expects($this->at(1)) - ->method('scroll') - ->with([ - 'scroll_id' => 'scrollId1', - 'scroll' => '1m', - ]) - ->willReturn([ - '_scroll_id' => 'scrollId2', - 'hits' => [ - 'hits' => [ - 0 => [ - '_id' => '123', - ], - 1 => [ - '_id' => '234', - ] - ], - ], - ]); - $this->elasticsearchClientMock->expects($this->at(2)) - ->method('scroll') - ->with([ - 'scroll_id' => 'scrollId2', - 'scroll' => '1m', - ]) - ->willReturn([ - '_scroll_id' => 'scrollId3', - 'hits' => [ - 'hits' => [], - ], - ]); - $result = $this->model->getAllIds($index, $entityType); - $this->assertEquals(['123' => '123', '234' => '234'], $result); - } - /** * Test createIndex() method, case when such index exists */ @@ -402,6 +344,36 @@ public function testAddFieldsMapping() 'type' => 'string', ], ], + 'dynamic_templates' => [ + [ + 'price_mapping' => [ + 'match' => 'price_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'float' + ], + ], + ], + [ + 'string_mapping' => [ + 'match' => '*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'string', + 'index' => 'no' + ], + ], + ], + [ + 'position_mapping' => [ + 'match' => 'position_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'int' + ], + ], + ], + ], ], ], ]); @@ -438,6 +410,36 @@ public function testAddFieldsMappingFailure() 'type' => 'string', ], ], + 'dynamic_templates' => [ + [ + 'price_mapping' => [ + 'match' => 'price_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'float' + ], + ], + ], + [ + 'string_mapping' => [ + 'match' => '*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'string', + 'index' => 'no' + ], + ], + ], + [ + 'position_mapping' => [ + 'match' => 'position_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'int' + ], + ], + ], + ], ], ], ]) From c37191621baff65808ef634456659286885f016e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 16:37:01 +0200 Subject: [PATCH 283/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 38 ++++++++++++------- .../FieldMapper/ProductFieldMapper.php | 6 ++- Model/Adapter/FieldType.php | 5 ++- .../Aggregation/Builder/DynamicTest.php | 8 ++-- .../Aggregation/Builder/TermTest.php | 10 ----- 5 files changed, 36 insertions(+), 31 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 27e9d44983f6c..a1625b20d05aa 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -195,8 +195,11 @@ public function map($productId, array $indexData, $storeId, $context = []) } if ($attributeCode === 'media_gallery') { - $this->builder->addFields($this->getProductMediaGalleryData( - $value, $mediaGalleryRoles) + $this->builder->addFields( + $this->getProductMediaGalleryData( + $value, + $mediaGalleryRoles + ) ); continue; } @@ -205,9 +208,13 @@ public function map($productId, array $indexData, $storeId, $context = []) $mediaGalleryRoles[$attributeCode] = $this->getMediaGalleryRole($attributeCode, $value); $value = $this->checkValue($value, $attribute, $storeId); - $this->builder->addField($this->fieldMapper->getFieldName( - $attributeCode, ['entityType' => self::PRODUCT_ENTITY_TYPE] - ), $value); + $this->builder->addField( + $this->fieldMapper->getFieldName( + $attributeCode, + ['entityType' => self::PRODUCT_ENTITY_TYPE] + ), + $value + ); unset($attribute); } @@ -224,7 +231,8 @@ public function map($productId, array $indexData, $storeId, $context = []) * @param string $storeId * @return array|mixed|null|string */ - protected function checkValue($value, $attribute, $storeId) { + protected function checkValue($value, $attribute, $storeId) + { if (is_array($value)) { return array_shift($value); } elseif ($attribute->getBackendType() === 'datetime' || $attribute->getBackendType() === 'timestamp' @@ -240,7 +248,8 @@ protected function checkValue($value, $attribute, $storeId) { * @param string $value * @return mixed */ - protected function getMediaGalleryRole($attributeCode, $value) { + protected function getMediaGalleryRole($attributeCode, $value) + { if (in_array($attributeCode, $this->mediaGalleryRoles)) { return $value; } @@ -324,7 +333,8 @@ protected function getProductMediaGalleryData($media, $roles) * @param array $roles * @return string */ - protected function getMediaRoleImage($file, $roles) { + protected function getMediaRoleImage($file, $roles) + { return $file == $roles[self::MEDIA_ROLE_IMAGE] ? '1' : '0'; } @@ -333,7 +343,8 @@ protected function getMediaRoleImage($file, $roles) { * @param array $roles * @return string */ - protected function getMediaRoleSmallImage($file, $roles) { + protected function getMediaRoleSmallImage($file, $roles) + { return $file == $roles[self::MEDIA_ROLE_SMALL_IMAGE] ? '1' : '0'; } @@ -342,7 +353,8 @@ protected function getMediaRoleSmallImage($file, $roles) { * @param array $roles * @return string */ - protected function getMediaRoleThumbnail($file, $roles) { + protected function getMediaRoleThumbnail($file, $roles) + { return $file == $roles[self::MEDIA_ROLE_THUMBNAIL] ? '1' : '0'; } @@ -351,7 +363,8 @@ protected function getMediaRoleThumbnail($file, $roles) { * @param array $roles * @return string */ - protected function getMediaRoleSwatchImage($file, $roles) { + protected function getMediaRoleSwatchImage($file, $roles) + { return $file == $roles[self::MEDIA_ROLE_SWATCH_IMAGE] ? '1' : '0'; } @@ -364,7 +377,6 @@ protected function getMediaRoleSwatchImage($file, $roles) { protected function getQtyAndStatus($data) { $result = []; - if (!is_array($data)) { $result['is_in_stock'] = $data ? 1 : 0; $result['qty'] = $data; @@ -400,7 +412,7 @@ protected function getProductPriceData($productId, $storeId, array $priceIndexDa } /** - * Retrieve date value in elasticseacrh format (ISO 8601) with Z + * Retrieve date value in elasticsearch format (ISO 8601) with Z * Example: 1995-12-31T23:59:59Z * * @param int $storeId diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 1e411108d2eb6..a13ca81f78ca3 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -160,7 +160,8 @@ protected function isAttributeUsedInAdvancedSearch($attribute) * @param string $attributeCode * @return string */ - protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode) { + protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode) + { return (in_array($frontendInput, ['select', 'boolean'], true) && $fieldType === 'integer') ? $attributeCode . '_value' : $attributeCode; } @@ -171,7 +172,8 @@ protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCod * @param string $attributeCode * @return string */ - protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode) { + protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode) + { if ($attributeCode === '*') { $fieldName = '_all'; } else { diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index b43b9667401b4..9ab52f7c3e305 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -5,6 +5,8 @@ */ namespace Magento\Elasticsearch\Model\Adapter; +use Magento\Eav\Model\Entity\Attribute\AbstractAttribute; + /** * Class FieldType */ @@ -21,8 +23,7 @@ class FieldType /**#@-*/ /** - * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute - * @SuppressWarnings(PHPMD.CyclomaticComplexity) + * @param AbstractAttribute $attribute * @return string */ public function getFieldType($attribute) diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php b/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php index 37279673d2c2d..a7322d0c5445d 100644 --- a/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php @@ -61,7 +61,8 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->dataProviderContainer = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider') + $this->dataProviderContainer = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider') ->disableOriginalConstructor() ->getMock(); @@ -73,7 +74,8 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->algorithmInterface = $this->getMockBuilder('Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface') + $this->algorithmInterface = $this + ->getMockBuilder('Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface') ->disableOriginalConstructor() ->getMock(); @@ -169,7 +171,5 @@ public function testBuild() $queryResult, $this->dataProviderContainer ); - } } - diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php b/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php index c60c6f21ae82f..dc13dce7e74c3 100644 --- a/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php @@ -20,11 +20,6 @@ class TermTest extends \PHPUnit_Framework_TestCase */ protected $requestBuckedInterface; -// /** -// * @var \Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider|\PHPUnit_Framework_MockObject_MockObject -// */ -// protected $dataProviderContainer; - /** * @var \Magento\Framework\Search\Dynamic\DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject */ @@ -47,10 +42,6 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); -// $this->dataProviderContainer = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider') -// ->disableOriginalConstructor() -// ->getMock(); - $this->dataProviderContainer = $this->getMockBuilder('Magento\Framework\Search\Dynamic\DataProviderInterface') ->disableOriginalConstructor() ->getMock(); @@ -113,4 +104,3 @@ public function testBuild() ); } } - From 098a1fab3f2eff9f5930280de2b254adffef881d Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 16:52:13 +0200 Subject: [PATCH 284/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 1 + SearchAdapter/Aggregation/Interval.php | 171 +++--------------- 2 files changed, 22 insertions(+), 150 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index a1625b20d05aa..6ac8747291ca7 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -153,6 +153,7 @@ public function __construct( * @throws \Magento\Framework\Exception\LocalizedException * @SuppressWarnings(PHPMD.NPathComplexity) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function map($productId, array $indexData, $storeId, $context = []) { diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 3dd874869d697..8a1548336db57 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -8,8 +8,6 @@ use Magento\Framework\Search\Dynamic\IntervalInterface; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Store\Model\StoreManagerInterface; -use Magento\Customer\Model\Session as CustomerSession; use Magento\Elasticsearch\Model\Config; class Interval implements IntervalInterface @@ -29,16 +27,6 @@ class Interval implements IntervalInterface */ protected $fieldMapper; - /** - * @var StoreManagerInterface - */ - protected $storeManager; - - /** - * @var CustomerSession - */ - protected $customerSession; - /** * @var Config */ @@ -62,8 +50,6 @@ class Interval implements IntervalInterface /** * @param ConnectionManager $connectionManager * @param FieldMapperInterface $fieldMapper - * @param StoreManagerInterface $storeManager - * @param CustomerSession $customerSession * @param Config $clientConfig * @param string $fieldName * @param string $storeId @@ -72,8 +58,6 @@ class Interval implements IntervalInterface public function __construct( ConnectionManager $connectionManager, FieldMapperInterface $fieldMapper, - StoreManagerInterface $storeManager, - CustomerSession $customerSession, Config $clientConfig, $fieldName, $storeId, @@ -81,8 +65,6 @@ public function __construct( ) { $this->connectionManager = $connectionManager; $this->fieldMapper = $fieldMapper; - $this->storeManager = $storeManager; - $this->customerSession = $customerSession; $this->clientConfig = $clientConfig; $this->fieldName = $fieldName; $this->storeId = $storeId; @@ -94,9 +76,7 @@ public function __construct( */ public function load($limit, $offset = null, $lower = null, $upper = null) { - $requestQuery = $from = $to = []; - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); + $from = $to = []; if ($lower) { $from = ['gte' => $lower - self::DELTA]; @@ -120,40 +100,14 @@ public function load($limit, $offset = null, $lower = null, $upper = null) 'filter' => [ 'bool' => [ 'must' => [ - [ - 'term' => [ - 'store_id' => $this->storeId, - ], - ], [ 'terms' => [ '_id' => $this->entityIds, ], ], [ - 'nested' => [ - 'path' => $this->fieldName, - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - [ - 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), - ], - ], - ], - ], - ], + 'range' => [ + $this->fieldName => array_merge($from, $to), ], ], ], @@ -162,12 +116,12 @@ public function load($limit, $offset = null, $lower = null, $upper = null) ], ], 'sort' => [ - 'price.price' => [ + 'price' => [ 'order' => 'asc', 'mode' => 'min', - 'nested_filter' => [ + 'filter' => [ 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), + $this->fieldName => array_merge($from, $to), ] ] ] @@ -177,7 +131,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null) ]; if ($offset) { - $filterQuery['from'] = $offset; + $requestQuery['body']['from'] = $offset; } $queryResult = $this->connectionManager->getConnection() @@ -191,9 +145,6 @@ public function load($limit, $offset = null, $lower = null, $upper = null) */ public function loadPrevious($data, $index, $lower = null) { - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); - if ($lower) { $from = ['gte' => $lower - self::DELTA]; } @@ -217,40 +168,14 @@ public function loadPrevious($data, $index, $lower = null) 'filter' => [ 'bool' => [ 'must' => [ - [ - 'term' => [ - 'store_id' => $this->storeId, - ], - ], [ 'terms' => [ '_id' => $this->entityIds, ], ], [ - 'nested' => [ - 'path' => $this->fieldName, - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - [ - 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), - ], - ], - ], - ], - ], + 'range' => [ + $this->fieldName => array_merge($from, $to), ], ], ], @@ -259,12 +184,12 @@ public function loadPrevious($data, $index, $lower = null) ], ], 'sort' => [ - 'price.price' => [ + 'price' => [ 'order' => 'asc', 'mode' => 'min', - 'nested_filter' => [ + 'filter' => [ 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), + $this->fieldName => array_merge($from, $to), ] ] ] @@ -287,13 +212,9 @@ public function loadPrevious($data, $index, $lower = null) */ public function loadNext($data, $rightIndex, $upper = null) { - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $from = ['gt' => $data + self::DELTA]; $to = ['lt' => $data - self::DELTA]; - $requestCountQuery = [ 'index' => $this->clientConfig->getIndexName(), 'type' => $this->clientConfig->getEntityType(), @@ -310,40 +231,14 @@ public function loadNext($data, $rightIndex, $upper = null) 'filter' => [ 'bool' => [ 'must' => [ - [ - 'term' => [ - 'store_id' => $this->storeId, - ], - ], [ 'terms' => [ '_id' => $this->entityIds, ], ], [ - 'nested' => [ - 'path' => $this->fieldName, - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - [ - 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), - ], - ], - ], - ], - ], + 'range' => [ + $this->fieldName.'.price' => array_merge($from, $to), ], ], ], @@ -352,12 +247,12 @@ public function loadNext($data, $rightIndex, $upper = null) ], ], 'sort' => [ - 'price.price' => [ + 'price' => [ 'order' => 'asc', 'mode' => 'min', 'nested_filter' => [ 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), + $this->fieldName => array_merge($from, $to), ] ] ] @@ -393,39 +288,15 @@ public function loadNext($data, $rightIndex, $upper = null) 'filter' => [ 'bool' => [ 'must' => [ - [ - 'term' => [ - 'store_id' => $this->storeId, - ], - ], [ 'terms' => [ '_id' => $this->entityIds, ], ], [ - 'nested' => [ - 'path' => $this->fieldName, - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - [ - 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), - ], - ], - ], - ], + [ + 'range' => [ + $this->fieldName => array_merge($from, $to), ], ], ], @@ -435,12 +306,12 @@ public function loadNext($data, $rightIndex, $upper = null) ], ], 'sort' => [ - 'price.price' => [ + 'price' => [ 'order' => 'asc', 'mode' => 'min', 'nested_filter' => [ 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), + $this->fieldName => array_merge($from, $to), ] ] ] From 16278a95c4c95f57c5ddfe6ed7ab1fa7be4851d9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 17:03:03 +0200 Subject: [PATCH 285/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Dynamic/DataProvider.php | 51 ++++--------------- .../Model/DataProvider/SuggestionsTest.php | 2 - 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 74d013fd94c6a..3a30bcc1bebdb 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -14,7 +14,6 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; use Magento\Store\Model\StoreManagerInterface; -use Magento\Customer\Model\Session as CustomerSession; use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; class DataProvider implements DataProviderInterface @@ -49,11 +48,6 @@ class DataProvider implements DataProviderInterface */ protected $storeManager; - /** - * @var CustomerSession - */ - protected $customerSession; - /** * @var SearchIndexNameResolver */ @@ -71,7 +65,6 @@ class DataProvider implements DataProviderInterface * @param IntervalFactory $intervalFactory * @param Config $clientConfig * @param StoreManagerInterface $storeManager - * @param CustomerSession $customerSession * @param SearchIndexNameResolver $searchIndexNameResolver * @param string $indexerId */ @@ -82,7 +75,6 @@ public function __construct( IntervalFactory $intervalFactory, Config $clientConfig, StoreManagerInterface $storeManager, - CustomerSession $customerSession, SearchIndexNameResolver $searchIndexNameResolver, $indexerId ) { @@ -92,10 +84,8 @@ public function __construct( $this->intervalFactory = $intervalFactory; $this->clientConfig = $clientConfig; $this->storeManager = $storeManager; - $this->customerSession = $customerSession; $this->searchIndexNameResolver = $searchIndexNameResolver; $this->indexerId = $indexerId; - } /** @@ -118,15 +108,7 @@ public function getAggregations(EntityStorage $entityStorage) 'std' => 0, ]; $entityIds = $entityStorage->getSource(); - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $fieldName = $this->fieldMapper->getFieldName( - 'price', - [ - 'customerGroupId' => $customerGroupId, - 'websiteId' => $websiteId, - ] - ); + $fieldName = $this->fieldMapper->getFieldName('price'); $storeId = $this->storeManager->getStore()->getId(); $requestQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), @@ -139,11 +121,6 @@ public function getAggregations(EntityStorage $entityStorage) 'query' => [ 'bool' => [ 'must' => [ - [ - 'term' => [ - 'store_id' => $storeId, - ], - ], [ 'terms' => [ '_id' => $entityIds, @@ -164,12 +141,12 @@ public function getAggregations(EntityStorage $entityStorage) $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - if (isset($queryResult['aggregations']['prices']['price_filter']['price_stats'])) { + if (isset($queryResult['aggregations']['prices'])) { $aggregations = [ - 'count' => $queryResult['aggregations']['prices']['price_filter']['price_stats']['count'], - 'max' => $queryResult['aggregations']['prices']['price_filter']['price_stats']['max'], - 'min' => $queryResult['aggregations']['prices']['price_filter']['price_stats']['min'], - 'std' => $queryResult['aggregations']['prices']['price_filter']['price_stats']['std_deviation'], + 'count' => $queryResult['aggregations']['prices']['count'], + 'max' => $queryResult['aggregations']['prices']['max'], + 'min' => $queryResult['aggregations']['prices']['min'], + 'std' => $queryResult['aggregations']['prices']['std_deviation'], ]; } @@ -207,15 +184,7 @@ public function getAggregation( ) { $result = []; $entityIds = $entityStorage->getSource(); - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); - $fieldName = $this->fieldMapper->getFieldName( - $bucket->getField(), - [ - 'customerGroupId' => $customerGroupId, - 'websiteId' => $websiteId, - ] - ); + $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); $dimension = current($dimensions); $storeId = $dimension->getValue(); $requestQuery = [ @@ -250,7 +219,8 @@ public function getAggregation( $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); foreach ($queryResult['aggregations']['prices']['buckets'] as $bucket) { - $result[$bucket['key'] / $range + 1] = $bucket['doc_count']; + $key = intval($bucket['key'] / $range + 1); + $result[$key] = $bucket['doc_count']; } return $result; } @@ -264,11 +234,9 @@ public function prepareData($range, array $dbRanges) if (!empty($dbRanges)) { $lastIndex = array_keys($dbRanges); $lastIndex = $lastIndex[count($lastIndex) - 1]; - foreach ($dbRanges as $index => $count) { $fromPrice = $index == 1 ? '' : ($index - 1) * $range; $toPrice = $index == $lastIndex ? '' : $index * $range; - $data[] = [ 'from' => $fromPrice, 'to' => $toPrice, @@ -276,7 +244,6 @@ public function prepareData($range, array $dbRanges) ]; } } - return $data; } } diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php index a4cef027469a3..a827666e17c82 100644 --- a/Test/Unit/Model/DataProvider/SuggestionsTest.php +++ b/Test/Unit/Model/DataProvider/SuggestionsTest.php @@ -117,8 +117,6 @@ protected function setUp() */ public function testGetItems() { - $result = []; - $this->scopeConfig->expects($this->any()) ->method('getValue') ->willReturn(1); From 21312b0e968f82fdeb32def8594df7b89e8bc418 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 17:11:06 +0200 Subject: [PATCH 286/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Mapper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 463d43d8c667e..0f7f37c0eb14a 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -17,6 +17,8 @@ /** * Mapper class + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Mapper { From e23b1c71843a6421817c3955d76b0a214dabc0f3 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 17:28:27 +0200 Subject: [PATCH 287/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../FieldMapper/ProductFieldMapperTest.php | 269 ++++++++++++++++++ 1 file changed, 269 insertions(+) create mode 100644 Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php new file mode 100644 index 0000000000000..76355241a5cbf --- /dev/null +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -0,0 +1,269 @@ +eavConfig = $this->getMockBuilder('\Magento\Eav\Model\Config') + ->disableOriginalConstructor() + ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes']) + ->getMock(); + + $this->fieldType = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\FieldType') + ->disableOriginalConstructor() + ->setMethods(['getFieldType']) + ->getMock(); + + $this->customerSession = $this->getMockBuilder('\Magento\Customer\Model\Session') + ->disableOriginalConstructor() + ->setMethods(['getCustomerGroupId']) + ->getMock(); + + $this->storeManager = $this->storeManager = $this->getMockForAbstractClass( + 'Magento\Store\Model\StoreManagerInterface', + [], + '', + false + ); + + $this->store = $this->getMockForAbstractClass( + 'Magento\Store\Api\Data\StoreInterface', + [], + '', + false, + false, + true, + ['getWebsiteId','getRootCategoryId'] + ); + + $this->coreRegistry = $this->getMock('\Magento\Framework\Registry'); + + $objectManager = new ObjectManagerHelper($this); + + $this->eavAttributeResource = $this->getMock( + '\Magento\Catalog\Model\ResourceModel\Eav\Attribute', + [ + '__wakeup', + 'getBackendType', + 'getFrontendInput' + ], + [], + '', + false + ); + + $this->mapper = $objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper', + [ + 'eavConfig' => $this->eavConfig, + 'storeManager' => $this->storeManager, + 'fieldType' => $this->fieldType, + 'customerSession' => $this->customerSession, + 'coreRegistry' => $this->coreRegistry + ] + ); + } + + /** + * @dataProvider attributeCodeProvider + * @param string $attributeCode + * @param string $fieldName + * @param string $fieldType + * @param array $context + * + * @return string + */ + public function testGetFieldName($attributeCode, $fieldName, $fieldType, $context = []) + { + $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + ->setMethods(['getBackendType', 'getFrontendInput', 'getAttribute']) + ->disableOriginalConstructor() + ->getMock(); + + $this->customerSession->expects($this->any()) + ->method('getCustomerGroupId') + ->willReturn('0'); + + $this->storeManager->expects($this->any()) + ->method('getStore') + ->willReturn($this->store); + $this->store->expects($this->any()) + ->method('getWebsiteId') + ->willReturn('1'); + $this->store->expects($this->any()) + ->method('getRootCategoryId') + ->willReturn('1'); + + $this->eavConfig->expects($this->any())->method('getAttribute') + ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode) + ->willReturn($attributeMock); + + $attributeMock->expects($this->any())->method('getFrontendInput') + ->will($this->returnValue('select')); + + $this->fieldType->expects($this->any())->method('getFieldType') + ->with($attributeMock) + ->willReturn($fieldType); + + $this->assertEquals( + $fieldName, + $this->mapper->getFieldName($attributeCode, $context) + ); + } + + /** + * @return string + */ + public function testGetFieldNameWithoutAttribute() + { + $this->eavConfig->expects($this->any())->method('getAttribute') + ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, 'attr1') + ->willReturn(''); + + $this->assertEquals( + 'attr1', + $this->mapper->getFieldName('attr1', []) + ); + } + + /** + * @dataProvider attributeProvider + * @param string $attributeCode + * + * @return array + */ + public function testGetAllAttributesTypes($attributeCode) + { + $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + ->setMethods(['getBackendType', 'getFrontendInput']) + ->disableOriginalConstructor() + ->getMock(); + + $store = $this->getMockBuilder('\Magento\Store\Model\Store') + ->setMethods(['getId', '__wakeup'])->disableOriginalConstructor()->getMock(); + $store->expects($this->any())->method('getId')->will($this->returnValue(1)); + $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store)); + $this->storeManager->expects($this->any()) + ->method('getStores') + ->will($this->returnValue([$store])); + + $this->eavConfig->expects($this->any())->method('getEntityAttributeCodes') + ->with(ProductAttributeInterface::ENTITY_TYPE_CODE) + ->willReturn([$attributeCode]); + + $this->eavConfig->expects($this->any())->method('getAttribute') + ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode) + ->willReturn($attributeMock); + + $attributeMock->expects($this->any())->method('getFrontendInput') + ->will($this->returnValue('select')); + + $this->eavAttributeResource->expects($this->any()) + ->method('getIsFilterable') + ->willReturn(true); + $this->eavAttributeResource->expects($this->any()) + ->method('getIsVisibleInAdvancedSearch') + ->willReturn(true); + $this->eavAttributeResource->expects($this->any()) + ->method('getIsFilterableInSearch') + ->willReturn(false); + $this->eavAttributeResource->expects($this->any()) + ->method('getIsGlobal') + ->willReturn(false); + $this->eavAttributeResource->expects($this->any()) + ->method('getIsGlobal') + ->willReturn(true); + + $this->assertInternalType( + 'array', + $this->mapper->getAllAttributesTypes() + ); + } + + /** + * @return array + */ + public static function attributeCodeProvider() + { + return [ + ['id', 'id', 'string'], + ['status', 'status', 'string'], + ['status', 'status', 'string', ['type'=>'default']], + ['price', 'price_0_1', 'string', ['type'=>'default']], + ['position', 'position_category_1', 'string', ['type'=>'default']], + ['price', 'price_2_3', 'string', ['type'=>'default', 'customerGroupId'=>'2', 'websiteId'=>'3']], + ['position', 'position_category_3', 'string', ['type'=>'default', 'categoryId'=>'3']], + ['color', 'color', 'select', ['type'=>'default']], + ['description', 'sort_description', 'string', ['type'=>'some']], + ['*', '_all', 'string', ['type'=>'text']], + ['description', 'sort_description', 'string', ['type'=>'text']], + ]; + } + + /** + * @return array + */ + public static function attributeProvider() + { + return [ + ['category_ids'], + ['attr_code'], + ]; + } +} From c1d14e530cdaa2558e2b3aff66d3464bcf717951 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 17:32:00 +0200 Subject: [PATCH 288/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Config.php | 20 +------------------- Test/Unit/Model/ConfigTest.php | 23 +---------------------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/Model/Config.php b/Model/Config.php index 04cc6faacbd8f..2d084642d346c 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -6,10 +6,8 @@ namespace Magento\Elasticsearch\Model; use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Framework\Encryption\EncryptorInterface; use Magento\Store\Model\ScopeInterface; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; -use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; /** * Elasticsearch config model @@ -41,31 +39,15 @@ class Config implements ClientOptionsInterface */ protected $scopeConfig; - /** - * @var EncryptorInterface - */ - protected $encryptor; - - /** - * @var ElasticsearchFactory - */ - protected $adapterFactory; - /** * Constructor * * @param ScopeConfigInterface $scopeConfig - * @param EncryptorInterface $encryptor - * @param ElasticsearchFactory $adapterFactory */ public function __construct( - ScopeConfigInterface $scopeConfig, - EncryptorInterface $encryptor, - ElasticsearchFactory $adapterFactory + ScopeConfigInterface $scopeConfig ) { $this->scopeConfig = $scopeConfig; - $this->encryptor = $encryptor; - $this->adapterFactory = $adapterFactory; } /** diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index ca562d15f7840..73c7c506a0d37 100644 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -8,8 +8,6 @@ use Magento\Elasticsearch\Model\Config; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Framework\Encryption\EncryptorInterface; -use Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory; /** * Class ConfigTest @@ -26,16 +24,6 @@ class ConfigTest extends \PHPUnit_Framework_TestCase */ protected $scopeConfig; - /** - * @var EncryptorInterface|\PHPUnit_Framework_MockObject_MockObject - */ - protected $encryptor; - - /** - * @var ElasticsearchFactory|\PHPUnit_Framework_MockObject_MockObject - */ - protected $adapterFactory; - /** * Setup * @@ -46,21 +34,12 @@ public function setUp() $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') ->disableOriginalConstructor() ->getMock(); - $this->encryptor = $this->getMockBuilder('Magento\Framework\Encryption\EncryptorInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->adapterFactory = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory') - ->disableOriginalConstructor() - ->setMethods(['create']) - ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( '\Magento\Elasticsearch\Model\Config', [ - 'scopeConfig' => $this->scopeConfig, - 'encryptor' => $this->encryptor, - 'adapterFactory' => $this->adapterFactory + 'scopeConfig' => $this->scopeConfig ] ); } From 6f096fded94de7f778b4c1077a5802a314b31650 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 17:34:44 +0200 Subject: [PATCH 289/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/ResourceModel/Engine.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/ResourceModel/Engine.php b/Model/ResourceModel/Engine.php index b5a29a5ea1846..22d10056c521d 100644 --- a/Model/ResourceModel/Engine.php +++ b/Model/ResourceModel/Engine.php @@ -17,12 +17,12 @@ class Engine implements EngineInterface /** * Catalog product visibility * - * @var \Magento\Catalog\Model\Product\Visibility + * @var Visibility */ protected $catalogProductVisibility; /** - * @var \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver + * @var IndexScopeResolver */ private $indexScopeResolver; From 28be92387835a641d2a385689ee7f1892b9419a5 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 17:40:45 +0200 Subject: [PATCH 290/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/Adapter/FieldMapperTest.php | 216 -------------------- 1 file changed, 216 deletions(-) delete mode 100644 Test/Unit/Model/Adapter/FieldMapperTest.php diff --git a/Test/Unit/Model/Adapter/FieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapperTest.php deleted file mode 100644 index 3442dde83f934..0000000000000 --- a/Test/Unit/Model/Adapter/FieldMapperTest.php +++ /dev/null @@ -1,216 +0,0 @@ -eavConfig = $this->getMockBuilder('\Magento\Eav\Model\Config') - ->disableOriginalConstructor() - ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes']) - ->getMock(); - - $this->fieldType = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\FieldType') - ->disableOriginalConstructor() - ->setMethods(['getFieldType']) - ->getMock(); - - $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface'); - - $objectManager = new ObjectManagerHelper($this); - - $this->eavAttributeResource = $this->getMock( - '\Magento\Catalog\Model\ResourceModel\Eav\Attribute', - [ - '__wakeup', - 'getBackendType', - 'getFrontendInput' - ], - [], - '', - false - ); - - $this->mapper = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\FieldMapper', - [ - 'eavConfig' => $this->eavConfig, - 'coreRegistry' => $this->coreRegistry, - 'storeManager' => $this->storeManager, - 'fieldType' => $this->fieldType - ] - ); - } - - /** - * @dataProvider attributeCodeProvider - * @param string $attributeCode - * @param string $fieldName - * @param string $fieldType - * @param array $context - * - * @return string - */ - public function testGetFieldName($attributeCode, $fieldName, $fieldType, $context = []) - { - $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') - ->setMethods(['getBackendType', 'getFrontendInput', 'getAttribute']) - ->disableOriginalConstructor() - ->getMock(); - - $this->eavConfig->expects($this->any())->method('getAttribute') - ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode) - ->willReturn($attributeMock); - - $attributeMock->expects($this->any())->method('getFrontendInput') - ->will($this->returnValue('select')); - - $this->fieldType->expects($this->any())->method('getFieldType') - ->with($attributeMock) - ->willReturn($fieldType); - - $this->assertEquals( - $fieldName, - $this->mapper->getFieldName($attributeCode, $context) - ); - } - - /** - * @return string - */ - public function testGetFieldNameWithoutAttribute() - { - $this->eavConfig->expects($this->any())->method('getAttribute') - ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, 'attr1') - ->willReturn(''); - - $this->assertEquals( - 'attr1', - $this->mapper->getFieldName('attr1', []) - ); - } - - /** - * @dataProvider attributeProvider - * @param string $attributeCode - * - * @return array - */ - public function testGetAllAttributesTypes($attributeCode) - { - $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') - ->setMethods(['getBackendType', 'getFrontendInput']) - ->disableOriginalConstructor() - ->getMock(); - - $store = $this->getMockBuilder('\Magento\Store\Model\Store') - ->setMethods(['getId', '__wakeup'])->disableOriginalConstructor()->getMock(); - $store->expects($this->any())->method('getId')->will($this->returnValue(1)); - $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store)); - $this->storeManager->expects($this->any()) - ->method('getStores') - ->will($this->returnValue([$store])); - - $this->eavConfig->expects($this->any())->method('getEntityAttributeCodes') - ->with(ProductAttributeInterface::ENTITY_TYPE_CODE) - ->willReturn([$attributeCode]); - - $this->eavConfig->expects($this->any())->method('getAttribute') - ->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode) - ->willReturn($attributeMock); - - $attributeMock->expects($this->any())->method('getFrontendInput') - ->will($this->returnValue('select')); - - $this->eavAttributeResource->expects($this->any()) - ->method('getIsFilterable') - ->willReturn(true); - $this->eavAttributeResource->expects($this->any()) - ->method('getIsVisibleInAdvancedSearch') - ->willReturn(true); - $this->eavAttributeResource->expects($this->any()) - ->method('getIsFilterableInSearch') - ->willReturn(false); - $this->eavAttributeResource->expects($this->any()) - ->method('getIsGlobal') - ->willReturn(false); - $this->eavAttributeResource->expects($this->any()) - ->method('getIsGlobal') - ->willReturn(true); - - $this->assertInternalType( - 'array', - $this->mapper->getAllAttributesTypes() - ); - } - - /** - * @return array - */ - public static function attributeCodeProvider() - { - return [ - ['id', 'id', 'string'], - ['status', 'status', 'string'], - ['price', 'price_value', 'string', ['type'=>'default']], - ['color', 'color_value', 'select', ['type'=>'default']], - ['description', 'sort_description', 'string', ['type'=>'some']], - ['*', '_all', 'string', ['type'=>'text']], - ]; - } - - /** - * @return array - */ - public static function attributeProvider() - { - return [ - ['category_ids'], - ['attr_code'], - ]; - } -} From 18b22a8a4d50febba876f10f1f174853146cb5f3 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 28 Dec 2015 17:46:44 +0200 Subject: [PATCH 291/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Dynamic/DataProviderTest.php | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 7f91c13eb8a22..a457d627bada7 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -17,6 +17,7 @@ use Magento\Framework\Search\Dynamic\EntityStorage; use Magento\Store\Api\Data\StoreInterface; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; class DataProviderTest extends \PHPUnit_Framework_TestCase { @@ -75,6 +76,11 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase */ protected $clientMock; + /** + * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject + */ + protected $searchIndexNameResolver; + /** * Setup method * @return void @@ -85,9 +91,7 @@ public function setUp() ->setMethods(['getConnection']) ->disableOriginalConstructor() ->getMock(); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') - ->disableOriginalConstructor() - ->getMock(); + $this->range = $this->getMockBuilder('Magento\Catalog\Model\Layer\Filter\Price\Range') ->setMethods(['getPriceRange']) ->disableOriginalConstructor() @@ -109,7 +113,6 @@ public function setUp() ->setMethods(['getCustomerGroupId']) ->disableOriginalConstructor() ->getMock(); - $this->entityStorage = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorage') ->setMethods(['getSource']) ->disableOriginalConstructor() @@ -117,9 +120,6 @@ public function setUp() $this->entityStorage->expects($this->any()) ->method('getSource') ->willReturn([1]); - $this->fieldMapper->expects($this->any()) - ->method('getFieldName') - ->willReturn('price'); $this->customerSession->expects($this->any()) ->method('getCustomerGroupId') ->willReturn(1); @@ -149,6 +149,14 @@ public function setUp() ->method('getConnection') ->willReturn($this->clientMock); + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->searchIndexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->disableOriginalConstructor() + ->getMock(); + $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider', @@ -159,7 +167,9 @@ public function setUp() 'intervalFactory' => $this->intervalFactory, 'clientConfig' => $this->clientConfig, 'storeManager' => $this->storeManager, - 'customerSession' => $this->customerSession + 'customerSession' => $this->customerSession, + 'searchIndexNameResolver' => $this->searchIndexNameResolver, + 'indexerId' => 'catalogsearch_fulltext' ] ); } @@ -194,14 +204,10 @@ public function testGetAggregations() ->willReturn([ 'aggregations' => [ 'prices' => [ - 'price_filter' => [ - 'price_stats' => [ - 'count' => 1, - 'max' => 1, - 'min' => 1, - 'std_deviation' => 1, - ], - ], + 'count' => 1, + 'max' => 1, + 'min' => 1, + 'std_deviation' => 1, ], ], ]); @@ -267,14 +273,10 @@ public function testGetAggregation() ->willReturn([ 'aggregations' => [ 'prices' => [ - 'price_filter' => [ - 'price_stats' => [ - 'buckets' => [ - [ - 'key' => 1, - 'doc_count' => 1, - ], - ], + 'buckets' => [ + [ + 'key' => 1, + 'doc_count' => 1, ], ], ], From 86dff20ff6c993f5549dd119a0e419af3a6cb894 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 17:48:04 +0200 Subject: [PATCH 292/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index 76355241a5cbf..71a0862792471 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -252,7 +252,7 @@ public static function attributeCodeProvider() ['color', 'color', 'select', ['type'=>'default']], ['description', 'sort_description', 'string', ['type'=>'some']], ['*', '_all', 'string', ['type'=>'text']], - ['description', 'sort_description', 'string', ['type'=>'text']], + ['description', 'description', 'string', ['type'=>'text']], ]; } From 1ed2c5162916e406bf9c9f4cf0bec5278201beeb Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 28 Dec 2015 19:04:34 +0200 Subject: [PATCH 293/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php | 4 ++-- Test/Unit/SearchAdapter/Filter/Builder/TermTest.php | 4 ++-- Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php | 4 ++-- Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php | 4 ++-- Test/Unit/SearchAdapter/Query/Builder/MatchTest.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php b/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php index 57b7a2aaac06d..cf552b77a6aa8 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php @@ -20,7 +20,7 @@ class RangeTest extends \PHPUnit_Framework_TestCase private $model; /** - * @var \Magento\Elasticsearch\SearchAdapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; @@ -51,7 +51,7 @@ class RangeTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php b/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php index 7e3532fa579d8..5cc47ecda0ee5 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php @@ -20,7 +20,7 @@ class TermTest extends \PHPUnit_Framework_TestCase private $model; /** - * @var \Magento\Elasticsearch\SearchAdapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; @@ -36,7 +36,7 @@ class TermTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php b/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php index fe94f01665d8c..a35649df682fe 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php @@ -20,7 +20,7 @@ class WildcardTest extends \PHPUnit_Framework_TestCase private $model; /** - * @var \Magento\Elasticsearch\SearchAdapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; @@ -36,7 +36,7 @@ class WildcardTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php b/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php index 7c0c6ae5febb1..b154c1ca2c600 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php @@ -16,7 +16,7 @@ class AggregationTest extends \PHPUnit_Framework_TestCase protected $model; /** - * @var \Magento\Elasticsearch\SearchAdapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; @@ -39,7 +39,7 @@ public function setUp() { $helper = new ObjectManager($this); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 2d1e317b98f1e..f8bfc2feabcc3 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -16,7 +16,7 @@ class MatchTest extends \PHPUnit_Framework_TestCase protected $model; /** - * @var \Magento\Elasticsearch\SearchAdapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; @@ -32,7 +32,7 @@ class MatchTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() ->getMock(); From 767b0c3f0797d5d1622926f9af68254e18978717 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Mon, 28 Dec 2015 19:22:22 +0200 Subject: [PATCH 294/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/ResourceModel/IndexTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index d5e106540ed88..6cfd27fd13f8e 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -418,7 +418,10 @@ public function testGetFullProductIndexData($frontendInput) $this->assertInternalType( 'array', - $this->model->getFullProductIndexData([1]) + $this->model->getFullProductIndexData(1, [ + 1 => '240-LV04' + ] + ) ); } From 34d74067b484ec6a82e13593754421b7c646b080 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Mon, 28 Dec 2015 19:24:42 +0200 Subject: [PATCH 295/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../ProductDataMapperTest.php} | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) rename Test/Unit/Model/Adapter/{DocumentDataMapperTest.php => DataMapper/ProductDataMapperTest.php} (95%) diff --git a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php similarity index 95% rename from Test/Unit/Model/Adapter/DocumentDataMapperTest.php rename to Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php index d32ae12623de1..79c0a859af031 100644 --- a/Test/Unit/Model/Adapter/DocumentDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php @@ -3,7 +3,7 @@ * Copyright © 2015 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Test\Unit\Model\Adapter; +namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\DataMapper; use Magento\Catalog\Model\ResourceModel\Eav\Attribute; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; @@ -12,20 +12,20 @@ use Magento\Framework\Stdlib\DateTime\TimezoneInterface; use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer; use Magento\Elasticsearch\Model\Adapter\Document\Builder; -use Magento\Elasticsearch\Model\Adapter\FieldMapper; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Store\Model\StoreManagerInterface; -use Magento\Elasticsearch\Model\Adapter\DocumentDataMapper; +use Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper; use Magento\Elasticsearch\Model\ResourceModel\Index; use Magento\AdvancedSearch\Model\ResourceModel\Index as AdvancedSearchIndex; use Magento\Store\Api\Data\StoreInterface; /** - * Class DocumentDataMapperTest + * Class ProductDataMapperTest */ -class DocumentDataMapperTest extends \PHPUnit_Framework_TestCase +class ProductDataMapperTest extends \PHPUnit_Framework_TestCase { /** - * @var DocumentDataMapper + * @var ProductDataMapper */ protected $model; @@ -55,7 +55,7 @@ class DocumentDataMapperTest extends \PHPUnit_Framework_TestCase private $advancedSearchIndex; /** - * @var FieldMapper|\PHPUnit_Framework_MockObject_MockObject + * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ private $fieldMapperMock; @@ -108,8 +108,8 @@ protected function setUp() ]) ->getMock(); - $this->fieldMapperMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapper') - ->setMethods(['getFieldName']) + $this->fieldMapperMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + ->setMethods(['getFieldName','getAllAttributesTypes']) ->disableOriginalConstructor() ->getMock(); @@ -144,7 +144,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\DocumentDataMapper', + '\Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper', [ 'builder' => $this->builderMock, 'attributeContainer' => $this->attributeContainerMock, From 130815646f226930f891c006bffe108c52b944c5 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 22:33:53 +0200 Subject: [PATCH 296/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Adapter/Container/Attribute.php | 13 +- .../Adapter/DataMapper/ProductDataMapper.php | 22 +--- SearchAdapter/Aggregation/Interval.php | 51 +------- SearchAdapter/Mapper.php | 61 +++------ SearchAdapter/Query/Builder.php | 85 +++++++++++++ Test/Unit/Model/Adapter/ElasticsearchTest.php | 78 ++++-------- .../SearchAdapter/ConnectionManagerTest.php | 95 -------------- Test/Unit/SearchAdapter/MapperTest.php | 69 +++------- Test/Unit/SearchAdapter/Query/BuilderTest.php | 120 ++++++++++++++++++ 9 files changed, 282 insertions(+), 312 deletions(-) create mode 100644 SearchAdapter/Query/Builder.php delete mode 100644 Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php create mode 100644 Test/Unit/SearchAdapter/Query/BuilderTest.php diff --git a/Model/Adapter/Container/Attribute.php b/Model/Adapter/Container/Attribute.php index 30131822e80d7..26989a0bbba47 100644 --- a/Model/Adapter/Container/Attribute.php +++ b/Model/Adapter/Container/Attribute.php @@ -6,6 +6,7 @@ namespace Magento\Elasticsearch\Model\Adapter\Container; use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection; +use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute; class Attribute { @@ -20,7 +21,7 @@ class Attribute private $attributeCollection; /** - * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute[] + * @var EavAttribute[] */ private $attributes = []; @@ -65,7 +66,7 @@ public function getAttributeIdByCode($attributeCode) /** * @param string $attributeCode - * @return \Magento\Catalog\Model\ResourceModel\Eav\Attribute|null + * @return EavAttribute|null */ public function getAttribute($attributeCode) { @@ -76,20 +77,18 @@ public function getAttribute($attributeCode) } /** - * @return \Magento\Catalog\Model\ResourceModel\Attribute[] + * @return EavAttribute[] */ public function getAttributes() { if (0 === count($this->attributes)) { - /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $attributesCollection */ + /** @var Collection $attributesCollection */ $attributesCollection = $this->attributeCollection; - foreach ($attributesCollection as $attribute) { - /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */ + /** @var EavAttribute $attribute */ $this->attributes[$attribute->getAttributeCode()] = $attribute; } } - return $this->attributes; } } diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 6ac8747291ca7..d70df11ab4781 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -18,34 +18,30 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Adapter\DataMapperInterface; -/** - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) - */ class ProductDataMapper implements DataMapperInterface { /** - * Attribute code for image. + * Attribute code for image */ const MEDIA_ROLE_IMAGE = 'image'; /** - * Attribute code for small image. + * Attribute code for small image */ const MEDIA_ROLE_SMALL_IMAGE = 'small_image'; /** - * Attribute code for thumbnail. + * Attribute code for thumbnail */ const MEDIA_ROLE_THUMBNAIL = 'thumbnail'; /** - * Attribute code for swatches. + * Attribute code for swatches */ const MEDIA_ROLE_SWATCH_IMAGE = 'swatch_image'; /** - * Entyity type for product. + * Entity type for product */ const PRODUCT_ENTITY_TYPE = 'product'; @@ -151,9 +147,6 @@ public function __construct( * @param array $context * @return array|false * @throws \Magento\Framework\Exception\LocalizedException - * @SuppressWarnings(PHPMD.NPathComplexity) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function map($productId, array $indexData, $storeId, $context = []) { @@ -289,7 +282,6 @@ protected function getProductTierPriceData($data) * @param array $media * @param array $roles * @return array - * @SuppressWarnings(PHPMD.NPathComplexity) */ protected function getProductMediaGalleryData($media, $roles) { @@ -399,10 +391,8 @@ protected function getQtyAndStatus($data) protected function getProductPriceData($productId, $storeId, array $priceIndexData) { $result = []; - if (array_key_exists($productId, $priceIndexData)) { $productPriceIndexData = $priceIndexData[$productId]; - $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId(); foreach ($productPriceIndexData as $customerGroupId => $price) { $fieldName = 'price_' . $customerGroupId . '_' . $websiteId; @@ -461,13 +451,11 @@ protected function getProductCategoryData($productId, array $categoryIndexData) if (array_key_exists($productId, $categoryIndexData)) { $indexData = $categoryIndexData[$productId]; - foreach ($indexData as $categoryData) { $categoryIds[] = $categoryData['id']; } if (count($categoryIds)) { $result = ['category_ids' => implode(' ', $categoryIds)]; - foreach ($indexData as $data) { $result['position_category_' . $data['id']] = $data['position']; $result['name_category_' . $data['id']] = $data['name']; diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 8a1548336db57..648a36c98d709 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -272,54 +272,9 @@ public function loadNext($data, $rightIndex, $upper = null) $to = ['lt' => $data - self::DELTA]; } - $requestQuery = [ - 'index' => $this->clientConfig->getIndexName(), - 'type' => $this->clientConfig->getEntityType(), - 'search_type' => 'count', - 'body' => [ - 'fields' => [ - '_id' - ], - 'query' => [ - 'filtered' => [ - 'query' => [ - 'match_all' => [], - ], - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'terms' => [ - '_id' => $this->entityIds, - ], - ], - [ - [ - 'range' => [ - $this->fieldName => array_merge($from, $to), - ], - ], - ], - ], - ], - ], - ], - ], - 'sort' => [ - 'price' => [ - 'order' => 'asc', - 'mode' => 'min', - 'nested_filter' => [ - 'range' => [ - $this->fieldName => array_merge($from, $to), - ] - ] - ] - ], - 'from' => $offset - 1, - 'size' => $rightIndex - $offset + 1, - ] - ]; + // TODO: change only some part of the query which is different + $requestQuery = $requestCountQuery; + $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 0f7f37c0eb14a..f96e8f105d8f4 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -10,22 +10,19 @@ use Magento\Framework\Search\Request\Query\BoolExpression as BoolQuery; use Magento\Framework\Search\Request\Query\Filter as FilterQuery; use Magento\Framework\Search\Request\Query\Match as MatchQuery; -use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\SearchAdapter\Query\Builder as QueryBuilder; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; -use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; /** * Mapper class - * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Mapper { /** - * @var Config + * @var QueryBuilder */ - protected $clientConfig; + protected $queryBuilder; /** * @var MatchQueryBuilder @@ -38,34 +35,18 @@ class Mapper protected $filterBuilder; /** - * @var AggregationBuilder - */ - protected $aggregationBuilder; - - /** - * @var SearchIndexNameResolver - */ - protected $searchIndexNameResolver; - - /** - * @param Config $clientConfig + * @param QueryBuilder $queryBuilder * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder - * @param AggregationBuilder $aggregationBuilder - * @param SearchIndexNameResolver $searchIndexNameResolver */ public function __construct( - Config $clientConfig, + QueryBuilder $queryBuilder, MatchQueryBuilder $matchQueryBuilder, - FilterBuilder $filterBuilder, - AggregationBuilder $aggregationBuilder, - SearchIndexNameResolver $searchIndexNameResolver + FilterBuilder $filterBuilder ) { - $this->clientConfig = $clientConfig; + $this->queryBuilder = $queryBuilder; $this->matchQueryBuilder = $matchQueryBuilder; $this->filterBuilder = $filterBuilder; - $this->aggregationBuilder = $aggregationBuilder; - $this->searchIndexNameResolver = $searchIndexNameResolver; } /** @@ -76,24 +57,16 @@ public function __construct( */ public function buildQuery(RequestInterface $request) { - $dimension = current($request->getDimensions()); - $storeId = $dimension->getValue(); - $searchQuery = [ - 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), - 'type' => $this->clientConfig->getEntityType(), - 'body' => [ - 'from' => $request->getFrom(), - 'size' => $request->getSize(), - 'fields' => ['_id', '_score'], - 'query' => $this->processQuery( - $request->getQuery(), - [], - BoolQuery::QUERY_CONDITION_MUST - ), - ], - ]; - $searchQuery['body']['query']['bool']['minimum_should_match'] = 1; - $searchQuery = $this->aggregationBuilder->build($request, $searchQuery); + $searchQuery = $this->queryBuilder->initQuery($request); + $searchQuery['body']['query'] = array_merge( + $searchQuery['body']['query'], + $this->processQuery( + $request->getQuery(), + [], + BoolQuery::QUERY_CONDITION_MUST + ) + ); + $searchQuery = $this->queryBuilder->initAggregations($request, $searchQuery); return $searchQuery; } diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php new file mode 100644 index 0000000000000..f8c68ca40c6ac --- /dev/null +++ b/SearchAdapter/Query/Builder.php @@ -0,0 +1,85 @@ +clientConfig = $clientConfig; + $this->searchIndexNameResolver = $searchIndexNameResolver; + $this->aggregationBuilder = $aggregationBuilder; + } + + /** + * Set initial settings for query + * + * @param RequestInterface $request + * @return array + */ + public function initQuery(RequestInterface $request) + { + $dimension = current($request->getDimensions()); + $storeId = $dimension->getValue(); + $searchQuery = [ + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), + 'type' => $this->clientConfig->getEntityType(), + 'body' => [ + 'from' => $request->getFrom(), + 'size' => $request->getSize(), + 'fields' => ['_id', '_score'], + 'query' => [ + 'bool' => [ + 'minimum_should_match' => 1, + ], + ], + ], + ]; + return $searchQuery; + } + + /** + * Add aggregations settings to query + * + * @param RequestInterface $request + * @param array $searchQuery + * @return array + */ + public function initAggregations( + RequestInterface $request, + array $searchQuery + ) { + return $this->aggregationBuilder->build($request, $searchQuery); + } +} diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 167ac5556666a..5f965619b9684 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -8,17 +8,16 @@ use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\Model\Adapter\DocumentDataMapper; -use Magento\Elasticsearch\Model\Adapter\FieldMapper; +use Magento\Elasticsearch\Model\Adapter\DataMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface; use Psr\Log\LoggerInterface; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; /** * Class ElasticsearchTest - * - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ElasticsearchTest extends \PHPUnit_Framework_TestCase { @@ -33,12 +32,12 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase protected $connectionManager; /** - * @var DocumentDataMapper|\PHPUnit_Framework_MockObject_MockObject + * @var DataMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $documentDataMapper; /** - * @var FieldMapper|\PHPUnit_Framework_MockObject_MockObject + * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; @@ -68,68 +67,46 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase protected $objectManager; /** - * @var string - */ - protected $entityType; - - /** - * @var int - */ - protected $storeId; - - /** - * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver|\PHPUnit_Framework_MockObject_MockObject + * @var IndexNameResolver|\PHPUnit_Framework_MockObject_MockObject */ protected $indexNameResolver; /** * Setup * - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) * @return void */ public function setUp() { $this->objectManager = new ObjectManagerHelper($this); - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') ->disableOriginalConstructor() - ->setMethods([ - 'getConnection', - ]) + ->setMethods(['getConnection']) ->getMock(); - $this->documentDataMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\DocumentDataMapper') + $this->documentDataMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\DataMapperInterface') ->disableOriginalConstructor() - ->setMethods([ - 'map', - ]) ->getMock(); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapper') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() - ->setMethods(['getAllAttributesTypes']) ->getMock(); $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->disableOriginalConstructor() ->setMethods([ 'getIndexPrefix', 'getEntityType', - 'getIndexSettings', - ]) - ->getMock(); + ])->getMock(); $this->indexBuilder = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface') ->disableOriginalConstructor() ->getMock(); $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') ->disableOriginalConstructor() ->getMock(); - $elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') ->setMethods([ 'indices', 'ping', 'bulk', 'search', - 'scroll', ]) ->disableOriginalConstructor() ->getMock(); @@ -155,7 +132,6 @@ public function setUp() 'elasticsearchClient' => $elasticsearchClientMock ]) ->getMock(); - $this->connectionManager->expects($this->any()) ->method('getConnection') ->willReturn($this->client); @@ -170,9 +146,6 @@ public function setUp() $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); - $this->entityType = 'product'; - $this->storeId = 1; - $this->indexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver') ->setMethods([ 'getIndexName', @@ -194,7 +167,6 @@ public function setUp() 'logger' => $this->logger, 'indexNameResolver' => $this->indexNameResolver, 'options' => [], - ] ); } @@ -269,7 +241,7 @@ public function testAddDocs() ], ], 1, - $this->entityType + 'product' ) ); } @@ -290,7 +262,7 @@ public function testAddDocsFailure() ], ], 1, - $this->entityType + 'product' ); } @@ -316,7 +288,7 @@ public function testCleanIndex() ->with('_product_1_v1'); $this->assertSame( $this->model, - $this->model->cleanIndex(1, $this->entityType) + $this->model->cleanIndex(1, 'product') ); } @@ -336,7 +308,7 @@ public function testCleanIndexTrue() $this->assertSame( $this->model, - $this->model->cleanIndex(1, $this->entityType) + $this->model->cleanIndex(1,'product') ); } @@ -349,7 +321,7 @@ public function testDeleteDocs() ->method('bulkQuery'); $this->assertSame( $this->model, - $this->model->deleteDocs(['1' => 1], 1, $this->entityType) + $this->model->deleteDocs(['1' => 1], 1, 'product') ); } @@ -362,7 +334,7 @@ public function testDeleteDocsFailure() $this->client->expects($this->once()) ->method('bulkQuery') ->willThrowException(new \Exception('Something went wrong')); - $this->model->deleteDocs(['1' => 1], 1, $this->entityType); + $this->model->deleteDocs(['1' => 1], 1, 'product'); } /** @@ -387,7 +359,7 @@ public function testUpdateAliasEmpty() $this->client->expects($this->never()) ->method('updateAlias'); - $this->assertEquals($model, $model->updateAlias(1, $this->entityType)); + $this->assertEquals($model, $model->updateAlias(1, 'product')); } /** @@ -432,8 +404,8 @@ public function testUpdateAlias() ->method('getIndexFromAlias') ->willReturn('_product_1_v1'); - $this->model->cleanIndex(1, $this->entityType); - $this->assertEquals($this->model, $this->model->updateAlias(1, $this->entityType)); + $this->model->cleanIndex(1, 'product'); + $this->assertEquals($this->model, $this->model->updateAlias(1, 'product')); } /** @@ -441,7 +413,7 @@ public function testUpdateAlias() */ public function testUpdateAliasWithOldIndex() { - $this->model->cleanIndex(1, $this->entityType); + $this->model->cleanIndex(1, 'product'); $this->indexNameResolver->expects($this->any()) ->method('getIndexFromAlias') @@ -459,9 +431,9 @@ public function testUpdateAliasWithOldIndex() $this->client->expects($this->any()) ->method('getAlias') ->with('indexName') - ->willReturn(['indexName_product_1_v'=>'indexName_product_1_v']); + ->willReturn(['indexName_product_1_v' => 'indexName_product_1_v']); - $this->assertEquals($this->model, $this->model->updateAlias(1, $this->entityType)); + $this->assertEquals($this->model, $this->model->updateAlias(1, 'product')); } /** @@ -469,7 +441,7 @@ public function testUpdateAliasWithOldIndex() */ public function testUpdateAliasWithoutOldIndex() { - $this->model->cleanIndex(1, $this->entityType); + $this->model->cleanIndex(1, 'product'); $this->client->expects($this->any()) ->method('existsAlias') ->with('indexName') @@ -478,9 +450,9 @@ public function testUpdateAliasWithoutOldIndex() $this->client->expects($this->any()) ->method('getAlias') ->with('indexName') - ->willReturn(['indexName_product_1_v2'=>'indexName_product_1_v2']); + ->willReturn(['indexName_product_1_v2' => 'indexName_product_1_v2']); - $this->assertEquals($this->model, $this->model->updateAlias(1, $this->entityType)); + $this->assertEquals($this->model, $this->model->updateAlias(1, 'product')); } /** diff --git a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php deleted file mode 100644 index 95df8aa57c49a..0000000000000 --- a/Test/Unit/Model/SearchAdapter/ConnectionManagerTest.php +++ /dev/null @@ -1,95 +0,0 @@ -logger = $this->getMockBuilder('Psr\Log\LoggerInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface') - ->disableOriginalConstructor() - ->setMethods(['create']) - ->getMock(); - $this->clientConfig = $this->getMockBuilder(ClientOptionsInterface::class) - ->disableOriginalConstructor() - ->setMethods( - [ - 'prepareClientOptions' - ] - ) - ->getMock(); - $this->clientConfig->expects($this->any()) - ->method('prepareClientOptions') - ->willReturn([]); - $this->model = new ConnectionManager( - $this->clientFactory, - $this->clientConfig, - $this->logger - ); - } - - /** - * Test getConnection() method without errors - */ - public function testGetConnectionSuccessful() - { - $client = $this->getMockBuilder('\Magento\Elasticsearch\Model\Client\Elasticsearch') - ->disableOriginalConstructor() - ->getMock(); - $this->clientFactory->expects($this->any()) - ->method('create') - ->willReturn($client); - $this->model->getConnection(); - } - - /** - * Test getConnection() method with errors - * @expectedException \RuntimeException - */ - public function testGetConnectionFailure() - { - $this->clientFactory->expects($this->any()) - ->method('create') - ->willThrowException(new \Exception('Something went wrong')); - $this->model->getConnection(); - } -} diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index 6135df55ab573..cedbf0266cd8b 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -6,7 +6,7 @@ namespace Magento\Elasticsearch\Test\Unit\SearchAdapter; use Magento\Elasticsearch\SearchAdapter\Mapper; -use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\SearchAdapter\Query\Builder as QueryBuilder; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; @@ -19,9 +19,9 @@ class MapperTest extends \PHPUnit_Framework_TestCase protected $model; /** - * @var Config|\PHPUnit_Framework_MockObject_MockObject + * @var QueryBuilder|\PHPUnit_Framework_MockObject_MockObject */ - protected $clientConfig; + protected $queryBuilder; /** * @var MatchQueryBuilder|\PHPUnit_Framework_MockObject_MockObject @@ -39,10 +39,10 @@ class MapperTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->queryBuilder = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Builder') ->setMethods([ - 'getIndexPrefix', - 'getEntityType', + 'initQuery', + 'initAggregations', ]) ->disableOriginalConstructor() ->getMock(); @@ -53,13 +53,20 @@ public function setUp() $this->filterBuilder = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Filter\Builder') ->disableOriginalConstructor() ->getMock(); - - $this->clientConfig->expects($this->any()) - ->method('getIndexPrefix') - ->willReturn('indexPrefix'); - $this->clientConfig->expects($this->any()) - ->method('getEntityType') - ->willReturn('product'); + $this->queryBuilder->expects($this->any()) + ->method('initQuery') + ->willReturn([ + 'body' => [ + 'query' => [], + ], + ]); + $this->queryBuilder->expects($this->any()) + ->method('initAggregations') + ->willReturn([ + 'body' => [ + 'query' => [], + ], + ]); $this->matchQueryBuilder->expects($this->any()) ->method('build') ->willReturn([]); @@ -68,7 +75,7 @@ public function setUp() $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Mapper', [ - 'clientConfig' => $this->clientConfig, + 'queryBuilder' => $this->queryBuilder, 'matchQueryBuilder' => $this->matchQueryBuilder, 'filterBuilder' => $this->filterBuilder ] @@ -84,26 +91,9 @@ public function testBuildQueryFailure() $request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') ->disableOriginalConstructor() ->getMock(); - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') - ->setMethods(['getValue']) - ->disableOriginalConstructor() - ->getMock(); $query = $this->getMockBuilder('Magento\Framework\Search\Request\QueryInterface') ->disableOriginalConstructor() ->getMock(); - - $request->expects($this->once()) - ->method('getDimensions') - ->willReturn([$dimension]); - $dimension->expects($this->once()) - ->method('getValue') - ->willReturn(1); - $request->expects($this->once()) - ->method('getFrom') - ->willReturn(0); - $request->expects($this->once()) - ->method('getSize') - ->willReturn(10); $request->expects($this->once()) ->method('getQuery') ->willReturn($query); @@ -128,10 +118,6 @@ public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMo $request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') ->disableOriginalConstructor() ->getMock(); - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') - ->setMethods(['getValue']) - ->disableOriginalConstructor() - ->getMock(); $query = $this->getMockBuilder($queryMock) ->disableOriginalConstructor() ->getMock(); @@ -141,19 +127,6 @@ public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMo $filterQuery = $this->getMockBuilder($filterMock) ->disableOriginalConstructor() ->getMock(); - - $request->expects($this->once()) - ->method('getDimensions') - ->willReturn([$dimension]); - $dimension->expects($this->once()) - ->method('getValue') - ->willReturn(1); - $request->expects($this->once()) - ->method('getFrom') - ->willReturn(0); - $request->expects($this->once()) - ->method('getSize') - ->willReturn(10); $request->expects($this->once()) ->method('getQuery') ->willReturn($query); diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/Test/Unit/SearchAdapter/Query/BuilderTest.php new file mode 100644 index 0000000000000..da3a3fe231f8c --- /dev/null +++ b/Test/Unit/SearchAdapter/Query/BuilderTest.php @@ -0,0 +1,120 @@ +clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + ->setMethods(['getEntityType']) + ->disableOriginalConstructor() + ->getMock(); + $this->searchIndexNameResolver = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->setMethods(['getIndexName']) + ->disableOriginalConstructor() + ->getMock(); + $this->aggregationBuilder = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation') + ->setMethods(['build']) + ->disableOriginalConstructor() + ->getMock(); + $this->request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + ->disableOriginalConstructor() + ->getMock(); + + $objectManagerHelper = new ObjectManagerHelper($this); + $this->model = $objectManagerHelper->getObject( + '\Magento\Elasticsearch\SearchAdapter\Query\Builder', + [ + 'clientConfig' => $this->clientConfig, + 'searchIndexNameResolver' => $this->searchIndexNameResolver, + 'aggregationBuilder' => $this->aggregationBuilder + ] + ); + } + + /** + * Test initQuery() method + */ + public function testInitQuery() + { + $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + ->setMethods(['getValue']) + ->disableOriginalConstructor() + ->getMock(); + $this->request->expects($this->once()) + ->method('getDimensions') + ->willReturn([$dimension]); + $dimension->expects($this->once()) + ->method('getValue') + ->willReturn(1); + $this->request->expects($this->once()) + ->method('getFrom') + ->willReturn(0); + $this->request->expects($this->once()) + ->method('getSize') + ->willReturn(10); + $this->request->expects($this->once()) + ->method('getIndex') + ->willReturn('catalogsearch_fulltext'); + $this->searchIndexNameResolver->expects($this->once()) + ->method('getIndexName') + ->willReturn('indexName'); + $this->clientConfig->expects($this->once()) + ->method('getEntityType') + ->willReturn('document'); + $this->model->initQuery($this->request); + } + + /** + * Test initQuery() method + */ + public function testInitAggregations() + { + $this->aggregationBuilder->expects($this->any()) + ->method('build') + ->willReturn([]); + $this->model->initAggregations($this->request, []); + } +} From 342889f0282e888d2ff8a4ac6c712d89aa579ef9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 23:05:23 +0200 Subject: [PATCH 297/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 90 ++++++++++--------- 1 file changed, 49 insertions(+), 41 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index d70df11ab4781..fea0ef0d392fc 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -146,20 +146,10 @@ public function __construct( * @param int $storeId * @param array $context * @return array|false - * @throws \Magento\Framework\Exception\LocalizedException */ public function map($productId, array $indexData, $storeId, $context = []) { $this->builder->addField('store_id', $storeId); - $mediaGalleryRoles = array_fill_keys($this->mediaGalleryRoles, ''); - - $productPriceIndexData = $this->attributeContainer->getAttribute('price') - ? $this->resourceIndex->getPriceIndexData([$productId], $storeId) - : []; - $productCategoryIndexData = $this->resourceIndex->getFullCategoryProductIndexData( - $storeId, - [$productId => $productId] - ); if (count($indexData)) { $productIndexData = $this->resourceIndex->getFullProductIndexData($productId, $indexData); } @@ -172,36 +162,20 @@ public function map($productId, array $indexData, $storeId, $context = []) } /* @var Attribute|null $attribute */ $attribute = $this->attributeContainer->getAttribute($attributeCode); - if (!$attribute - || in_array($attributeCode, ['price', 'media_gallery'], true) - ) { - continue; - } - - if ($attributeCode === 'tier_price') { - $this->builder->addFields($this->getProductTierPriceData($value)); - continue; - } - - if ($attributeCode === 'quantity_and_stock_status') { - $this->builder->addFields($this->getQtyAndStatus($value)); - continue; - } - - if ($attributeCode === 'media_gallery') { - $this->builder->addFields( - $this->getProductMediaGalleryData( - $value, - $mediaGalleryRoles - ) - ); + if (!$attribute || in_array( + $attributeCode, + [ + 'price', + 'media_gallery', + 'tier_price', + 'quantity_and_stock_status', + 'media_gallery', + ] + )) { continue; } - $attribute->setStoreId($storeId); - $mediaGalleryRoles[$attributeCode] = $this->getMediaGalleryRole($attributeCode, $value); $value = $this->checkValue($value, $attribute, $storeId); - $this->builder->addField( $this->fieldMapper->getFieldName( $attributeCode, @@ -209,14 +183,48 @@ public function map($productId, array $indexData, $storeId, $context = []) ), $value ); - - unset($attribute); } + $this->processAdvancedAttributes($productId, $productIndexData, $storeId); + return $this->builder->build(); + } + + /** + * Process advanced attribute values + * + * @param int $productId + * @param array $productIndexData + * @param int $storeId + * @return void + */ + protected function processAdvancedAttributes($productId, array $productIndexData, $storeId) + { + $mediaGalleryRoles = array_fill_keys($this->mediaGalleryRoles, ''); + $productPriceIndexData = $this->attributeContainer->getAttribute('price') + ? $this->resourceIndex->getPriceIndexData([$productId], $storeId) + : []; + $productCategoryIndexData = $this->resourceIndex->getFullCategoryProductIndexData( + $storeId, + [$productId => $productId] + ); + foreach ($productIndexData as $attributeCode => $value) { + if (in_array($attributeCode, $this->mediaGalleryRoles)) { + $mediaGalleryRoles[$attributeCode] = $value; + } elseif ($attributeCode == 'tier_price') { + $this->builder->addFields($this->getProductTierPriceData($value)); + } elseif ($attributeCode == 'quantity_and_stock_status') { + $this->builder->addFields($this->getQtyAndStatus($value)); + } elseif ($attributeCode == 'media_gallery') { + $this->builder->addFields( + $this->getProductMediaGalleryData( + $value, + $mediaGalleryRoles + ) + ); + } + } $this->builder->addFields($this->getProductPriceData($productId, $storeId, $productPriceIndexData)); $this->builder->addFields($this->getProductCategoryData($productId, $productCategoryIndexData)); - - return $this->builder->build(); } /** @@ -245,7 +253,7 @@ protected function checkValue($value, $attribute, $storeId) protected function getMediaGalleryRole($attributeCode, $value) { if (in_array($attributeCode, $this->mediaGalleryRoles)) { - return $value; + return $value; } } From 2da70f1564e0267e8a4bb8a8e188908fe35a4fcf Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 23:23:57 +0200 Subject: [PATCH 298/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../Adapter/DataMapper/ProductDataMapper.php | 77 +++--------------- Model/Adapter/FieldType/Date.php | 80 +++++++++++++++++++ .../SearchIndexNameResolverTest.php | 18 ----- 3 files changed, 90 insertions(+), 85 deletions(-) create mode 100644 Model/Adapter/FieldType/Date.php diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index fea0ef0d392fc..50b716e2213c1 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -6,17 +6,14 @@ namespace Magento\Elasticsearch\Model\Adapter\DataMapper; use Magento\Catalog\Model\ResourceModel\Eav\Attribute; -use Magento\Framework\App\Config\ScopeConfigInterface; -use Magento\Framework\Stdlib\DateTime; -use Magento\Framework\Stdlib\DateTime\TimezoneInterface; use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer; use Magento\Elasticsearch\Model\Adapter\Document\Builder; -use Magento\Store\Model\ScopeInterface; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Api\Data\GroupInterface; use Magento\Elasticsearch\Model\ResourceModel\Index; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Adapter\DataMapperInterface; +use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType; class ProductDataMapper implements DataMapperInterface { @@ -45,13 +42,6 @@ class ProductDataMapper implements DataMapperInterface */ const PRODUCT_ENTITY_TYPE = 'product'; - /** - * Array of \DateTime objects per store - * - * @var \DateTime[] - */ - protected $dateFormats = []; - /** * @var Builder */ @@ -73,24 +63,14 @@ class ProductDataMapper implements DataMapperInterface private $fieldMapper; /** - * @var DateTime - */ - private $dateTime; - - /** - * @var TimezoneInterface - */ - private $localeDate; - - /** - * @var ScopeConfigInterface + * @var StoreManagerInterface */ - private $scopeConfig; + private $storeManager; /** - * @var StoreManagerInterface + * @var DateFieldType */ - private $storeManager; + private $dateFieldType; /** * Media gallery roles @@ -106,29 +86,23 @@ class ProductDataMapper implements DataMapperInterface * @param AttributeContainer $attributeContainer * @param Index $resourceIndex * @param FieldMapperInterface $fieldMapper - * @param DateTime $dateTime - * @param TimezoneInterface $localeDate - * @param ScopeConfigInterface $scopeConfig * @param StoreManagerInterface $storeManager + * @param DateFieldType $dateFieldType */ public function __construct( Builder $builder, AttributeContainer $attributeContainer, Index $resourceIndex, FieldMapperInterface $fieldMapper, - DateTime $dateTime, - TimezoneInterface $localeDate, - ScopeConfigInterface $scopeConfig, - StoreManagerInterface $storeManager + StoreManagerInterface $storeManager, + DateFieldType $dateFieldType ) { $this->builder = $builder; $this->attributeContainer = $attributeContainer; $this->resourceIndex = $resourceIndex; $this->fieldMapper = $fieldMapper; - $this->dateTime = $dateTime; - $this->localeDate = $localeDate; - $this->scopeConfig = $scopeConfig; $this->storeManager = $storeManager; + $this->dateFieldType = $dateFieldType; $this->mediaGalleryRoles = [ self::MEDIA_ROLE_IMAGE, @@ -160,7 +134,6 @@ public function map($productId, array $indexData, $storeId, $context = []) $this->builder->addField($attributeCode, $value); continue; } - /* @var Attribute|null $attribute */ $attribute = $this->attributeContainer->getAttribute($attributeCode); if (!$attribute || in_array( $attributeCode, @@ -239,7 +212,7 @@ protected function checkValue($value, $attribute, $storeId) return array_shift($value); } elseif ($attribute->getBackendType() === 'datetime' || $attribute->getBackendType() === 'timestamp' || $attribute->getFrontendInput() === 'date') { - return $this->formatDate($storeId, $value); + return $this->dateFieldType->formatDate($storeId, $value); } else { return $value; } @@ -410,36 +383,6 @@ protected function getProductPriceData($productId, $storeId, array $priceIndexDa return $result; } - /** - * Retrieve date value in elasticsearch format (ISO 8601) with Z - * Example: 1995-12-31T23:59:59Z - * - * @param int $storeId - * @param string|null $date - * @return string|null - */ - protected function formatDate($storeId, $date = null) - { - if ($this->dateTime->isEmptyDate($date)) { - return null; - } - - if (!array_key_exists($storeId, $this->dateFormats)) { - $timezone = $this->scopeConfig->getValue( - $this->localeDate->getDefaultTimezonePath(), - ScopeInterface::SCOPE_STORE, - $storeId - ); - - $dateObj = new \DateTime(); - $dateObj->setTimezone(new \DateTimeZone($timezone)); - $this->dateFormats[$storeId] = $dateObj; - } - - $dateObj = $this->dateFormats[$storeId]; - return $dateObj->format('c'); - } - /** * Prepare category index data for product * diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php new file mode 100644 index 0000000000000..426c00ba38488 --- /dev/null +++ b/Model/Adapter/FieldType/Date.php @@ -0,0 +1,80 @@ +dateTime = $dateTime; + $this->localeDate = $localeDate; + $this->scopeConfig = $scopeConfig; + } + + /** + * Retrieve date value in elasticsearch format (ISO 8601) with Z + * Example: 1995-12-31T23:59:59Z + * + * @param int $storeId + * @param string|null $date + * @return string|null + */ + public function formatDate($storeId, $date = null) + { + if ($this->dateTime->isEmptyDate($date)) { + return null; + } + if (!array_key_exists($storeId, $this->dateFormats)) { + $timezone = $this->scopeConfig->getValue( + $this->localeDate->getDefaultTimezonePath(), + ScopeInterface::SCOPE_STORE, + $storeId + ); + $dateObj = new \DateTime(); + $dateObj->setTimezone(new \DateTimeZone($timezone)); + $this->dateFormats[$storeId] = $dateObj; + } + $dateObj = $this->dateFormats[$storeId]; + return $dateObj->format('c'); + } +} diff --git a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php index 05e120e750377..0de80a628eaea 100644 --- a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php +++ b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php @@ -88,22 +88,4 @@ public function testGetIndexName() $this->model->getIndexName($this->storeId, 'else_index_id') ); } - - /** - * Get elasticsearch client options - * - * @return array - */ - protected function getClientOptions() - { - return [ - 'hostname' => 'localhost', - 'port' => '9200', - 'timeout' => 15, - 'index' => 'magento2', - 'enableAuth' => 1, - 'username' => 'user', - 'password' => 'my-password', - ]; - } } From f9f0e1f378983b243a74e82cecad1e8b4a869186 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 28 Dec 2015 23:31:02 +0200 Subject: [PATCH 299/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Adapter/DataMapper/ProductDataMapper.php | 6 ++++-- .../Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php | 2 +- Test/Unit/Model/Adapter/ElasticsearchTest.php | 2 +- .../Model/Adapter/FieldMapper/ProductFieldMapperTest.php | 2 +- Test/Unit/Model/ResourceModel/IndexTest.php | 4 +++- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 50b716e2213c1..a91c578b4292b 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -135,7 +135,8 @@ public function map($productId, array $indexData, $storeId, $context = []) continue; } $attribute = $this->attributeContainer->getAttribute($attributeCode); - if (!$attribute || in_array( + if (!$attribute || + in_array( $attributeCode, [ 'price', @@ -144,7 +145,8 @@ public function map($productId, array $indexData, $storeId, $context = []) 'quantity_and_stock_status', 'media_gallery', ] - )) { + ) + ) { continue; } $attribute->setStoreId($storeId); diff --git a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php index 79c0a859af031..4850d013474f9 100644 --- a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php @@ -109,7 +109,7 @@ protected function setUp() ->getMock(); $this->fieldMapperMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') - ->setMethods(['getFieldName','getAllAttributesTypes']) + ->setMethods(['getFieldName', 'getAllAttributesTypes']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 5f965619b9684..12d10c1ff8201 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -308,7 +308,7 @@ public function testCleanIndexTrue() $this->assertSame( $this->model, - $this->model->cleanIndex(1,'product') + $this->model->cleanIndex(1, 'product') ); } diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index 71a0862792471..b3f22f10ed884 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -89,7 +89,7 @@ protected function setUp() false, false, true, - ['getWebsiteId','getRootCategoryId'] + ['getWebsiteId', 'getRootCategoryId'] ); $this->coreRegistry = $this->getMock('\Magento\Framework\Registry'); diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index 6cfd27fd13f8e..052922e1c2133 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -418,7 +418,9 @@ public function testGetFullProductIndexData($frontendInput) $this->assertInternalType( 'array', - $this->model->getFullProductIndexData(1, [ + $this->model->getFullProductIndexData( + 1, + [ 1 => '240-LV04' ] ) diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index a457d627bada7..b10acc781710e 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -153,7 +153,8 @@ public function setUp() ->disableOriginalConstructor() ->getMock(); - $this->searchIndexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + $this->searchIndexNameResolver = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') ->disableOriginalConstructor() ->getMock(); From ff06d1fb51411c7aaac7c5ce501f78fab1a43462 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 11:16:26 +0200 Subject: [PATCH 300/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../FieldMapper/ProductFieldMapperTest.php | 5 +- .../Unit/Model/Adapter/FieldType/DateTest.php | 94 +++++++++++++++++++ Test/Unit/Model/Client/ElasticsearchTest.php | 13 +++ 3 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 Test/Unit/Model/Adapter/FieldType/DateTest.php diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index b3f22f10ed884..fb9c4dbe9a3bb 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -9,7 +9,6 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Store\Model\StoreManagerInterface; use Magento\Customer\Model\Session; -use PHPUnit_Framework_MockObject_MockObject as MockObject; class ProductFieldMapperTest extends \PHPUnit_Framework_TestCase { @@ -19,12 +18,12 @@ class ProductFieldMapperTest extends \PHPUnit_Framework_TestCase protected $mapper; /** - * @var \Magento\Eav\Model\Config|MockObject + * @var \Magento\Eav\Model\Config|PHPUnit_Framework_MockObject_MockObject */ protected $eavConfig; /** - * @var \Magento\Framework\Registry|MockObject + * @var \Magento\Framework\Registry|PHPUnit_Framework_MockObject_MockObject */ protected $coreRegistry; diff --git a/Test/Unit/Model/Adapter/FieldType/DateTest.php b/Test/Unit/Model/Adapter/FieldType/DateTest.php new file mode 100644 index 0000000000000..0d44e65da3182 --- /dev/null +++ b/Test/Unit/Model/Adapter/FieldType/DateTest.php @@ -0,0 +1,94 @@ +dateTime = $this->getMockBuilder('\Magento\Framework\Stdlib\DateTime') + ->disableOriginalConstructor() + ->setMethods(['isEmptyDate']) + ->getMock(); + + $this->localeDate = $this->getMockBuilder('\Magento\Framework\Stdlib\DateTime\TimezoneInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->scopeConfig = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface') + ->disableOriginalConstructor() + ->getMock(); + + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\FieldType\Date', + [ + 'dateTime' => $this->dateTime, + 'localeDate' => $this->localeDate, + 'scopeConfig' => $this->scopeConfig + ] + ); + } + + /** + * Test formatDate() method + */ + public function testFormatDateEmpty() + { + $this->dateTime->expects($this->once()) + ->method('isEmptyDate') + ->willReturn(true); + $this->assertNull($this->model->formatDate(1, null)); + } + + /** + * Test formatDate() method + */ + public function testFormatDate() + { + $this->dateTime->expects($this->once()) + ->method('isEmptyDate') + ->willReturn(false); + $this->localeDate->expects($this->once()) + ->method('getDefaultTimezonePath') + ->willReturn('timezonePath'); + $this->scopeConfig->expects($this->once()) + ->method('getValue') + ->willReturn('Europe/Kiev'); + $this->model->formatDate(1, '1997-12-31'); + } +} diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 461988fb9f685..773b404ab9791 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -505,6 +505,19 @@ public function testQuery() $this->assertEquals([], $this->model->query($query)); } + /** + * Test suggest() method + * @return void + */ + public function testSuggest() + { + $query = 'query'; + $this->elasticsearchClientMock->expects($this->once()) + ->method('search') + ->willReturn([]); + $this->assertEquals([], $this->model->query($query)); + } + /** * Get elasticsearch client options * From 75091a251d6c589aebfef10da8361dcddb24a9e3 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 29 Dec 2015 11:55:24 +0200 Subject: [PATCH 301/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/ResourceModel/IndexTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index 052922e1c2133..6c8356131b4a1 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -395,7 +395,9 @@ public function testGetFullProductIndexData($frontendInput) ->disableOriginalConstructor() ->setMethods([ 'getFrontendInput', - 'getOptions' + 'getOptions', + 'getData', + 'getAttributeId', ]) ->getMock(); @@ -404,6 +406,10 @@ public function testGetFullProductIndexData($frontendInput) ->with('catalog_product', 'name') ->willReturn($attributeMock); + $attributeMock->expects($this->any()) + ->method('getAttributeId') + ->willReturn(1); + $attributeMock->expects($this->any()) ->method('getFrontendInput') ->willReturn($frontendInput); From 21f0c4e9cc2714f56e99b9e58d9a9b7754f5e022 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 12:14:43 +0200 Subject: [PATCH 302/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../DataMapper/DataMapperResolverTest.php | 104 ++++++++++++++++ .../FieldMapper/FieldMapperResolverTest.php | 116 ++++++++++++++++++ .../FieldMapper/ProductFieldMapperTest.php | 12 +- Test/Unit/Model/Adapter/FieldTypeTest.php | 2 +- 4 files changed, 227 insertions(+), 7 deletions(-) create mode 100644 Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php create mode 100644 Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php diff --git a/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php b/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php new file mode 100644 index 0000000000000..b41bd38c02e7f --- /dev/null +++ b/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php @@ -0,0 +1,104 @@ +objectManagerMock = $this->getMockBuilder('\Magento\Framework\ObjectManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->dataMapperEntity = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\DataMapperInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->dataMappers = [ + 'product' => 'productDataMapper', + ]; + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\DataMapper\DataMapperResolver', + [ + 'objectManager' => $this->objectManagerMock, + 'dataMappers' => $this->dataMappers + ] + ); + } + + /** + * Test map() with Exception + * @return void + * @expectedException \Exception + */ + public function testMapEmpty() + { + $this->model->map(1, [], 1, ['entityType' => '']); + } + + /** + * Test map() with Exception + * @return void + * @expectedException \LogicException + */ + public function testMapWrongType() + { + $this->model->map(1, [], 1, ['entityType' => 'error']); + } + + /** + * Test map() with Exception + * @return void + * @expectedException \InvalidArgumentException + */ + public function testMapFailure() + { + $this->objectManagerMock->expects($this->once()) + ->method('create') + ->willReturn(false); + $this->model->map(1, [], 1, ['entityType' => 'product']); + } + + /** + * Test map() method + * @return void + */ + public function testMap() + { + $this->objectManagerMock->expects($this->once()) + ->method('create') + ->willReturn($this->dataMapperEntity); + $this->model->map(1, [], 1, ['entityType' => 'product']); + } +} diff --git a/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php b/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php new file mode 100644 index 0000000000000..e212921476c9d --- /dev/null +++ b/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php @@ -0,0 +1,116 @@ +objectManagerMock = $this->getMockBuilder('\Magento\Framework\ObjectManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->fieldMapperEntity = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->fieldMappers = [ + 'product' => 'productFieldMapper', + ]; + $objectManager = new ObjectManagerHelper($this); + $this->model = $objectManager->getObject( + '\Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver', + [ + 'objectManager' => $this->objectManagerMock, + 'fieldMappers' => $this->fieldMappers + ] + ); + } + + /** + * Test getFieldName() with Exception + * @return void + * @expectedException \Exception + */ + public function testGetFieldNameEmpty() + { + $this->model->getFieldName('attribute', ['entityType' => '']); + } + + /** + * Test getFieldName() with Exception + * @return void + * @expectedException \LogicException + */ + public function testGetFieldNameWrongType() + { + $this->model->getFieldName('attribute', ['entityType' => 'error']); + } + + /** + * Test getFieldName() with Exception + * @return void + * @expectedException \InvalidArgumentException + */ + public function testGetFieldNameFailure() + { + $this->objectManagerMock->expects($this->once()) + ->method('create') + ->willReturn(false); + $this->model->getFieldName('attribute', ['entityType' => 'product']); + } + + /** + * Test getFieldName() method + * @return void + */ + public function testGetFieldName() + { + $this->objectManagerMock->expects($this->once()) + ->method('create') + ->willReturn($this->fieldMapperEntity); + $this->model->getFieldName('attribute', []); + } + + /** + * Test getAllAttributesTypes() method + * @return void + */ + public function testGetAllAttributesTypes() + { + $this->objectManagerMock->expects($this->once()) + ->method('create') + ->willReturn($this->fieldMapperEntity); + $this->model->getAllAttributesTypes([]); + } +} diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index fb9c4dbe9a3bb..d36b3e5cb8eb5 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -18,12 +18,12 @@ class ProductFieldMapperTest extends \PHPUnit_Framework_TestCase protected $mapper; /** - * @var \Magento\Eav\Model\Config|PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */ protected $eavConfig; /** - * @var \Magento\Framework\Registry|PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */ protected $coreRegistry; @@ -53,7 +53,7 @@ class ProductFieldMapperTest extends \PHPUnit_Framework_TestCase protected $store; /** - * Set up test environment. + * Set up test environment * * @return void */ @@ -126,7 +126,7 @@ protected function setUp() * @param string $fieldType * @param array $context * - * @return string + * @return void */ public function testGetFieldName($attributeCode, $fieldName, $fieldType, $context = []) { @@ -167,7 +167,7 @@ public function testGetFieldName($attributeCode, $fieldName, $fieldType, $contex } /** - * @return string + * @return void */ public function testGetFieldNameWithoutAttribute() { @@ -185,7 +185,7 @@ public function testGetFieldNameWithoutAttribute() * @dataProvider attributeProvider * @param string $attributeCode * - * @return array + * @return void */ public function testGetAllAttributesTypes($attributeCode) { diff --git a/Test/Unit/Model/Adapter/FieldTypeTest.php b/Test/Unit/Model/Adapter/FieldTypeTest.php index 8bb2bd7e12656..a96cdb182bc8a 100644 --- a/Test/Unit/Model/Adapter/FieldTypeTest.php +++ b/Test/Unit/Model/Adapter/FieldTypeTest.php @@ -100,7 +100,7 @@ public static function attributeTypesProvider() ['attr1','static', 'text'], ['attr1','timestamp', 'select'], ['attr1','int', 'select'], - ['attr1','decimal', 'select'], + ['attr1','decimal', 'text'], ['attr1','varchar', 'select'], ['attr1','array', 'multiselect'], ['price','int', 'text'], From 3fd704941906ee79888ccac2789259eba8b21ff5 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 29 Dec 2015 12:29:41 +0200 Subject: [PATCH 303/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/ResourceModel/IndexTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index 6c8356131b4a1..a763d7a0425cb 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -415,7 +415,7 @@ public function testGetFullProductIndexData($frontendInput) ->willReturn($frontendInput); $attributeOption = $this->getMock('\Magento\Eav\Model\Entity\Attribute\Option', [], [], '', false); - $attributeOption->expects($this->any())->method('getValue')->willReturn('Product Name'); + $attributeOption->expects($this->any())->method('getValue')->willReturn('240-LV04'); $attributeOption->expects($this->any())->method('getLabel')->willReturn('label'); $attributeMock->expects($this->any()) From 1a526bbd4127d1a960191ebfcd1b286c68389124 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 29 Dec 2015 12:56:24 +0200 Subject: [PATCH 304/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Aggregation/Interval.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 648a36c98d709..1ce37c8e940f9 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -9,6 +9,8 @@ use Magento\Elasticsearch\SearchAdapter\ConnectionManager; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; +use Magento\CatalogSearch\Model\Indexer\Fulltext;; class Interval implements IntervalInterface { @@ -47,10 +49,16 @@ class Interval implements IntervalInterface */ private $entityIds; + /** + * @var SearchIndexNameResolver + */ + private $searchIndexNameResolver; + /** * @param ConnectionManager $connectionManager * @param FieldMapperInterface $fieldMapper * @param Config $clientConfig + * @param SearchIndexNameResolver $searchIndexNameResolver * @param string $fieldName * @param string $storeId * @param array $entityIds @@ -59,6 +67,7 @@ public function __construct( ConnectionManager $connectionManager, FieldMapperInterface $fieldMapper, Config $clientConfig, + SearchIndexNameResolver $searchIndexNameResolver, $fieldName, $storeId, $entityIds @@ -69,6 +78,7 @@ public function __construct( $this->fieldName = $fieldName; $this->storeId = $storeId; $this->entityIds = $entityIds; + $this->searchIndexNameResolver = $searchIndexNameResolver; } /** @@ -86,7 +96,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null) } $requestQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID), 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ @@ -153,7 +163,7 @@ public function loadPrevious($data, $index, $lower = null) } $requestQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID), 'type' => $this->clientConfig->getEntityType(), 'search_type' => 'count', 'body' => [ @@ -216,7 +226,7 @@ public function loadNext($data, $rightIndex, $upper = null) $to = ['lt' => $data - self::DELTA]; $requestCountQuery = [ - 'index' => $this->clientConfig->getIndexName(), + 'index' => $this->searchIndexNameResolver->getIndexName($this->storeId, Fulltext::INDEXER_ID), 'type' => $this->clientConfig->getEntityType(), 'search_type' => 'count', 'body' => [ From 455c84e1845ce89f252b9a53a6efa8245df574f5 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 29 Dec 2015 13:44:12 +0200 Subject: [PATCH 305/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- .../DataMapper/ProductDataMapperTest.php | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php index 4850d013474f9..9510c3d3ea607 100644 --- a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php @@ -165,10 +165,12 @@ protected function setUp() * @param int $productId * @param array $productData * @param int $storeId + * @param bool $emptyDate + * @param string $type * - * @return array + * @return void */ - public function testGetMap($productId, $productData, $storeId, $emptyDate) + public function testGetMap($productId, $productData, $storeId, $emptyDate, $type) { $this->attributeContainerMock->expects($this->any())->method('getAttribute')->will( $this->returnValue($this->attribute) @@ -210,14 +212,11 @@ public function testGetMap($productId, $productData, $storeId, $emptyDate) $this->returnValue($this->attributeContainerMock) ); $this->attribute->expects($this->any())->method('getBackendType')->will( - $this->returnValue('datetime') + $this->returnValue($type) ); $this->dateTimeMock->expects($this->any())->method('isEmptyDate')->will( $this->returnValue($emptyDate) ); - $this->attributeContainerMock->expects($this->any())->method('getFrontendInput')->will( - $this->returnValue('date') - ); $this->scopeConfigMock->expects($this->any())->method('getValue')->will( $this->returnValue('Europe/London') ); @@ -231,10 +230,9 @@ public function testGetMap($productId, $productData, $storeId, $emptyDate) $this->returnValue([]) ); - $data = [$productId => $productData]; $this->resourceIndex->expects($this->once()) ->method('getFullProductIndexData') - ->willReturn($data); + ->willReturn($productData); $this->assertInternalType( 'array', @@ -254,12 +252,14 @@ public static function mapProvider() ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'], '1', false, + 'datetime' ], [ '1', ['price'=>'11','created_at'=>null,'color_value'=>'11', ], '1', true, + 'datetime' ], [ '1', @@ -278,12 +278,14 @@ public static function mapProvider() ], '1', false, + 'string' ], [ '1', ['image'=>'11','created_at'=>'00-00-00 00:00:00'], '1', false, + 'string' ], [ '1', @@ -313,6 +315,7 @@ public static function mapProvider() ], '1', false, + 'string' ], [ '1', @@ -347,18 +350,28 @@ public static function mapProvider() ], '1', false, + 'string' ], [ '1', ['quantity_and_stock_status'=>'11','created_at'=>'00-00-00 00:00:00'], '1', false, + 'string' + ], + [ + '1', + ['quantity_and_stock_status'=>['is_in_stock' => '1', 'qty' => '12'],'created_at'=>'00-00-00 00:00:00'], + '1', + false, + 'string' ], [ '1', ['price'=>'11','created_at'=>'1995-12-31 23:59:59','options'=>['value1','value2']], '1', false, + 'string' ], ]; } From 26c8aaff1487ad99f5e6ec5a2b6c6b2e4db0622c Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 14:06:15 +0200 Subject: [PATCH 306/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Filter/Builder/Range.php | 67 ++-------------- .../Filter/Builder/RangeTest.php | 80 +------------------ 2 files changed, 7 insertions(+), 140 deletions(-) diff --git a/SearchAdapter/Filter/Builder/Range.php b/SearchAdapter/Filter/Builder/Range.php index 8b2ccccd2333a..819ecde92778c 100644 --- a/SearchAdapter/Filter/Builder/Range.php +++ b/SearchAdapter/Filter/Builder/Range.php @@ -8,8 +8,6 @@ use Magento\Framework\Search\Request\Filter\Range as RangeFilterRequest; use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Store\Model\StoreManagerInterface; -use Magento\Customer\Model\Session as CustomerSession; class Range implements FilterInterface { @@ -18,29 +16,13 @@ class Range implements FilterInterface */ protected $fieldMapper; - /** - * @var StoreManagerInterface - */ - protected $storeManager; - - /** - * @var CustomerSession - */ - protected $customerSession; - /** * @param FieldMapperInterface $fieldMapper - * @param StoreManagerInterface $storeManager - * @param CustomerSession $customerSession */ public function __construct( - FieldMapperInterface $fieldMapper, - StoreManagerInterface $storeManager, - CustomerSession $customerSession + FieldMapperInterface $fieldMapper ) { $this->fieldMapper = $fieldMapper; - $this->storeManager = $storeManager; - $this->customerSession = $customerSession; } /** @@ -51,48 +33,11 @@ public function buildFilter(RequestFilterInterface $filter) { $filterQuery = $from = $to = []; $fieldName = $this->fieldMapper->getFieldName($filter->getField()); - if ($fieldName == 'price') { - $customerGroupId = $this->customerSession->getCustomerGroupId(); - $websiteId = $this->storeManager->getStore()->getWebsiteId(); - if ($filter->getFrom()) { - $from = ['gte' => $filter->getFrom()]; - } - if ($filter->getTo()) { - $to = ['lte' => $filter->getTo()]; - } - $filterQuery = [ - 'nested' => [ - 'path' => 'price', - 'filter' => [ - 'bool' => [ - 'must' => [ - [ - 'term' => [ - 'price.customer_group_id' => $customerGroupId, - ], - ], - [ - 'term' => [ - 'price.website_id' => $websiteId, - ], - ], - [ - 'range' => [ - 'price.price' => array_merge($from, $to), - ], - ], - ], - ], - ], - ], - ]; - } else { - if ($filter->getFrom()) { - $filterQuery['range'][$fieldName]['gte'] = $filter->getFrom(); - } - if ($filter->getTo()) { - $filterQuery['range'][$fieldName]['lte'] = $filter->getTo(); - } + if ($filter->getFrom()) { + $filterQuery['range'][$fieldName]['gte'] = $filter->getFrom(); + } + if ($filter->getTo()) { + $filterQuery['range'][$fieldName]['lte'] = $filter->getTo(); } return [$filterQuery]; } diff --git a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php b/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php index cf552b77a6aa8..de485c3f3c7b2 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php @@ -24,26 +24,11 @@ class RangeTest extends \PHPUnit_Framework_TestCase */ protected $fieldMapper; - /** - * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject - */ - protected $storeManager; - - /** - * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject - */ - protected $customerSession; - /** * @var \Magento\Framework\Search\Request\Filter\Wildcard|\PHPUnit_Framework_MockObject_MockObject */ protected $filterInterface; - /** - * @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject - */ - protected $storeInterface; - /** * Set up test environment. * @@ -55,19 +40,6 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') - ->disableOriginalConstructor() - ->getMock(); - - $this->storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') - ->disableOriginalConstructor() - ->getMock(); - - $this->customerSession = $this->getMockBuilder('Magento\Customer\Model\Session') - ->disableOriginalConstructor() - ->setMethods(['getCustomerGroupId']) - ->getMock(); - $this->filterInterface = $this->getMockBuilder('Magento\Framework\Search\Request\Filter\Range') ->disableOriginalConstructor() ->setMethods([ @@ -81,9 +53,7 @@ protected function setUp() $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range', [ - 'fieldMapper' => $this->fieldMapper, - 'storeManager' => $this->storeManager, - 'customerSession' => $this->customerSession + 'fieldMapper' => $this->fieldMapper ] ); } @@ -101,54 +71,6 @@ public function testBuildFilter() ->method('getField') ->willReturn('field'); - $this->customerSession->expects($this->any()) - ->method('getCustomerGroupId') - ->willReturn(1); - - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn(1); - - $this->storeManager->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); - - $this->filterInterface->expects($this->any()) - ->method('getFrom') - ->willReturn('field'); - - $this->filterInterface->expects($this->any()) - ->method('getTo') - ->willReturn('field'); - - $this->model->buildFilter($this->filterInterface); - } - - /** - * Test buildFilter method with field name 'price' - */ - public function testPriceBuildFilter() - { - $this->fieldMapper->expects($this->any()) - ->method('getFieldName') - ->willReturn('price'); - - $this->filterInterface->expects($this->any()) - ->method('getField') - ->willReturn('field'); - - $this->customerSession->expects($this->any()) - ->method('getCustomerGroupId') - ->willReturn(1); - - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn($this->storeInterface); - - $this->storeInterface->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); - $this->filterInterface->expects($this->any()) ->method('getFrom') ->willReturn('field'); From 374309ef34f0733c50a303aba1101db2b4e6441d Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 14:08:56 +0200 Subject: [PATCH 307/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Query/Builder/Aggregation.php | 25 +++++---------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/SearchAdapter/Query/Builder/Aggregation.php b/SearchAdapter/Query/Builder/Aggregation.php index 9bd521733c1eb..8f5c3951eafcf 100644 --- a/SearchAdapter/Query/Builder/Aggregation.php +++ b/SearchAdapter/Query/Builder/Aggregation.php @@ -64,26 +64,11 @@ protected function buildBucket( ]; break; case BucketInterface::TYPE_DYNAMIC: - if ($field == 'price') { - $searchQuery['body']['aggregations'][$bucket->getName()]= [ - 'nested' => [ - 'path' => $field, - ], - 'aggregations' => [ - $bucket->getName() => [ - 'extended_stats' => [ - 'field' => $field . '.price', - ], - ], - ], - ]; - } else { - $searchQuery['body']['aggregations'][$bucket->getName()]= [ - 'extended_stats' => [ - 'field' => $field, - ], - ]; - } + $searchQuery['body']['aggregations'][$bucket->getName()]= [ + 'extended_stats' => [ + 'field' => $field, + ], + ]; break; } return $searchQuery; From 5b884c9a3f48273101f45ae0dba58dbd0cc79e95 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Tue, 29 Dec 2015 15:59:40 +0200 Subject: [PATCH 308/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Aggregation/Interval.php | 63 +++------ .../Aggregation/IntervalTest.php | 120 +++++++++++------- 2 files changed, 96 insertions(+), 87 deletions(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 1ce37c8e940f9..052a4a3ae30f6 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -10,7 +10,7 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; -use Magento\CatalogSearch\Model\Indexer\Fulltext;; +use Magento\CatalogSearch\Model\Indexer\Fulltext; class Interval implements IntervalInterface { @@ -100,7 +100,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null) 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ - '_id' + '_id', $this->fieldName ], 'query' => [ 'filtered' => [ @@ -125,17 +125,6 @@ public function load($limit, $offset = null, $lower = null, $upper = null) ], ], ], - 'sort' => [ - 'price' => [ - 'order' => 'asc', - 'mode' => 'min', - 'filter' => [ - 'range' => [ - $this->fieldName => array_merge($from, $to), - ] - ] - ] - ], 'size' => $limit ] ]; @@ -147,7 +136,8 @@ public function load($limit, $offset = null, $lower = null, $upper = null) $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - return $this->arrayValuesToFloat($queryResult['hits']['hits']); + + return $this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName); } /** @@ -193,22 +183,12 @@ public function loadPrevious($data, $index, $lower = null) ], ], ], - 'sort' => [ - 'price' => [ - 'order' => 'asc', - 'mode' => 'min', - 'filter' => [ - 'range' => [ - $this->fieldName => array_merge($from, $to), - ] - ] - ] - ] - ] + ], ]; $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); + $offset = $queryResult['hits']['total']; if (!$offset) { return false; @@ -248,7 +228,7 @@ public function loadNext($data, $rightIndex, $upper = null) ], [ 'range' => [ - $this->fieldName.'.price' => array_merge($from, $to), + $this->fieldName => array_merge($from, $to), ], ], ], @@ -256,18 +236,7 @@ public function loadNext($data, $rightIndex, $upper = null) ], ], ], - 'sort' => [ - 'price' => [ - 'order' => 'asc', - 'mode' => 'min', - 'nested_filter' => [ - 'range' => [ - $this->fieldName => array_merge($from, $to), - ] - ] - ] - ] - ] + ], ]; $queryCountResult = $this->connectionManager->getConnection() ->query($requestCountQuery); @@ -282,27 +251,33 @@ public function loadNext($data, $rightIndex, $upper = null) $to = ['lt' => $data - self::DELTA]; } - // TODO: change only some part of the query which is different $requestQuery = $requestCountQuery; + $requestCountQuery['body']['query']['filtered']['filter']['bool']['must']['range'] = + [$this->fieldName => array_merge($from, $to)]; + + $requestCountQuery['body']['from'] = $offset - 1; + $requestCountQuery['body']['size'] = $rightIndex - $offset + 1; $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - return array_reverse($this->arrayValuesToFloat($queryResult['hits']['hits'])); + return array_reverse($this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName)); } /** * @param array $hits - * + * @param string $fieldName + * * @return float[] */ - private function arrayValuesToFloat($hits) + private function arrayValuesToFloat($hits, $fieldName) { $returnPrices = []; foreach ($hits as $hit) { - $returnPrices[] = (float) $hit['sort'][0]; + $returnPrices[] = (float) $hit['fields'][$fieldName][0]; } return $returnPrices; } } + diff --git a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php index c9dfec37f7abc..9c0602ae2a349 100644 --- a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php @@ -14,6 +14,7 @@ use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Store\Api\Data\StoreInterface; +use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; class IntervalTest extends \PHPUnit_Framework_TestCase { @@ -57,6 +58,11 @@ class IntervalTest extends \PHPUnit_Framework_TestCase */ protected $storeMock; + /** + * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject + */ + protected $searchIndexNameResolver; + /** * Set up test environment. * @@ -68,7 +74,7 @@ protected function setUp() ->setMethods(['getConnection']) ->disableOriginalConstructor() ->getMock(); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() ->getMock(); $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') @@ -91,6 +97,9 @@ protected function setUp() $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); + $this->searchIndexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->disableOriginalConstructor() + ->getMock(); $this->storeMock->expects($this->any()) ->method('getWebsiteId') ->willReturn(1); @@ -117,9 +126,11 @@ protected function setUp() [ 'connectionManager' => $this->connectionManager, 'fieldMapper' => $this->fieldMapper, - 'storeManager' => $this->storeManager, - 'customerSession' => $this->customerSession, - 'clientConfig' => $this->clientConfig + 'clientConfig' => $this->clientConfig, + 'searchIndexNameResolver' => $this->searchIndexNameResolver, + 'fieldName' => 'price_0_1', + 'storeId' => 1, + 'entityIds' => [265, 313, 281] ] ); } @@ -137,14 +148,14 @@ public function testLoad($limit, $offset, $lower, $upper) $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn($this->storeMock); - $this->storeMock->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); + $this->searchIndexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('magento2_product_1'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('document'); - $expectedResult = ['25', '26']; + $expectedResult = [25]; $this->clientMock->expects($this->once()) ->method('query') @@ -152,11 +163,12 @@ public function testLoad($limit, $offset, $lower, $upper) 'hits' => [ 'hits' => [ [ - 'sort' => ['25'], + 'fields' => [ + + 'price_0_1' => [25], + + ], ], - [ - 'sort' => ['26'], - ] ], ], ]); @@ -175,19 +187,30 @@ public function testLoad($limit, $offset, $lower, $upper) */ public function testLoadPrevArray($data, $index, $lower) { - $queryResult = ['hits' => ['total'=> '1','hits' => [['sort' => '25'],['sort' =>'26']]]]; + $queryResult = [ + 'hits' => [ + 'total'=> '1', + 'hits' => [ + [ + 'fields' => [ + 'price_0_1' => ['25'] + ] + ], + ], + ], + ]; $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn($this->storeMock); - $this->storeMock->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); + $this->searchIndexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('magento2_product_1'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('document'); - $expectedResult = ['2.0', '2.0']; + $expectedResult = ['25.0']; $this->clientMock->expects($this->any()) ->method('query') @@ -212,12 +235,12 @@ public function testLoadPrevFalse($data, $index, $lower) $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn($this->storeMock); - $this->storeMock->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); + $this->searchIndexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('magento2_product_1'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('document'); $this->clientMock->expects($this->any()) ->method('query') @@ -236,19 +259,30 @@ public function testLoadPrevFalse($data, $index, $lower) */ public function testLoadNextArray($data, $rightIndex, $upper) { - $queryResult = ['hits' => ['total'=> '1','hits' => [['sort' => '25'],['sort' =>'26']]]]; + $queryResult = [ + 'hits' => [ + 'total'=> '1', + 'hits' => [ + [ + 'fields' => [ + 'price_0_1' => ['25'] + ] + ], + ], + ] + ]; $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn($this->storeMock); - $this->storeMock->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); + $this->searchIndexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('magento2_product_1'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('document'); - $expectedResult = ['2.0', '2.0']; + $expectedResult = ['25.0']; $this->clientMock->expects($this->any()) ->method('query') @@ -273,12 +307,12 @@ public function testLoadNextFalse($data, $rightIndex, $upper) $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); - $this->storeManager->expects($this->any()) - ->method('getStore') - ->willReturn($this->storeMock); - $this->storeMock->expects($this->any()) - ->method('getWebsiteId') - ->willReturn(1); + $this->searchIndexNameResolver->expects($this->any()) + ->method('getIndexName') + ->willReturn('magento2_product_1'); + $this->clientConfig->expects($this->any()) + ->method('getEntityType') + ->willReturn('document'); $this->clientMock->expects($this->any()) ->method('query') From 5b5bbb2bd94599fe4ea7dcdba95cb280781f011f Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 16:04:12 +0200 Subject: [PATCH 309/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- SearchAdapter/Aggregation/Interval.php | 1 - SearchAdapter/Filter/Builder/Range.php | 2 +- Test/Unit/SearchAdapter/Aggregation/IntervalTest.php | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 052a4a3ae30f6..4e15c29a6e747 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -280,4 +280,3 @@ private function arrayValuesToFloat($hits, $fieldName) return $returnPrices; } } - diff --git a/SearchAdapter/Filter/Builder/Range.php b/SearchAdapter/Filter/Builder/Range.php index 819ecde92778c..51fde49106bce 100644 --- a/SearchAdapter/Filter/Builder/Range.php +++ b/SearchAdapter/Filter/Builder/Range.php @@ -31,7 +31,7 @@ public function __construct( */ public function buildFilter(RequestFilterInterface $filter) { - $filterQuery = $from = $to = []; + $filterQuery = []; $fieldName = $this->fieldMapper->getFieldName($filter->getField()); if ($filter->getFrom()) { $filterQuery['range'][$fieldName]['gte'] = $filter->getFrom(); diff --git a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php index 9c0602ae2a349..2dd4c1a745265 100644 --- a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php @@ -97,7 +97,8 @@ protected function setUp() $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') ->disableOriginalConstructor() ->getMock(); - $this->searchIndexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + $this->searchIndexNameResolver = $this + ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') ->disableOriginalConstructor() ->getMock(); $this->storeMock->expects($this->any()) From 040354d25bef47efa4cea4a235ebebc3712f9c74 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 16:23:22 +0200 Subject: [PATCH 310/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Model/Adapter/DataMapper/ProductDataMapper.php | 12 ------------ Test/Unit/Model/Client/ElasticsearchTest.php | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index a91c578b4292b..cb16990e62680 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -220,18 +220,6 @@ protected function checkValue($value, $attribute, $storeId) } } - /** - * @param string $attributeCode - * @param string $value - * @return mixed - */ - protected function getMediaGalleryRole($attributeCode, $value) - { - if (in_array($attributeCode, $this->mediaGalleryRoles)) { - return $value; - } - } - /** * Prepare tier price data for product * diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 773b404ab9791..d41e0a8a8077a 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -515,7 +515,7 @@ public function testSuggest() $this->elasticsearchClientMock->expects($this->once()) ->method('search') ->willReturn([]); - $this->assertEquals([], $this->model->query($query)); + $this->assertEquals([], $this->model->suggest($query)); } /** From aa0925af277bcc93202f922831eed7acc4cef98e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 29 Dec 2015 16:27:58 +0200 Subject: [PATCH 311/616] PRD-101: Re-factor Indexer Implementation to easily support search CMS (or other entities) --- Test/Unit/Model/Client/ElasticsearchTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index d41e0a8a8077a..b795bed38b505 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -44,6 +44,7 @@ public function setUp() 'bulk', 'search', 'scroll', + 'suggest', ]) ->disableOriginalConstructor() ->getMock(); @@ -513,7 +514,7 @@ public function testSuggest() { $query = 'query'; $this->elasticsearchClientMock->expects($this->once()) - ->method('search') + ->method('suggest') ->willReturn([]); $this->assertEquals([], $this->model->suggest($query)); } From e6e10c0953d432daaaf92b2f915de45501490c5a Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 30 Dec 2015 11:42:01 +0200 Subject: [PATCH 312/616] PRD-105: Merge PR from Sprint 5 --- _files/indexer_rollback.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_files/indexer_rollback.php b/_files/indexer_rollback.php index b6d0bba68265e..a9f5d32087570 100644 --- a/_files/indexer_rollback.php +++ b/_files/indexer_rollback.php @@ -31,4 +31,4 @@ $registry->register('isSecureArea', false); /* Refresh stores memory cache */ -$objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); \ No newline at end of file +$objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); From 2a1848ea41f9b4a5164ac9ba78241793f2379849 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 30 Dec 2015 11:42:01 +0200 Subject: [PATCH 313/616] PRD-105: Merge PR from Sprint 5 --- Model/Adapter/Elasticsearch.php | 48 ++++++++----------- Model/Client/Elasticsearch.php | 2 +- SearchAdapter/Dynamic/DataProvider.php | 65 +++++++++++--------------- composer.json | 1 + 4 files changed, 49 insertions(+), 67 deletions(-) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index be1dbffb4fd03..0206c15d14837 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -5,14 +5,6 @@ */ namespace Magento\Elasticsearch\Model\Adapter; -use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; -use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Psr\Log\LoggerInterface; -use Magento\Elasticsearch\Model\Config; -use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; -use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface; -use Magento\Framework\Exception\LocalizedException; - /** * Elasticsearch adapter */ @@ -28,7 +20,7 @@ class Elasticsearch /**#@-*/ /** - * @var ConnectionManager + * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager */ protected $connectionManager; @@ -38,7 +30,7 @@ class Elasticsearch protected $documentDataMapper; /** - * @var IndexNameResolver + * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver */ protected $indexNameResolver; @@ -48,22 +40,22 @@ class Elasticsearch protected $fieldMapper; /** - * @var Config + * @var \Magento\Elasticsearch\Model\Config */ protected $clientConfig; /** - * @var ElasticsearchClient + * @var \Magento\Elasticsearch\Model\Client\Elasticsearch */ protected $client; /** - * @var BuilderInterface + * @var \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface */ protected $indexBuilder; /** - * @var LoggerInterface + * @var \Psr\Log\LoggerInterface */ protected $logger; @@ -75,25 +67,25 @@ class Elasticsearch /** * Constructor for Elasticsearch adapter. * - * @param ConnectionManager $connectionManager + * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager * @param DataMapperInterface $documentDataMapper * @param FieldMapperInterface $fieldMapper - * @param Config $clientConfig - * @param BuilderInterface $indexBuilder - * @param LoggerInterface $logger - * @param IndexNameResolver $indexNameResolver + * @param \Magento\Elasticsearch\Model\Config $clientConfig + * @param \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder + * @param \Psr\Log\LoggerInterface $logger + * @param \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver * @param array $options * - * @throws LocalizedException + * @throws \Magento\Framework\Exception\LocalizedException */ public function __construct( - ConnectionManager $connectionManager, + \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, DataMapperInterface $documentDataMapper, FieldMapperInterface $fieldMapper, - Config $clientConfig, - BuilderInterface $indexBuilder, - LoggerInterface $logger, - IndexNameResolver $indexNameResolver, + \Magento\Elasticsearch\Model\Config $clientConfig, + \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface $indexBuilder, + \Psr\Log\LoggerInterface $logger, + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver, $options = [] ) { $this->connectionManager = $connectionManager; @@ -108,7 +100,7 @@ public function __construct( $this->client = $this->connectionManager->getConnection($options); } catch (\Exception $e) { $this->logger->critical($e); - throw new LocalizedException( + throw new \Magento\Framework\Exception\LocalizedException( __('We were unable to perform the search because of a search engine misconfiguration.') ); } @@ -118,14 +110,14 @@ public function __construct( * Retrieve Elasticsearch server status * * @return bool - * @throws LocalizedException + * @throws \Magento\Framework\Exception\LocalizedException */ public function ping() { try { $response = $this->client->ping(); } catch (\Exception $e) { - throw new LocalizedException( + throw new \Magento\Framework\Exception\LocalizedException( __('Could not ping search engine: %1', $e->getMessage()) ); } diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 55f5c6757eab2..b9e344b58676e 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -298,7 +298,7 @@ public function query($query) /** * Execute suggest query * - * @param $query + * @param array $query * @return array */ public function suggest($query) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 3a30bcc1bebdb..92d2adb150a9b 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -5,51 +5,40 @@ */ namespace Magento\Elasticsearch\SearchAdapter\Dynamic; -use Magento\Catalog\Model\Layer\Filter\Price\Range; -use Magento\Framework\Search\Dynamic\DataProviderInterface; -use Magento\Framework\Search\Dynamic\EntityStorage; -use Magento\Framework\Search\Request\BucketInterface; -use Magento\Framework\Search\Dynamic\IntervalFactory; -use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Elasticsearch\Model\Config; -use Magento\Store\Model\StoreManagerInterface; -use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; - -class DataProvider implements DataProviderInterface +class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInterface { /** - * @var ConnectionManager + * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager */ protected $connectionManager; /** - * @var FieldMapperInterface + * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface */ protected $fieldMapper; /** - * @var Range + * @var \Magento\Catalog\Model\Layer\Filter\Price\Range */ protected $range; /** - * @var IntervalFactory + * @var \Magento\Framework\Search\Dynamic\IntervalFactory */ protected $intervalFactory; /** - * @var Config + * @var \Magento\Elasticsearch\Model\Config */ protected $clientConfig; /** - * @var StoreManagerInterface + * @var \Magento\Store\Model\StoreManagerInterface */ protected $storeManager; /** - * @var SearchIndexNameResolver + * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver */ protected $searchIndexNameResolver; @@ -59,23 +48,23 @@ class DataProvider implements DataProviderInterface protected $indexerId; /** - * @param ConnectionManager $connectionManager - * @param FieldMapperInterface $fieldMapper - * @param Range $range - * @param IntervalFactory $intervalFactory - * @param Config $clientConfig - * @param StoreManagerInterface $storeManager - * @param SearchIndexNameResolver $searchIndexNameResolver + * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager + * @param \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface $fieldMapper + * @param \Magento\Catalog\Model\Layer\Filter\Price\Range $range + * @param \Magento\Framework\Search\Dynamic\IntervalFactory $intervalFactory + * @param \Magento\Elasticsearch\Model\Config $clientConfig + * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver * @param string $indexerId */ public function __construct( - ConnectionManager $connectionManager, - FieldMapperInterface $fieldMapper, - Range $range, - IntervalFactory $intervalFactory, - Config $clientConfig, - StoreManagerInterface $storeManager, - SearchIndexNameResolver $searchIndexNameResolver, + \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, + \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface $fieldMapper, + \Magento\Catalog\Model\Layer\Filter\Price\Range $range, + \Magento\Framework\Search\Dynamic\IntervalFactory $intervalFactory, + \Magento\Elasticsearch\Model\Config $clientConfig, + \Magento\Store\Model\StoreManagerInterface $storeManager, + \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver, $indexerId ) { $this->connectionManager = $connectionManager; @@ -99,7 +88,7 @@ public function getRange() /** * {@inheritdoc} */ - public function getAggregations(EntityStorage $entityStorage) + public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage $entityStorage) { $aggregations = [ 'count' => 0, @@ -157,9 +146,9 @@ public function getAggregations(EntityStorage $entityStorage) * {@inheritdoc} */ public function getInterval( - BucketInterface $bucket, + \Magento\Framework\Search\Request\BucketInterface $bucket, array $dimensions, - EntityStorage $entityStorage + \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage ) { $entityIds = $entityStorage->getSource(); $fieldName = $this->fieldMapper->getFieldName('price'); @@ -177,10 +166,10 @@ public function getInterval( * {@inheritdoc} */ public function getAggregation( - BucketInterface $bucket, + \Magento\Framework\Search\Request\BucketInterface $bucket, array $dimensions, $range, - EntityStorage $entityStorage + \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage ) { $result = []; $entityIds = $entityStorage->getSource(); diff --git a/composer.json b/composer.json index 62c160324fcb7..a47af7929bb13 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "magento/module-catalog-search": "100.0.*", "magento/module-customer": "100.0.*", "magento/module-eav": "100.0.*", + "magento/module-search": "100.0.*", "magento/module-store": "100.0.*", "magento/framework": "100.0.*", "elasticsearch/elasticsearch": "~2.0" From 7eaf61fd1dc0b6b3b0c6f8d2dc1ee3bd9362ac3c Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 30 Dec 2015 14:59:12 +0200 Subject: [PATCH 314/616] PRD-105: Merge PR from Sprint 5 --- Model/DataProvider/Suggestions.php | 28 ++++++++++++++++++++++++++++ etc/di.xml | 7 +++++++ 2 files changed, 35 insertions(+) create mode 100644 Model/DataProvider/Suggestions.php diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php new file mode 100644 index 0000000000000..506dff2def687 --- /dev/null +++ b/Model/DataProvider/Suggestions.php @@ -0,0 +1,28 @@ +\Magento\Store\Model\ScopeInterface::SCOPE_STORE + + + + Magento\AdvancedSearch\Model\DataProvider\Suggestions + + + From ddf7148dc1bdec61aab7aa1bf9af002df9dabd2b Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Wed, 30 Dec 2015 17:08:58 +0200 Subject: [PATCH 315/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/AdapterTest.php | 429 ++++++++++++++++++++++++++++ _files/products.php | 88 ++++++ _files/products_rollback.php | 23 ++ _files/requests.xml | 314 ++++++++++++++++++++ _files/search_products.php | 11 + _files/search_products_rollback.php | 11 + 6 files changed, 876 insertions(+) create mode 100644 SearchAdapter/AdapterTest.php create mode 100644 _files/products.php create mode 100644 _files/products_rollback.php create mode 100644 _files/requests.xml create mode 100644 _files/search_products.php create mode 100644 _files/search_products_rollback.php diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php new file mode 100644 index 0000000000000..26b00263c4a00 --- /dev/null +++ b/SearchAdapter/AdapterTest.php @@ -0,0 +1,429 @@ +objectManager = Bootstrap::getObjectManager(); + + /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ + $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter'); + + $document = new \DOMDocument(); + $document->load(__DIR__ . '/../_files/requests.xml'); + $requestConfig = $converter->convert($document); + + /** @var \Magento\Framework\Search\Request\Config $config */ + $config = $this->objectManager->create('Magento\Framework\Search\Request\Config'); + $config->merge($requestConfig); + + $this->requestBuilder = $this->objectManager->create( + 'Magento\Framework\Search\Request\Builder', + ['config' => $config] + ); + + $this->adapter = $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); + } + + /** + * @return \Magento\Framework\Search\Response\QueryResponse + */ + private function executeQuery() + { + $this->reindexAll(); + + /** @var \Magento\Framework\Search\RequestInterface $queryRequest */ + $queryRequest = $this->requestBuilder->create(); + $queryResponse = $this->adapter->query($queryRequest); + + return $queryResponse; + } + + private function reindexAll() + { + /** @var \Magento\Indexer\Model\Indexer[] $indexerList */ + $indexerList = $this->objectManager->get('Magento\Indexer\Model\Indexer\CollectionFactory') + ->create() + ->getItems(); + + foreach ($indexerList as $indexer) { + $indexer->reindexAll(); + } + } +/** + * wrong $queryResponse->count() + */ +// /** +// * Sample test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testMatchQuery() +// { +// $this->requestBuilder->bind('fulltext_search_query', 'socks'); +// $this->requestBuilder->setRequestName('one_match'); +// $queryResponse = $this->executeQuery(); +// +// $this->assertEquals(1, $queryResponse->count()); +// } + + /** + * wrong range / $queryResponse->count() + */ +// /** +// * Sample test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testAggregationsQuery() +// { +// $this->requestBuilder->bind('fulltext_search_query', 'peoples'); +// $this->requestBuilder->setRequestName('one_aggregations'); +// +// $queryResponse = $this->executeQuery(); +// +// $this->assertEquals( +// ['weight_bucket', 'dynamic_price'], +// $queryResponse->getAggregations() +// ->getBucketNames() +// ); +// } + + +/** + * wrong query +**/ +// /** +// * Sample test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testMatchQueryFilters() +// { +// $this->requestBuilder->bind('fulltext_search_query', 'socks'); +// $this->requestBuilder->bind('pidm_from', 11); +// $this->requestBuilder->bind('pidm_to', 17); +// $this->requestBuilder->bind('pidsh', 18); +// $this->requestBuilder->setRequestName('one_match_filters'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(1, $queryResponse->count()); +// } +// +/** + * wrong $queryResponse->count() + */ + +// /** +// * Range filter test with all fields filled +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testRangeFilterWithAllFields() +// { +// $this->requestBuilder->bind('range_filter_from', 11); +// $this->requestBuilder->bind('range_filter_to', 16); +// $this->requestBuilder->setRequestName('range_filter'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(3, $queryResponse->count()); +// } +/** + * wrong $queryResponse->count() + */ +// /** +// * Range filter test with all fields filled +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testRangeFilterWithoutFromField() +// { +// $this->requestBuilder->bind('range_filter_to', 18); +// $this->requestBuilder->setRequestName('range_filter_without_from_field'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(4, $queryResponse->count()); +// } +// + /** + * wrong $queryResponse->count() + */ + +// /** +// * Range filter test with all fields filled +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testRangeFilterWithoutToField() +// { +// $this->requestBuilder->bind('range_filter_from', 14); +// $this->requestBuilder->setRequestName('range_filter_without_to_field'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(4, $queryResponse->count()); +// } + + /** + * wrong $queryResponse->count() + */ + +// /** +// * Term filter test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testTermFilter() +// { +// $this->requestBuilder->bind('request.price', 18); +// $this->requestBuilder->setRequestName('term_filter'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(1, $queryResponse->count()); +// $this->assertEquals( +// 4, +// $queryResponse->getIterator() +// ->offsetGet(0) +// ->getId() +// ); +// } +// + /** + * wrong $queryResponse->count() + */ + +// /** +// * Term filter test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testTermFilterArray() +// { +// $this->requestBuilder->bind('request.price', [16, 18]); +// $this->requestBuilder->setRequestName('term_filter'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(2, $queryResponse->count()); +// } +// + /** + * wrong $queryResponse->count() + */ +// /** +// * Term filter test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testWildcardFilter() +// { +// $this->requestBuilder->bind('wildcard_filter', 'un'); +// $this->requestBuilder->setRequestName('one_wildcard'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(1, $queryResponse->count()); +// } +// + /** + * + */ + +// /** +// * Bool filter test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testBoolFilter() +// { +// $expectedIds = [2, 3]; +// $this->requestBuilder->bind('must_range_filter1_from', 12); +// $this->requestBuilder->bind('must_range_filter1_to', 22); +// $this->requestBuilder->bind('should_term_filter1', 12); +// $this->requestBuilder->bind('should_term_filter2', 14); +// $this->requestBuilder->bind('should_term_filter3', 16); +// $this->requestBuilder->bind('should_term_filter4', 18); +// $this->requestBuilder->bind('not_term_filter1', 12); +// $this->requestBuilder->bind('not_term_filter2', 18); +// $this->requestBuilder->setRequestName('bool_filter'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(count($expectedIds), $queryResponse->count()); +// $actualIds = []; +// foreach ($queryResponse as $document) { +// /** @var \Magento\Framework\Search\Document $document */ +// $actualIds[] = $document->getId(); +// } +// $this->assertEquals($expectedIds, $actualIds); +// } +// + /** + * wrong query + */ +// /** +// * Test bool filter with nested negative bool filter +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testBoolFilterWithNestedNegativeBoolFilter() +// { +// $expectedIds = [1]; +// $this->requestBuilder->bind('not_range_filter_from', 14); +// $this->requestBuilder->bind('not_range_filter_to', 20); +// $this->requestBuilder->bind('nested_not_term_filter', 12); +// $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(count($expectedIds), $queryResponse->count()); +// $actualIds = []; +// foreach ($queryResponse as $document) { +// /** @var \Magento\Framework\Search\Document $document */ +// $actualIds[] = $document->getId(); +// } +// $this->assertEquals($expectedIds, $actualIds); +// } +// + /** + * wrong query + */ +// /** +// * Test range inside nested negative bool filter +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testBoolFilterWithNestedRangeInNegativeBoolFilter() +// { +// $expectedIds = [1, 5]; +// $this->requestBuilder->bind('nested_must_range_filter_from', 14); +// $this->requestBuilder->bind('nested_must_range_filter_to', 18); +// $this->requestBuilder->setRequestName('bool_filter_with_range_in_nested_negative_filter'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(count($expectedIds), $queryResponse->count()); +// $actualIds = []; +// foreach ($queryResponse as $document) { +// /** @var \Magento\Framework\Search\Document $document */ +// $actualIds[] = $document->getId(); +// } +// sort($actualIds); +// $this->assertEquals($expectedIds, $actualIds); +// } + +/** + * wrong query + */ +// /** +// * Sample Advanced search request test +// * +// * @dataProvider advancedSearchDataProvider +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testSimpleAdvancedSearch( +// $nameQuery, +// $descriptionQuery, +// $rangeFilter, +// $expectedRecordsCount +// ) { +// $this->requestBuilder->bind('name_query', $nameQuery); +// $this->requestBuilder->bind('description_query', $descriptionQuery); +// $this->requestBuilder->bind('request.from_price', $rangeFilter['from']); +// $this->requestBuilder->bind('request.to_price', $rangeFilter['to']); +// $this->requestBuilder->setRequestName('advanced_search_test'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals($expectedRecordsCount, $queryResponse->count()); +// } +// +// /** +// * @return array +// */ +// public function advancedSearchDataProvider() +// { +// return [ +// ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], +// ['white', 'shorts', ['from' => '12', 'to' => '18'], 1], +// ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], +// ['peoples', 'green', ['from' => '12', 'to' => '22'], 2], +// ]; +// } + + /** + * wrong $queryResponse->count() + */ +// /** +// * Request limits test +// * +// * @magentoDbIsolation disabled +// * @magentoAppIsolation enabled +// * @magentoConfigFixture current_store catalog/search/engine elasticsearch +// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php +// */ +// public function testSearchLimit() +// { +// $this->requestBuilder->bind('wildcard_filter', '*'); +// $this->requestBuilder->setFrom(2); +// $this->requestBuilder->setSize(2); +// $this->requestBuilder->setRequestName('one_wildcard'); +// +// $queryResponse = $this->executeQuery(); +// $this->assertEquals(2, $queryResponse->count()); +// } +} diff --git a/_files/products.php b/_files/products.php new file mode 100644 index 0000000000000..bc8d543959d17 --- /dev/null +++ b/_files/products.php @@ -0,0 +1,88 @@ +create('Magento\Catalog\Model\Product'); +$productFirst->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Apple') + ->setSku('fulltext-1') + ->setPrice(10) + ->setMetaTitle('first meta title') + ->setMetaKeyword('first meta keyword') + ->setMetaDescription('first meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productSecond = $objectManager->create('Magento\Catalog\Model\Product'); +$productSecond->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Banana') + ->setSku('fulltext-2') + ->setPrice(20) + ->setMetaTitle('second meta title') + ->setMetaKeyword('second meta keyword') + ->setMetaDescription('second meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productThird = $objectManager->create('Magento\Catalog\Model\Product'); +$productThird->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Orange') + ->setSku('fulltext-3') + ->setPrice(20) + ->setMetaTitle('third meta title') + ->setMetaKeyword('third meta keyword') + ->setMetaDescription('third meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productFourth = $objectManager->create('Magento\Catalog\Model\Product'); +$productFourth->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Papaya') + ->setSku('fulltext-4') + ->setPrice(20) + ->setMetaTitle('fourth meta title') + ->setMetaKeyword('fourth meta keyword') + ->setMetaDescription('fourth meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); + +/** @var $productFirst \Magento\Catalog\Model\Product */ +$productFifth = $objectManager->create('Magento\Catalog\Model\Product'); +$productFifth->setTypeId('simple') + ->setAttributeSetId(4) + ->setWebsiteIds([1]) + ->setName('Simple Product Cherry') + ->setSku('fulltext-5') + ->setPrice(20) + ->setMetaTitle('fifth meta title') + ->setMetaKeyword('fifth meta keyword') + ->setMetaDescription('fifth meta description') + ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) + ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 0]) + ->save(); diff --git a/_files/products_rollback.php b/_files/products_rollback.php new file mode 100644 index 0000000000000..d64275f0fd73f --- /dev/null +++ b/_files/products_rollback.php @@ -0,0 +1,23 @@ +get('Magento\Framework\Registry'); +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */ +$collection = $objectManager->create('Magento\Catalog\Model\ResourceModel\Product\Collection'); +$collection->addAttributeToSelect('id')->load(); +if ($collection->count() > 0) { + $collection->delete(); +} + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); diff --git a/_files/requests.xml b/_files/requests.xml new file mode 100644 index 0000000000000..1c3cea536c0b5 --- /dev/null +++ b/_files/requests.xml @@ -0,0 +1,314 @@ + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + 0 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + + diff --git a/_files/search_products.php b/_files/search_products.php new file mode 100644 index 0000000000000..cde4751a044c8 --- /dev/null +++ b/_files/search_products.php @@ -0,0 +1,11 @@ +getMessage(); +} diff --git a/_files/search_products_rollback.php b/_files/search_products_rollback.php new file mode 100644 index 0000000000000..0e1bcfee49be1 --- /dev/null +++ b/_files/search_products_rollback.php @@ -0,0 +1,11 @@ +getMessage(); +} From 2a404337397b841a0f87d7b34458e046a8319f13 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Wed, 30 Dec 2015 18:10:36 +0200 Subject: [PATCH 316/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/AdapterTest.php | 602 ++++++++++++++++------------------ _files/products.php | 88 ----- _files/products_rollback.php | 23 -- 3 files changed, 278 insertions(+), 435 deletions(-) delete mode 100644 _files/products.php delete mode 100644 _files/products_rollback.php diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 26b00263c4a00..be782b7d4fd5a 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -72,358 +72,312 @@ private function reindexAll() $indexer->reindexAll(); } } -/** - * wrong $queryResponse->count() - */ -// /** -// * Sample test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testMatchQuery() -// { -// $this->requestBuilder->bind('fulltext_search_query', 'socks'); -// $this->requestBuilder->setRequestName('one_match'); -// $queryResponse = $this->executeQuery(); -// -// $this->assertEquals(1, $queryResponse->count()); -// } /** - * wrong range / $queryResponse->count() + * Sample test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ -// /** -// * Sample test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testAggregationsQuery() -// { -// $this->requestBuilder->bind('fulltext_search_query', 'peoples'); -// $this->requestBuilder->setRequestName('one_aggregations'); -// -// $queryResponse = $this->executeQuery(); -// -// $this->assertEquals( -// ['weight_bucket', 'dynamic_price'], -// $queryResponse->getAggregations() -// ->getBucketNames() -// ); -// } + public function testMatchQuery() + { + $this->requestBuilder->bind('fulltext_search_query', 'socks'); + $this->requestBuilder->setRequestName('one_match'); + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + } -/** - * wrong query -**/ -// /** -// * Sample test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testMatchQueryFilters() -// { -// $this->requestBuilder->bind('fulltext_search_query', 'socks'); -// $this->requestBuilder->bind('pidm_from', 11); -// $this->requestBuilder->bind('pidm_to', 17); -// $this->requestBuilder->bind('pidsh', 18); -// $this->requestBuilder->setRequestName('one_match_filters'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(1, $queryResponse->count()); -// } -// -/** - * wrong $queryResponse->count() - */ + /** + * Sample test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + */ + public function testAggregationsQuery() + { + $this->requestBuilder->bind('fulltext_search_query', 'peoples'); + $this->requestBuilder->setRequestName('one_aggregations'); + + $queryResponse = $this->executeQuery(); + + $this->assertEquals( + ['weight_bucket', 'dynamic_price'], + $queryResponse->getAggregations() + ->getBucketNames() + ); + } -// /** -// * Range filter test with all fields filled -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testRangeFilterWithAllFields() -// { -// $this->requestBuilder->bind('range_filter_from', 11); -// $this->requestBuilder->bind('range_filter_to', 16); -// $this->requestBuilder->setRequestName('range_filter'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(3, $queryResponse->count()); -// } -/** - * wrong $queryResponse->count() - */ -// /** -// * Range filter test with all fields filled -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testRangeFilterWithoutFromField() -// { -// $this->requestBuilder->bind('range_filter_to', 18); -// $this->requestBuilder->setRequestName('range_filter_without_from_field'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(4, $queryResponse->count()); -// } -// /** - * wrong $queryResponse->count() + * Sample test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ + public function testMatchQueryFilters() + { + $this->requestBuilder->bind('fulltext_search_query', 'socks'); + $this->requestBuilder->bind('pidm_from', 11); + $this->requestBuilder->bind('pidm_to', 17); + $this->requestBuilder->bind('pidsh', 18); + $this->requestBuilder->setRequestName('one_match_filters'); -// /** -// * Range filter test with all fields filled -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testRangeFilterWithoutToField() -// { -// $this->requestBuilder->bind('range_filter_from', 14); -// $this->requestBuilder->setRequestName('range_filter_without_to_field'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(4, $queryResponse->count()); -// } + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + } /** - * wrong $queryResponse->count() + * Range filter test with all fields filled + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ + public function testRangeFilterWithAllFields() + { + $this->requestBuilder->bind('range_filter_from', 11); + $this->requestBuilder->bind('range_filter_to', 16); + $this->requestBuilder->setRequestName('range_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(3, $queryResponse->count()); + } -// /** -// * Term filter test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testTermFilter() -// { -// $this->requestBuilder->bind('request.price', 18); -// $this->requestBuilder->setRequestName('term_filter'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(1, $queryResponse->count()); -// $this->assertEquals( -// 4, -// $queryResponse->getIterator() -// ->offsetGet(0) -// ->getId() -// ); -// } -// /** - * wrong $queryResponse->count() + * Range filter test with all fields filled + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ + public function testRangeFilterWithoutFromField() + { + $this->requestBuilder->bind('range_filter_to', 18); + $this->requestBuilder->setRequestName('range_filter_without_from_field'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(4, $queryResponse->count()); + } -// /** -// * Term filter test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testTermFilterArray() -// { -// $this->requestBuilder->bind('request.price', [16, 18]); -// $this->requestBuilder->setRequestName('term_filter'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(2, $queryResponse->count()); -// } -// /** - * wrong $queryResponse->count() + * Range filter test with all fields filled + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ -// /** -// * Term filter test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testWildcardFilter() -// { -// $this->requestBuilder->bind('wildcard_filter', 'un'); -// $this->requestBuilder->setRequestName('one_wildcard'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(1, $queryResponse->count()); -// } -// + public function testRangeFilterWithoutToField() + { + $this->requestBuilder->bind('range_filter_from', 14); + $this->requestBuilder->setRequestName('range_filter_without_to_field'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(4, $queryResponse->count()); + } + /** + * Term filter test * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ + public function testTermFilter() + { + $this->requestBuilder->bind('request.price', 18); + $this->requestBuilder->setRequestName('term_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + $this->assertEquals( + 4, + $queryResponse->getIterator() + ->offsetGet(0) + ->getId() + ); + } -// /** -// * Bool filter test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testBoolFilter() -// { -// $expectedIds = [2, 3]; -// $this->requestBuilder->bind('must_range_filter1_from', 12); -// $this->requestBuilder->bind('must_range_filter1_to', 22); -// $this->requestBuilder->bind('should_term_filter1', 12); -// $this->requestBuilder->bind('should_term_filter2', 14); -// $this->requestBuilder->bind('should_term_filter3', 16); -// $this->requestBuilder->bind('should_term_filter4', 18); -// $this->requestBuilder->bind('not_term_filter1', 12); -// $this->requestBuilder->bind('not_term_filter2', 18); -// $this->requestBuilder->setRequestName('bool_filter'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(count($expectedIds), $queryResponse->count()); -// $actualIds = []; -// foreach ($queryResponse as $document) { -// /** @var \Magento\Framework\Search\Document $document */ -// $actualIds[] = $document->getId(); -// } -// $this->assertEquals($expectedIds, $actualIds); -// } -// /** - * wrong query + * Term filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ -// /** -// * Test bool filter with nested negative bool filter -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testBoolFilterWithNestedNegativeBoolFilter() -// { -// $expectedIds = [1]; -// $this->requestBuilder->bind('not_range_filter_from', 14); -// $this->requestBuilder->bind('not_range_filter_to', 20); -// $this->requestBuilder->bind('nested_not_term_filter', 12); -// $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(count($expectedIds), $queryResponse->count()); -// $actualIds = []; -// foreach ($queryResponse as $document) { -// /** @var \Magento\Framework\Search\Document $document */ -// $actualIds[] = $document->getId(); -// } -// $this->assertEquals($expectedIds, $actualIds); -// } -// + public function testTermFilterArray() + { + $this->requestBuilder->bind('request.price', [16, 18]); + $this->requestBuilder->setRequestName('term_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(2, $queryResponse->count()); + } + /** - * wrong query + * Term filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ -// /** -// * Test range inside nested negative bool filter -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testBoolFilterWithNestedRangeInNegativeBoolFilter() -// { -// $expectedIds = [1, 5]; -// $this->requestBuilder->bind('nested_must_range_filter_from', 14); -// $this->requestBuilder->bind('nested_must_range_filter_to', 18); -// $this->requestBuilder->setRequestName('bool_filter_with_range_in_nested_negative_filter'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(count($expectedIds), $queryResponse->count()); -// $actualIds = []; -// foreach ($queryResponse as $document) { -// /** @var \Magento\Framework\Search\Document $document */ -// $actualIds[] = $document->getId(); -// } -// sort($actualIds); -// $this->assertEquals($expectedIds, $actualIds); -// } + public function testWildcardFilter() + { + $this->requestBuilder->bind('wildcard_filter', 'un'); + $this->requestBuilder->setRequestName('one_wildcard'); -/** - * wrong query - */ -// /** -// * Sample Advanced search request test -// * -// * @dataProvider advancedSearchDataProvider -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testSimpleAdvancedSearch( -// $nameQuery, -// $descriptionQuery, -// $rangeFilter, -// $expectedRecordsCount -// ) { -// $this->requestBuilder->bind('name_query', $nameQuery); -// $this->requestBuilder->bind('description_query', $descriptionQuery); -// $this->requestBuilder->bind('request.from_price', $rangeFilter['from']); -// $this->requestBuilder->bind('request.to_price', $rangeFilter['to']); -// $this->requestBuilder->setRequestName('advanced_search_test'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals($expectedRecordsCount, $queryResponse->count()); -// } -// -// /** -// * @return array -// */ -// public function advancedSearchDataProvider() -// { -// return [ -// ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], -// ['white', 'shorts', ['from' => '12', 'to' => '18'], 1], -// ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], -// ['peoples', 'green', ['from' => '12', 'to' => '22'], 2], -// ]; -// } + $queryResponse = $this->executeQuery(); + $this->assertEquals(1, $queryResponse->count()); + } + + /** + * Bool filter test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + */ + public function testBoolFilter() + { + $expectedIds = [2, 3]; + $this->requestBuilder->bind('must_range_filter1_from', 12); + $this->requestBuilder->bind('must_range_filter1_to', 22); + $this->requestBuilder->bind('should_term_filter1', 12); + $this->requestBuilder->bind('should_term_filter2', 14); + $this->requestBuilder->bind('should_term_filter3', 16); + $this->requestBuilder->bind('should_term_filter4', 18); + $this->requestBuilder->bind('not_term_filter1', 12); + $this->requestBuilder->bind('not_term_filter2', 18); + $this->requestBuilder->setRequestName('bool_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(count($expectedIds), $queryResponse->count()); + $actualIds = []; + foreach ($queryResponse as $document) { + /** @var \Magento\Framework\Search\Document $document */ + $actualIds[] = $document->getId(); + } + $this->assertEquals($expectedIds, $actualIds); + } /** - * wrong $queryResponse->count() + * Test bool filter with nested negative bool filter + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ -// /** -// * Request limits test -// * -// * @magentoDbIsolation disabled -// * @magentoAppIsolation enabled -// * @magentoConfigFixture current_store catalog/search/engine elasticsearch -// * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php -// */ -// public function testSearchLimit() -// { -// $this->requestBuilder->bind('wildcard_filter', '*'); -// $this->requestBuilder->setFrom(2); -// $this->requestBuilder->setSize(2); -// $this->requestBuilder->setRequestName('one_wildcard'); -// -// $queryResponse = $this->executeQuery(); -// $this->assertEquals(2, $queryResponse->count()); -// } + public function testBoolFilterWithNestedNegativeBoolFilter() + { + $expectedIds = [1]; + $this->requestBuilder->bind('not_range_filter_from', 14); + $this->requestBuilder->bind('not_range_filter_to', 20); + $this->requestBuilder->bind('nested_not_term_filter', 12); + $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(count($expectedIds), $queryResponse->count()); + $actualIds = []; + foreach ($queryResponse as $document) { + /** @var \Magento\Framework\Search\Document $document */ + $actualIds[] = $document->getId(); + } + $this->assertEquals($expectedIds, $actualIds); + } + + /** + * Test range inside nested negative bool filter + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + */ + public function testBoolFilterWithNestedRangeInNegativeBoolFilter() + { + $expectedIds = [1, 5]; + $this->requestBuilder->bind('nested_must_range_filter_from', 14); + $this->requestBuilder->bind('nested_must_range_filter_to', 18); + $this->requestBuilder->setRequestName('bool_filter_with_range_in_nested_negative_filter'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(count($expectedIds), $queryResponse->count()); + $actualIds = []; + foreach ($queryResponse as $document) { + /** @var \Magento\Framework\Search\Document $document */ + $actualIds[] = $document->getId(); + } + sort($actualIds); + $this->assertEquals($expectedIds, $actualIds); + } + + /** + * Sample Advanced search request test + * + * @dataProvider advancedSearchDataProvider + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + */ + public function testSimpleAdvancedSearch( + $nameQuery, + $descriptionQuery, + $rangeFilter, + $expectedRecordsCount + ) { + $this->requestBuilder->bind('name_query', $nameQuery); + $this->requestBuilder->bind('description_query', $descriptionQuery); + $this->requestBuilder->bind('request.from_price', $rangeFilter['from']); + $this->requestBuilder->bind('request.to_price', $rangeFilter['to']); + $this->requestBuilder->setRequestName('advanced_search_test'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals($expectedRecordsCount, $queryResponse->count()); + } + + /** + * @return array + */ + public function advancedSearchDataProvider() + { + return [ + ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], + ['white', 'shorts', ['from' => '12', 'to' => '18'], 1], + ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], + ['peoples', 'green', ['from' => '12', 'to' => '22'], 2], + ]; + } + + /** + * Request limits test + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + */ + public function testSearchLimit() + { + $this->requestBuilder->bind('wildcard_filter', '*'); + $this->requestBuilder->setFrom(2); + $this->requestBuilder->setSize(2); + $this->requestBuilder->setRequestName('one_wildcard'); + + $queryResponse = $this->executeQuery(); + $this->assertEquals(2, $queryResponse->count()); + } } diff --git a/_files/products.php b/_files/products.php deleted file mode 100644 index bc8d543959d17..0000000000000 --- a/_files/products.php +++ /dev/null @@ -1,88 +0,0 @@ -create('Magento\Catalog\Model\Product'); -$productFirst->setTypeId('simple') - ->setAttributeSetId(4) - ->setWebsiteIds([1]) - ->setName('Simple Product Apple') - ->setSku('fulltext-1') - ->setPrice(10) - ->setMetaTitle('first meta title') - ->setMetaKeyword('first meta keyword') - ->setMetaDescription('first meta description') - ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) - ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) - ->setStockData(['use_config_manage_stock' => 0]) - ->save(); - -/** @var $productFirst \Magento\Catalog\Model\Product */ -$productSecond = $objectManager->create('Magento\Catalog\Model\Product'); -$productSecond->setTypeId('simple') - ->setAttributeSetId(4) - ->setWebsiteIds([1]) - ->setName('Simple Product Banana') - ->setSku('fulltext-2') - ->setPrice(20) - ->setMetaTitle('second meta title') - ->setMetaKeyword('second meta keyword') - ->setMetaDescription('second meta description') - ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) - ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) - ->setStockData(['use_config_manage_stock' => 0]) - ->save(); - -/** @var $productFirst \Magento\Catalog\Model\Product */ -$productThird = $objectManager->create('Magento\Catalog\Model\Product'); -$productThird->setTypeId('simple') - ->setAttributeSetId(4) - ->setWebsiteIds([1]) - ->setName('Simple Product Orange') - ->setSku('fulltext-3') - ->setPrice(20) - ->setMetaTitle('third meta title') - ->setMetaKeyword('third meta keyword') - ->setMetaDescription('third meta description') - ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) - ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) - ->setStockData(['use_config_manage_stock' => 0]) - ->save(); - -/** @var $productFirst \Magento\Catalog\Model\Product */ -$productFourth = $objectManager->create('Magento\Catalog\Model\Product'); -$productFourth->setTypeId('simple') - ->setAttributeSetId(4) - ->setWebsiteIds([1]) - ->setName('Simple Product Papaya') - ->setSku('fulltext-4') - ->setPrice(20) - ->setMetaTitle('fourth meta title') - ->setMetaKeyword('fourth meta keyword') - ->setMetaDescription('fourth meta description') - ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) - ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) - ->setStockData(['use_config_manage_stock' => 0]) - ->save(); - -/** @var $productFirst \Magento\Catalog\Model\Product */ -$productFifth = $objectManager->create('Magento\Catalog\Model\Product'); -$productFifth->setTypeId('simple') - ->setAttributeSetId(4) - ->setWebsiteIds([1]) - ->setName('Simple Product Cherry') - ->setSku('fulltext-5') - ->setPrice(20) - ->setMetaTitle('fifth meta title') - ->setMetaKeyword('fifth meta keyword') - ->setMetaDescription('fifth meta description') - ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH) - ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED) - ->setStockData(['use_config_manage_stock' => 0]) - ->save(); diff --git a/_files/products_rollback.php b/_files/products_rollback.php deleted file mode 100644 index d64275f0fd73f..0000000000000 --- a/_files/products_rollback.php +++ /dev/null @@ -1,23 +0,0 @@ -get('Magento\Framework\Registry'); -$registry->unregister('isSecureArea'); -$registry->register('isSecureArea', true); - -/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */ -$collection = $objectManager->create('Magento\Catalog\Model\ResourceModel\Product\Collection'); -$collection->addAttributeToSelect('id')->load(); -if ($collection->count() > 0) { - $collection->delete(); -} - -$registry->unregister('isSecureArea'); -$registry->register('isSecureArea', false); From 4d30fe239f52010e09016e51929cb27fe7db0ead Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 4 Jan 2016 15:40:17 +0200 Subject: [PATCH 317/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Query/Preprocessor/Stopwords.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 7a2062f06aee7..9c3661b646f33 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -74,7 +74,8 @@ public function __construct( $this->readFactory = $readFactory; $this->configCache = $configCache; $this->esConfig = $esConfig; - $this->fileDir = $fileDir; + $rootDir = preg_replace('/app\/code.*/i', '', dirname(__DIR__)); + $this->fileDir = $rootDir . $fileDir; } /** From 84d5513221e0de7ca01af1c8dcc446cb931f09f9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 4 Jan 2016 19:51:15 +0200 Subject: [PATCH 318/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Filter/Builder.php | 72 ++++++++++++++------------------ SearchAdapter/Mapper.php | 13 ++++-- 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/SearchAdapter/Filter/Builder.php b/SearchAdapter/Filter/Builder.php index 33328d96443d3..2f3b7b93dd19e 100644 --- a/SearchAdapter/Filter/Builder.php +++ b/SearchAdapter/Filter/Builder.php @@ -15,10 +15,11 @@ class Builder implements BuilderInterface { /**#@+ - * Text flags for Elasticsearch bulk actions + * Text flags for Elasticsearch filter query condition types */ - const QUERY_OPERATOR_AND = 'AND'; - const QUERY_OPERATOR_OR = 'OR'; + const QUERY_CONDITION_MUST = 'must'; + const QUERY_CONDITION_SHOULD = 'should'; + const QUERY_CONDITION_MUST_NOT = 'must_not'; /**#@-*/ /** @@ -48,79 +49,68 @@ public function __construct( */ public function build(RequestFilterInterface $filter, $conditionType) { - return $this->processFilter($filter, $this->isNegation($conditionType)); + return $this->processFilter($filter, $conditionType); } /** * @param RequestFilterInterface $filter - * @param bool $isNegation + * @param string $conditionType * @return array */ - protected function processFilter(RequestFilterInterface $filter, $isNegation) + protected function processFilter(RequestFilterInterface $filter, $conditionType) { if (RequestFilterInterface::TYPE_BOOL == $filter->getType()) { - $query = $this->processBoolFilter($filter, $isNegation); + $query = $this->processBoolFilter($filter); } else { if (!array_key_exists($filter->getType(), $this->filters)) { throw new \InvalidArgumentException('Unknown filter type ' . $filter->getType()); } - $query = $this->filters[$filter->getType()]->buildFilter($filter); - if ($isNegation) { - $query = ['not' => $query]; - } + $query = [ + 'bool' => [ + $conditionType => $this->filters[$filter->getType()]->buildFilter($filter), + ] + ]; } return $query; } /** - * @param RequestFilterInterface|\Magento\Framework\Search\Request\Filter\BoolExpression $filter - * @param bool $isNegation + * @param RequestFilterInterface|BoolExpression $filter * @return array */ - protected function processBoolFilter(RequestFilterInterface $filter, $isNegation) + protected function processBoolFilter(RequestFilterInterface $filter) { - $must = $this->buildFilters($filter->getMust(), self::QUERY_OPERATOR_AND, $isNegation); - $should = $this->buildFilters($filter->getShould(), self::QUERY_OPERATOR_OR, $isNegation); - $mustNot = $this->buildFilters($filter->getMustNot(), self::QUERY_OPERATOR_AND, !$isNegation); + $must = $this->buildFilters($filter->getMust(), self::QUERY_CONDITION_MUST); + $should = $this->buildFilters($filter->getShould(), self::QUERY_CONDITION_SHOULD); + $mustNot = $this->buildFilters($filter->getMustNot(), self::QUERY_CONDITION_MUST_NOT); $queries = [ - 'bool' => [ - 'must' => $must, - 'should' => $should, - 'must_not' => $mustNot, - ] + 'bool' => array_merge( + isset($must['bool']) ? $must['bool'] : [], + isset($should['bool']) ? $should['bool'] : [], + isset($mustNot['bool']) ? $mustNot['bool'] : [] + ), ]; return $queries; } /** - * @param \Magento\Framework\Search\Request\FilterInterface[] $filters - * @param string $unionOperator - * @param bool $isNegation + * @param RequestFilterInterface[] $filters + * @param string $conditionType * @return string */ - private function buildFilters(array $filters, $unionOperator, $isNegation) + private function buildFilters(array $filters, $conditionType) { $queries = []; foreach ($filters as $filter) { - $queries[] = $this->processFilter($filter, $isNegation); - } - if ($unionOperator === self::QUERY_OPERATOR_OR) { - return [ - 'or' => $queries, - ]; + $filterQuery = $this->processFilter($filter, $conditionType); + $queries['bool'][$conditionType] = array_merge( + isset($queries['bool'][$conditionType]) ? $queries['bool'][$conditionType] : [], + $filterQuery['bool'][$conditionType] + ); } return $queries; } - - /** - * @param string $conditionType - * @return bool - */ - protected function isNegation($conditionType) - { - return BoolExpression::QUERY_CONDITION_NOT === $conditionType; - } } diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index f96e8f105d8f4..4edb1cc8ac6ec 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -178,10 +178,15 @@ private function processFilterQuery( $selectQuery = $this->processQuery($query->getReference(), $selectQuery, $conditionType); break; case FilterQuery::REFERENCE_FILTER: - $selectQuery['bool']['must']= array_merge( - isset($selectQuery['bool']['must']) ? $selectQuery['bool']['must'] : [], - $this->filterBuilder->build($query->getReference(), $conditionType) - ); + $conditionType = $conditionType === BoolQuery::QUERY_CONDITION_NOT ? + MatchQueryBuilder::QUERY_CONDITION_MUST_NOT : $conditionType; + $filterQuery = $this->filterBuilder->build($query->getReference(), $conditionType); + foreach ($filterQuery['bool'] as $condition => $filter) { + $selectQuery['bool'][$condition]= array_merge( + isset($selectQuery['bool'][$condition]) ? $selectQuery['bool'][$condition] : [], + $filter + ); + } break; } From b3cd1302a242505c2679c709a9338202329b65e4 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Mon, 4 Jan 2016 19:51:15 +0200 Subject: [PATCH 319/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/AdapterTest.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index be782b7d4fd5a..4f05be6440126 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -61,16 +61,18 @@ private function executeQuery() return $queryResponse; } + /** + * Perform full reindex + * + * @return void + */ private function reindexAll() { - /** @var \Magento\Indexer\Model\Indexer[] $indexerList */ - $indexerList = $this->objectManager->get('Magento\Indexer\Model\Indexer\CollectionFactory') - ->create() - ->getItems(); - - foreach ($indexerList as $indexer) { - $indexer->reindexAll(); - } + $indexer = Bootstrap::getObjectManager()->create( + 'Magento\Indexer\Model\Indexer' + ); + $indexer->load('catalogsearch_fulltext'); + $indexer->reindexAll(); } /** From 74130d513071de258563320b4183fb7d72fc6c2e Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 11:14:15 +0200 Subject: [PATCH 320/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Filter/Builder/Term.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/Filter/Builder/Term.php b/SearchAdapter/Filter/Builder/Term.php index 03e9ae62d1d5e..d88f5e9106525 100644 --- a/SearchAdapter/Filter/Builder/Term.php +++ b/SearchAdapter/Filter/Builder/Term.php @@ -32,14 +32,12 @@ public function buildFilter(RequestFilterInterface $filter) { $filterQuery = []; if ($filter->getValue()) { - $filterValues = is_array($filter->getValue()) ? $filter->getValue() : [$filter->getValue()]; - foreach ($filterValues as $value) { - $filterQuery[] = [ - 'term' => [ - $this->fieldMapper->getFieldName($filter->getField()) => $value, - ], - ]; - } + $operator = is_array($filter->getValue()) ? 'terms' : 'term'; + $filterQuery []= [ + $operator => [ + $this->fieldMapper->getFieldName($filter->getField()) => $filter->getValue(), + ], + ]; } return $filterQuery; } From 397f406e8ea3eb459de48e14ca810d19072a5a74 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 11:57:50 +0200 Subject: [PATCH 321/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Mapper.php | 1 + SearchAdapter/Query/Builder.php | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 4edb1cc8ac6ec..677a201310c16 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -66,6 +66,7 @@ public function buildQuery(RequestInterface $request) BoolQuery::QUERY_CONDITION_MUST ) ); + $searchQuery['body']['query']['bool']['minimum_should_match'] = 1; $searchQuery = $this->queryBuilder->initAggregations($request, $searchQuery); return $searchQuery; } diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index f8c68ca40c6ac..7e936b4e0b37b 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -59,11 +59,7 @@ public function initQuery(RequestInterface $request) 'from' => $request->getFrom(), 'size' => $request->getSize(), 'fields' => ['_id', '_score'], - 'query' => [ - 'bool' => [ - 'minimum_should_match' => 1, - ], - ], + 'query' => [], ], ]; return $searchQuery; From 14d89dc2142a896d3ada750d3666ca9f411701ae Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 12:25:30 +0200 Subject: [PATCH 322/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Filter/Builder.php | 34 ++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/Filter/Builder.php b/SearchAdapter/Filter/Builder.php index 2f3b7b93dd19e..87d974ae00383 100644 --- a/SearchAdapter/Filter/Builder.php +++ b/SearchAdapter/Filter/Builder.php @@ -60,7 +60,7 @@ public function build(RequestFilterInterface $filter, $conditionType) protected function processFilter(RequestFilterInterface $filter, $conditionType) { if (RequestFilterInterface::TYPE_BOOL == $filter->getType()) { - $query = $this->processBoolFilter($filter); + $query = $this->processBoolFilter($filter, $this->isNegation($conditionType)); } else { if (!array_key_exists($filter->getType(), $this->filters)) { throw new \InvalidArgumentException('Unknown filter type ' . $filter->getType()); @@ -77,13 +77,20 @@ protected function processFilter(RequestFilterInterface $filter, $conditionType) /** * @param RequestFilterInterface|BoolExpression $filter + * @param bool $isNegation * @return array */ - protected function processBoolFilter(RequestFilterInterface $filter) + protected function processBoolFilter(RequestFilterInterface $filter, $isNegation) { - $must = $this->buildFilters($filter->getMust(), self::QUERY_CONDITION_MUST); + $must = $this->buildFilters( + $filter->getMust(), + $isNegation ? self::QUERY_CONDITION_MUST_NOT : self::QUERY_CONDITION_MUST + ); $should = $this->buildFilters($filter->getShould(), self::QUERY_CONDITION_SHOULD); - $mustNot = $this->buildFilters($filter->getMustNot(), self::QUERY_CONDITION_MUST_NOT); + $mustNot = $this->buildFilters( + $filter->getMustNot(), + $isNegation ? self::QUERY_CONDITION_MUST : self::QUERY_CONDITION_MUST_NOT + ); $queries = [ 'bool' => array_merge( @@ -106,11 +113,22 @@ private function buildFilters(array $filters, $conditionType) $queries = []; foreach ($filters as $filter) { $filterQuery = $this->processFilter($filter, $conditionType); - $queries['bool'][$conditionType] = array_merge( - isset($queries['bool'][$conditionType]) ? $queries['bool'][$conditionType] : [], - $filterQuery['bool'][$conditionType] - ); + if (isset($filterQuery['bool'][$conditionType])) { + $queries['bool'][$conditionType] = array_merge( + isset($queries['bool'][$conditionType]) ? $queries['bool'][$conditionType] : [], + $filterQuery['bool'][$conditionType] + ); + } } return $queries; } + + /** + * @param string $conditionType + * @return bool + */ + protected function isNegation($conditionType) + { + return self::QUERY_CONDITION_MUST_NOT === $conditionType; + } } From 2b3e55dcfaa185661805c557d17f02fee24ac835 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 5 Jan 2016 12:28:18 +0200 Subject: [PATCH 323/616] PRD-106: Merge PR from Sprint 6 --- .../Query/Preprocessor/SynonymsTest.php | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100755 Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php new file mode 100755 index 0000000000000..4f6cbde4480e3 --- /dev/null +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php @@ -0,0 +1,60 @@ +synonymAnalyzer = $this->getMockBuilder('Magento\Search\Api\SynonymAnalyzerInterface') + ->disableOriginalConstructor() + ->getMock(); + + $objectManagerHelper = new ObjectManagerHelper($this); + $this->model = $objectManagerHelper->getObject( + 'Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Synonyms', + [ + 'synonymAnalyzer' => $this->synonymAnalyzer, + ] + ); + } + + /** + * Test process() method + */ + public function testProcess() + { + $synonyms = [['red', 'blue']]; + + $this->synonymAnalyzer->expects($this->once()) + ->method('getSynonymsForPhrase') + ->willReturn($synonyms); + + $this->assertEquals( + 'red blue', + $this->model->process('blue') + ); + } +} From 652a6a152a8a5d5c00847bce64409eda5831fda4 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 15:37:35 +0200 Subject: [PATCH 324/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Query/Preprocessor/Synonyms.php | 10 ++++++---- .../SearchAdapter/Query/Preprocessor/SynonymsTest.php | 10 ++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SearchAdapter/Query/Preprocessor/Synonyms.php b/SearchAdapter/Query/Preprocessor/Synonyms.php index 77921119e68d8..1f647806ffdf0 100644 --- a/SearchAdapter/Query/Preprocessor/Synonyms.php +++ b/SearchAdapter/Query/Preprocessor/Synonyms.php @@ -30,10 +30,12 @@ public function process($query) { $synonyms = []; $synonymsArray = $this->synonymsAnalyzer->getSynonymsForPhrase($query); - foreach ($synonymsArray as $synonymPart) { - $synonyms []= implode(' ', $synonymPart); + if (count($synonymsArray) > 0) { + foreach ($synonymsArray as $synonymPart) { + $synonyms [] = implode(' ', $synonymPart); + } + $query = implode(' ', $synonyms); } - $queryWithSynonyms = implode(' ', $synonyms); - return $queryWithSynonyms; + return $query; } } diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php index 4f6cbde4480e3..7959aacccf617 100755 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php @@ -46,15 +46,13 @@ public function setUp() */ public function testProcess() { - $synonyms = [['red', 'blue']]; - - $this->synonymAnalyzer->expects($this->once()) + $this->synonymAnalyzer->expects($this->any()) ->method('getSynonymsForPhrase') - ->willReturn($synonyms); + ->willReturn([]); $this->assertEquals( - 'red blue', - $this->model->process('blue') + 'red', + $this->model->process('red') ); } } From b69b1d63cde402271cc34880deeaaabe917c64a7 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 15:42:41 +0200 Subject: [PATCH 325/616] PRD-106: Merge PR from Sprint 6 --- Test/Unit/SearchAdapter/MapperTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index cedbf0266cd8b..3244775b7db69 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -160,7 +160,11 @@ public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMo ->willReturn('matchQuery'); $this->filterBuilder->expects(($this->any())) ->method('build') - ->willReturn([]); + ->willReturn([ + 'bool' => [ + 'must' => [], + ], + ]); $this->model->buildQuery($request); } From f2ff449f56b8c7289243d6db1d750c7554315638 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 16:23:22 +0200 Subject: [PATCH 326/616] PRD-106: Merge PR from Sprint 6 --- .../Query/Preprocessor/SynonymsTest.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php index 7959aacccf617..5f9e28718032e 100755 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php @@ -19,7 +19,7 @@ class SynonymsTest extends \PHPUnit_Framework_TestCase /** * @var SynonymAnalyzerInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $synonymAnalyzer; + protected $synonymsAnalyzer; /** * Set up test environment. @@ -28,15 +28,15 @@ class SynonymsTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->synonymAnalyzer = $this->getMockBuilder('Magento\Search\Api\SynonymAnalyzerInterface') + $this->synonymsAnalyzer = $this->getMockBuilder('\Magento\Search\Api\SynonymAnalyzerInterface') ->disableOriginalConstructor() ->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - 'Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Synonyms', + '\Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Synonyms', [ - 'synonymAnalyzer' => $this->synonymAnalyzer, + 'synonymsAnalyzer' => $this->synonymsAnalyzer, ] ); } @@ -46,12 +46,14 @@ public function setUp() */ public function testProcess() { - $this->synonymAnalyzer->expects($this->any()) + $this->synonymsAnalyzer->expects($this->once()) ->method('getSynonymsForPhrase') - ->willReturn([]); + ->willReturn([ + ['red', 'blue'] + ]); $this->assertEquals( - 'red', + 'red blue', $this->model->process('red') ); } From 00aa00017ebd39d0c3221c63f8c7b520ae32e6ec Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 5 Jan 2016 16:51:59 +0200 Subject: [PATCH 327/616] PRD-106: Merge PR from Sprint 6 --- Test/Unit/SearchAdapter/Filter/BuilderTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/Test/Unit/SearchAdapter/Filter/BuilderTest.php index aa705711bb0e7..22c6af0a39c8f 100644 --- a/Test/Unit/SearchAdapter/Filter/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Filter/BuilderTest.php @@ -49,6 +49,10 @@ public function setUp() ->disableOriginalConstructor() ->getMock(); + $this->term->expects($this->any()) + ->method('buildFilter') + ->willReturn([]); + $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Filter\Builder', From 9bf93a0f6e8ace68ea75b63ad38e36e1b6ff4d5d Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 16:58:22 +0200 Subject: [PATCH 328/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Filter/Builder.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/Filter/Builder.php b/SearchAdapter/Filter/Builder.php index 87d974ae00383..daa37da6eb412 100644 --- a/SearchAdapter/Filter/Builder.php +++ b/SearchAdapter/Filter/Builder.php @@ -84,12 +84,12 @@ protected function processBoolFilter(RequestFilterInterface $filter, $isNegation { $must = $this->buildFilters( $filter->getMust(), - $isNegation ? self::QUERY_CONDITION_MUST_NOT : self::QUERY_CONDITION_MUST + $this->mapConditionType(self::QUERY_CONDITION_MUST, $isNegation) ); $should = $this->buildFilters($filter->getShould(), self::QUERY_CONDITION_SHOULD); $mustNot = $this->buildFilters( $filter->getMustNot(), - $isNegation ? self::QUERY_CONDITION_MUST : self::QUERY_CONDITION_MUST_NOT + $this->mapConditionType(self::QUERY_CONDITION_MUST_NOT, $isNegation) ); $queries = [ @@ -131,4 +131,21 @@ protected function isNegation($conditionType) { return self::QUERY_CONDITION_MUST_NOT === $conditionType; } + + /** + * @param string $conditionType + * @param bool $isNegation + * @return string + */ + private function mapConditionType($conditionType, $isNegation) + { + if ($isNegation) { + if ($conditionType == self::QUERY_CONDITION_MUST) { + $conditionType = self::QUERY_CONDITION_MUST_NOT; + } elseif ($conditionType == self::QUERY_CONDITION_MUST_NOT) { + $conditionType = self::QUERY_CONDITION_MUST; + } + } + return $conditionType; + } } From b17b8c34924feab33fd90eccb3edbba649e009e4 Mon Sep 17 00:00:00 2001 From: PhoenixDev - DR Date: Tue, 5 Jan 2016 17:47:48 +0200 Subject: [PATCH 329/616] PRD-106: Merge PR from Sprint 6 --- .../Unit/SearchAdapter/Filter/BuilderTest.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/Test/Unit/SearchAdapter/Filter/BuilderTest.php index 22c6af0a39c8f..7613286ab8b96 100644 --- a/Test/Unit/SearchAdapter/Filter/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Filter/BuilderTest.php @@ -113,6 +113,39 @@ public function testBuild($filterMock, $filterType) $this->model->build($filter, 'must'); } + /** + * Test build() method with negation + * @param string $filterMock + * @param string $filterType + * @dataProvider buildDataProvider + */ + public function testBuildNegation($filterMock, $filterType) + { + $filter = $this->getMockBuilder($filterMock) + ->disableOriginalConstructor() + ->getMock(); + $filter->expects($this->any()) + ->method('getType') + ->willReturn($filterType); + $childFilter = $this->getMockBuilder('Magento\Framework\Search\Request\FilterInterface') + ->disableOriginalConstructor() + ->getMock(); + $childFilter->expects($this->any()) + ->method('getType') + ->willReturn('termFilter'); + $filter->expects($this->any()) + ->method('getMust') + ->willReturn([$childFilter]); + $filter->expects($this->any()) + ->method('getShould') + ->willReturn([$childFilter]); + $filter->expects($this->any()) + ->method('getMustNot') + ->willReturn([$childFilter]); + + $this->model->build($filter, 'must_not'); + } + /** * @return array */ From 367abaafbe74d081c4876e75e51ec5ed5e1593f1 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Tue, 5 Jan 2016 18:30:10 +0200 Subject: [PATCH 330/616] PRD-105: Merge PR from Sprint 5 --- Model/Indexer/IndexHandlerTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 87c2dfb5869bc..93ee971d7a1b1 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -14,7 +14,7 @@ use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; /** - * @magentoDbIsolation disabled + * @magentoDbIsolation enabled * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase @@ -127,6 +127,7 @@ public function testReindexAll() */ public function testReindexRowAfterEdit() { + $this->reindexAll(); $this->productApple->setData('name', 'Simple Product Cucumber'); $this->productApple->save(); @@ -148,6 +149,7 @@ public function testReindexRowAfterEdit() */ public function testReindexRowAfterMassAction() { + $this->reindexAll(); $productIds = [ $this->productApple->getId(), $this->productBanana->getId(), From 4ab62a3a27a105854ef5b87552c7d4b5ce2ec989 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 5 Jan 2016 10:59:41 -0600 Subject: [PATCH 331/616] PRD-105: Merge PR from Sprint 5 - Skip elastic search integration tests --- Model/Indexer/IndexHandlerTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 93ee971d7a1b1..2390b6c0ace5e 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -15,7 +15,7 @@ /** * @magentoDbIsolation enabled - * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php + * magentoDataFixture Magento/Elasticsearch/_files/indexer.php */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase { @@ -79,6 +79,8 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { + $this->markTestSkipped('Skipping until Elastic search support becomes available on Bamboo.'); + $this->connectionManager = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' ); From 8fb394855fa472bf501cfc8ea4d279a9710adbd9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 8 Jan 2016 14:01:24 +0200 Subject: [PATCH 332/616] PRD-106: Merge PR from Sprint 6 --- .../Adapter/DataMapper/ProductDataMapper.php | 6 ++--- Model/ResourceModel/Index.php | 23 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index cb16990e62680..cbc0966c9a620 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -210,11 +210,11 @@ protected function processAdvancedAttributes($productId, array $productIndexData */ protected function checkValue($value, $attribute, $storeId) { - if (is_array($value)) { - return array_shift($value); - } elseif ($attribute->getBackendType() === 'datetime' || $attribute->getBackendType() === 'timestamp' + if (in_array($attribute->getBackendType(), ['datetime', 'timestamp']) || $attribute->getFrontendInput() === 'date') { return $this->dateFieldType->formatDate($storeId, $value); + } elseif ($attribute->getFrontendInput() === 'multiselect') { + return str_replace(',', ' ', $value); } else { return $value; } diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index e7e661421b91d..a36b7002c6882 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -66,17 +66,18 @@ public function getFullProductIndexData($productId, $indexData) $productAttributes = []; $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE); $product = $this->productRepository->getById($productId); - $productAttributesWithValues = $product->getData(); - foreach ($productAttributesWithValues as $attributeCode => $value) { - $attribute = $this->eavConfig->getAttribute( - ProductAttributeInterface::ENTITY_TYPE_CODE, - $attributeCode - ); - $frontendInput = $attribute->getFrontendInput(); - if (in_array($attribute->getAttributeId(), array_keys($indexData))) { - $value = $indexData[$attribute->getAttributeId()]; - } - if (in_array($attributeCode, $attributeCodes)) { + foreach ($attributeCodes as $attributeCode) { + $attributeValue = $product->getCustomAttribute($attributeCode); + if ($attributeValue) { + $value = $attributeValue->getValue(); + $attribute = $this->eavConfig->getAttribute( + ProductAttributeInterface::ENTITY_TYPE_CODE, + $attributeCode + ); + $frontendInput = $attribute->getFrontendInput(); + if (in_array($attribute->getAttributeId(), array_keys($indexData))) { + $value = $indexData[$attribute->getAttributeId()][$productId]; + } $productAttributes[$attributeCode] = $value; if ($frontendInput == 'select') { foreach ($attribute->getOptions() as $option) { From 7be86cb4669b30dd7e81871459be897bc87628f2 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 8 Jan 2016 14:44:28 +0200 Subject: [PATCH 333/616] PRD-106: Merge PR from Sprint 6 --- SearchAdapter/Aggregation/Interval.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 4e15c29a6e747..e73fa6f8050bf 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -87,7 +87,6 @@ public function __construct( public function load($limit, $offset = null, $lower = null, $upper = null) { $from = $to = []; - if ($lower) { $from = ['gte' => $lower - self::DELTA]; } @@ -100,7 +99,8 @@ public function load($limit, $offset = null, $lower = null, $upper = null) 'type' => $this->clientConfig->getEntityType(), 'body' => [ 'fields' => [ - '_id', $this->fieldName + '_id', + $this->fieldName, ], 'query' => [ 'filtered' => [ @@ -125,18 +125,18 @@ public function load($limit, $offset = null, $lower = null, $upper = null) ], ], ], - 'size' => $limit - ] + 'sort' => [ + $this->fieldName, + ], + 'size' => $limit, + ], ]; - if ($offset) { $requestQuery['body']['from'] = $offset; } - $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - return $this->arrayValuesToFloat($queryResult['hits']['hits'], $this->fieldName); } @@ -183,12 +183,14 @@ public function loadPrevious($data, $index, $lower = null) ], ], ], + 'sort' => [ + $this->fieldName, + ], ], ]; $queryResult = $this->connectionManager->getConnection() ->query($requestQuery); - $offset = $queryResult['hits']['total']; if (!$offset) { return false; @@ -236,6 +238,9 @@ public function loadNext($data, $rightIndex, $upper = null) ], ], ], + 'sort' => [ + $this->fieldName, + ], ], ]; $queryCountResult = $this->connectionManager->getConnection() From 46e25151b2e0c4e7ed486ffe401825741ccd17d9 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 8 Jan 2016 16:31:04 +0200 Subject: [PATCH 334/616] PRD-106: Merge PR from Sprint 6 --- .../FieldMapper/ProductFieldMapper.php | 2 +- Model/Adapter/FieldType.php | 5 ++-- Model/ResourceModel/Index.php | 27 ++++++++++++------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index a13ca81f78ca3..1ace8b3bd4a58 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -94,7 +94,7 @@ public function getFieldName($attributeCode, $context = []) array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY]) ); } - $fieldName = $this->getRefinedFieldName($frontendInput, $fieldType, $attributeCode); + $fieldName = $attributeCode; } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) { $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode); } else { diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 9ab52f7c3e305..efebfe1dec16c 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -34,8 +34,9 @@ public function getFieldType($attribute) if (in_array($backendType, ['timestamp', 'datetime'], true)) { $fieldType = self::ES_DATA_TYPE_DATE; } elseif ( - in_array($backendType, ['int', 'smallint'], true) - || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar') + (in_array($backendType, ['int', 'smallint'], true) + || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar')) + && !$attribute->getIsUserDefined() ) { $fieldType = self::ES_DATA_TYPE_INT; } elseif ($backendType === 'decimal') { diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index a36b7002c6882..3b392d8d7c2b3 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -67,17 +67,24 @@ public function getFullProductIndexData($productId, $indexData) $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE); $product = $this->productRepository->getById($productId); foreach ($attributeCodes as $attributeCode) { - $attributeValue = $product->getCustomAttribute($attributeCode); - if ($attributeValue) { - $value = $attributeValue->getValue(); - $attribute = $this->eavConfig->getAttribute( - ProductAttributeInterface::ENTITY_TYPE_CODE, - $attributeCode - ); - $frontendInput = $attribute->getFrontendInput(); - if (in_array($attribute->getAttributeId(), array_keys($indexData))) { - $value = $indexData[$attribute->getAttributeId()][$productId]; + $value = $product->getData($attributeCode); + $attribute = $this->eavConfig->getAttribute( + ProductAttributeInterface::ENTITY_TYPE_CODE, + $attributeCode + ); + $frontendInput = $attribute->getFrontendInput(); + if (in_array($attribute->getAttributeId(), array_keys($indexData))) { + if (is_array($indexData[$attribute->getAttributeId()])) { + if (isset($indexData[$attribute->getAttributeId()][$productId])) { + $value = $indexData[$attribute->getAttributeId()][$productId]; + } else { + $value = implode(' ', $indexData[$attribute->getAttributeId()]); + } + } else { + $value = $indexData[$attribute->getAttributeId()]; } + } + if ($value) { $productAttributes[$attributeCode] = $value; if ($frontendInput == 'select') { foreach ($attribute->getOptions() as $option) { From 8b699fe1eb9eedb47e119374d7b39be34be76146 Mon Sep 17 00:00:00 2001 From: Sergey Plakhonin Date: Fri, 8 Jan 2016 18:01:36 +0200 Subject: [PATCH 335/616] PRD-106: Merge PR from Sprint 6 --- .../DataMapper/ProductDataMapperTest.php | 41 ++++++++++++++----- Test/Unit/Model/ResourceModel/IndexTest.php | 25 +++++++++-- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php index 9510c3d3ea607..89cbf13b715cb 100644 --- a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php @@ -167,10 +167,11 @@ protected function setUp() * @param int $storeId * @param bool $emptyDate * @param string $type + * @param string $frontendInput * * @return void */ - public function testGetMap($productId, $productData, $storeId, $emptyDate, $type) + public function testGetMap($productId, $productData, $storeId, $emptyDate, $type, $frontendInput) { $this->attributeContainerMock->expects($this->any())->method('getAttribute')->will( $this->returnValue($this->attribute) @@ -214,6 +215,9 @@ public function testGetMap($productId, $productData, $storeId, $emptyDate, $type $this->attribute->expects($this->any())->method('getBackendType')->will( $this->returnValue($type) ); + $this->attribute->expects($this->any())->method('getFrontendInput')->will( + $this->returnValue($frontendInput) + ); $this->dateTimeMock->expects($this->any())->method('isEmptyDate')->will( $this->returnValue($emptyDate) ); @@ -252,14 +256,24 @@ public static function mapProvider() ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'], '1', false, - 'datetime' + 'datetime', + 'select', + ], + [ + '1', + ['price'=>'11','created_at'=>'00-00-00 00:00:00', 'color_value'=>'11'], + '1', + false, + 'time', + 'multiselect', ], [ '1', ['price'=>'11','created_at'=>null,'color_value'=>'11', ], '1', true, - 'datetime' + 'datetime', + 'select', ], [ '1', @@ -278,14 +292,16 @@ public static function mapProvider() ], '1', false, - 'string' + 'string', + 'select', ], [ '1', ['image'=>'11','created_at'=>'00-00-00 00:00:00'], '1', false, - 'string' + 'string', + 'select', ], [ '1', @@ -315,7 +331,8 @@ public static function mapProvider() ], '1', false, - 'string' + 'string', + 'select', ], [ '1', @@ -350,28 +367,32 @@ public static function mapProvider() ], '1', false, - 'string' + 'string', + 'select', ], [ '1', ['quantity_and_stock_status'=>'11','created_at'=>'00-00-00 00:00:00'], '1', false, - 'string' + 'string', + 'select', ], [ '1', ['quantity_and_stock_status'=>['is_in_stock' => '1', 'qty' => '12'],'created_at'=>'00-00-00 00:00:00'], '1', false, - 'string' + 'string', + 'select', ], [ '1', ['price'=>'11','created_at'=>'1995-12-31 23:59:59','options'=>['value1','value2']], '1', false, - 'string' + 'string', + 'select', ], ]; } diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index a763d7a0425cb..edaa70fc3d9da 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -369,10 +369,11 @@ public function testGetMovedCategoryProductIds() * Test getFullProductIndexData method * * @param string $frontendInput + * @param mixed $indexData * @return void * @dataProvider attributeCodeProvider */ - public function testGetFullProductIndexData($frontendInput) + public function testGetFullProductIndexData($frontendInput, $indexData) { $this->productRepository->expects($this->once()) ->method('getById') @@ -427,7 +428,7 @@ public function testGetFullProductIndexData($frontendInput) $this->model->getFullProductIndexData( 1, [ - 1 => '240-LV04' + 1 => $indexData ] ) ); @@ -486,8 +487,24 @@ public function testGetFullCategoryProductIndexData() public static function attributeCodeProvider() { return [ - ['string'], - ['select'], + [ + 'string', + '240-LV04', + ], + [ + 'select', + '240-LV04', + ], + [ + 'select', + [1, ], + ], + [ + 'select', + [ + 1 => 1, + ], + ] ]; } } From 0b00a5fc926664635b86d9344690ea17810d0871 Mon Sep 17 00:00:00 2001 From: Oleksii Pugach Date: Fri, 8 Jan 2016 19:56:51 +0200 Subject: [PATCH 336/616] PRD-106: Merge PR from Sprint 6 --- Model/Adapter/DataMapper/ProductDataMapper.php | 7 +------ SearchAdapter/Query/Preprocessor/Stopwords.php | 4 ++-- .../SearchAdapter/Query/Preprocessor/StopwordsTest.php | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index cbc0966c9a620..63aaff4ae62f6 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -37,11 +37,6 @@ class ProductDataMapper implements DataMapperInterface */ const MEDIA_ROLE_SWATCH_IMAGE = 'swatch_image'; - /** - * Entity type for product - */ - const PRODUCT_ENTITY_TYPE = 'product'; - /** * @var Builder */ @@ -154,7 +149,7 @@ public function map($productId, array $indexData, $storeId, $context = []) $this->builder->addField( $this->fieldMapper->getFieldName( $attributeCode, - ['entityType' => self::PRODUCT_ENTITY_TYPE] + $context ), $value ); diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 9c3661b646f33..09f89f07637e1 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -92,7 +92,7 @@ public function process($query) /** * Get stopwords list for current locale * - * return array + * @return array */ protected function getStopwordsList() { @@ -113,7 +113,7 @@ protected function getStopwordsList() /** * Get stopwords file for current locale * - * return string + * @return string */ protected function getStopwordsFile() { diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php index 5ff26ed3ca78a..1197a1281ed70 100644 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php @@ -88,8 +88,8 @@ public function setUp() } /** - * Test process() method - */ + * Test process() method + */ public function testProcess() { $this->esConfig->expects($this->once()) From c24885cbeed6df97d0b25ef0df6b943fbd2d2b85 Mon Sep 17 00:00:00 2001 From: Volodymyr Klymenko Date: Tue, 12 Jan 2016 17:55:35 +0200 Subject: [PATCH 337/616] MAGETWO-47325: Adapt search and advanced search --- Model/ResourceModel/Index.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index e7e661421b91d..92fc70d54f9df 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -11,6 +11,7 @@ use Magento\Catalog\Api\CategoryRepositoryInterface; use Magento\Eav\Model\Config; use Magento\Catalog\Api\Data\ProductAttributeInterface; +use Magento\Framework\Model\Entity\MetadataPool; /** * Elasticsearch index resource model @@ -33,16 +34,19 @@ class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index protected $eavConfig; /** + * Index constructor. * @param Context $context * @param StoreManagerInterface $storeManager + * @param MetadataPool $metadataPool * @param ProductRepositoryInterface $productRepository * @param CategoryRepositoryInterface $categoryRepository * @param Config $eavConfig - * @param string|null $connectionName + * @param null $connectionName */ public function __construct( Context $context, StoreManagerInterface $storeManager, + MetadataPool $metadataPool, ProductRepositoryInterface $productRepository, CategoryRepositoryInterface $categoryRepository, Config $eavConfig, @@ -51,7 +55,7 @@ public function __construct( $this->productRepository = $productRepository; $this->categoryRepository = $categoryRepository; $this->eavConfig = $eavConfig; - parent::__construct($context, $storeManager, $connectionName); + parent::__construct($context, $storeManager, $metadataPool, $connectionName); } /** From 1b02c5962cbedd6a5b071b7b4d683226a1b496ef Mon Sep 17 00:00:00 2001 From: Volodymyr Klymenko Date: Tue, 12 Jan 2016 17:55:35 +0200 Subject: [PATCH 338/616] MAGETWO-47325: Adapt search and advanced search --- Model/ResourceModel/Index.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 7529175875fdf..8bf4e9382d87d 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -8,6 +8,8 @@ use Magento\Framework\Model\ResourceModel\Db\AbstractDb; use Magento\Store\Model\StoreManagerInterface; use Magento\Framework\Model\ResourceModel\Db\Context; +use Magento\Framework\Model\Entity\MetadataPool; +use Magento\Catalog\Api\Data\CategoryInterface; class Index extends AbstractDb { @@ -17,16 +19,25 @@ class Index extends AbstractDb protected $storeManager; /** + * @var MetadataPool + */ + protected $metadataPool; + + /** + * Index constructor. * @param Context $context * @param StoreManagerInterface $storeManager - * @param string $connectionName + * @param MetadataPool $metadataPool + * @param null $connectionName */ public function __construct( Context $context, StoreManagerInterface $storeManager, + MetadataPool $metadataPool, $connectionName = null ) { $this->storeManager = $storeManager; + $this->metadataPool = $metadataPool; parent::__construct($context, $connectionName); } @@ -125,12 +136,14 @@ public function getMovedCategoryProductIds($categoryId) { $connection = $this->getConnection(); + $identifierField = $this->metadataPool->getMetadata(CategoryInterface::class)->getIdentifierField(); + $select = $connection->select()->distinct()->from( ['c_p' => $this->getTable('catalog_category_product')], ['product_id'] )->join( ['c_e' => $this->getTable('catalog_category_entity')], - 'c_p.category_id = c_e.entity_id', + 'c_p.category_id = c_e.' . $identifierField, [] )->where( $connection->quoteInto('c_e.path LIKE ?', '%/' . $categoryId . '/%') From 3468db974a7d6ac7514a5caa4d739c3133efb35a Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Wed, 13 Jan 2016 10:00:42 -0600 Subject: [PATCH 339/616] MAGETWO-41323: Elastic Adapter - Handle Code Review & PR Management - Milestone 12 Sprint 4 - skipping test --- SearchAdapter/AdapterTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 4f05be6440126..64b4580a83c2b 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -26,6 +26,8 @@ class AdapterTest extends \PHPUnit_Framework_TestCase protected function setUp() { + $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); + $this->objectManager = Bootstrap::getObjectManager(); /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ From 9915c86c195bcbf23a850e63ca26f04b97dce619 Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Wed, 13 Jan 2016 16:32:59 -0600 Subject: [PATCH 340/616] MAGETWO-41323: Elastic Adapter - Handle Code Review & PR Management - Milestone 12 Sprint 4 - removing magentoDataFixture for skipped tests. --- Model/Indexer/IndexHandlerTest.php | 3 ++- SearchAdapter/AdapterTest.php | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 2390b6c0ace5e..090e9d60bdf10 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -79,7 +79,8 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->markTestSkipped('Skipping until Elastic search support becomes available on Bamboo.'); + //remember to add @ on line 18 when MAGETWO-44489 is done + $this->markTestSkipped('MAGETWO-44489 - Skipping until Elastic search support becomes available on Bamboo.'); $this->connectionManager = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 64b4580a83c2b..5af4f6ddf81f3 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -26,6 +26,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase protected function setUp() { + //remember to add @ for magentoDataFixture when MAGETWO-44489 is done $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); $this->objectManager = Bootstrap::getObjectManager(); @@ -83,7 +84,7 @@ private function reindexAll() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQuery() { @@ -100,7 +101,7 @@ public function testMatchQuery() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testAggregationsQuery() { @@ -122,7 +123,7 @@ public function testAggregationsQuery() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQueryFilters() { @@ -142,7 +143,7 @@ public function testMatchQueryFilters() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithAllFields() { @@ -160,7 +161,7 @@ public function testRangeFilterWithAllFields() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutFromField() { @@ -177,7 +178,7 @@ public function testRangeFilterWithoutFromField() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutToField() { @@ -194,7 +195,7 @@ public function testRangeFilterWithoutToField() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilter() { @@ -217,7 +218,7 @@ public function testTermFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilterArray() { @@ -234,7 +235,7 @@ public function testTermFilterArray() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testWildcardFilter() { @@ -251,7 +252,7 @@ public function testWildcardFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilter() { @@ -282,7 +283,7 @@ public function testBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() { @@ -308,7 +309,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() { @@ -335,7 +336,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testSimpleAdvancedSearch( $nameQuery, @@ -372,7 +373,7 @@ public function advancedSearchDataProvider() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testSearchLimit() { From 7569e1e436d1d3aaa8f96d4523446abe0b76bde5 Mon Sep 17 00:00:00 2001 From: Volodymyr Klymenko Date: Mon, 18 Jan 2016 12:35:53 +0200 Subject: [PATCH 341/616] MAGETWO-47980: Stabilize unit tests --- Test/Unit/Model/ResourceModel/IndexTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index a763d7a0425cb..b54ffa6ef2225 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -52,6 +52,11 @@ class IndexTest extends \PHPUnit_Framework_TestCase */ protected $eventManager; + /** + * @var \Magento\Framework\Model\Entity\MetadataPool|\PHPUnit_Framework_MockObject_MockObject + */ + protected $metadataPool; + /** * @var \Magento\Catalog\Api\Data\ProductInterface|\PHPUnit_Framework_MockObject_MockObject */ @@ -178,6 +183,14 @@ public function setUp() ]) ->getMock(); + $this->metadataPool = $this->getMockBuilder('\Magento\Framework\Model\Entity\MetadataPool') + ->disableOriginalConstructor() + ->setMethods([ + 'getMetadata', + 'getIdentifierField' + ]) + ->getMock(); + $this->context->expects($this->any()) ->method('getResources') ->willReturn($this->resources); @@ -190,12 +203,18 @@ public function setUp() ->method('getTablePrefix') ->willReturn(''); + $this->metadataPool->method('getMetadata') + ->willReturnSelf(); + $this->metadataPool->method('getIdentifierField') + ->willReturn('entity_id'); + $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( '\Magento\Elasticsearch\Model\ResourceModel\Index', [ 'context' => $this->context, 'storeManager' => $this->storeManager, + 'metadataPool' => $this->metadataPool, 'productRepository' => $this->productRepository, 'categoryRepository' => $this->categoryRepository, 'eavConfig' => $this->eavConfig, From 1b1dd88769d6e6ce86aee888dfab137883258a1b Mon Sep 17 00:00:00 2001 From: Volodymyr Klymenko Date: Tue, 19 Jan 2016 16:22:22 +0200 Subject: [PATCH 342/616] MAGETWO-47980: Stabilize unit tests --- Test/Unit/Model/ResourceModel/IndexTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index b54ffa6ef2225..5fe500b0a84eb 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -9,6 +9,7 @@ /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyFields) */ class IndexTest extends \PHPUnit_Framework_TestCase { From 8f43fd17442646ec92a09706a2b508e6c83ff5dc Mon Sep 17 00:00:00 2001 From: Maddy Chellathurai Date: Thu, 21 Jan 2016 17:17:07 -0600 Subject: [PATCH 343/616] MAGETWO-48145: Remove synonym from search terms - removing usages of synonym for --- Model/ResourceModel/Recommendations.php | 2 +- view/adminhtml/layout/catalog_search_block.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index b476510eedd1d..8ac8f0646b913 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -137,7 +137,7 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) */ public function getRecommendationsByQuery($query, $params, $searchRecommendationsCount) { - $this->_searchQueryModel->loadByQuery($query); + $this->_searchQueryModel->loadByQueryText($query); if (isset($params['store_id'])) { $this->_searchQueryModel->setStoreId($params['store_id']); diff --git a/view/adminhtml/layout/catalog_search_block.xml b/view/adminhtml/layout/catalog_search_block.xml index 2eb8fb47417b4..e99d51d7f34d2 100644 --- a/view/adminhtml/layout/catalog_search_block.xml +++ b/view/adminhtml/layout/catalog_search_block.xml @@ -75,12 +75,6 @@ number - - - Synonym - synonym_for - - Redirect URL From bcdc4188eac1375213db580479f5d0c45f765ffe Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 26 Jan 2016 10:37:10 -0600 Subject: [PATCH 344/616] MAGETWO-48144: MySQL global synonyms implementation - Code updates based on review --- .../Query/Preprocessor/PreprocessorInterface.php | 15 --------------- SearchAdapter/Query/Preprocessor/Stopwords.php | 1 + SearchAdapter/Query/Preprocessor/Synonyms.php | 1 + 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 SearchAdapter/Query/Preprocessor/PreprocessorInterface.php diff --git a/SearchAdapter/Query/Preprocessor/PreprocessorInterface.php b/SearchAdapter/Query/Preprocessor/PreprocessorInterface.php deleted file mode 100644 index ac4bf5a35a4b6..0000000000000 --- a/SearchAdapter/Query/Preprocessor/PreprocessorInterface.php +++ /dev/null @@ -1,15 +0,0 @@ - Date: Tue, 26 Jan 2016 11:50:03 -0600 Subject: [PATCH 345/616] MAGETWO-48144: MySQL global synonyms implementation - Fixed failing unit tests --- SearchAdapter/Query/Builder/Match.php | 2 +- Test/Unit/SearchAdapter/Query/Builder/MatchTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index c5c2ca1d6221a..00308a527fb37 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -8,7 +8,7 @@ use Magento\Framework\Search\Request\Query\BoolExpression; use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface; +use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface; class Match implements QueryInterface { diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 35867b3c4d67f..1d9b92e675dbb 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -9,7 +9,7 @@ use Magento\Framework\Search\Request\QueryInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface; +use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;; class MatchTest extends \PHPUnit_Framework_TestCase { From cfb27ca99dc7be2fd357ba3885bff894a52a2311 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 27 Jan 2016 09:28:55 -0600 Subject: [PATCH 346/616] MAGETWO-48144: MySQL global synonyms implementation - Minor style change to fix failing static test --- Test/Unit/SearchAdapter/Query/Builder/MatchTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 1d9b92e675dbb..27e67c730995e 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -9,7 +9,7 @@ use Magento\Framework\Search\Request\QueryInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;; +use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface; class MatchTest extends \PHPUnit_Framework_TestCase { From cdf24256c428306b15c59b4a3443f44613ae4c81 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 27 Jan 2016 13:50:43 -0600 Subject: [PATCH 347/616] MAGETWO-48144: MySQL global synonyms implementation - Minor code update to fix an integration test --- Test/Unit/SearchAdapter/Query/Builder/MatchTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 27e67c730995e..68dd6127043cf 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -49,7 +49,7 @@ public function setUp() ->getMock(); $this->preprocessorInterface = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\PreprocessorInterface') + ->getMockBuilder('Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface') ->disableOriginalConstructor() ->getMock(); From 62d5859fafe25322b741c0da5369d52c7abef271 Mon Sep 17 00:00:00 2001 From: Eddie Lau Date: Wed, 3 Feb 2016 10:35:04 -0600 Subject: [PATCH 348/616] MAGETWO-48705: Create XSD and XML files - added xml files --- etc/search_engine.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 etc/search_engine.xml diff --git a/etc/search_engine.xml b/etc/search_engine.xml new file mode 100644 index 0000000000000..c4edab636b431 --- /dev/null +++ b/etc/search_engine.xml @@ -0,0 +1,12 @@ + + + + + + + From ad93e0725ca7d57532514a8a9afaf0ed547ff962 Mon Sep 17 00:00:00 2001 From: Eddie Lau Date: Thu, 4 Feb 2016 13:31:39 -0600 Subject: [PATCH 349/616] MAGETWO-48705: Create XSD and XML files - changed xml attribute value --- etc/search_engine.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/search_engine.xml b/etc/search_engine.xml index c4edab636b431..bc86e474856a6 100644 --- a/etc/search_engine.xml +++ b/etc/search_engine.xml @@ -7,6 +7,6 @@ --> - + From df49c0791928e63a7bebece02d8dcdb700f74caf Mon Sep 17 00:00:00 2001 From: Ivan Gavryshko Date: Wed, 2 Mar 2016 17:05:38 +0000 Subject: [PATCH 350/616] MAGETWO-48212: [Git][PR] Bunch of public PR #3029 - EE changes --- Test/Unit/Model/Adapter/ElasticsearchTest.php | 2 +- Test/Unit/Model/Adapter/Index/BuilderTest.php | 2 +- Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php | 2 +- Test/Unit/Model/Client/ElasticsearchTest.php | 2 +- Test/Unit/Model/ConfigTest.php | 2 +- Test/Unit/Model/ResourceModel/IndexTest.php | 2 +- Test/Unit/SearchAdapter/AdapterTest.php | 2 +- Test/Unit/SearchAdapter/ConnectionManagerTest.php | 2 +- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 2 +- Test/Unit/SearchAdapter/Filter/BuilderTest.php | 2 +- Test/Unit/SearchAdapter/MapperTest.php | 2 +- Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php | 2 +- Test/Unit/SearchAdapter/Query/Builder/MatchTest.php | 2 +- Test/Unit/SearchAdapter/Query/BuilderTest.php | 2 +- Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php | 2 +- Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php | 2 +- Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 12d10c1ff8201..727299a831fab 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -76,7 +76,7 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->objectManager = new ObjectManagerHelper($this); $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') diff --git a/Test/Unit/Model/Adapter/Index/BuilderTest.php b/Test/Unit/Model/Adapter/Index/BuilderTest.php index 43cbd7357aa46..064aec68abb48 100644 --- a/Test/Unit/Model/Adapter/Index/BuilderTest.php +++ b/Test/Unit/Model/Adapter/Index/BuilderTest.php @@ -31,7 +31,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->localeResolver = $this->getMockBuilder('Magento\Framework\Locale\Resolver') ->disableOriginalConstructor() diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index 2ff218acd2e22..1657db011b7c7 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -58,7 +58,7 @@ class IndexNameResolverTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->objectManager = new ObjectManagerHelper($this); diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index b795bed38b505..f09804867c854 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -35,7 +35,7 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') ->setMethods([ diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index 73c7c506a0d37..99b97732bf5a9 100644 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -29,7 +29,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') ->disableOriginalConstructor() diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index 3ceff00c6f365..1d1e8710b22d5 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -99,7 +99,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase * @SuppressWarnings(PHPMD.ExcessiveMethodLength) * @return void */ - public function setUp() + protected function setUp() { $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/AdapterTest.php b/Test/Unit/SearchAdapter/AdapterTest.php index 81db24de7ad50..a98e974f4b72a 100644 --- a/Test/Unit/SearchAdapter/AdapterTest.php +++ b/Test/Unit/SearchAdapter/AdapterTest.php @@ -47,7 +47,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/SearchAdapter/ConnectionManagerTest.php index bb388b0ae31bd..05fe50bfa66cb 100644 --- a/Test/Unit/SearchAdapter/ConnectionManagerTest.php +++ b/Test/Unit/SearchAdapter/ConnectionManagerTest.php @@ -41,7 +41,7 @@ class ConnectionManagerTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index b10acc781710e..f1eca95fe7b1c 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -85,7 +85,7 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') ->setMethods(['getConnection']) diff --git a/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/Test/Unit/SearchAdapter/Filter/BuilderTest.php index 7613286ab8b96..aa870e653184b 100644 --- a/Test/Unit/SearchAdapter/Filter/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Filter/BuilderTest.php @@ -37,7 +37,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->range = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index 3244775b7db69..ac6ce6924eeeb 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -37,7 +37,7 @@ class MapperTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->queryBuilder = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Builder') ->setMethods([ diff --git a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php b/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php index b154c1ca2c600..098ec07464e31 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php @@ -35,7 +35,7 @@ class AggregationTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $helper = new ObjectManager($this); diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index 68dd6127043cf..bf1a944270eb1 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -38,7 +38,7 @@ class MatchTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/Test/Unit/SearchAdapter/Query/BuilderTest.php index da3a3fe231f8c..f3962632836e5 100644 --- a/Test/Unit/SearchAdapter/Query/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Query/BuilderTest.php @@ -43,7 +43,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->setMethods(['getEntityType']) diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php index 1197a1281ed70..c5e214bf7871a 100644 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php @@ -50,7 +50,7 @@ class StopwordsTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php index 5f9e28718032e..40a6b948f8e27 100755 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php @@ -26,7 +26,7 @@ class SynonymsTest extends \PHPUnit_Framework_TestCase * * @return void */ - public function setUp() + protected function setUp() { $this->synonymsAnalyzer = $this->getMockBuilder('\Magento\Search\Api\SynonymAnalyzerInterface') ->disableOriginalConstructor() diff --git a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php index 0de80a628eaea..6ce5c01dc1154 100644 --- a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php +++ b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php @@ -40,7 +40,7 @@ class SearchIndexNameResolverTest extends \PHPUnit_Framework_TestCase * Setup method * @return void */ - public function setUp() + protected function setUp() { $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->disableOriginalConstructor() From e00bb1222cc43b5716b85b58b1ea7f6ab556a3f7 Mon Sep 17 00:00:00 2001 From: Ivan Gavryshko Date: Wed, 2 Mar 2016 14:34:33 -0600 Subject: [PATCH 351/616] MAGETWO-48212: [Git][PR] Bunch of public PR #3029 - fixed static tests --- Test/Unit/SearchAdapter/Filter/BuilderTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/Test/Unit/SearchAdapter/Filter/BuilderTest.php index aa870e653184b..a82c5adc4b112 100644 --- a/Test/Unit/SearchAdapter/Filter/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Filter/BuilderTest.php @@ -17,6 +17,7 @@ class BuilderTest extends \PHPUnit_Framework_TestCase * @var Builder */ protected $model; + /** * @var Range|\PHPUnit_Framework_MockObject_MockObject */ From 84510d28b747bcaa1d88798f02f157cff7113214 Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Thu, 10 Mar 2016 14:07:47 -0600 Subject: [PATCH 352/616] MAGETWO-48568: CLONE - PHP bug in libxml can bring website down [is relevant for php versions less than 5.5.22] - Updated the rest of the composer files. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a47af7929bb13..2bac829c11124 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-elasticsearch", "description": "N/A", "require": { - "php": "~5.5.0|~5.6.0|~7.0.0", + "php": "~5.5.22|~5.6.0|~7.0.0", "magento/module-advanced-search": "100.0.*", "magento/module-catalog": "100.0.*", "magento/module-catalog-search": "100.0.*", From 036fcd8522b2cb961e4b8f16badb388d3b8f9dfb Mon Sep 17 00:00:00 2001 From: Hayder Sharhan Date: Thu, 10 Mar 2016 14:07:47 -0600 Subject: [PATCH 353/616] MAGETWO-48568: CLONE - PHP bug in libxml can bring website down [is relevant for php versions less than 5.5.22] - Updated the rest of the composer files. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 38c687c163fe8..2a7cc5f3f66b3 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-advanced-search", "description": "N/A", "require": { - "php": "~5.5.0|~5.6.0|~7.0.0", + "php": "~5.5.22|~5.6.0|~7.0.0", "magento/framework": "100.0.*", "magento/module-search": "100.0.*", "magento/module-backend": "100.0.*", From 9ba132c3bce5e35c8e87b88882a6dfa5bf5c7045 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Thu, 17 Mar 2016 16:14:01 -0500 Subject: [PATCH 354/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search --- SearchAdapter/Dynamic/DataProvider.php | 4 +++- SearchAdapter/Query/Builder.php | 4 +++- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 7 +++++++ Test/Unit/SearchAdapter/Query/BuilderTest.php | 7 +++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 92d2adb150a9b..f019ba31db760 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -175,7 +175,9 @@ public function getAggregation( $entityIds = $entityStorage->getSource(); $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); $dimension = current($dimensions); - $storeId = $dimension->getValue(); + /** @var \Magento\Store\Model\Store $storeModel */ + $storeModel = $dimension->getValue(); + $storeId = $storeModel->getStoreId(); $requestQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), 'type' => $this->clientConfig->getEntityType(), diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index 7e936b4e0b37b..f69de28ef8c37 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -51,7 +51,9 @@ public function __construct( public function initQuery(RequestInterface $request) { $dimension = current($request->getDimensions()); - $storeId = $dimension->getValue(); + /** @var \Magento\Store\Model\Store $storeModel */ + $storeModel = $dimension->getValue(); + $storeId = $storeModel->getStoreId(); $searchQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), 'type' => $this->clientConfig->getEntityType(), diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index b10acc781710e..6cec3f97a716c 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -265,8 +265,15 @@ public function testGetAggregation() ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); + $storeModel = $this->getMockBuilder('\Magento\Store\Model\Store') + ->setMethods(['getStoreId']) + ->disableOriginalConstructor() + ->getMock(); $dimension->expects($this->once()) ->method('getValue') + ->willReturn($storeModel); + $storeModel->expects($this->once()) + ->method('getStoreId') ->willReturn(1); $this->clientMock->expects($this->once()) diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/Test/Unit/SearchAdapter/Query/BuilderTest.php index da3a3fe231f8c..f3244fb1f6689 100644 --- a/Test/Unit/SearchAdapter/Query/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Query/BuilderTest.php @@ -83,11 +83,18 @@ public function testInitQuery() ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); + $storeModel = $this->getMockBuilder('\Magento\Store\Model\Store') + ->setMethods(['getStoreId']) + ->disableOriginalConstructor() + ->getMock(); $this->request->expects($this->once()) ->method('getDimensions') ->willReturn([$dimension]); $dimension->expects($this->once()) ->method('getValue') + ->willReturn($storeModel); + $storeModel->expects($this->once()) + ->method('getStoreId') ->willReturn(1); $this->request->expects($this->once()) ->method('getFrom') From ee71f1da912299d68c0a717f08a1d3ae10242ba9 Mon Sep 17 00:00:00 2001 From: Joan He Date: Thu, 17 Mar 2016 16:16:36 -0500 Subject: [PATCH 355/616] MAGETWO-48081: Copyright Year Update --- Block/Adminhtml/System/Config/TestConnection.php | 2 +- Model/Adapter/Container/Attribute.php | 2 +- Model/Adapter/DataMapper/DataMapperResolver.php | 2 +- Model/Adapter/DataMapper/ProductDataMapper.php | 2 +- Model/Adapter/DataMapperInterface.php | 2 +- Model/Adapter/Document/Builder.php | 2 +- Model/Adapter/Elasticsearch.php | 2 +- Model/Adapter/FieldMapper/FieldMapperResolver.php | 2 +- Model/Adapter/FieldMapper/ProductFieldMapper.php | 2 +- Model/Adapter/FieldMapperInterface.php | 2 +- Model/Adapter/FieldType.php | 2 +- Model/Adapter/FieldType/Date.php | 2 +- Model/Adapter/Index/Builder.php | 2 +- Model/Adapter/Index/BuilderInterface.php | 2 +- Model/Adapter/Index/Config/Converter.php | 2 +- Model/Adapter/Index/Config/EsConfig.php | 2 +- Model/Adapter/Index/Config/EsConfigInterface.php | 2 +- Model/Adapter/Index/Config/SchemaLocator.php | 2 +- Model/Adapter/Index/IndexNameResolver.php | 2 +- Model/Client/Elasticsearch.php | 2 +- Model/Config.php | 2 +- Model/DataProvider/Suggestions.php | 2 +- Model/Indexer/IndexStructure.php | 2 +- Model/Indexer/IndexerHandler.php | 2 +- Model/ResourceModel/Engine.php | 2 +- Model/ResourceModel/Index.php | 2 +- SearchAdapter/Adapter.php | 2 +- SearchAdapter/Aggregation/Builder.php | 2 +- SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php | 2 +- SearchAdapter/Aggregation/Builder/Dynamic.php | 2 +- SearchAdapter/Aggregation/Builder/Term.php | 2 +- SearchAdapter/Aggregation/Interval.php | 2 +- SearchAdapter/AggregationFactory.php | 2 +- SearchAdapter/ConnectionManager.php | 2 +- SearchAdapter/DocumentFactory.php | 2 +- SearchAdapter/Dynamic/DataProvider.php | 2 +- SearchAdapter/Filter/Builder.php | 2 +- SearchAdapter/Filter/Builder/FilterInterface.php | 2 +- SearchAdapter/Filter/Builder/Range.php | 2 +- SearchAdapter/Filter/Builder/Term.php | 2 +- SearchAdapter/Filter/Builder/Wildcard.php | 2 +- SearchAdapter/Filter/BuilderInterface.php | 2 +- SearchAdapter/Mapper.php | 2 +- SearchAdapter/Query/Builder.php | 2 +- SearchAdapter/Query/Builder/Aggregation.php | 2 +- SearchAdapter/Query/Builder/Match.php | 2 +- SearchAdapter/Query/Builder/QueryInterface.php | 2 +- SearchAdapter/Query/Preprocessor/Stopwords.php | 2 +- SearchAdapter/Query/Preprocessor/Synonyms.php | 2 +- SearchAdapter/ResponseFactory.php | 2 +- SearchAdapter/SearchIndexNameResolver.php | 2 +- Test/Unit/Model/Adapter/Container/AttributeTest.php | 2 +- Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php | 2 +- Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php | 2 +- Test/Unit/Model/Adapter/Document/BuilderTest.php | 2 +- Test/Unit/Model/Adapter/ElasticsearchTest.php | 2 +- Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php | 2 +- Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php | 2 +- Test/Unit/Model/Adapter/FieldType/DateTest.php | 2 +- Test/Unit/Model/Adapter/FieldTypeTest.php | 2 +- Test/Unit/Model/Adapter/Index/BuilderTest.php | 2 +- Test/Unit/Model/Adapter/Index/Config/ConverterTest.php | 2 +- Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php | 2 +- Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php | 2 +- Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml | 2 +- Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php | 2 +- Test/Unit/Model/Client/ElasticsearchTest.php | 2 +- Test/Unit/Model/ConfigTest.php | 2 +- Test/Unit/Model/DataProvider/SuggestionsTest.php | 2 +- Test/Unit/Model/Indexer/IndexStructureTest.php | 2 +- Test/Unit/Model/Indexer/IndexerHandlerTest.php | 2 +- Test/Unit/Model/ResourceModel/EngineTest.php | 2 +- Test/Unit/Model/ResourceModel/IndexTest.php | 2 +- Test/Unit/SearchAdapter/AdapterTest.php | 2 +- Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php | 2 +- Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php | 2 +- Test/Unit/SearchAdapter/Aggregation/BuilderTest.php | 2 +- Test/Unit/SearchAdapter/Aggregation/IntervalTest.php | 2 +- Test/Unit/SearchAdapter/AggregationFactoryTest.php | 2 +- Test/Unit/SearchAdapter/ConnectionManagerTest.php | 2 +- Test/Unit/SearchAdapter/DocumentFactoryTest.php | 2 +- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 2 +- Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php | 2 +- Test/Unit/SearchAdapter/Filter/Builder/TermTest.php | 2 +- Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php | 2 +- Test/Unit/SearchAdapter/Filter/BuilderTest.php | 2 +- Test/Unit/SearchAdapter/MapperTest.php | 2 +- Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php | 2 +- Test/Unit/SearchAdapter/Query/Builder/MatchTest.php | 2 +- Test/Unit/SearchAdapter/Query/BuilderTest.php | 2 +- Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php | 2 +- Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php | 2 +- Test/Unit/SearchAdapter/ResponseFactoryTest.php | 2 +- Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php | 2 +- etc/adminhtml/system.xml | 2 +- etc/config.xml | 2 +- etc/di.xml | 2 +- etc/esconfig.xml | 2 +- etc/esconfig.xsd | 2 +- etc/module.xml | 2 +- etc/search_engine.xml | 2 +- registration.php | 2 +- 102 files changed, 102 insertions(+), 102 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index 1e8b29fe848d5..30f4c9969b5e3 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -1,6 +1,6 @@ diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index 2ff218acd2e22..56c2279f111f8 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -1,6 +1,6 @@ diff --git a/etc/config.xml b/etc/config.xml index 8a3c1e49bd0ab..1815fbe35fdb0 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -1,7 +1,7 @@ diff --git a/etc/di.xml b/etc/di.xml index 847cf66bd567d..20640914c7b50 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -1,7 +1,7 @@ diff --git a/etc/esconfig.xml b/etc/esconfig.xml index 9969d7c536de7..faefbcce4bb44 100644 --- a/etc/esconfig.xml +++ b/etc/esconfig.xml @@ -1,7 +1,7 @@ diff --git a/etc/esconfig.xsd b/etc/esconfig.xsd index e9e0a62f35f60..6e27d73275265 100644 --- a/etc/esconfig.xsd +++ b/etc/esconfig.xsd @@ -3,7 +3,7 @@ /** * This schema must be used to validate esconfig.xml files * - * Copyright © 2015 Magento. All rights reserved. + * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ --> diff --git a/etc/module.xml b/etc/module.xml index 4b9df19c41fec..a62806875fcb7 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/etc/search_engine.xml b/etc/search_engine.xml index bc86e474856a6..eb1f2945cf540 100644 --- a/etc/search_engine.xml +++ b/etc/search_engine.xml @@ -1,7 +1,7 @@ diff --git a/registration.php b/registration.php index ad24de6daa497..5bb12d339a3c2 100644 --- a/registration.php +++ b/registration.php @@ -1,6 +1,6 @@ Date: Thu, 17 Mar 2016 16:16:36 -0500 Subject: [PATCH 356/616] MAGETWO-48081: Copyright Year Update --- Block/Adminhtml/Search/Edit.php | 2 +- Block/Adminhtml/Search/Grid.php | 2 +- Block/Adminhtml/System/Config/TestConnection.php | 2 +- Block/Recommendations.php | 2 +- Block/SearchData.php | 2 +- Block/SearchDataInterface.php | 2 +- Block/Suggestions.php | 2 +- Controller/Adminhtml/Search/System/Config/TestConnection.php | 2 +- Model/Adminhtml/Search/Grid/Options.php | 2 +- Model/Client/ClientFactory.php | 2 +- Model/Client/ClientFactoryInterface.php | 2 +- Model/Client/ClientInterface.php | 2 +- Model/Client/ClientOptionsInterface.php | 2 +- Model/Client/ClientResolver.php | 2 +- Model/DataProvider/Suggestions.php | 2 +- Model/Indexer/Fulltext/Plugin/CustomerGroup.php | 2 +- Model/Recommendations/DataProvider.php | 2 +- Model/Recommendations/SaveSearchQueryRelationsObserver.php | 2 +- Model/ResourceModel/Index.php | 2 +- Model/ResourceModel/Recommendations.php | 2 +- Model/ResourceModel/Search/Grid/Collection.php | 2 +- Model/SuggestedQueries.php | 2 +- Model/SuggestedQueriesInterface.php | 2 +- Setup/InstallSchema.php | 2 +- Test/Unit/Block/SearchDataTest.php | 2 +- .../Adminhtml/Search/System/Config/TestConnectionTest.php | 2 +- Test/Unit/Model/Client/ClientResolverTest.php | 2 +- Test/Unit/Model/DataProviderTest.php | 2 +- Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php | 2 +- etc/adminhtml/events.xml | 2 +- etc/adminhtml/routes.xml | 2 +- etc/adminhtml/system.xml | 2 +- etc/config.xml | 2 +- etc/di.xml | 2 +- etc/module.xml | 2 +- registration.php | 2 +- view/adminhtml/layout/catalog_search_block.xml | 2 +- view/adminhtml/layout/catalog_search_edit.xml | 2 +- view/adminhtml/layout/catalog_search_relatedgrid.xml | 2 +- view/adminhtml/requirejs-config.js | 2 +- view/adminhtml/templates/system/config/testconnection.phtml | 2 +- view/adminhtml/web/js/testconnection.js | 2 +- view/frontend/layout/catalogsearch_result_index.xml | 2 +- view/frontend/templates/search_data.phtml | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Block/Adminhtml/Search/Edit.php b/Block/Adminhtml/Search/Edit.php index 5f78bcc84579e..7e3f748d707b9 100644 --- a/Block/Adminhtml/Search/Edit.php +++ b/Block/Adminhtml/Search/Edit.php @@ -1,6 +1,6 @@ diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml index 87215b5e43f0e..c767d56f3a23e 100644 --- a/etc/adminhtml/routes.xml +++ b/etc/adminhtml/routes.xml @@ -1,7 +1,7 @@ diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index efb88cccb6511..225ae7270d237 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -1,7 +1,7 @@ diff --git a/etc/config.xml b/etc/config.xml index b5ff38ec74a3f..a8d9a112f4446 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -1,7 +1,7 @@ diff --git a/etc/di.xml b/etc/di.xml index 1f5a46c5cdcb6..d92587bb37308 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -1,6 +1,6 @@ diff --git a/etc/module.xml b/etc/module.xml index bf37579aeca0f..c6fe9d6b711c6 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,7 +1,7 @@ diff --git a/registration.php b/registration.php index 322d426a2ec2a..0ca9f182e544c 100644 --- a/registration.php +++ b/registration.php @@ -1,6 +1,6 @@ diff --git a/view/adminhtml/layout/catalog_search_edit.xml b/view/adminhtml/layout/catalog_search_edit.xml index 0d58deca08116..96d72602ecb8f 100644 --- a/view/adminhtml/layout/catalog_search_edit.xml +++ b/view/adminhtml/layout/catalog_search_edit.xml @@ -1,7 +1,7 @@ diff --git a/view/adminhtml/layout/catalog_search_relatedgrid.xml b/view/adminhtml/layout/catalog_search_relatedgrid.xml index 731478ab21209..e446085368a11 100644 --- a/view/adminhtml/layout/catalog_search_relatedgrid.xml +++ b/view/adminhtml/layout/catalog_search_relatedgrid.xml @@ -1,7 +1,7 @@ diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js index 2fec1520c73eb..0db61805b33eb 100644 --- a/view/adminhtml/requirejs-config.js +++ b/view/adminhtml/requirejs-config.js @@ -1,5 +1,5 @@ /** - * Copyright © 2015 Magento. All rights reserved. + * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/view/adminhtml/templates/system/config/testconnection.phtml index ddab7edf78b33..80e37a2f4c451 100644 --- a/view/adminhtml/templates/system/config/testconnection.phtml +++ b/view/adminhtml/templates/system/config/testconnection.phtml @@ -1,6 +1,6 @@ diff --git a/view/frontend/templates/search_data.phtml b/view/frontend/templates/search_data.phtml index 2dc2cb22a5a74..c9eedba5dd062 100644 --- a/view/frontend/templates/search_data.phtml +++ b/view/frontend/templates/search_data.phtml @@ -1,6 +1,6 @@ Date: Thu, 17 Mar 2016 16:16:36 -0500 Subject: [PATCH 357/616] MAGETWO-48081: Copyright Year Update --- Model/Indexer/IndexHandlerTest.php | 2 +- SearchAdapter/AdapterTest.php | 2 +- _files/indexer.php | 2 +- _files/indexer_rollback.php | 2 +- _files/requests.xml | 2 +- _files/search_products.php | 2 +- _files/search_products_rollback.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 090e9d60bdf10..42f522c4f2935 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -1,6 +1,6 @@ diff --git a/_files/search_products.php b/_files/search_products.php index cde4751a044c8..70b7b368cb69f 100644 --- a/_files/search_products.php +++ b/_files/search_products.php @@ -1,6 +1,6 @@ Date: Thu, 17 Mar 2016 16:16:36 -0500 Subject: [PATCH 358/616] MAGETWO-48081: Copyright Year Update --- Block/SuggestionsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Block/SuggestionsTest.php b/Block/SuggestionsTest.php index 5ec0457ce74e5..49e2fc0ce4bfa 100644 --- a/Block/SuggestionsTest.php +++ b/Block/SuggestionsTest.php @@ -1,6 +1,6 @@ Date: Fri, 18 Mar 2016 10:42:00 -0500 Subject: [PATCH 359/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search - Code updates as per review comments. --- SearchAdapter/Dynamic/DataProvider.php | 6 +++--- SearchAdapter/Query/Builder.php | 6 +++--- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 4 ++-- Test/Unit/SearchAdapter/Query/BuilderTest.php | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index f019ba31db760..97cdf1ec2e721 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -175,9 +175,9 @@ public function getAggregation( $entityIds = $entityStorage->getSource(); $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); $dimension = current($dimensions); - /** @var \Magento\Store\Model\Store $storeModel */ - $storeModel = $dimension->getValue(); - $storeId = $storeModel->getStoreId(); + /** @var \Magento\Store\Api\Data\StoreInterface $storeInterface */ + $storeInterface = $dimension->getValue(); + $storeId = $storeInterface->getId(); $requestQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), 'type' => $this->clientConfig->getEntityType(), diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index f69de28ef8c37..b8a5e6cf9848b 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -51,9 +51,9 @@ public function __construct( public function initQuery(RequestInterface $request) { $dimension = current($request->getDimensions()); - /** @var \Magento\Store\Model\Store $storeModel */ - $storeModel = $dimension->getValue(); - $storeId = $storeModel->getStoreId(); + /** @var \Magento\Store\Api\Data\StoreInterface $storeInterface */ + $storeInterface = $dimension->getValue(); + $storeId = $storeInterface->getId(); $searchQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), 'type' => $this->clientConfig->getEntityType(), diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 6cec3f97a716c..99029936c38f7 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -266,14 +266,14 @@ public function testGetAggregation() ->disableOriginalConstructor() ->getMock(); $storeModel = $this->getMockBuilder('\Magento\Store\Model\Store') - ->setMethods(['getStoreId']) + ->setMethods(['getId']) ->disableOriginalConstructor() ->getMock(); $dimension->expects($this->once()) ->method('getValue') ->willReturn($storeModel); $storeModel->expects($this->once()) - ->method('getStoreId') + ->method('getId') ->willReturn(1); $this->clientMock->expects($this->once()) diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/Test/Unit/SearchAdapter/Query/BuilderTest.php index f3244fb1f6689..65439955a0f1a 100644 --- a/Test/Unit/SearchAdapter/Query/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Query/BuilderTest.php @@ -84,7 +84,7 @@ public function testInitQuery() ->disableOriginalConstructor() ->getMock(); $storeModel = $this->getMockBuilder('\Magento\Store\Model\Store') - ->setMethods(['getStoreId']) + ->setMethods(['getId']) ->disableOriginalConstructor() ->getMock(); $this->request->expects($this->once()) @@ -94,7 +94,7 @@ public function testInitQuery() ->method('getValue') ->willReturn($storeModel); $storeModel->expects($this->once()) - ->method('getStoreId') + ->method('getId') ->willReturn(1); $this->request->expects($this->once()) ->method('getFrom') From 1c577abd88f51975501c30bc22f514ffc0d7cd9b Mon Sep 17 00:00:00 2001 From: Anton Kaplya Date: Sun, 20 Mar 2016 13:40:14 +0200 Subject: [PATCH 360/616] MAGETWO-50676: EntityManager introduction --- Model/ResourceModel/Index.php | 2 +- Test/Unit/Model/ResourceModel/IndexTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index cf4314de70fa0..316c9caf02f24 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -11,7 +11,7 @@ use Magento\Catalog\Api\CategoryRepositoryInterface; use Magento\Eav\Model\Config; use Magento\Catalog\Api\Data\ProductAttributeInterface; -use Magento\Framework\Model\Entity\MetadataPool; +use Magento\Framework\EntityManager\MetadataPool; /** * Elasticsearch index resource model diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index 1d1e8710b22d5..1a90641f6abea 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -54,7 +54,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase protected $eventManager; /** - * @var \Magento\Framework\Model\Entity\MetadataPool|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\EntityManager\MetadataPool|\PHPUnit_Framework_MockObject_MockObject */ protected $metadataPool; @@ -184,7 +184,7 @@ protected function setUp() ]) ->getMock(); - $this->metadataPool = $this->getMockBuilder('\Magento\Framework\Model\Entity\MetadataPool') + $this->metadataPool = $this->getMockBuilder('\Magento\Framework\EntityManager\MetadataPool') ->disableOriginalConstructor() ->setMethods([ 'getMetadata', From 0cd814ab06e1e6ba4e18ae5eeb4ff1fe284e13c6 Mon Sep 17 00:00:00 2001 From: Anton Kaplya Date: Sun, 20 Mar 2016 13:40:14 +0200 Subject: [PATCH 361/616] MAGETWO-50676: EntityManager introduction --- Model/ResourceModel/Index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 8bf4e9382d87d..1135d3da5a125 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -8,7 +8,7 @@ use Magento\Framework\Model\ResourceModel\Db\AbstractDb; use Magento\Store\Model\StoreManagerInterface; use Magento\Framework\Model\ResourceModel\Db\Context; -use Magento\Framework\Model\Entity\MetadataPool; +use Magento\Framework\EntityManager\MetadataPool; use Magento\Catalog\Api\Data\CategoryInterface; class Index extends AbstractDb From 38f266b8b1287d20cdcba7ecbb2989c831e203dc Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 29 Mar 2016 12:35:35 -0500 Subject: [PATCH 362/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search - Code updates to accomodate review comments --- Model/Indexer/IndexStructure.php | 15 ++++-- Model/Indexer/IndexerHandler.php | 15 ++++-- SearchAdapter/Dynamic/DataProvider.php | 16 ++++-- SearchAdapter/Query/Builder.php | 15 ++++-- .../Unit/Model/Indexer/IndexStructureTest.php | 39 +++++++++++++++ .../Unit/Model/Indexer/IndexerHandlerTest.php | 37 ++++++++++++++ .../Dynamic/DataProviderTest.php | 50 +++++++++++++++---- Test/Unit/SearchAdapter/Query/BuilderTest.php | 42 ++++++++++++---- 8 files changed, 196 insertions(+), 33 deletions(-) diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php index 93dd0b0c5f699..8cb97beeb7f2e 100644 --- a/Model/Indexer/IndexStructure.php +++ b/Model/Indexer/IndexStructure.php @@ -7,6 +7,7 @@ use Magento\Framework\Indexer\IndexStructureInterface; use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; +use Magento\Framework\App\ScopeResolverInterface; class IndexStructure implements IndexStructureInterface { @@ -15,13 +16,21 @@ class IndexStructure implements IndexStructureInterface */ private $adapter; + /** + * @var ScopeResolverInterface + */ + private $scopeResolver; + /** * @param ElasticsearchAdapter $adapter + * @param ScopeResolverInterface $scopeResolver */ public function __construct( - ElasticsearchAdapter $adapter + ElasticsearchAdapter $adapter, + ScopeResolverInterface $scopeResolver ) { $this->adapter = $adapter; + $this->scopeResolver = $scopeResolver; } /** @@ -32,7 +41,7 @@ public function delete( array $dimensions = [] ) { $dimension = current($dimensions); - $storeId = $dimension->getValue(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); $this->adapter->cleanIndex($storeId, $indexerId); } @@ -46,7 +55,7 @@ public function create( array $dimensions = [] ) { $dimension = current($dimensions); - $storeId = $dimension->getValue(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();; $this->adapter->checkIndex($storeId, $indexerId, false); } } diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index e7a3efa569782..b8c6592f40458 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -10,6 +10,7 @@ use Magento\Framework\Indexer\IndexStructureInterface; use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; +use Magento\Framework\App\ScopeResolverInterface; class IndexerHandler implements IndexerInterface { @@ -48,6 +49,11 @@ class IndexerHandler implements IndexerInterface */ private $batchSize; + /** + * @var ScopeResolverInterface + */ + private $scopeResolver; + /** * @param IndexStructureInterface $indexStructure * @param ElasticsearchAdapter $adapter @@ -55,6 +61,7 @@ class IndexerHandler implements IndexerInterface * @param Batch $batch * @param array $data * @param int $batchSize + * @param ScopeResolverInterface $scopeResolver */ public function __construct( IndexStructureInterface $indexStructure, @@ -62,7 +69,8 @@ public function __construct( IndexNameResolver $indexNameResolver, Batch $batch, array $data = [], - $batchSize = self::DEFAULT_BATCH_SIZE + $batchSize = self::DEFAULT_BATCH_SIZE, + ScopeResolverInterface $scopeResolver ) { $this->indexStructure = $indexStructure; $this->adapter = $adapter; @@ -70,6 +78,7 @@ public function __construct( $this->batch = $batch; $this->data = $data; $this->batchSize = $batchSize; + $this->scopeResolver = $scopeResolver; } /** @@ -78,7 +87,7 @@ public function __construct( public function saveIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); - $storeId = $dimension->getValue(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) { $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $storeId); $this->adapter->addDocs($docs, $storeId, $this->getIndexerId()); @@ -93,7 +102,7 @@ public function saveIndex($dimensions, \Traversable $documents) public function deleteIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); - $storeId = $dimension->getValue(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();; $documentIds = []; foreach ($documents as $document) { $documentIds[$document] = $document; diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 97cdf1ec2e721..f7b2d4ba6eba0 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -47,6 +47,11 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte */ protected $indexerId; + /** + * @var \Magento\Framework\App\ScopeResolverInterface + */ + protected $scopeResolver; + /** * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager * @param \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface $fieldMapper @@ -56,6 +61,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver * @param string $indexerId + * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver */ public function __construct( \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, @@ -65,7 +71,8 @@ public function __construct( \Magento\Elasticsearch\Model\Config $clientConfig, \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver $searchIndexNameResolver, - $indexerId + $indexerId, + \Magento\Framework\App\ScopeResolverInterface $scopeResolver ) { $this->connectionManager = $connectionManager; $this->fieldMapper = $fieldMapper; @@ -75,6 +82,7 @@ public function __construct( $this->storeManager = $storeManager; $this->searchIndexNameResolver = $searchIndexNameResolver; $this->indexerId = $indexerId; + $this->scopeResolver = $scopeResolver; } /** @@ -153,7 +161,7 @@ public function getInterval( $entityIds = $entityStorage->getSource(); $fieldName = $this->fieldMapper->getFieldName('price'); $dimension = current($dimensions); - $storeId = $dimension->getValue(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); return $this->intervalFactory->create([ 'entityIds' => $entityIds, @@ -175,9 +183,7 @@ public function getAggregation( $entityIds = $entityStorage->getSource(); $fieldName = $this->fieldMapper->getFieldName($bucket->getField()); $dimension = current($dimensions); - /** @var \Magento\Store\Api\Data\StoreInterface $storeInterface */ - $storeInterface = $dimension->getValue(); - $storeId = $storeInterface->getId(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); $requestQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $this->indexerId), 'type' => $this->clientConfig->getEntityType(), diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index b8a5e6cf9848b..62eb9fa747830 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -9,6 +9,7 @@ use Magento\Elasticsearch\Model\Config; use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; +use Magento\Framework\App\ScopeResolverInterface; class Builder { @@ -27,19 +28,27 @@ class Builder */ protected $aggregationBuilder; + /** + * @var ScopeResolverInterface + */ + protected $scopeResolver; + /** * @param Config $clientConfig * @param SearchIndexNameResolver $searchIndexNameResolver * @param AggregationBuilder $aggregationBuilder + * @param ScopeResolverInterface $scopeResolver */ public function __construct( Config $clientConfig, SearchIndexNameResolver $searchIndexNameResolver, - AggregationBuilder $aggregationBuilder + AggregationBuilder $aggregationBuilder, + ScopeResolverInterface $scopeResolver ) { $this->clientConfig = $clientConfig; $this->searchIndexNameResolver = $searchIndexNameResolver; $this->aggregationBuilder = $aggregationBuilder; + $this->scopeResolver = $scopeResolver; } /** @@ -51,9 +60,7 @@ public function __construct( public function initQuery(RequestInterface $request) { $dimension = current($request->getDimensions()); - /** @var \Magento\Store\Api\Data\StoreInterface $storeInterface */ - $storeInterface = $dimension->getValue(); - $storeId = $storeInterface->getId(); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); $searchQuery = [ 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), 'type' => $this->clientConfig->getEntityType(), diff --git a/Test/Unit/Model/Indexer/IndexStructureTest.php b/Test/Unit/Model/Indexer/IndexStructureTest.php index d7d78d371389e..5f1c466cc83e6 100644 --- a/Test/Unit/Model/Indexer/IndexStructureTest.php +++ b/Test/Unit/Model/Indexer/IndexStructureTest.php @@ -20,6 +20,16 @@ class IndexStructureTest extends \PHPUnit_Framework_TestCase */ private $adapter; + /** + * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $scopeResolver; + + /** + * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $scopeInterface; + /** * Set up test environment. @@ -32,35 +42,64 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->scopeResolver = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeResolverInterface', + [], + '', + false + ); + + $this->scopeInterface = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeInterface', + [], + '', + false + ); + $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( 'Magento\Elasticsearch\Model\Indexer\IndexStructure', [ 'adapter' => $this->adapter, + 'scopeResolver' => $this->scopeResolver ] ); } public function testDelete() { + $storeId = 9; $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') ->disableOriginalConstructor() ->getMock(); $this->adapter->expects($this->any()) ->method('cleanIndex'); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) + ->method('getId') + ->willReturn($storeId); $this->model->delete('product', [$dimension]); } public function testCreate() { + $storeId = 9; $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') ->disableOriginalConstructor() ->getMock(); $this->adapter->expects($this->any()) ->method('checkIndex'); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) + ->method('getId') + ->willReturn($storeId); $this->model->create('product', [], [$dimension]); } diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/Test/Unit/Model/Indexer/IndexerHandlerTest.php index e830a00e188b2..8722251ddc038 100644 --- a/Test/Unit/Model/Indexer/IndexerHandlerTest.php +++ b/Test/Unit/Model/Indexer/IndexerHandlerTest.php @@ -45,6 +45,16 @@ class IndexerHandlerTest extends \PHPUnit_Framework_TestCase */ private $client; + /** + * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $scopeResolver; + + /** + * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject + */ + private $scopeInterface; + /** * Set up test environment. * @@ -82,6 +92,20 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->scopeResolver = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeResolverInterface', + [], + '', + false + ); + + $this->scopeInterface = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeInterface', + [], + '', + false + ); + $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( @@ -93,6 +117,7 @@ protected function setUp() 'batch' => $this->batch, 'data' => ['indexer_id' => 'catalogsearch_fulltext'], 500, + 'scopeResolver' => $this->scopeResolver ] ); } @@ -124,6 +149,12 @@ public function testDeleteIndex() $dimension->expects($this->once()) ->method('getValue') ->willReturn($dimensionValue); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) + ->method('getId') + ->willReturn($dimensionValue); $result = $this->model->deleteIndex([$dimension], new \ArrayIterator([$documentId])); @@ -155,6 +186,12 @@ public function testSaveIndex() $this->adapter->expects($this->once()) ->method('addDocs') ->with([$documentId]); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) + ->method('getId') + ->willReturn($dimensionValue); $result = $this->model->saveIndex([$dimension], $documents); diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 5d48d2ea16674..275ace336577b 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -81,6 +81,16 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase */ protected $searchIndexNameResolver; + /** + * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $scopeResolver; + + /** + * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $scopeInterface; + /** * Setup method * @return void @@ -158,6 +168,20 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); + $this->scopeResolver = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeResolverInterface', + [], + '', + false + ); + + $this->scopeInterface = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeInterface', + [], + '', + false + ); + $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider', @@ -170,7 +194,8 @@ protected function setUp() 'storeManager' => $this->storeManager, 'customerSession' => $this->customerSession, 'searchIndexNameResolver' => $this->searchIndexNameResolver, - 'indexerId' => 'catalogsearch_fulltext' + 'indexerId' => 'catalogsearch_fulltext', + 'scopeResolver' => $this->scopeResolver ] ); } @@ -223,6 +248,7 @@ public function testGetAggregations() */ public function testGetInterval() { + $dimensionValue = 1; $bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') ->disableOriginalConstructor() ->getMock(); @@ -235,7 +261,13 @@ public function testGetInterval() ->getMock(); $dimension->expects($this->once()) ->method('getValue') - ->willReturn(1); + ->willReturn($dimensionValue); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) + ->method('getId') + ->willReturn($dimensionValue); $this->intervalFactory->expects($this->once()) ->method('create') ->willReturn($interval); @@ -255,6 +287,7 @@ public function testGetInterval() */ public function testGetAggregation() { + $dimensionValue = 1; $expectedResult = [ 1 => 1, ]; @@ -265,16 +298,15 @@ public function testGetAggregation() ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); - $storeModel = $this->getMockBuilder('\Magento\Store\Model\Store') - ->setMethods(['getId']) - ->disableOriginalConstructor() - ->getMock(); $dimension->expects($this->once()) ->method('getValue') - ->willReturn($storeModel); - $storeModel->expects($this->once()) + ->willReturn($dimensionValue); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) ->method('getId') - ->willReturn(1); + ->willReturn($dimensionValue); $this->clientMock->expects($this->once()) ->method('query') diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/Test/Unit/SearchAdapter/Query/BuilderTest.php index ed7d1fbdb95b3..8b8c46b3ac20b 100644 --- a/Test/Unit/SearchAdapter/Query/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Query/BuilderTest.php @@ -39,11 +39,21 @@ class BuilderTest extends \PHPUnit_Framework_TestCase */ protected $request; + /** + * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $scopeResolver; + + /** + * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $scopeInterface; + /** * Setup method * @return void */ - protected function setUp() + public function setUp() { $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') ->setMethods(['getEntityType']) @@ -62,6 +72,18 @@ protected function setUp() $this->request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') ->disableOriginalConstructor() ->getMock(); + $this->scopeResolver = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeResolverInterface', + [], + '', + false + ); + $this->scopeInterface = $this->getMockForAbstractClass( + 'Magento\Framework\App\ScopeInterface', + [], + '', + false + ); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( @@ -69,7 +91,8 @@ protected function setUp() [ 'clientConfig' => $this->clientConfig, 'searchIndexNameResolver' => $this->searchIndexNameResolver, - 'aggregationBuilder' => $this->aggregationBuilder + 'aggregationBuilder' => $this->aggregationBuilder, + 'scopeResolver' => $this->scopeResolver ] ); } @@ -79,23 +102,24 @@ protected function setUp() */ public function testInitQuery() { + $dimensionValue = 1; $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); - $storeModel = $this->getMockBuilder('\Magento\Store\Model\Store') - ->setMethods(['getId']) - ->disableOriginalConstructor() - ->getMock(); + $this->request->expects($this->once()) ->method('getDimensions') ->willReturn([$dimension]); $dimension->expects($this->once()) ->method('getValue') - ->willReturn($storeModel); - $storeModel->expects($this->once()) + ->willReturn($dimensionValue); + $this->scopeResolver->expects($this->once()) + ->method('getScope') + ->willReturn($this->scopeInterface); + $this->scopeInterface->expects($this->once()) ->method('getId') - ->willReturn(1); + ->willReturn($dimensionValue); $this->request->expects($this->once()) ->method('getFrom') ->willReturn(0); From 2fa0704720fdd4bcef5b6449582f5a47f63fd5b7 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 29 Mar 2016 15:53:58 -0500 Subject: [PATCH 363/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search - Code review updates --- Model/Indexer/IndexStructure.php | 8 ++++---- Model/Indexer/IndexerHandler.php | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php index 8cb97beeb7f2e..20e80acaae6b7 100644 --- a/Model/Indexer/IndexStructure.php +++ b/Model/Indexer/IndexStructure.php @@ -41,8 +41,8 @@ public function delete( array $dimensions = [] ) { $dimension = current($dimensions); - $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); - $this->adapter->cleanIndex($storeId, $indexerId); + $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); + $this->adapter->cleanIndex($scopeId, $indexerId); } /** @@ -55,7 +55,7 @@ public function create( array $dimensions = [] ) { $dimension = current($dimensions); - $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();; - $this->adapter->checkIndex($storeId, $indexerId, false); + $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();; + $this->adapter->checkIndex($scopeId, $indexerId, false); } } diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index b8c6592f40458..6cf64ed003dc2 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -59,18 +59,18 @@ class IndexerHandler implements IndexerInterface * @param ElasticsearchAdapter $adapter * @param IndexNameResolver $indexNameResolver * @param Batch $batch + * @param ScopeResolverInterface $scopeResolver * @param array $data * @param int $batchSize - * @param ScopeResolverInterface $scopeResolver */ public function __construct( IndexStructureInterface $indexStructure, ElasticsearchAdapter $adapter, IndexNameResolver $indexNameResolver, Batch $batch, + ScopeResolverInterface $scopeResolver, array $data = [], - $batchSize = self::DEFAULT_BATCH_SIZE, - ScopeResolverInterface $scopeResolver + $batchSize = self::DEFAULT_BATCH_SIZE ) { $this->indexStructure = $indexStructure; $this->adapter = $adapter; @@ -87,12 +87,12 @@ public function __construct( public function saveIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); - $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); + $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); foreach ($this->batch->getItems($documents, $this->batchSize) as $documentsBatch) { - $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $storeId); - $this->adapter->addDocs($docs, $storeId, $this->getIndexerId()); + $docs = $this->adapter->prepareDocsPerStore($documentsBatch, $scopeId); + $this->adapter->addDocs($docs, $scopeId, $this->getIndexerId()); } - $this->adapter->updateAlias($storeId, $this->getIndexerId()); + $this->adapter->updateAlias($scopeId, $this->getIndexerId()); return $this; } @@ -102,12 +102,12 @@ public function saveIndex($dimensions, \Traversable $documents) public function deleteIndex($dimensions, \Traversable $documents) { $dimension = current($dimensions); - $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId();; + $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); $documentIds = []; foreach ($documents as $document) { $documentIds[$document] = $document; } - $this->adapter->deleteDocs($documentIds, $storeId, $this->getIndexerId()); + $this->adapter->deleteDocs($documentIds, $scopeId, $this->getIndexerId()); return $this; } From 10e7440476ddeab7dacb5099b4a5ae9aa62dd276 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 30 Mar 2016 10:12:15 -0500 Subject: [PATCH 364/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search - Code review updates - Updates to fix failing static tests --- Model/Indexer/IndexStructure.php | 2 +- .../Unit/Model/Indexer/IndexStructureTest.php | 9 ++-- .../Unit/Model/Indexer/IndexerHandlerTest.php | 1 - .../Dynamic/DataProviderTest.php | 50 +++++++++---------- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php index 20e80acaae6b7..d4fc7c41b7d2b 100644 --- a/Model/Indexer/IndexStructure.php +++ b/Model/Indexer/IndexStructure.php @@ -55,7 +55,7 @@ public function create( array $dimensions = [] ) { $dimension = current($dimensions); - $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();; + $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); $this->adapter->checkIndex($scopeId, $indexerId, false); } } diff --git a/Test/Unit/Model/Indexer/IndexStructureTest.php b/Test/Unit/Model/Indexer/IndexStructureTest.php index 5f1c466cc83e6..9802eef2369ab 100644 --- a/Test/Unit/Model/Indexer/IndexStructureTest.php +++ b/Test/Unit/Model/Indexer/IndexStructureTest.php @@ -30,7 +30,6 @@ class IndexStructureTest extends \PHPUnit_Framework_TestCase */ private $scopeInterface; - /** * Set up test environment. * @@ -69,7 +68,7 @@ protected function setUp() public function testDelete() { - $storeId = 9; + $scopeId = 9; $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') ->disableOriginalConstructor() ->getMock(); @@ -81,14 +80,14 @@ public function testDelete() ->willReturn($this->scopeInterface); $this->scopeInterface->expects($this->once()) ->method('getId') - ->willReturn($storeId); + ->willReturn($scopeId); $this->model->delete('product', [$dimension]); } public function testCreate() { - $storeId = 9; + $scopeId = 9; $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') ->disableOriginalConstructor() ->getMock(); @@ -99,7 +98,7 @@ public function testCreate() ->willReturn($this->scopeInterface); $this->scopeInterface->expects($this->once()) ->method('getId') - ->willReturn($storeId); + ->willReturn($scopeId); $this->model->create('product', [], [$dimension]); } diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/Test/Unit/Model/Indexer/IndexerHandlerTest.php index 8722251ddc038..1b1241804ec8e 100644 --- a/Test/Unit/Model/Indexer/IndexerHandlerTest.php +++ b/Test/Unit/Model/Indexer/IndexerHandlerTest.php @@ -137,7 +137,6 @@ public function testIsAvailable() $this->assertTrue($result); } - public function testDeleteIndex() { $dimensionValue = 3; diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 275ace336577b..58a4686defa01 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -6,18 +6,7 @@ namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Dynamic; use Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider; -use Magento\Catalog\Model\Layer\Filter\Price\Range; -use Magento\Framework\Search\Dynamic\IntervalFactory; -use Magento\Elasticsearch\SearchAdapter\ConnectionManager; -use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Elasticsearch\Model\Config; -use Magento\Store\Model\StoreManagerInterface; -use Magento\Customer\Model\Session as CustomerSession; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Framework\Search\Dynamic\EntityStorage; -use Magento\Store\Api\Data\StoreInterface; -use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; -use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; class DataProviderTest extends \PHPUnit_Framework_TestCase { @@ -27,75 +16,75 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase protected $model; /** - * @var ConnectionManager|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Elasticsearch\SearchAdapter\ConnectionManager|\PHPUnit_Framework_MockObject_MockObject */ protected $connectionManager; /** - * @var FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Elasticsearch\Model\Adapter\FieldMapperInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $fieldMapper; /** - * @var Range|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Catalog\Model\Layer\Filter\Price\Range|\PHPUnit_Framework_MockObject_MockObject */ protected $range; /** - * @var IntervalFactory|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Framework\Search\Dynamic\IntervalFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $intervalFactory; /** - * @var Config|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Elasticsearch\Model\Config|\PHPUnit_Framework_MockObject_MockObject */ protected $clientConfig; /** - * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $storeManager; /** - * @var CustomerSession|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */ protected $customerSession; /** - * @var EntityStorage|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Framework\Search\Dynamic\EntityStorage|\PHPUnit_Framework_MockObject_MockObject */ protected $entityStorage; /** - * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $storeMock; /** - * @var ElasticsearchClient|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Elasticsearch\Model\Client\Elasticsearch|\PHPUnit_Framework_MockObject_MockObject */ protected $clientMock; /** - * @var SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver|\PHPUnit_Framework_MockObject_MockObject */ protected $searchIndexNameResolver; /** - * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $scopeResolver; /** - * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject + * @var Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $scopeInterface; /** - * Setup method + * A private helper for setUp method. * @return void */ - protected function setUp() + private function setUpMockObjects() { $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') ->setMethods(['getConnection']) @@ -181,6 +170,15 @@ protected function setUp() '', false ); + } + + /** + * Setup method + * @return void + */ + protected function setUp() + { + $this->setUpMockObjects(); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( From 13474291d126ec48d512e2c55ecd7cba6e85928f Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 30 Mar 2016 10:50:47 -0500 Subject: [PATCH 365/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search - Update to reduce coupling between objects --- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 58a4686defa01..50df27f3f72a2 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -5,13 +5,10 @@ */ namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Dynamic; -use Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; - class DataProviderTest extends \PHPUnit_Framework_TestCase { /** - * @var DataProvider + * @var \Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider */ protected $model; @@ -180,7 +177,7 @@ protected function setUp() { $this->setUpMockObjects(); - $objectManagerHelper = new ObjectManagerHelper($this); + $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->model = $objectManagerHelper->getObject( '\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider', [ From a181d420d0005837244bb7fbfe1b7c8a9ac78953 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 30 Mar 2016 11:48:13 -0500 Subject: [PATCH 366/616] MAGETWO-50554: Processing your request errors appears while using Advanced Search with configured Elastic Search - Minor update to fix static test issue --- Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 50df27f3f72a2..af95b1391ddfb 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -5,6 +5,9 @@ */ namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Dynamic; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class DataProviderTest extends \PHPUnit_Framework_TestCase { /** From 6903058df9930d02d327aa983e98948c102e801e Mon Sep 17 00:00:00 2001 From: Nadiya Syvokonenko Date: Tue, 5 Apr 2016 15:22:46 +0300 Subject: [PATCH 367/616] MAGETWO-50676: EntityManager introduction --- Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php b/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php index 7cd3b334a8534..28133c1507d29 100644 --- a/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php +++ b/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php @@ -52,7 +52,7 @@ protected function setUp() */ public function testGetSchema() { - $this->assertEquals('schema_dir/esconfig.xsd', $this->model->getSchema()); + $this->assertEquals('schema_dir' . DIRECTORY_SEPARATOR . 'esconfig.xsd', $this->model->getSchema()); } /** @@ -60,6 +60,6 @@ public function testGetSchema() */ public function testGetPerFileSchema() { - $this->assertEquals('schema_dir/esconfig.xsd', $this->model->getPerFileSchema()); + $this->assertEquals('schema_dir' . DIRECTORY_SEPARATOR . 'esconfig.xsd', $this->model->getPerFileSchema()); } } From 54d0f37636e3d33b6034d763ae33690501b98a9c Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 5 Apr 2016 15:45:41 -0500 Subject: [PATCH 368/616] MAGETWO-50736: [TD] Search related improvements for mysql - synonyms support --- SearchAdapter/Query/Preprocessor/Synonyms.php | 42 ------------- .../Query/Preprocessor/SynonymsTest.php | 60 ------------------- etc/di.xml | 2 +- 3 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 SearchAdapter/Query/Preprocessor/Synonyms.php delete mode 100755 Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php diff --git a/SearchAdapter/Query/Preprocessor/Synonyms.php b/SearchAdapter/Query/Preprocessor/Synonyms.php deleted file mode 100644 index 9872b70e41ea3..0000000000000 --- a/SearchAdapter/Query/Preprocessor/Synonyms.php +++ /dev/null @@ -1,42 +0,0 @@ -synonymsAnalyzer = $synonymsAnalyzer; - } - - /** - * {@inheritdoc} - */ - public function process($query) - { - $synonyms = []; - $synonymsArray = $this->synonymsAnalyzer->getSynonymsForPhrase($query); - if (count($synonymsArray) > 0) { - foreach ($synonymsArray as $synonymPart) { - $synonyms [] = implode(' ', $synonymPart); - } - $query = implode(' ', $synonyms); - } - return $query; - } -} diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php deleted file mode 100755 index 67f3fd13f1266..0000000000000 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/SynonymsTest.php +++ /dev/null @@ -1,60 +0,0 @@ -synonymsAnalyzer = $this->getMockBuilder('\Magento\Search\Api\SynonymAnalyzerInterface') - ->disableOriginalConstructor() - ->getMock(); - - $objectManagerHelper = new ObjectManagerHelper($this); - $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Synonyms', - [ - 'synonymsAnalyzer' => $this->synonymsAnalyzer, - ] - ); - } - - /** - * Test process() method - */ - public function testProcess() - { - $this->synonymsAnalyzer->expects($this->once()) - ->method('getSynonymsForPhrase') - ->willReturn([ - ['red', 'blue'] - ]); - - $this->assertEquals( - 'red blue', - $this->model->process('red') - ); - } -} diff --git a/etc/di.xml b/etc/di.xml index 20640914c7b50..6236ce5a387b5 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -114,7 +114,7 @@ Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords - Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Synonyms + Magento\Search\Adapter\Query\Preprocessor\Synonyms From 9336594098d43eaa9c3ce7c62f75a10086f7dc58 Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Fri, 15 Apr 2016 14:34:49 +0300 Subject: [PATCH 369/616] MAGETWO-51538: Exception when perform advanced search by space in any field --- SearchAdapter/AdapterTest.php | 290 +++++----------------------- _files/requests.xml | 85 ++++++-- _files/search_products.php | 11 -- _files/search_products_rollback.php | 11 -- 4 files changed, 118 insertions(+), 279 deletions(-) delete mode 100644 _files/search_products.php delete mode 100644 _files/search_products_rollback.php diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index c66cc199512d6..a1354fb177dfe 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -5,338 +5,170 @@ */ namespace Magento\Elasticsearch\SearchAdapter; -use Magento\TestFramework\Helper\Bootstrap; +use Magento\Elasticsearch\Model\Config; -class AdapterTest extends \PHPUnit_Framework_TestCase +/** + * Class AdapterTest + * + * @magentoDbIsolation disabled + * @magentoAppIsolation enabled + * magentoDataFixture Magento/Framework/Search/_files/products.php + */ +class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest { /** - * @var \Magento\Elasticsearch\SearchAdapter\Adapter + * @var string */ - private $adapter; + protected $requestConfig = __DIR__ . '/../_files/requests.xml'; /** - * @var \Magento\Framework\Search\Request\Builder + * @var string */ - private $requestBuilder; + protected $searchEngine = Config::ENGINE_NAME; /** - * @var \Magento\Framework\ObjectManagerInterface + * @return \Magento\Framework\Search\AdapterInterface */ - private $objectManager; + protected function createAdapter() + { + return $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); + } protected function setUp() { //remember to add @ for magentoDataFixture when MAGETWO-44489 is done $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); - - $this->objectManager = Bootstrap::getObjectManager(); - - /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ - $converter = $this->objectManager->create('Magento\Framework\Search\Request\Config\Converter'); - - $document = new \DOMDocument(); - $document->load(__DIR__ . '/../_files/requests.xml'); - $requestConfig = $converter->convert($document); - - /** @var \Magento\Framework\Search\Request\Config $config */ - $config = $this->objectManager->create('Magento\Framework\Search\Request\Config'); - $config->merge($requestConfig); - - $this->requestBuilder = $this->objectManager->create( - 'Magento\Framework\Search\Request\Builder', - ['config' => $config] - ); - - $this->adapter = $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); - } - - /** - * @return \Magento\Framework\Search\Response\QueryResponse - */ - private function executeQuery() - { - $this->reindexAll(); - - /** @var \Magento\Framework\Search\RequestInterface $queryRequest */ - $queryRequest = $this->requestBuilder->create(); - $queryResponse = $this->adapter->query($queryRequest); - - return $queryResponse; - } - - /** - * Perform full reindex - * - * @return void - */ - private function reindexAll() - { - $indexer = Bootstrap::getObjectManager()->create( - 'Magento\Indexer\Model\Indexer' - ); - $indexer->load('catalogsearch_fulltext'); - $indexer->reindexAll(); } /** - * Sample test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQuery() { - $this->requestBuilder->bind('fulltext_search_query', 'socks'); - $this->requestBuilder->setRequestName('one_match'); - $queryResponse = $this->executeQuery(); - - $this->assertEquals(1, $queryResponse->count()); + parent::testMatchQuery(); } /** - * Sample test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testAggregationsQuery() { - $this->requestBuilder->bind('fulltext_search_query', 'peoples'); - $this->requestBuilder->setRequestName('one_aggregations'); - - $queryResponse = $this->executeQuery(); - - $this->assertEquals( - ['weight_bucket', 'dynamic_price'], - $queryResponse->getAggregations() - ->getBucketNames() - ); + $this->markTestSkipped('Range query does not implemented.'); } /** - * Sample test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQueryFilters() { - $this->requestBuilder->bind('fulltext_search_query', 'socks'); - $this->requestBuilder->bind('pidm_from', 11); - $this->requestBuilder->bind('pidm_to', 17); - $this->requestBuilder->bind('pidsh', 18); - $this->requestBuilder->setRequestName('one_match_filters'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); + parent::testMatchQueryFilters(); } /** * Range filter test with all fields filled * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithAllFields() { - $this->requestBuilder->bind('range_filter_from', 11); - $this->requestBuilder->bind('range_filter_to', 16); - $this->requestBuilder->setRequestName('range_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(3, $queryResponse->count()); + parent::testRangeFilterWithAllFields(); } /** * Range filter test with all fields filled * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutFromField() { - $this->requestBuilder->bind('range_filter_to', 18); - $this->requestBuilder->setRequestName('range_filter_without_from_field'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(4, $queryResponse->count()); + parent::testRangeFilterWithoutFromField(); } /** * Range filter test with all fields filled * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutToField() { - $this->requestBuilder->bind('range_filter_from', 14); - $this->requestBuilder->setRequestName('range_filter_without_to_field'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(4, $queryResponse->count()); + parent::testRangeFilterWithoutToField(); } /** * Term filter test * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilter() { - $this->requestBuilder->bind('request.price', 18); - $this->requestBuilder->setRequestName('term_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); - $this->assertEquals( - 4, - $queryResponse->getIterator() - ->offsetGet(0) - ->getId() - ); + parent::testTermFilter(); } /** * Term filter test * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilterArray() { - $this->requestBuilder->bind('request.price', [16, 18]); - $this->requestBuilder->setRequestName('term_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(2, $queryResponse->count()); + parent::testTermFilterArray(); } /** * Term filter test * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testWildcardFilter() { - $this->requestBuilder->bind('wildcard_filter', 'un'); - $this->requestBuilder->setRequestName('one_wildcard'); + parent::testWildcardFilter(); + } - $queryResponse = $this->executeQuery(); - $this->assertEquals(1, $queryResponse->count()); + /** + * Request limits test + * + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + */ + public function testSearchLimit() + { + parent::testSearchLimit(); } /** * Bool filter test * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilter() { - $expectedIds = [2, 3]; - $this->requestBuilder->bind('must_range_filter1_from', 12); - $this->requestBuilder->bind('must_range_filter1_to', 22); - $this->requestBuilder->bind('should_term_filter1', 12); - $this->requestBuilder->bind('should_term_filter2', 14); - $this->requestBuilder->bind('should_term_filter3', 16); - $this->requestBuilder->bind('should_term_filter4', 18); - $this->requestBuilder->bind('not_term_filter1', 12); - $this->requestBuilder->bind('not_term_filter2', 18); - $this->requestBuilder->setRequestName('bool_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(count($expectedIds), $queryResponse->count()); - $actualIds = []; - foreach ($queryResponse as $document) { - /** @var \Magento\Framework\Search\Document $document */ - $actualIds[] = $document->getId(); - } - $this->assertEquals($expectedIds, $actualIds); + parent::testBoolFilter(); } /** * Test bool filter with nested negative bool filter * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() { - $expectedIds = [1]; - $this->requestBuilder->bind('not_range_filter_from', 14); - $this->requestBuilder->bind('not_range_filter_to', 20); - $this->requestBuilder->bind('nested_not_term_filter', 12); - $this->requestBuilder->setRequestName('bool_filter_with_nested_bool_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(count($expectedIds), $queryResponse->count()); - $actualIds = []; - foreach ($queryResponse as $document) { - /** @var \Magento\Framework\Search\Document $document */ - $actualIds[] = $document->getId(); - } - $this->assertEquals($expectedIds, $actualIds); + parent::testBoolFilterWithNestedNegativeBoolFilter(); } /** * Test range inside nested negative bool filter * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() { - $expectedIds = [1, 5]; - $this->requestBuilder->bind('nested_must_range_filter_from', 14); - $this->requestBuilder->bind('nested_must_range_filter_to', 18); - $this->requestBuilder->setRequestName('bool_filter_with_range_in_nested_negative_filter'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(count($expectedIds), $queryResponse->count()); - $actualIds = []; - foreach ($queryResponse as $document) { - /** @var \Magento\Framework\Search\Document $document */ - $actualIds[] = $document->getId(); - } - sort($actualIds); - $this->assertEquals($expectedIds, $actualIds); + parent::testBoolFilterWithNestedRangeInNegativeBoolFilter(); } /** * Sample Advanced search request test * - * @dataProvider advancedSearchDataProvider - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @dataProvider advancedSearchDataProvider */ public function testSimpleAdvancedSearch( $nameQuery, @@ -344,45 +176,19 @@ public function testSimpleAdvancedSearch( $rangeFilter, $expectedRecordsCount ) { - $this->requestBuilder->bind('name_query', $nameQuery); - $this->requestBuilder->bind('description_query', $descriptionQuery); - $this->requestBuilder->bind('request.from_price', $rangeFilter['from']); - $this->requestBuilder->bind('request.to_price', $rangeFilter['to']); - $this->requestBuilder->setRequestName('advanced_search_test'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals($expectedRecordsCount, $queryResponse->count()); - } - - /** - * @return array - */ - public function advancedSearchDataProvider() - { - return [ - ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], - ['white', 'shorts', ['from' => '12', 'to' => '18'], 1], - ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], - ['peoples', 'green', ['from' => '12', 'to' => '22'], 2], - ]; + parent::testSimpleAdvancedSearch( + $nameQuery, + $descriptionQuery, + $rangeFilter, + $expectedRecordsCount + ); } /** - * Request limits test - * - * @magentoDbIsolation disabled - * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ - public function testSearchLimit() + public function testCustomFilterableAttribute() { - $this->requestBuilder->bind('wildcard_filter', '*'); - $this->requestBuilder->setFrom(2); - $this->requestBuilder->setSize(2); - $this->requestBuilder->setRequestName('one_wildcard'); - - $queryResponse = $this->executeQuery(); - $this->assertEquals(2, $queryResponse->count()); + parent::testCustomFilterableAttribute(); } } diff --git a/_files/requests.xml b/_files/requests.xml index 627788ee42a79..33192b212f0a0 100644 --- a/_files/requests.xml +++ b/_files/requests.xml @@ -8,7 +8,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -41,6 +41,16 @@ + + + + + + + + + + 0 @@ -48,7 +58,7 @@ - + @@ -63,7 +73,7 @@ - + @@ -79,7 +89,7 @@ - + @@ -107,7 +117,7 @@ - + @@ -126,7 +136,7 @@ - + @@ -144,7 +154,7 @@ - + @@ -162,7 +172,7 @@ - + @@ -177,7 +187,7 @@ - + @@ -229,7 +239,7 @@ - + @@ -259,7 +269,7 @@ - + @@ -284,7 +294,7 @@ - + @@ -293,9 +303,9 @@ - + - + @@ -311,4 +321,49 @@ 0 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + diff --git a/_files/search_products.php b/_files/search_products.php deleted file mode 100644 index 70b7b368cb69f..0000000000000 --- a/_files/search_products.php +++ /dev/null @@ -1,11 +0,0 @@ -getMessage(); -} diff --git a/_files/search_products_rollback.php b/_files/search_products_rollback.php deleted file mode 100644 index 3e3be2f12182f..0000000000000 --- a/_files/search_products_rollback.php +++ /dev/null @@ -1,11 +0,0 @@ -getMessage(); -} From 40a9189692760f51aa7f2b93feefda43c7db4dea Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Mon, 18 Apr 2016 13:18:04 -0500 Subject: [PATCH 370/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Unblocked Magento/Elasticsearch/SearchAdapter/AdapterTest.php --- Model/Indexer/IndexHandlerTest.php | 2 +- SearchAdapter/AdapterTest.php | 31 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 42f522c4f2935..2e303958466a5 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -80,7 +80,7 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase protected function setUp() { //remember to add @ on line 18 when MAGETWO-44489 is done - $this->markTestSkipped('MAGETWO-44489 - Skipping until Elastic search support becomes available on Bamboo.'); + $this->markTestSkipped('Skipping until Bamboo parallel builds issue gets resolved (CICD-2073).'); $this->connectionManager = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index c66cc199512d6..d022234b10480 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -26,9 +26,6 @@ class AdapterTest extends \PHPUnit_Framework_TestCase protected function setUp() { - //remember to add @ for magentoDataFixture when MAGETWO-44489 is done - $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); - $this->objectManager = Bootstrap::getObjectManager(); /** @var \Magento\Framework\Search\Request\Config\Converter $converter */ @@ -84,7 +81,7 @@ private function reindexAll() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQuery() { @@ -101,7 +98,7 @@ public function testMatchQuery() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testAggregationsQuery() { @@ -123,7 +120,7 @@ public function testAggregationsQuery() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQueryFilters() { @@ -143,7 +140,7 @@ public function testMatchQueryFilters() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithAllFields() { @@ -161,7 +158,7 @@ public function testRangeFilterWithAllFields() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutFromField() { @@ -178,7 +175,7 @@ public function testRangeFilterWithoutFromField() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutToField() { @@ -195,7 +192,7 @@ public function testRangeFilterWithoutToField() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilter() { @@ -218,7 +215,7 @@ public function testTermFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilterArray() { @@ -235,7 +232,7 @@ public function testTermFilterArray() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testWildcardFilter() { @@ -252,7 +249,7 @@ public function testWildcardFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilter() { @@ -283,7 +280,7 @@ public function testBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() { @@ -309,7 +306,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() { @@ -336,7 +333,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testSimpleAdvancedSearch( $nameQuery, @@ -373,7 +370,7 @@ public function advancedSearchDataProvider() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testSearchLimit() { From 3748e112d03e088100170c3ccef1f1cc11accea1 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 19 Apr 2016 16:35:34 -0500 Subject: [PATCH 371/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Changed elasticsearch_index_prefix for dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php --- Model/Indexer/IndexHandlerTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 2e303958466a5..d423b4d5cfc61 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -15,7 +15,7 @@ /** * @magentoDbIsolation enabled - * magentoDataFixture Magento/Elasticsearch/_files/indexer.php + * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase { @@ -79,9 +79,6 @@ class IndexHandlerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - //remember to add @ on line 18 when MAGETWO-44489 is done - $this->markTestSkipped('Skipping until Bamboo parallel builds issue gets resolved (CICD-2073).'); - $this->connectionManager = Bootstrap::getObjectManager()->create( 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' ); @@ -111,6 +108,7 @@ protected function setUp() /** * Test reindex process * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest */ public function testReindexAll() { @@ -127,6 +125,7 @@ public function testReindexAll() /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest */ public function testReindexRowAfterEdit() { @@ -149,6 +148,7 @@ public function testReindexRowAfterEdit() /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest */ public function testReindexRowAfterMassAction() { @@ -188,6 +188,7 @@ public function testReindexRowAfterMassAction() /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest * @magentoAppArea adminhtml */ public function testReindexRowAfterDelete() From 4a6723f34eac2a60b29545fe8540b33d458f343b Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Tue, 19 Apr 2016 19:58:09 -0500 Subject: [PATCH 372/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Made elasticsearch_index_prefix value lower case --- Model/Indexer/IndexHandlerTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index d423b4d5cfc61..e89bf3d5e3216 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -108,7 +108,7 @@ protected function setUp() /** * Test reindex process * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest */ public function testReindexAll() { @@ -125,7 +125,7 @@ public function testReindexAll() /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest */ public function testReindexRowAfterEdit() { @@ -148,7 +148,7 @@ public function testReindexRowAfterEdit() /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest */ public function testReindexRowAfterMassAction() { @@ -188,7 +188,7 @@ public function testReindexRowAfterMassAction() /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix IndexHandlerTest + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest * @magentoAppArea adminhtml */ public function testReindexRowAfterDelete() From 577edb030c5876631e7de297f8d93f88a2512c97 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 20 Apr 2016 10:16:34 -0500 Subject: [PATCH 373/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Minor updates: - Added docblock comment for the elastic search intergration test files emphasizing need for unique index name per test file - Changed the index prefix for AdapterTest.php from default value (magento2) to 'adaptertest' --- Model/Indexer/IndexHandlerTest.php | 4 ++++ SearchAdapter/AdapterTest.php | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index e89bf3d5e3216..4cb5e55f8e0b3 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -14,6 +14,10 @@ use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; /** + * Important: Please make sure that each integration test file works with unique elastic search index. In order to + * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test + * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest' + * * @magentoDbIsolation enabled * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php */ diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index d022234b10480..724691b8f47c7 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -7,6 +7,11 @@ use Magento\TestFramework\Helper\Bootstrap; +/** + * Important: Please make sure that each integration test file works with unique elastic search index. In order to + * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test + * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest' + * class AdapterTest extends \PHPUnit_Framework_TestCase { /** @@ -81,6 +86,7 @@ private function reindexAll() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQuery() @@ -98,6 +104,7 @@ public function testMatchQuery() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testAggregationsQuery() @@ -120,6 +127,7 @@ public function testAggregationsQuery() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testMatchQueryFilters() @@ -140,6 +148,7 @@ public function testMatchQueryFilters() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithAllFields() @@ -158,6 +167,7 @@ public function testRangeFilterWithAllFields() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutFromField() @@ -175,6 +185,7 @@ public function testRangeFilterWithoutFromField() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testRangeFilterWithoutToField() @@ -192,6 +203,7 @@ public function testRangeFilterWithoutToField() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilter() @@ -215,6 +227,7 @@ public function testTermFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testTermFilterArray() @@ -232,6 +245,7 @@ public function testTermFilterArray() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testWildcardFilter() @@ -249,6 +263,7 @@ public function testWildcardFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilter() @@ -280,6 +295,7 @@ public function testBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() @@ -306,6 +322,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() @@ -333,6 +350,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testSimpleAdvancedSearch( @@ -370,6 +388,7 @@ public function advancedSearchDataProvider() * @magentoDbIsolation disabled * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php */ public function testSearchLimit() From 2163fe8696578d0cdf71c32e952d1e23c733134b Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Wed, 20 Apr 2016 10:37:23 -0500 Subject: [PATCH 374/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Minor update to fix missing ending / for multi-line comment --- SearchAdapter/AdapterTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 724691b8f47c7..0e2f95f31612e 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -11,7 +11,7 @@ * Important: Please make sure that each integration test file works with unique elastic search index. In order to * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest' - * + */ class AdapterTest extends \PHPUnit_Framework_TestCase { /** From 4329d9d6f37b29fb9181b2cdbe4639d354e4a8b3 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 29 Apr 2016 12:09:41 +0300 Subject: [PATCH 375/616] MAGETWO-51858: Convert literal class names to \Namespace\Classname::class --- Model/Indexer/IndexHandlerTest.php | 15 ++++++++------- SearchAdapter/AdapterTest.php | 5 +++-- _files/indexer.php | 16 ++++++++-------- _files/indexer_rollback.php | 8 ++++---- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 42f522c4f2935..8bc4eeef74dfb 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -16,6 +16,7 @@ /** * @magentoDbIsolation enabled * magentoDataFixture Magento/Elasticsearch/_files/indexer.php + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase { @@ -83,22 +84,22 @@ protected function setUp() $this->markTestSkipped('MAGETWO-44489 - Skipping until Elastic search support becomes available on Bamboo.'); $this->connectionManager = Bootstrap::getObjectManager()->create( - 'Magento\Elasticsearch\SearchAdapter\ConnectionManager' + \Magento\Elasticsearch\SearchAdapter\ConnectionManager::class ); $this->client = $this->connectionManager->getConnection(); $this->storeManager = Bootstrap::getObjectManager()->create( - 'Magento\Store\Model\StoreManagerInterface' + \Magento\Store\Model\StoreManagerInterface::class ); $this->storeIds = array_keys($this->storeManager->getStores()); $this->clientConfig = Bootstrap::getObjectManager()->create( - 'Magento\Elasticsearch\Model\Config' + \Magento\Elasticsearch\Model\Config::class ); $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create( - 'Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver' + \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class ); $this->productApple = $this->getProductBySku('fulltext-1'); @@ -163,7 +164,7 @@ public function testReindexRowAfterMassAction() /** @var \Magento\Catalog\Model\Product\Action $action */ $action = Bootstrap::getObjectManager()->get( - 'Magento\Catalog\Model\Product\Action' + \Magento\Catalog\Model\Product\Action::class ); foreach ($this->storeIds as $storeId) { @@ -243,7 +244,7 @@ protected function getProductBySku($sku) { /** @var Product $product */ $product = Bootstrap::getObjectManager()->get( - 'Magento\Catalog\Model\Product' + \Magento\Catalog\Model\Product::class ); return $product->loadByAttribute('sku', $sku); } @@ -256,7 +257,7 @@ protected function getProductBySku($sku) private function reindexAll() { $indexer = Bootstrap::getObjectManager()->create( - 'Magento\Indexer\Model\Indexer' + \Magento\Indexer\Model\Indexer::class ); $indexer->load('catalogsearch_fulltext'); $indexer->reindexAll(); diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index a1354fb177dfe..5e1c5adb5492f 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -19,7 +19,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest /** * @var string */ - protected $requestConfig = __DIR__ . '/../_files/requests.xml'; + protected $requestConfig; /** * @var string @@ -31,11 +31,12 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest */ protected function createAdapter() { - return $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); + return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class); } protected function setUp() { + $this->requestConfig = __DIR__ . '/../_files/requests.xml'; //remember to add @ for magentoDataFixture when MAGETWO-44489 is done $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); } diff --git a/_files/indexer.php b/_files/indexer.php index eb15e8433ac8b..114353f3473de 100644 --- a/_files/indexer.php +++ b/_files/indexer.php @@ -8,10 +8,10 @@ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */ -$storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface'); +$storeManager = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class); /** @var \Magento\Store\Model\Store $store */ -$store = $objectManager->create('Magento\Store\Model\Store'); +$store = $objectManager->create(\Magento\Store\Model\Store::class); $storeCode = 'secondary'; if (!$store->load($storeCode)->getId()) { @@ -24,7 +24,7 @@ $store->save(); /** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */ - $scopeConfig = $objectManager->get('Magento\Framework\App\MutableScopeConfig'); + $scopeConfig = $objectManager->get(\Magento\Framework\App\MutableScopeConfig::class); $scopeConfig->setValue( 'general/locale/code', 'de_DE', @@ -37,7 +37,7 @@ } /** @var $productFirst \Magento\Catalog\Model\Product */ -$productFirst = $objectManager->create('Magento\Catalog\Model\Product'); +$productFirst = $objectManager->create(\Magento\Catalog\Model\Product::class); $productFirst->setTypeId('simple') ->setAttributeSetId(4) ->setWebsiteIds([1]) @@ -53,7 +53,7 @@ ->save(); /** @var $productFirst \Magento\Catalog\Model\Product */ -$productSecond = $objectManager->create('Magento\Catalog\Model\Product'); +$productSecond = $objectManager->create(\Magento\Catalog\Model\Product::class); $productSecond->setTypeId('simple') ->setAttributeSetId(4) ->setWebsiteIds([1]) @@ -69,7 +69,7 @@ ->save(); /** @var $productFirst \Magento\Catalog\Model\Product */ -$productThird = $objectManager->create('Magento\Catalog\Model\Product'); +$productThird = $objectManager->create(\Magento\Catalog\Model\Product::class); $productThird->setTypeId('simple') ->setAttributeSetId(4) ->setWebsiteIds([1]) @@ -85,7 +85,7 @@ ->save(); /** @var $productFirst \Magento\Catalog\Model\Product */ -$productFourth = $objectManager->create('Magento\Catalog\Model\Product'); +$productFourth = $objectManager->create(\Magento\Catalog\Model\Product::class); $productFourth->setTypeId('simple') ->setAttributeSetId(4) ->setWebsiteIds([1]) @@ -101,7 +101,7 @@ ->save(); /** @var $productFirst \Magento\Catalog\Model\Product */ -$productFifth = $objectManager->create('Magento\Catalog\Model\Product'); +$productFifth = $objectManager->create(\Magento\Catalog\Model\Product::class); $productFifth->setTypeId('simple') ->setAttributeSetId(4) ->setWebsiteIds([1]) diff --git a/_files/indexer_rollback.php b/_files/indexer_rollback.php index 638ac3ea3fae9..065eda80f59ff 100644 --- a/_files/indexer_rollback.php +++ b/_files/indexer_rollback.php @@ -8,19 +8,19 @@ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager(); /** @var \Magento\Framework\Registry $registry */ -$registry = $objectManager->get('Magento\Framework\Registry'); +$registry = $objectManager->get(\Magento\Framework\Registry::class); $registry->unregister('isSecureArea'); $registry->register('isSecureArea', true); /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */ -$collection = $objectManager->create('Magento\Catalog\Model\ResourceModel\Product\Collection'); +$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class); $collection->addAttributeToSelect('id')->load(); if ($collection->count() > 0) { $collection->delete(); } /** @var \Magento\Store\Model\Store $store */ -$store = $objectManager->create('Magento\Store\Model\Store'); +$store = $objectManager->create(\Magento\Store\Model\Store::class); $storeCode = 'secondary'; $store->load($storeCode); if ($store->getId()) { @@ -31,4 +31,4 @@ $registry->register('isSecureArea', false); /* Refresh stores memory cache */ -$objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores(); +$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores(); From 7aa9418ff6d4a03c5ba4f596d4bde93b51be84ba Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 29 Apr 2016 12:09:41 +0300 Subject: [PATCH 376/616] MAGETWO-51858: Convert literal class names to \Namespace\Classname::class --- Block/SuggestionsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Block/SuggestionsTest.php b/Block/SuggestionsTest.php index 49e2fc0ce4bfa..cc405affe91b0 100644 --- a/Block/SuggestionsTest.php +++ b/Block/SuggestionsTest.php @@ -26,7 +26,7 @@ protected function setUp() new QueryResult("", 1) ]); - $this->block = Bootstrap::getObjectManager()->create('Magento\AdvancedSearch\Block\Suggestions', [ + $this->block = Bootstrap::getObjectManager()->create(\Magento\AdvancedSearch\Block\Suggestions::class, [ 'searchDataProvider' => $suggestedQueries, 'title' => 'title', ]); From 40882c4fb07ffacf3b76fbe200ffcdd6ca5382f1 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 29 Apr 2016 12:10:59 +0300 Subject: [PATCH 377/616] MAGETWO-51858: Convert literal class names to \Namespace\Classname::class --- Test/Unit/Block/SearchDataTest.php | 10 ++++---- .../System/Config/TestConnectionTest.php | 23 +++++++++++-------- Test/Unit/Model/Client/ClientResolverTest.php | 14 +++++------ Test/Unit/Model/DataProviderTest.php | 14 +++++------ .../Fulltext/Plugin/CustomerGroupTest.php | 12 +++++----- 5 files changed, 39 insertions(+), 34 deletions(-) diff --git a/Test/Unit/Block/SearchDataTest.php b/Test/Unit/Block/SearchDataTest.php index 6b6c023dce842..152d1f3baf3e5 100644 --- a/Test/Unit/Block/SearchDataTest.php +++ b/Test/Unit/Block/SearchDataTest.php @@ -35,26 +35,26 @@ class SearchDataTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->dataProvider = $this->getMockBuilder('\Magento\AdvancedSearch\Model\SuggestedQueriesInterface') + $this->dataProvider = $this->getMockBuilder(\Magento\AdvancedSearch\Model\SuggestedQueriesInterface::class) ->disableOriginalConstructor() ->setMethods(['getItems', 'isResultsCountEnabled']) ->getMockForAbstractClass(); - $this->searchQuery = $this->getMockBuilder('\Magento\Search\Model\QueryInterface') + $this->searchQuery = $this->getMockBuilder(\Magento\Search\Model\QueryInterface::class) ->disableOriginalConstructor() ->setMethods(['getQueryText']) ->getMockForAbstractClass(); - $this->queryFactory = $this->getMockBuilder('\Magento\Search\Model\QueryFactoryInterface') + $this->queryFactory = $this->getMockBuilder(\Magento\Search\Model\QueryFactoryInterface::class) ->disableOriginalConstructor() ->setMethods(['get']) ->getMockForAbstractClass(); $this->queryFactory->expects($this->once()) ->method('get') ->will($this->returnValue($this->searchQuery)); - $this->context = $this->getMockBuilder('\Magento\Framework\View\Element\Template\Context') + $this->context = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class) ->disableOriginalConstructor() ->getMock(); - $this->block = $this->getMockBuilder('\Magento\AdvancedSearch\Block\SearchData')->setConstructorArgs( + $this->block = $this->getMockBuilder(\Magento\AdvancedSearch\Block\SearchData::class)->setConstructorArgs( [ $this->context, $this->dataProvider, diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php index fca99b6a1d119..689184ed1ea07 100644 --- a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php +++ b/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php @@ -9,6 +9,11 @@ use Magento\AdvancedSearch\Model\Client\ClientResolver; use Magento\AdvancedSearch\Model\Client\ClientInterface; +/** + * Class TestConnectionTest + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class TestConnectionTest extends \PHPUnit_Framework_TestCase { /** @@ -54,14 +59,14 @@ class TestConnectionTest extends \PHPUnit_Framework_TestCase protected function setUp() { $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $this->requestMock = $this->getMock('Magento\Framework\App\Request\Http', ['getParams'], [], '', false); - $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false); + $this->requestMock = $this->getMock(\Magento\Framework\App\Request\Http::class, ['getParams'], [], '', false); + $responseMock = $this->getMock(\Magento\Framework\App\Response\Http::class, [], [], '', false); $context = $this->getMock( - 'Magento\Backend\App\Action\Context', + \Magento\Backend\App\Action\Context::class, ['getRequest', 'getResponse', 'getMessageManager', 'getSession'], $helper->getConstructArguments( - 'Magento\Backend\App\Action\Context', + \Magento\Backend\App\Action\Context::class, [ 'request' => $this->requestMock ] @@ -70,23 +75,23 @@ protected function setUp() $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->requestMock)); $context->expects($this->once())->method('getResponse')->will($this->returnValue($responseMock)); - $this->clientResolverMock = $this->getMockBuilder('Magento\AdvancedSearch\Model\Client\ClientResolver') + $this->clientResolverMock = $this->getMockBuilder(\Magento\AdvancedSearch\Model\Client\ClientResolver::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); - $this->clientMock = $this->getMock('Magento\AdvancedSearch\Model\Client\ClientInterface'); + $this->clientMock = $this->getMock(\Magento\AdvancedSearch\Model\Client\ClientInterface::class); - $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json') + $this->resultJson = $this->getMockBuilder(\Magento\Framework\Controller\Result\Json::class) ->disableOriginalConstructor() ->getMock(); - $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory') + $this->resultJsonFactory = $this->getMockBuilder(\Magento\Framework\Controller\Result\JsonFactory::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); - $this->tagFilterMock = $this->getMockBuilder('Magento\Framework\Filter\StripTags') + $this->tagFilterMock = $this->getMockBuilder(\Magento\Framework\Filter\StripTags::class) ->disableOriginalConstructor() ->setMethods(['filter']) ->getMock(); diff --git a/Test/Unit/Model/Client/ClientResolverTest.php b/Test/Unit/Model/Client/ClientResolverTest.php index 9e8017e0dc255..4aac5c257c0cd 100644 --- a/Test/Unit/Model/Client/ClientResolverTest.php +++ b/Test/Unit/Model/Client/ClientResolverTest.php @@ -34,14 +34,14 @@ protected function setUp() { $this->helper = new ObjectManager($this); - $this->scopeConfig = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface') + $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface'); + $this->objectManager = $this->getMock(\Magento\Framework\ObjectManagerInterface::class); $this->model= $this->helper->getObject( - '\Magento\AdvancedSearch\Model\Client\ClientResolver', + \Magento\AdvancedSearch\Model\Client\ClientResolver::class, [ 'objectManager' => $this->objectManager, 'scopeConfig' => $this->scopeConfig, @@ -59,11 +59,11 @@ public function testCreate() ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) ->will($this->returnValue('engineName')); - $factoryMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface'); + $factoryMock = $this->getMock(\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface::class); - $clientMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientInterface'); + $clientMock = $this->getMock(\Magento\AdvancedSearch\Model\Client\ClientInterface::class); - $clientOptionsMock = $this->getMock('\Magento\AdvancedSearch\Model\Client\ClientOptionsInterface'); + $clientOptionsMock = $this->getMock(\Magento\AdvancedSearch\Model\Client\ClientOptionsInterface::class); $this->objectManager->expects($this->exactly(2))->method('create') ->withConsecutive( @@ -84,7 +84,7 @@ public function testCreate() ->will($this->returnValue($clientMock)); $result = $this->model->create(); - $this->assertInstanceOf('\Magento\AdvancedSearch\Model\Client\ClientInterface', $result); + $this->assertInstanceOf(\Magento\AdvancedSearch\Model\Client\ClientInterface::class, $result); } /** diff --git a/Test/Unit/Model/DataProviderTest.php b/Test/Unit/Model/DataProviderTest.php index 61859fe736702..d93ceb8dd9876 100644 --- a/Test/Unit/Model/DataProviderTest.php +++ b/Test/Unit/Model/DataProviderTest.php @@ -38,7 +38,7 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->engineResolverMock = $this->getMockBuilder('Magento\Search\Model\EngineResolver') + $this->engineResolverMock = $this->getMockBuilder(\Magento\Search\Model\EngineResolver::class) ->setMethods(['getCurrentSearchEngine']) ->disableOriginalConstructor() ->getMock(); @@ -50,7 +50,7 @@ protected function setUp() * @var \Magento\AdvancedSearch\Model\SuggestedQueriesInterface| * \PHPUnit_Framework_MockObject_MockObject */ - $suggestedQueriesMock = $this->getMock('Magento\AdvancedSearch\Model\SuggestedQueriesInterface'); + $suggestedQueriesMock = $this->getMock(\Magento\AdvancedSearch\Model\SuggestedQueriesInterface::class); $suggestedQueriesMock->expects($this->any()) ->method('isResultsCountEnabled') ->willReturn(true); @@ -58,7 +58,7 @@ protected function setUp() ->method('getItems') ->willReturn([]); - $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface') + $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) ->disableOriginalConstructor() ->getMock(); $this->objectManagerMock->expects($this->any()) @@ -68,7 +68,7 @@ protected function setUp() $this->objectManagerHelper = new ObjectManagerHelper($this); $this->model = $this->objectManagerHelper->getObject( - '\Magento\AdvancedSearch\Model\SuggestedQueries', + \Magento\AdvancedSearch\Model\SuggestedQueries::class, [ 'engineResolver' => $this->engineResolverMock, 'objectManager' => $this->objectManagerMock, @@ -96,7 +96,7 @@ public function testIsResultsCountEnabled() */ public function testIsResultsCountEnabledException() { - $objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface') + $objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManagerMock->expects($this->once()) @@ -106,7 +106,7 @@ public function testIsResultsCountEnabledException() $objectManagerHelper = new ObjectManagerHelper($this); /* @var $model \Magento\AdvancedSearch\Model\SuggestedQueries */ $model = $objectManagerHelper->getObject( - '\Magento\AdvancedSearch\Model\SuggestedQueries', + \Magento\AdvancedSearch\Model\SuggestedQueries::class, [ 'engineResolver' => $this->engineResolverMock, 'objectManager' => $objectManagerMock, @@ -124,7 +124,7 @@ public function testIsResultsCountEnabledException() public function testGetItems() { /** @var $queryInterfaceMock \Magento\Search\Model\QueryInterface */ - $queryInterfaceMock = $this->getMock('Magento\Search\Model\QueryInterface'); + $queryInterfaceMock = $this->getMock(\Magento\Search\Model\QueryInterface::class); $result = $this->model->getItems($queryInterfaceMock); $this->assertEquals([], $result); } diff --git a/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php b/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php index 2927426bdedcf..f90e7ba338e3a 100644 --- a/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php +++ b/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php @@ -42,16 +42,16 @@ class CustomerGroupTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->subjectMock = $this->getMock('Magento\Customer\Model\ResourceModel\Group', [], [], '', false); + $this->subjectMock = $this->getMock(\Magento\Customer\Model\ResourceModel\Group::class, [], [], '', false); $this->customerOptionsMock = $this->getMock( - 'Magento\AdvancedSearch\Model\Client\ClientOptionsInterface', + \Magento\AdvancedSearch\Model\Client\ClientOptionsInterface::class, [], [], '', false ); $this->indexerMock = $this->getMockForAbstractClass( - 'Magento\Framework\Indexer\IndexerInterface', + \Magento\Framework\Indexer\IndexerInterface::class, [], '', false, @@ -60,14 +60,14 @@ protected function setUp() ['getId', 'getState', '__wakeup'] ); $this->indexerRegistryMock = $this->getMock( - 'Magento\Framework\Indexer\IndexerRegistry', + \Magento\Framework\Indexer\IndexerRegistry::class, ['get'], [], '', false ); $this->engineResolverMock = $this->getMock( - 'Magento\Search\Model\EngineResolver', + \Magento\Search\Model\EngineResolver::class, ['getCurrentSearchEngine'], [], '', @@ -95,7 +95,7 @@ public function testAroundSave($searchEngine, $isObjectNew, $isTaxClassIdChanged ->will($this->returnValue($searchEngine)); $groupMock = $this->getMock( - 'Magento\Customer\Model\Group', + \Magento\Customer\Model\Group::class, ['dataHasChangedFor', 'isObjectNew', '__wakeup'], [], '', From 2e4634c02aba91b4e3a4af2563a5380484145cb6 Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Fri, 29 Apr 2016 12:11:52 +0300 Subject: [PATCH 378/616] MAGETWO-51858: Convert literal class names to \Namespace\Classname::class --- SearchAdapter/AggregationFactory.php | 9 ++-- SearchAdapter/DocumentFactory.php | 4 +- SearchAdapter/ResponseFactory.php | 2 +- .../Model/Adapter/Container/AttributeTest.php | 4 +- .../DataMapper/DataMapperResolverTest.php | 6 +-- .../DataMapper/ProductDataMapperTest.php | 29 ++++++------ .../Model/Adapter/Document/BuilderTest.php | 2 +- Test/Unit/Model/Adapter/ElasticsearchTest.php | 36 ++++++++------- .../FieldMapper/FieldMapperResolverTest.php | 8 ++-- .../FieldMapper/ProductFieldMapperTest.php | 22 ++++----- .../Unit/Model/Adapter/FieldType/DateTest.php | 8 ++-- Test/Unit/Model/Adapter/FieldTypeTest.php | 8 ++-- Test/Unit/Model/Adapter/Index/BuilderTest.php | 8 ++-- .../Adapter/Index/Config/ConverterTest.php | 4 +- .../Adapter/Index/Config/EsConfigTest.php | 6 +-- .../Index/Config/SchemaLocatorTest.php | 4 +- .../Adapter/Index/IndexNameResolverTest.php | 21 +++++---- Test/Unit/Model/Client/ElasticsearchTest.php | 12 ++--- Test/Unit/Model/ConfigTest.php | 4 +- .../Model/DataProvider/SuggestionsTest.php | 25 ++++++----- .../Unit/Model/Indexer/IndexStructureTest.php | 12 ++--- .../Unit/Model/Indexer/IndexerHandlerTest.php | 30 +++++++------ Test/Unit/Model/ResourceModel/EngineTest.php | 12 ++--- Test/Unit/Model/ResourceModel/IndexTest.php | 34 +++++++------- Test/Unit/SearchAdapter/AdapterTest.php | 16 ++++--- .../Aggregation/Builder/DynamicTest.php | 20 +++++---- .../Aggregation/Builder/TermTest.php | 11 ++--- .../SearchAdapter/Aggregation/BuilderTest.php | 14 +++--- .../Aggregation/IntervalTest.php | 31 +++++++------ .../SearchAdapter/AggregationFactoryTest.php | 4 +- .../SearchAdapter/ConnectionManagerTest.php | 8 ++-- .../SearchAdapter/DocumentFactoryTest.php | 16 +++---- .../Dynamic/DataProviderTest.php | 38 ++++++++-------- .../Filter/Builder/RangeTest.php | 6 +-- .../SearchAdapter/Filter/Builder/TermTest.php | 6 +-- .../Filter/Builder/WildcardTest.php | 6 +-- .../Unit/SearchAdapter/Filter/BuilderTest.php | 20 ++++----- Test/Unit/SearchAdapter/MapperTest.php | 45 +++++++++---------- .../Query/Builder/AggregationTest.php | 8 ++-- .../SearchAdapter/Query/Builder/MatchTest.php | 10 ++--- Test/Unit/SearchAdapter/Query/BuilderTest.php | 19 ++++---- .../Query/Preprocessor/StopwordsTest.php | 27 ++++++----- .../SearchAdapter/ResponseFactoryTest.php | 12 ++--- .../SearchIndexNameResolverTest.php | 4 +- 44 files changed, 336 insertions(+), 295 deletions(-) diff --git a/SearchAdapter/AggregationFactory.php b/SearchAdapter/AggregationFactory.php index 59077c9a099ba..e17e3a2086a2d 100644 --- a/SearchAdapter/AggregationFactory.php +++ b/SearchAdapter/AggregationFactory.php @@ -39,14 +39,17 @@ public function create(array $rawAggregation) foreach ($rawAggregation as $rawBucketName => $rawBucket) { /** @var \Magento\Framework\Search\Response\Bucket[] $buckets */ $buckets[$rawBucketName] = $this->objectManager->create( - 'Magento\Framework\Search\Response\Bucket', + \Magento\Framework\Search\Response\Bucket::class, [ 'name' => $rawBucketName, 'values' => $this->prepareValues($rawBucket) ] ); } - return $this->objectManager->create('Magento\Framework\Search\Response\Aggregation', ['buckets' => $buckets]); + return $this->objectManager->create( + \Magento\Framework\Search\Response\Aggregation::class, + ['buckets' => $buckets] + ); } /** @@ -60,7 +63,7 @@ private function prepareValues(array $values) $valuesObjects = []; foreach ($values as $name => $value) { $valuesObjects[] = $this->objectManager->create( - 'Magento\Framework\Search\Response\Aggregation\Value', + \Magento\Framework\Search\Response\Aggregation\Value::class, [ 'value' => $name, 'metrics' => $value, diff --git a/SearchAdapter/DocumentFactory.php b/SearchAdapter/DocumentFactory.php index c40cd31e95162..28bfa2d7a4ee2 100644 --- a/SearchAdapter/DocumentFactory.php +++ b/SearchAdapter/DocumentFactory.php @@ -54,14 +54,14 @@ public function create($rawDocument) $documentId = $value; } elseif ($fieldName === '_score') { $fields['score'] = $this->objectManager->create( - 'Magento\Framework\Search\DocumentField', + \Magento\Framework\Search\DocumentField::class, ['name' => 'score', 'value' => $value] ); } } return $this->objectManager->create( - 'Magento\Framework\Search\Document', + \Magento\Framework\Search\Document::class, [ 'documentId' => $documentId, 'documentFields' => $fields diff --git a/SearchAdapter/ResponseFactory.php b/SearchAdapter/ResponseFactory.php index c6b49c9e7548e..e630cb74e994f 100644 --- a/SearchAdapter/ResponseFactory.php +++ b/SearchAdapter/ResponseFactory.php @@ -66,7 +66,7 @@ public function create($response) /** @var \Magento\Framework\Search\Response\Aggregation $aggregations */ $aggregations = $this->aggregationFactory->create($response['aggregations']); return $this->objectManager->create( - 'Magento\Framework\Search\Response\QueryResponse', + \Magento\Framework\Search\Response\QueryResponse::class, [ 'documents' => $documents, 'aggregations' => $aggregations, diff --git a/Test/Unit/Model/Adapter/Container/AttributeTest.php b/Test/Unit/Model/Adapter/Container/AttributeTest.php index 93a6c46dd3be3..9a38bc63f6cd2 100644 --- a/Test/Unit/Model/Adapter/Container/AttributeTest.php +++ b/Test/Unit/Model/Adapter/Container/AttributeTest.php @@ -34,7 +34,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->attribute = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Container\Attribute', + \Magento\Elasticsearch\Model\Adapter\Container\Attribute::class, [ 'attributeCollection' => $this->collectionMock, ] @@ -224,7 +224,7 @@ private function mockAttributeByCode($attributeId, $attributeCode, $sequence = 0 */ private function createAttributeMock($attributeId, $attributeCode) { - $attribute = $this->getMockBuilder('\Magento\Catalog\Model\ResourceModel\Eav\Attribute') + $attribute = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class) ->setMethods(['getAttributeCode', 'getId']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php b/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php index 8617f41173f34..d08eb7d1b684f 100644 --- a/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php +++ b/Test/Unit/Model/Adapter/DataMapper/DataMapperResolverTest.php @@ -38,10 +38,10 @@ class DataMapperResolverTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->objectManagerMock = $this->getMockBuilder('\Magento\Framework\ObjectManagerInterface') + $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->dataMapperEntity = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\DataMapperInterface') + $this->dataMapperEntity = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\DataMapperInterface::class) ->disableOriginalConstructor() ->getMock(); $this->dataMappers = [ @@ -49,7 +49,7 @@ protected function setUp() ]; $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\DataMapper\DataMapperResolver', + \Magento\Elasticsearch\Model\Adapter\DataMapper\DataMapperResolver::class, [ 'objectManager' => $this->objectManagerMock, 'dataMappers' => $this->dataMappers diff --git a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php index 1be95dce10e1b..bea009405888c 100644 --- a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php +++ b/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php @@ -21,6 +21,8 @@ /** * Class ProductDataMapperTest + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ProductDataMapperTest extends \PHPUnit_Framework_TestCase { @@ -89,17 +91,18 @@ class ProductDataMapperTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->builderMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Document\Builder') + $this->builderMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Document\Builder::class) ->setMethods(['addField', 'addFields', 'build']) ->disableOriginalConstructor() ->getMock(); - $this->attributeContainerMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Container\Attribute') - ->setMethods(['getAttribute', 'setStoreId', 'getBackendType', 'getFrontendInput']) + $this->attributeContainerMock = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\Container\Attribute::class + )->setMethods(['getAttribute', 'setStoreId', 'getBackendType', 'getFrontendInput']) ->disableOriginalConstructor() ->getMock(); - $this->resourceIndex = $this->getMockBuilder('Magento\Elasticsearch\Model\ResourceModel\Index') + $this->resourceIndex = $this->getMockBuilder(\Magento\Elasticsearch\Model\ResourceModel\Index::class) ->disableOriginalConstructor() ->setMethods([ 'getPriceIndexData', @@ -108,43 +111,43 @@ protected function setUp() ]) ->getMock(); - $this->fieldMapperMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapperMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->setMethods(['getFieldName', 'getAllAttributesTypes']) ->disableOriginalConstructor() ->getMock(); - $this->dateTimeMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime') + $this->dateTimeMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class) ->setMethods(['isEmptyDate', 'setTimezone', 'format']) ->disableOriginalConstructor() ->getMock(); - $this->localeDateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface') + $this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') + $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->advancedSearchIndex = $this->getMockBuilder('Magento\AdvancedSearch\Model\ResourceModel\Index') + $this->advancedSearchIndex = $this->getMockBuilder(\Magento\AdvancedSearch\Model\ResourceModel\Index::class) ->disableOriginalConstructor() ->getMock(); - $this->attribute = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + $this->attribute = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class) ->disableOriginalConstructor() ->getMock(); - $this->storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper', + \Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper::class, [ 'builder' => $this->builderMock, 'attributeContainer' => $this->attributeContainerMock, diff --git a/Test/Unit/Model/Adapter/Document/BuilderTest.php b/Test/Unit/Model/Adapter/Document/BuilderTest.php index f23aa4c9141f6..dac53f255bbdf 100644 --- a/Test/Unit/Model/Adapter/Document/BuilderTest.php +++ b/Test/Unit/Model/Adapter/Document/BuilderTest.php @@ -25,7 +25,7 @@ protected function setUp() { $objectManager = new ObjectManagerHelper($this); $this->builder = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Document\Builder' + \Magento\Elasticsearch\Model\Adapter\Document\Builder::class ); } diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/Test/Unit/Model/Adapter/ElasticsearchTest.php index 6a714a5d50c4b..85933118584d4 100644 --- a/Test/Unit/Model/Adapter/ElasticsearchTest.php +++ b/Test/Unit/Model/Adapter/ElasticsearchTest.php @@ -18,6 +18,8 @@ /** * Class ElasticsearchTest + * + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class ElasticsearchTest extends \PHPUnit_Framework_TestCase { @@ -79,29 +81,29 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase protected function setUp() { $this->objectManager = new ObjectManagerHelper($this); - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->disableOriginalConstructor() ->setMethods(['getConnection']) ->getMock(); - $this->documentDataMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\DataMapperInterface') + $this->documentDataMapper = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\DataMapperInterface::class + )->disableOriginalConstructor()->getMock(); + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') - ->disableOriginalConstructor() - ->getMock(); - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->disableOriginalConstructor() ->setMethods([ 'getIndexPrefix', 'getEntityType', ])->getMock(); - $this->indexBuilder = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface') + $this->indexBuilder = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class) ->disableOriginalConstructor() ->getMock(); - $elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + $elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class) ->setMethods([ 'indices', 'ping', @@ -110,7 +112,7 @@ protected function setUp() ]) ->disableOriginalConstructor() ->getMock(); - $indicesMock = $this->getMockBuilder('\Elasticsearch\Namespaces\IndicesNamespace') + $indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class) ->setMethods([ 'exists', 'getSettings', @@ -126,7 +128,7 @@ protected function setUp() $elasticsearchClientMock->expects($this->any()) ->method('indices') ->willReturn($indicesMock); - $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->setConstructorArgs([ 'options' => $this->getClientOptions(), 'elasticsearchClient' => $elasticsearchClientMock @@ -146,7 +148,9 @@ protected function setUp() $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); - $this->indexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver') + $this->indexNameResolver = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class + ) ->setMethods([ 'getIndexName', 'getIndexNamespace', @@ -157,7 +161,7 @@ protected function setUp() ->getMock(); $this->model = $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', + \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class, [ 'connectionManager' => $this->connectionManager, 'documentDataMapper' => $this->documentDataMapper, @@ -343,7 +347,7 @@ public function testDeleteDocsFailure() public function testUpdateAliasEmpty() { $model = $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', + \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class, [ 'connectionManager' => $this->connectionManager, 'documentDataMapper' => $this->documentDataMapper, @@ -367,7 +371,7 @@ public function testUpdateAliasEmpty() */ public function testConnectException() { - $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->disableOriginalConstructor() ->setMethods([ 'getConnection', @@ -379,7 +383,7 @@ public function testConnectException() ->willThrowException(new \Exception('Something went wrong')); $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Elasticsearch', + \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class, [ 'connectionManager' => $connectionManager, 'documentDataMapper' => $this->documentDataMapper, diff --git a/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php b/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php index d030cbf1a79a8..cc93d36dc4838 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php @@ -38,10 +38,12 @@ class FieldMapperResolverTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->objectManagerMock = $this->getMockBuilder('\Magento\Framework\ObjectManagerInterface') + $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->fieldMapperEntity = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapperEntity = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class + ) ->disableOriginalConstructor() ->getMock(); $this->fieldMappers = [ @@ -49,7 +51,7 @@ protected function setUp() ]; $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver', + \Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver::class, [ 'objectManager' => $this->objectManagerMock, 'fieldMappers' => $this->fieldMappers diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index c41f82cf5c1cc..29e589ba490a6 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -59,30 +59,30 @@ class ProductFieldMapperTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->eavConfig = $this->getMockBuilder('\Magento\Eav\Model\Config') + $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class) ->disableOriginalConstructor() ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes']) ->getMock(); - $this->fieldType = $this->getMockBuilder('\Magento\Elasticsearch\Model\Adapter\FieldType') + $this->fieldType = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldType::class) ->disableOriginalConstructor() ->setMethods(['getFieldType']) ->getMock(); - $this->customerSession = $this->getMockBuilder('\Magento\Customer\Model\Session') + $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class) ->disableOriginalConstructor() ->setMethods(['getCustomerGroupId']) ->getMock(); $this->storeManager = $this->storeManager = $this->getMockForAbstractClass( - 'Magento\Store\Model\StoreManagerInterface', + \Magento\Store\Model\StoreManagerInterface::class, [], '', false ); $this->store = $this->getMockForAbstractClass( - 'Magento\Store\Api\Data\StoreInterface', + \Magento\Store\Api\Data\StoreInterface::class, [], '', false, @@ -91,12 +91,12 @@ protected function setUp() ['getWebsiteId', 'getRootCategoryId'] ); - $this->coreRegistry = $this->getMock('\Magento\Framework\Registry'); + $this->coreRegistry = $this->getMock(\Magento\Framework\Registry::class); $objectManager = new ObjectManagerHelper($this); $this->eavAttributeResource = $this->getMock( - '\Magento\Catalog\Model\ResourceModel\Eav\Attribute', + \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [ '__wakeup', 'getBackendType', @@ -108,7 +108,7 @@ protected function setUp() ); $this->mapper = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper', + \Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper::class, [ 'eavConfig' => $this->eavConfig, 'storeManager' => $this->storeManager, @@ -130,7 +130,7 @@ protected function setUp() */ public function testGetFieldName($attributeCode, $fieldName, $fieldType, $context = []) { - $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class) ->setMethods(['getBackendType', 'getFrontendInput', 'getAttribute']) ->disableOriginalConstructor() ->getMock(); @@ -189,12 +189,12 @@ public function testGetFieldNameWithoutAttribute() */ public function testGetAllAttributesTypes($attributeCode) { - $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class) ->setMethods(['getBackendType', 'getFrontendInput']) ->disableOriginalConstructor() ->getMock(); - $store = $this->getMockBuilder('\Magento\Store\Model\Store') + $store = $this->getMockBuilder(\Magento\Store\Model\Store::class) ->setMethods(['getId', '__wakeup'])->disableOriginalConstructor()->getMock(); $store->expects($this->any())->method('getId')->will($this->returnValue(1)); $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store)); diff --git a/Test/Unit/Model/Adapter/FieldType/DateTest.php b/Test/Unit/Model/Adapter/FieldType/DateTest.php index 657ba4985dea9..db93fc2bc95c9 100644 --- a/Test/Unit/Model/Adapter/FieldType/DateTest.php +++ b/Test/Unit/Model/Adapter/FieldType/DateTest.php @@ -40,22 +40,22 @@ class DateTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->dateTime = $this->getMockBuilder('\Magento\Framework\Stdlib\DateTime') + $this->dateTime = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime::class) ->disableOriginalConstructor() ->setMethods(['isEmptyDate']) ->getMock(); - $this->localeDate = $this->getMockBuilder('\Magento\Framework\Stdlib\DateTime\TimezoneInterface') + $this->localeDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->scopeConfig = $this->getMockBuilder('\Magento\Framework\App\Config\ScopeConfigInterface') + $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\FieldType\Date', + \Magento\Elasticsearch\Model\Adapter\FieldType\Date::class, [ 'dateTime' => $this->dateTime, 'localeDate' => $this->localeDate, diff --git a/Test/Unit/Model/Adapter/FieldTypeTest.php b/Test/Unit/Model/Adapter/FieldTypeTest.php index 9b471f023765e..a78b5a99467b6 100644 --- a/Test/Unit/Model/Adapter/FieldTypeTest.php +++ b/Test/Unit/Model/Adapter/FieldTypeTest.php @@ -32,7 +32,7 @@ class FieldTypeTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->eavConfig = $this->getMockBuilder('\Magento\Eav\Model\Config') + $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class) ->disableOriginalConstructor() ->setMethods(['getEntityType', 'getAttribute', 'getEntityAttributeCodes']) ->getMock(); @@ -40,7 +40,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->eavAttributeResource = $this->getMock( - '\Magento\Catalog\Model\ResourceModel\Eav\Attribute', + \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [ '__wakeup', 'getBackendType', @@ -52,7 +52,7 @@ protected function setUp() ); $this->type = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\FieldType', + \Magento\Elasticsearch\Model\Adapter\FieldType::class, [ 'eavConfig' => $this->eavConfig, ] @@ -70,7 +70,7 @@ protected function setUp() */ public function testGetFieldType($attributeCode, $backendType, $frontendType) { - $attributeMock = $this->getMockBuilder('Magento\Catalog\Model\ResourceModel\Eav\Attribute') + $attributeMock = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class) ->setMethods(['getBackendType', 'getFrontendInput', 'getAttributeCode']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/Model/Adapter/Index/BuilderTest.php b/Test/Unit/Model/Adapter/Index/BuilderTest.php index c9f8e7275498e..badd38cf1a7c0 100644 --- a/Test/Unit/Model/Adapter/Index/BuilderTest.php +++ b/Test/Unit/Model/Adapter/Index/BuilderTest.php @@ -33,20 +33,22 @@ class BuilderTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->localeResolver = $this->getMockBuilder('Magento\Framework\Locale\Resolver') + $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\Resolver::class) ->disableOriginalConstructor() ->setMethods([ 'emulate', 'getLocale' ]) ->getMock(); - $this->esConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface') + $this->esConfig = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface::class + ) ->disableOriginalConstructor() ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\Builder', + \Magento\Elasticsearch\Model\Adapter\Index\Builder::class, [ 'localeResolver' => $this->localeResolver, 'esConfig' => $this->esConfig diff --git a/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php b/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php index eb14d10648af2..d1b1b7a70f111 100644 --- a/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php +++ b/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php @@ -24,7 +24,9 @@ class ConverterTest extends \PHPUnit_Framework_TestCase protected function setUp() { $objectManager = new ObjectManagerHelper($this); - $this->converter = $objectManager->getObject('\Magento\Elasticsearch\Model\Adapter\Index\Config\Converter'); + $this->converter = $objectManager->getObject( + \Magento\Elasticsearch\Model\Adapter\Index\Config\Converter::class + ); } /** diff --git a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php b/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php index 5ad88f816f06f..b7e3f42913a73 100644 --- a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php +++ b/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php @@ -34,11 +34,11 @@ class EsConfigTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->reader = $this->getMockBuilder('Magento\Framework\Config\ReaderInterface') + $this->reader = $this->getMockBuilder(\Magento\Framework\Config\ReaderInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->cache = $this->getMockBuilder('Magento\Framework\Config\CacheInterface') + $this->cache = $this->getMockBuilder(\Magento\Framework\Config\CacheInterface::class) ->disableOriginalConstructor() ->getMock(); @@ -48,7 +48,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->config = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig', + \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig::class, [ 'reader' => $this->reader, 'cache' => $this->cache diff --git a/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php b/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php index 28133c1507d29..39bdd43e93846 100644 --- a/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php +++ b/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php @@ -26,7 +26,7 @@ class SchemaLocatorTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->moduleReaderMock = $this->getMock('Magento\Framework\Module\Dir\Reader', [], [], '', false); + $this->moduleReaderMock = $this->getMock(\Magento\Framework\Module\Dir\Reader::class, [], [], '', false); $this->moduleReaderMock->expects( $this->any() )->method( @@ -40,7 +40,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator', + \Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator::class, [ 'moduleReader' => $this->moduleReaderMock ] diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php index 2b5888a8d383e..fd85fa17aaa0c 100644 --- a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php +++ b/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php @@ -12,6 +12,9 @@ use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class IndexNameResolverTest extends \PHPUnit_Framework_TestCase { /** @@ -62,14 +65,14 @@ protected function setUp() { $this->objectManager = new ObjectManagerHelper($this); - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->disableOriginalConstructor() ->setMethods([ 'getConnection', ]) ->getMock(); - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->disableOriginalConstructor() ->setMethods([ 'getIndexPrefix', @@ -78,11 +81,11 @@ protected function setUp() ]) ->getMock(); - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class) ->disableOriginalConstructor() ->getMock(); - $elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + $elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class) ->setMethods([ 'indices', 'ping', @@ -93,7 +96,7 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $indicesMock = $this->getMockBuilder('\Elasticsearch\Namespaces\IndicesNamespace') + $indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class) ->setMethods([ 'exists', 'getSettings', @@ -109,7 +112,7 @@ protected function setUp() $elasticsearchClientMock->expects($this->any()) ->method('indices') ->willReturn($indicesMock); - $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->setConstructorArgs([ 'options' => $this->getClientOptions(), 'elasticsearchClient' => $elasticsearchClientMock @@ -131,7 +134,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver', + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class, [ 'connectionManager' => $this->connectionManager, 'clientConfig' => $this->clientConfig, @@ -227,7 +230,7 @@ public function testUpdateAliasWithOldIndex() */ public function testConnectException() { - $connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->disableOriginalConstructor() ->setMethods([ 'getConnection', @@ -239,7 +242,7 @@ public function testConnectException() ->willThrowException(new \Exception('Something went wrong')); $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver', + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class, [ 'connectionManager' => $connectionManager, 'clientConfig' => $this->clientConfig, diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 67e0362cfc940..e954dbd80b2e2 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -37,7 +37,7 @@ class ElasticsearchTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->elasticsearchClientMock = $this->getMockBuilder('\Elasticsearch\Client') + $this->elasticsearchClientMock = $this->getMockBuilder(\Elasticsearch\Client::class) ->setMethods([ 'indices', 'ping', @@ -48,7 +48,7 @@ protected function setUp() ]) ->disableOriginalConstructor() ->getMock(); - $this->indicesMock = $this->getMockBuilder('\Elasticsearch\Namespaces\IndicesNamespace') + $this->indicesMock = $this->getMockBuilder(\Elasticsearch\Namespaces\IndicesNamespace::class) ->setMethods([ 'exists', 'getSettings', @@ -72,7 +72,7 @@ protected function setUp() $this->objectManager = new ObjectManagerHelper($this); $this->model = $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Client\Elasticsearch', + \Magento\Elasticsearch\Model\Client\Elasticsearch::class, [ 'options' => $this->getOptions(), 'elasticsearchClient' => $this->elasticsearchClientMock @@ -86,7 +86,7 @@ protected function setUp() public function testConstructorOptionsException() { $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Client\Elasticsearch', + \Magento\Elasticsearch\Model\Client\Elasticsearch::class, [ 'options' => [] ] @@ -99,7 +99,7 @@ public function testConstructorOptionsException() public function testConstructorWithOptions() { $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Client\Elasticsearch', + \Magento\Elasticsearch\Model\Client\Elasticsearch::class, [ 'options' => $this->getOptions() ] @@ -139,7 +139,7 @@ public function testTestConnectionFalse() public function testTestConnectionPing() { $this->model = $this->objectManager->getObject( - '\Magento\Elasticsearch\Model\Client\Elasticsearch', + \Magento\Elasticsearch\Model\Client\Elasticsearch::class, [ 'options' => $this->getEmptyIndexOption(), 'elasticsearchClient' => $this->elasticsearchClientMock diff --git a/Test/Unit/Model/ConfigTest.php b/Test/Unit/Model/ConfigTest.php index 0b958665e9100..0c87824b9d072 100644 --- a/Test/Unit/Model/ConfigTest.php +++ b/Test/Unit/Model/ConfigTest.php @@ -31,13 +31,13 @@ class ConfigTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') + $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\Config', + \Magento\Elasticsearch\Model\Config::class, [ 'scopeConfig' => $this->scopeConfig ] diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/Test/Unit/Model/DataProvider/SuggestionsTest.php index 1b0af67cb52b2..ec5ca8e9fe52a 100644 --- a/Test/Unit/Model/DataProvider/SuggestionsTest.php +++ b/Test/Unit/Model/DataProvider/SuggestionsTest.php @@ -15,6 +15,9 @@ use Magento\Store\Model\StoreManagerInterface as StoreManager; use Magento\Search\Model\QueryInterface; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class SuggestionsTest extends \PHPUnit_Framework_TestCase { /** @@ -64,43 +67,43 @@ class SuggestionsTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->config = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->disableOriginalConstructor() ->setMethods(['isElasticsearchEnabled']) ->getMock(); - $this->queryResultFactory = $this->getMockBuilder('Magento\Search\Model\QueryResultFactory') + $this->queryResultFactory = $this->getMockBuilder(\Magento\Search\Model\QueryResultFactory::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->disableOriginalConstructor() ->setMethods(['getConnection']) ->getMock(); - $this->scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface') + $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class) ->disableOriginalConstructor() ->setMethods(['getIndexName']) ->getMock(); - $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->query = $this->getMockBuilder('Magento\Search\Model\QueryInterface') + $this->query = $this->getMockBuilder(\Magento\Search\Model\QueryInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - 'Magento\Elasticsearch\Model\DataProvider\Suggestions', + \Magento\Elasticsearch\Model\DataProvider\Suggestions::class, [ 'queryResultFactory' => $this->queryResultFactory, 'connectionManager' => $this->connectionManager, @@ -125,7 +128,7 @@ public function testGetItems() ->method('isElasticsearchEnabled') ->willReturn(1); - $store = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); @@ -145,7 +148,7 @@ public function testGetItems() ->method('getQueryText') ->willReturn('query'); - $client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->disableOriginalConstructor() ->getMock(); @@ -169,7 +172,7 @@ public function testGetItems() ], ]); - $query = $this->getMockBuilder('Magento\Search\Model\QueryResult') + $query = $this->getMockBuilder(\Magento\Search\Model\QueryResult::class) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/Model/Indexer/IndexStructureTest.php b/Test/Unit/Model/Indexer/IndexStructureTest.php index ba5a15d520eb0..4b1a0d31d71a5 100644 --- a/Test/Unit/Model/Indexer/IndexStructureTest.php +++ b/Test/Unit/Model/Indexer/IndexStructureTest.php @@ -37,19 +37,19 @@ class IndexStructureTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->adapter = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Elasticsearch') + $this->adapter = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Elasticsearch::class) ->disableOriginalConstructor() ->getMock(); $this->scopeResolver = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeResolverInterface', + \Magento\Framework\App\ScopeResolverInterface::class, [], '', false ); $this->scopeInterface = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeInterface', + \Magento\Framework\App\ScopeInterface::class, [], '', false @@ -58,7 +58,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - 'Magento\Elasticsearch\Model\Indexer\IndexStructure', + \Magento\Elasticsearch\Model\Indexer\IndexStructure::class, [ 'adapter' => $this->adapter, 'scopeResolver' => $this->scopeResolver @@ -69,7 +69,7 @@ protected function setUp() public function testDelete() { $scopeId = 9; - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); @@ -88,7 +88,7 @@ public function testDelete() public function testCreate() { $scopeId = 9; - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); $this->adapter->expects($this->any()) diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/Test/Unit/Model/Indexer/IndexerHandlerTest.php index 7b410278deb0f..89eec30c42514 100644 --- a/Test/Unit/Model/Indexer/IndexerHandlerTest.php +++ b/Test/Unit/Model/Indexer/IndexerHandlerTest.php @@ -62,11 +62,11 @@ class IndexerHandlerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->adapter = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Elasticsearch') + $this->adapter = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\Elasticsearch::class) ->disableOriginalConstructor() ->getMock(); - $this->adapterFactory = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory') + $this->adapterFactory = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\ElasticsearchFactory::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); @@ -75,32 +75,34 @@ protected function setUp() ->method('create') ->willReturn($this->adapter); - $this->batch = $this->getMockBuilder('Magento\Framework\Indexer\SaveHandler\Batch') + $this->batch = $this->getMockBuilder(\Magento\Framework\Indexer\SaveHandler\Batch::class) ->disableOriginalConstructor() ->getMock(); - $this->indexStructure = $this->getMockBuilder('Magento\Framework\Indexer\IndexStructureInterface') + $this->indexStructure = $this->getMockBuilder(\Magento\Framework\Indexer\IndexStructureInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->indexNameResolver = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver') + $this->indexNameResolver = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver::class + ) ->disableOriginalConstructor() ->getMock(); - $this->client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $this->client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->setMethods(['ping']) ->disableOriginalConstructor() ->getMock(); $this->scopeResolver = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeResolverInterface', + \Magento\Framework\App\ScopeResolverInterface::class, [], '', false ); $this->scopeInterface = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeInterface', + \Magento\Framework\App\ScopeInterface::class, [], '', false @@ -109,7 +111,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - 'Magento\Elasticsearch\Model\Indexer\IndexerHandler', + \Magento\Elasticsearch\Model\Indexer\IndexerHandler::class, [ 'indexStructure' => $this->indexStructure, 'adapter' => $this->adapter, @@ -142,7 +144,7 @@ public function testDeleteIndex() $dimensionValue = 3; $documentId = 123; - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); $dimension->expects($this->once()) @@ -166,7 +168,7 @@ public function testSaveIndex() $documentId = 123; $documents = new \ArrayIterator([$documentId]); - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); $dimension->expects($this->once()) @@ -204,7 +206,7 @@ public function testCleanIndexCatalogSearchFullText() { $dimensionValue = 'SomeDimension'; - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); $dimension->expects($this->any()) @@ -226,7 +228,7 @@ public function testCleanIndex() { $objectManager = new ObjectManagerHelper($this); $model = $objectManager->getObject( - 'Magento\Elasticsearch\Model\Indexer\IndexerHandler', + \Magento\Elasticsearch\Model\Indexer\IndexerHandler::class, [ 'adapterFactory' => $this->adapterFactory, 'batch' => $this->batch, @@ -235,7 +237,7 @@ public function testCleanIndex() ); $dimensionValue = 'SomeDimension'; - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); $dimension->expects($this->any()) diff --git a/Test/Unit/Model/ResourceModel/EngineTest.php b/Test/Unit/Model/ResourceModel/EngineTest.php index 11ee58caff977..413063b85d445 100644 --- a/Test/Unit/Model/ResourceModel/EngineTest.php +++ b/Test/Unit/Model/ResourceModel/EngineTest.php @@ -37,11 +37,11 @@ class EngineTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->connection = $this->getMockBuilder('\Magento\Framework\DB\Adapter\AdapterInterface') + $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class) ->disableOriginalConstructor() ->setMethods(['getIfNullSql']) ->getMockForAbstractClass(); - $resource = $this->getMockBuilder('\Magento\Framework\App\ResourceConnection') + $resource = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class) ->disableOriginalConstructor() ->setMethods(['getConnection', 'getTableName']) ->getMock(); @@ -53,19 +53,21 @@ protected function setUp() ->method('getTableName') ->will($this->returnArgument(0)); - $this->catalogProductVisibility = $this->getMockBuilder('\Magento\Catalog\Model\Product\Visibility') + $this->catalogProductVisibility = $this->getMockBuilder(\Magento\Catalog\Model\Product\Visibility::class) ->disableOriginalConstructor() ->setMethods(['getVisibleInSiteIds']) ->getMock(); - $this->indexScopeResolver = $this->getMockBuilder('\Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver') + $this->indexScopeResolver = $this->getMockBuilder( + \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class + ) ->disableOriginalConstructor() ->setMethods(['getVisibleInSiteIds']) ->getMock(); $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\ResourceModel\Engine', + \Magento\Elasticsearch\Model\ResourceModel\Engine::class, [ 'catalogProductVisibility' => $this->catalogProductVisibility, 'indexScopeResolver' => $this->indexScopeResolver diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/Test/Unit/Model/ResourceModel/IndexTest.php index 3f18c7220ac6f..8e0f3db1b7914 100644 --- a/Test/Unit/Model/ResourceModel/IndexTest.php +++ b/Test/Unit/Model/ResourceModel/IndexTest.php @@ -101,27 +101,27 @@ class IndexTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface') + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->disableOriginalConstructor() ->setMethods([ 'getStore', ]) ->getMockForAbstractClass(); - $this->storeInterface = $this->getMockBuilder('\Magento\Store\Api\Data\StoreInterface') + $this->storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->setMethods([ 'getWebsiteId', ]) ->getMockForAbstractClass(); - $this->productRepository = $this->getMockBuilder('\Magento\Catalog\Api\ProductRepositoryInterface') + $this->productRepository = $this->getMockBuilder(\Magento\Catalog\Api\ProductRepositoryInterface::class) ->getMockForAbstractClass(); - $this->categoryRepository = $this->getMockBuilder('\Magento\Catalog\Api\CategoryRepositoryInterface') + $this->categoryRepository = $this->getMockBuilder(\Magento\Catalog\Api\CategoryRepositoryInterface::class) ->getMockForAbstractClass(); - $this->eavConfig = $this->getMockBuilder('\Magento\Eav\Model\Config') + $this->eavConfig = $this->getMockBuilder(\Magento\Eav\Model\Config::class) ->disableOriginalConstructor() ->setMethods([ 'getEntityAttributeCodes', @@ -129,11 +129,11 @@ protected function setUp() ]) ->getMock(); - $this->fullText = $this->getMockBuilder('\Magento\CatalogSearch\Model\ResourceModel\Fulltext') + $this->fullText = $this->getMockBuilder(\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class) ->disableOriginalConstructor() ->getMock(); - $this->context = $this->getMockBuilder('\Magento\Framework\Model\ResourceModel\Db\Context') + $this->context = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\Context::class) ->disableOriginalConstructor() ->setMethods([ 'getTransactionManager', @@ -142,29 +142,29 @@ protected function setUp() ]) ->getMock(); - $this->eventManager = $this->getMockBuilder('\Magento\Framework\Event\ManagerInterface') + $this->eventManager = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class) ->setMethods(['dispatch']) ->getMock(); - $this->product = $this->getMockBuilder('\Magento\Catalog\Api\Data\ProductInterface') + $this->product = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterface::class) ->disableOriginalConstructor() ->setMethods([ 'getData', ]) ->getMockForAbstractClass(); - $this->category = $this->getMockBuilder('\Magento\Catalog\Api\Data\CategoryInterface') + $this->category = $this->getMockBuilder(\Magento\Catalog\Api\Data\CategoryInterface::class) ->disableOriginalConstructor() ->setMethods([ 'getName', ]) ->getMockForAbstractClass(); - $this->connection = $this->getMockBuilder('Magento\Framework\DB\Adapter\AdapterInterface') + $this->connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->select = $this->getMockBuilder('\Magento\Framework\DB\Select') + $this->select = $this->getMockBuilder(\Magento\Framework\DB\Select::class) ->disableOriginalConstructor() ->setMethods([ 'distinct', @@ -175,7 +175,7 @@ protected function setUp() ]) ->getMock(); - $this->resources = $this->getMockBuilder('\Magento\Framework\App\ResourceConnection') + $this->resources = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class) ->disableOriginalConstructor() ->setMethods([ 'getConnection', @@ -184,7 +184,7 @@ protected function setUp() ]) ->getMock(); - $this->metadataPool = $this->getMockBuilder('\Magento\Framework\EntityManager\MetadataPool') + $this->metadataPool = $this->getMockBuilder(\Magento\Framework\EntityManager\MetadataPool::class) ->disableOriginalConstructor() ->setMethods([ 'getMetadata', @@ -211,7 +211,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\Model\ResourceModel\Index', + \Magento\Elasticsearch\Model\ResourceModel\Index::class, [ 'context' => $this->context, 'storeManager' => $this->storeManager, @@ -412,7 +412,7 @@ public function testGetFullProductIndexData($frontendInput, $indexData) 'name', ]); - $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\AbstractAttribute') + $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class) ->disableOriginalConstructor() ->setMethods([ 'getFrontendInput', @@ -435,7 +435,7 @@ public function testGetFullProductIndexData($frontendInput, $indexData) ->method('getFrontendInput') ->willReturn($frontendInput); - $attributeOption = $this->getMock('\Magento\Eav\Model\Entity\Attribute\Option', [], [], '', false); + $attributeOption = $this->getMock(\Magento\Eav\Model\Entity\Attribute\Option::class, [], [], '', false); $attributeOption->expects($this->any())->method('getValue')->willReturn('240-LV04'); $attributeOption->expects($this->any())->method('getLabel')->willReturn('label'); diff --git a/Test/Unit/SearchAdapter/AdapterTest.php b/Test/Unit/SearchAdapter/AdapterTest.php index 6ad836f936600..59f477e5b4614 100644 --- a/Test/Unit/SearchAdapter/AdapterTest.php +++ b/Test/Unit/SearchAdapter/AdapterTest.php @@ -49,27 +49,29 @@ class AdapterTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->disableOriginalConstructor() ->getMock(); - $this->mapper = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Mapper') + $this->mapper = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Mapper::class) ->setMethods([ 'buildQuery', ]) ->disableOriginalConstructor() ->getMock(); - $this->responseFactory = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ResponseFactory') + $this->responseFactory = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ResponseFactory::class) ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); - $this->request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + $this->request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->aggregationBuilder = $this->getMockBuilder('\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder') + $this->aggregationBuilder = $this->getMockBuilder( + \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder::class + ) ->setMethods([ 'build', ]) @@ -78,7 +80,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\SearchAdapter\Adapter', + \Magento\Elasticsearch\SearchAdapter\Adapter::class, [ 'connectionManager' => $this->connectionManager, 'mapper' => $this->mapper, @@ -95,7 +97,7 @@ protected function setUp() */ public function testQuery() { - $client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->setMethods(['query']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php b/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php index d0c18da894f56..656fe5c12fb27 100644 --- a/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php @@ -57,34 +57,38 @@ class DynamicTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->requestBuckedInterface = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + $this->requestBuckedInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class) ->disableOriginalConstructor() ->getMock(); $this->dataProviderContainer = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider::class) ->disableOriginalConstructor() ->getMock(); - $this->algorithmRepository = $this->getMockBuilder('Magento\Framework\Search\Dynamic\Algorithm\Repository') + $this->algorithmRepository = $this->getMockBuilder( + \Magento\Framework\Search\Dynamic\Algorithm\Repository::class + ) ->disableOriginalConstructor() ->getMock(); - $this->entityStorageFactory = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorageFactory') + $this->entityStorageFactory = $this->getMockBuilder( + \Magento\Framework\Search\Dynamic\EntityStorageFactory::class + ) ->disableOriginalConstructor() ->getMock(); $this->algorithmInterface = $this - ->getMockBuilder('Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface') + ->getMockBuilder(\Magento\Framework\Search\Dynamic\Algorithm\AlgorithmInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\Aggregation\DynamicBucket') + $this->bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\Aggregation\DynamicBucket::class) ->setMethods(['getMethod']) ->disableOriginalConstructor() ->getMock(); - $this->entityStorage = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorage') + $this->entityStorage = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\EntityStorage::class) ->disableOriginalConstructor() ->getMock(); @@ -95,7 +99,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic', + \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic::class, [ 'algorithmRepository' => $this->algorithmRepository, 'entityStorageFactory' => $this->entityStorageFactory, diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php b/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php index b2d3748d8e761..90dc7a02538be 100644 --- a/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php @@ -30,7 +30,6 @@ class TermTest extends \PHPUnit_Framework_TestCase */ protected $bucket; - /** * Set up test environment. * @@ -38,15 +37,17 @@ class TermTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->requestBuckedInterface = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + $this->requestBuckedInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->dataProviderContainer = $this->getMockBuilder('Magento\Framework\Search\Dynamic\DataProviderInterface') + $this->dataProviderContainer = $this->getMockBuilder( + \Magento\Framework\Search\Dynamic\DataProviderInterface::class + ) ->disableOriginalConstructor() ->getMock(); - $this->bucket = $this->getMockBuilder('Magento\Framework\Search\Request\Aggregation\TermBucket') + $this->bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\Aggregation\TermBucket::class) ->setMethods(['getName']) ->disableOriginalConstructor() ->getMock(); @@ -54,7 +55,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term', + \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term::class, [] ); } diff --git a/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php b/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php index 12687fcc0ea95..4845b07ea6d26 100644 --- a/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php @@ -44,17 +44,19 @@ class BuilderTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->dataProviderContainer = $this->getMockBuilder('Magento\Framework\Search\Dynamic\DataProviderInterface') + $this->dataProviderContainer = $this->getMockBuilder( + \Magento\Framework\Search\Dynamic\DataProviderInterface::class + ) ->disableOriginalConstructor() ->getMock(); $this->aggregationContainer = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Aggregation\Builder', + \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder::class, [ 'dataProviderContainer' => ['indexName' => $this->dataProviderContainer], 'aggregationContainer' => ['bucketType' => $this->aggregationContainer], @@ -67,11 +69,11 @@ protected function setUp() */ public function testBuild() { - $this->requestInterface = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + $this->requestInterface = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->requestBuckedInterface = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + $this->requestBuckedInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class) ->disableOriginalConstructor() ->getMock(); @@ -79,7 +81,7 @@ public function testBuild() ->method('getIndex') ->willReturn('indexName'); - $dimensionMock = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimensionMock = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php index 6ded577bce9a3..7c0a0a3010db9 100644 --- a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php +++ b/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php @@ -16,6 +16,9 @@ use Magento\Store\Api\Data\StoreInterface; use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class IntervalTest extends \PHPUnit_Framework_TestCase { /** @@ -70,35 +73,35 @@ class IntervalTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->setMethods(['getConnection']) ->disableOriginalConstructor() ->getMock(); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->setMethods([ 'getIndexName', 'getEntityType', ]) ->disableOriginalConstructor() ->getMock(); - $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->customerSession = $this->getMockBuilder('Magento\Customer\Model\Session') + $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class) ->setMethods(['getCustomerGroupId']) ->disableOriginalConstructor() ->getMock(); $this->customerSession->expects($this->any()) ->method('getCustomerGroupId') ->willReturn(1); - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class) ->disableOriginalConstructor() ->getMock(); $this->storeMock->expects($this->any()) @@ -113,7 +116,7 @@ protected function setUp() $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); - $this->clientMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->setMethods(['query']) ->disableOriginalConstructor() ->getMock(); @@ -123,7 +126,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Aggregation\Interval', + \Magento\Elasticsearch\SearchAdapter\Aggregation\Interval::class, [ 'connectionManager' => $this->connectionManager, 'fieldMapper' => $this->fieldMapper, @@ -146,7 +149,7 @@ protected function setUp() */ public function testLoad($limit, $offset, $lower, $upper) { - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver->expects($this->any()) @@ -201,7 +204,7 @@ public function testLoadPrevArray($data, $index, $lower) ], ]; - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver->expects($this->any()) @@ -233,7 +236,7 @@ public function testLoadPrevFalse($data, $index, $lower) { $queryResult = ['hits' => ['total'=> '0']]; - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver->expects($this->any()) @@ -273,7 +276,7 @@ public function testLoadNextArray($data, $rightIndex, $upper) ] ]; - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver->expects($this->any()) @@ -305,7 +308,7 @@ public function testLoadNextFalse($data, $rightIndex, $upper) { $queryResult = ['hits' => ['total'=> '0']]; - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver->expects($this->any()) diff --git a/Test/Unit/SearchAdapter/AggregationFactoryTest.php b/Test/Unit/SearchAdapter/AggregationFactoryTest.php index 86b47800e0f82..8000c095d53cd 100644 --- a/Test/Unit/SearchAdapter/AggregationFactoryTest.php +++ b/Test/Unit/SearchAdapter/AggregationFactoryTest.php @@ -31,13 +31,13 @@ class AggregationFactoryTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->objectManager = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface') + $this->objectManager = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\AggregationFactory', + \Magento\Elasticsearch\SearchAdapter\AggregationFactory::class, [ 'objectManager' => $this->objectManager ] diff --git a/Test/Unit/SearchAdapter/ConnectionManagerTest.php b/Test/Unit/SearchAdapter/ConnectionManagerTest.php index b4c200ea7ae74..ca137cd67a2fc 100644 --- a/Test/Unit/SearchAdapter/ConnectionManagerTest.php +++ b/Test/Unit/SearchAdapter/ConnectionManagerTest.php @@ -43,10 +43,10 @@ class ConnectionManagerTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->logger = $this->getMockBuilder('Psr\Log\LoggerInterface') + $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->clientFactory = $this->getMockBuilder('\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface') + $this->clientFactory = $this->getMockBuilder(\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); @@ -67,7 +67,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\ConnectionManager', + \Magento\Elasticsearch\SearchAdapter\ConnectionManager::class, [ 'clientFactory' => $this->clientFactory, 'clientConfig' => $this->clientConfig, @@ -81,7 +81,7 @@ protected function setUp() */ public function testGetConnectionSuccessfull() { - $client = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $client = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->disableOriginalConstructor() ->getMock(); $this->clientFactory->expects($this->once()) diff --git a/Test/Unit/SearchAdapter/DocumentFactoryTest.php b/Test/Unit/SearchAdapter/DocumentFactoryTest.php index 066fe64b0e812..50badae374d4e 100644 --- a/Test/Unit/SearchAdapter/DocumentFactoryTest.php +++ b/Test/Unit/SearchAdapter/DocumentFactoryTest.php @@ -55,25 +55,25 @@ class DocumentFactoryTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->entityMetadata = $this->getMockBuilder('Magento\Framework\Search\EntityMetadata') + $this->entityMetadata = $this->getMockBuilder(\Magento\Framework\Search\EntityMetadata::class) ->disableOriginalConstructor() ->getMock(); - $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface'); + $this->objectManager = $this->getMock(\Magento\Framework\ObjectManagerInterface::class); - $this->document = $this->getMockBuilder('Magento\Framework\Search\Document') + $this->document = $this->getMockBuilder(\Magento\Framework\Search\Document::class) ->disableOriginalConstructor() ->getMock(); - $this->documentField = $this->getMockBuilder('\Magento\Framework\Search\DocumentField') + $this->documentField = $this->getMockBuilder(\Magento\Framework\Search\DocumentField::class) ->disableOriginalConstructor() ->getMock(); - $this->instanceName = '\Magento\Framework\Search\Document'; + $this->instanceName = \Magento\Framework\Search\Document::class; $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\DocumentFactory', + \Magento\Elasticsearch\SearchAdapter\DocumentFactory::class, [ 'objectManager' => $this->objectManager, 'entityMetadata' => $this->entityMetadata @@ -94,9 +94,9 @@ public function testCreate() */ $closure = function ($class) { switch ($class) { - case 'Magento\Framework\Search\DocumentField': + case \Magento\Framework\Search\DocumentField::class: return $this->documentField; - case 'Magento\Framework\Search\Document': + case \Magento\Framework\Search\Document::class: return $this->document; } return null; diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php index 1380165efeb71..4d98ad9e4af91 100644 --- a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php +++ b/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php @@ -86,33 +86,33 @@ class DataProviderTest extends \PHPUnit_Framework_TestCase */ private function setUpMockObjects() { - $this->connectionManager = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\ConnectionManager') + $this->connectionManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class) ->setMethods(['getConnection']) ->disableOriginalConstructor() ->getMock(); - $this->range = $this->getMockBuilder('Magento\Catalog\Model\Layer\Filter\Price\Range') + $this->range = $this->getMockBuilder(\Magento\Catalog\Model\Layer\Filter\Price\Range::class) ->setMethods(['getPriceRange']) ->disableOriginalConstructor() ->getMock(); - $this->intervalFactory = $this->getMockBuilder('Magento\Framework\Search\Dynamic\IntervalFactory') + $this->intervalFactory = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\IntervalFactory::class) ->disableOriginalConstructor() ->getMock(); - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->setMethods([ 'getIndexName', 'getEntityType', ]) ->disableOriginalConstructor() ->getMock(); - $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->customerSession = $this->getMockBuilder('Magento\Customer\Model\Session') + $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class) ->setMethods(['getCustomerGroupId']) ->disableOriginalConstructor() ->getMock(); - $this->entityStorage = $this->getMockBuilder('Magento\Framework\Search\Dynamic\EntityStorage') + $this->entityStorage = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\EntityStorage::class) ->setMethods(['getSource']) ->disableOriginalConstructor() ->getMock(); @@ -122,7 +122,7 @@ private function setUpMockObjects() $this->customerSession->expects($this->any()) ->method('getCustomerGroupId') ->willReturn(1); - $this->storeMock = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $this->storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->storeManager->expects($this->any()) @@ -140,7 +140,7 @@ private function setUpMockObjects() $this->clientConfig->expects($this->any()) ->method('getEntityType') ->willReturn('product'); - $this->clientMock = $this->getMockBuilder('Magento\Elasticsearch\Model\Client\Elasticsearch') + $this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class) ->setMethods(['query']) ->disableOriginalConstructor() ->getMock(); @@ -148,24 +148,24 @@ private function setUpMockObjects() ->method('getConnection') ->willReturn($this->clientMock); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class) ->disableOriginalConstructor() ->getMock(); $this->scopeResolver = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeResolverInterface', + \Magento\Framework\App\ScopeResolverInterface::class, [], '', false ); $this->scopeInterface = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeInterface', + \Magento\Framework\App\ScopeInterface::class, [], '', false @@ -182,7 +182,7 @@ protected function setUp() $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider', + \Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider::class, [ 'connectionManager' => $this->connectionManager, 'fieldMapper' => $this->fieldMapper, @@ -247,13 +247,13 @@ public function testGetAggregations() public function testGetInterval() { $dimensionValue = 1; - $bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + $bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class) ->disableOriginalConstructor() ->getMock(); - $interval = $this->getMockBuilder('Magento\Framework\Search\Dynamic\IntervalInterface') + $interval = $this->getMockBuilder(\Magento\Framework\Search\Dynamic\IntervalInterface::class) ->disableOriginalConstructor() ->getMock(); - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); @@ -289,10 +289,10 @@ public function testGetAggregation() $expectedResult = [ 1 => 1, ]; - $bucket = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + $bucket = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class) ->disableOriginalConstructor() ->getMock(); - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php b/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php index 9260fa34397f6..8c1070f7b5d7c 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php @@ -36,11 +36,11 @@ class RangeTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->filterInterface = $this->getMockBuilder('Magento\Framework\Search\Request\Filter\Range') + $this->filterInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\Filter\Range::class) ->disableOriginalConstructor() ->setMethods([ 'getField', @@ -51,7 +51,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range', + \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range::class, [ 'fieldMapper' => $this->fieldMapper ] diff --git a/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php b/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php index 38ebc614023c8..31ab4aa5749a6 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php @@ -36,11 +36,11 @@ class TermTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->filterInterface = $this->getMockBuilder('Magento\Framework\Search\Request\Filter\Term') + $this->filterInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\Filter\Term::class) ->disableOriginalConstructor() ->setMethods([ 'getValue', @@ -50,7 +50,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term', + \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term::class, [ 'fieldMapper' => $this->fieldMapper ] diff --git a/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php b/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php index 507d4aa421672..5503e74ab9d2d 100644 --- a/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php +++ b/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php @@ -36,11 +36,11 @@ class WildcardTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->filterInterface = $this->getMockBuilder('Magento\Framework\Search\Request\Filter\Wildcard') + $this->filterInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\Filter\Wildcard::class) ->disableOriginalConstructor() ->setMethods([ 'getField', @@ -50,7 +50,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard', + \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard::class, [ 'fieldMapper' => $this->fieldMapper ] diff --git a/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/Test/Unit/SearchAdapter/Filter/BuilderTest.php index 1c770a836b833..482e130ab78f3 100644 --- a/Test/Unit/SearchAdapter/Filter/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Filter/BuilderTest.php @@ -40,13 +40,13 @@ class BuilderTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->range = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range') + $this->range = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range::class) ->disableOriginalConstructor() ->getMock(); - $this->term = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term') + $this->term = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term::class) ->disableOriginalConstructor() ->getMock(); - $this->wildcard = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard') + $this->wildcard = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard::class) ->disableOriginalConstructor() ->getMock(); @@ -56,7 +56,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Filter\Builder', + \Magento\Elasticsearch\SearchAdapter\Filter\Builder::class, [ 'range' => $this->range, 'term' => $this->term, @@ -71,7 +71,7 @@ protected function setUp() */ public function testBuildFailure() { - $filter = $this->getMockBuilder('Magento\Framework\Search\Request\FilterInterface') + $filter = $this->getMockBuilder(\Magento\Framework\Search\Request\FilterInterface::class) ->disableOriginalConstructor() ->getMock(); $filter->expects($this->any()) @@ -95,7 +95,7 @@ public function testBuild($filterMock, $filterType) $filter->expects($this->any()) ->method('getType') ->willReturn($filterType); - $childFilter = $this->getMockBuilder('Magento\Framework\Search\Request\FilterInterface') + $childFilter = $this->getMockBuilder(\Magento\Framework\Search\Request\FilterInterface::class) ->disableOriginalConstructor() ->getMock(); $childFilter->expects($this->any()) @@ -128,7 +128,7 @@ public function testBuildNegation($filterMock, $filterType) $filter->expects($this->any()) ->method('getType') ->willReturn($filterType); - $childFilter = $this->getMockBuilder('Magento\Framework\Search\Request\FilterInterface') + $childFilter = $this->getMockBuilder(\Magento\Framework\Search\Request\FilterInterface::class) ->disableOriginalConstructor() ->getMock(); $childFilter->expects($this->any()) @@ -153,12 +153,10 @@ public function testBuildNegation($filterMock, $filterType) public function buildDataProvider() { return [ - [ - 'Magento\Framework\Search\Request\FilterInterface', + [\Magento\Framework\Search\Request\FilterInterface::class, 'termFilter' ], - [ - 'Magento\Framework\Search\Request\Filter\BoolExpression', + [\Magento\Framework\Search\Request\Filter\BoolExpression::class, 'boolFilter' ], ]; diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/Test/Unit/SearchAdapter/MapperTest.php index 05ef74c5940fb..2827681289a01 100644 --- a/Test/Unit/SearchAdapter/MapperTest.php +++ b/Test/Unit/SearchAdapter/MapperTest.php @@ -11,6 +11,9 @@ use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class MapperTest extends \PHPUnit_Framework_TestCase { /** @@ -39,18 +42,20 @@ class MapperTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->queryBuilder = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Builder') + $this->queryBuilder = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Query\Builder::class) ->setMethods([ 'initQuery', 'initAggregations', ]) ->disableOriginalConstructor() ->getMock(); - $this->matchQueryBuilder = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Builder\Match') + $this->matchQueryBuilder = $this->getMockBuilder( + \Magento\Elasticsearch\SearchAdapter\Query\Builder\Match::class + ) ->setMethods(['build']) ->disableOriginalConstructor() ->getMock(); - $this->filterBuilder = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Filter\Builder') + $this->filterBuilder = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Filter\Builder::class) ->disableOriginalConstructor() ->getMock(); $this->queryBuilder->expects($this->any()) @@ -73,7 +78,7 @@ protected function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Mapper', + \Magento\Elasticsearch\SearchAdapter\Mapper::class, [ 'queryBuilder' => $this->queryBuilder, 'matchQueryBuilder' => $this->matchQueryBuilder, @@ -88,10 +93,10 @@ protected function setUp() */ public function testBuildQueryFailure() { - $request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + $request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class) ->disableOriginalConstructor() ->getMock(); - $query = $this->getMockBuilder('Magento\Framework\Search\Request\QueryInterface') + $query = $this->getMockBuilder(\Magento\Framework\Search\Request\QueryInterface::class) ->disableOriginalConstructor() ->getMock(); $request->expects($this->once()) @@ -115,13 +120,13 @@ public function testBuildQueryFailure() */ public function testBuildQuery($queryType, $queryMock, $referenceType, $filterMock) { - $request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + $request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class) ->disableOriginalConstructor() ->getMock(); $query = $this->getMockBuilder($queryMock) ->disableOriginalConstructor() ->getMock(); - $matchQuery = $this->getMockBuilder('Magento\Framework\Search\Request\Query\Match') + $matchQuery = $this->getMockBuilder(\Magento\Framework\Search\Request\Query\Match::class) ->disableOriginalConstructor() ->getMock(); $filterQuery = $this->getMockBuilder($filterMock) @@ -176,28 +181,20 @@ public function buildQueryDataProvider() { return [ [ - 'matchQuery', - 'Magento\Framework\Search\Request\Query\Match', - 'query', - 'Magento\Framework\Search\Request\QueryInterface', + 'matchQuery', \Magento\Framework\Search\Request\Query\Match::class, + 'query', \Magento\Framework\Search\Request\QueryInterface::class, ], [ - 'boolQuery', - 'Magento\Framework\Search\Request\Query\BoolExpression', - 'query', - 'Magento\Framework\Search\Request\QueryInterface', + 'boolQuery', \Magento\Framework\Search\Request\Query\BoolExpression::class, + 'query', \Magento\Framework\Search\Request\QueryInterface::class, ], [ - 'filteredQuery', - 'Magento\Framework\Search\Request\Query\Filter', - 'query', - 'Magento\Framework\Search\Request\QueryInterface', + 'filteredQuery', \Magento\Framework\Search\Request\Query\Filter::class, + 'query', \Magento\Framework\Search\Request\QueryInterface::class, ], [ - 'filteredQuery', - 'Magento\Framework\Search\Request\Query\Filter', - 'filter', - 'Magento\Framework\Search\Request\FilterInterface', + 'filteredQuery', \Magento\Framework\Search\Request\Query\Filter::class, + 'filter', \Magento\Framework\Search\Request\FilterInterface::class, ], ]; } diff --git a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php b/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php index ba3148c93944f..0602c6bd3e234 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php @@ -39,20 +39,20 @@ protected function setUp() { $helper = new ObjectManager($this); - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->requestInterface = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + $this->requestInterface = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->requestBucketInterface = $this->getMockBuilder('Magento\Framework\Search\Request\BucketInterface') + $this->requestBucketInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\BucketInterface::class) ->disableOriginalConstructor() ->getMock(); $this->model = $helper->getObject( - 'Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation', + \Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation::class, [ 'fieldMapper' =>$this->fieldMapper, ] diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index c6ce1b85a2cde..922140ec94d8d 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -40,22 +40,22 @@ class MatchTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->fieldMapper = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\FieldMapperInterface') + $this->fieldMapper = $this->getMockBuilder(\Magento\Elasticsearch\Model\Adapter\FieldMapperInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->queryInterface = $this->getMockBuilder('Magento\Framework\Search\Request\QueryInterface') + $this->queryInterface = $this->getMockBuilder(\Magento\Framework\Search\Request\QueryInterface::class) ->disableOriginalConstructor() ->getMock(); $this->preprocessorInterface = $this - ->getMockBuilder('Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface') + ->getMockBuilder(\Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface::class) ->disableOriginalConstructor() ->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Query\Builder\Match', + \Magento\Elasticsearch\SearchAdapter\Query\Builder\Match::class, [ 'fieldMapper' => $this->fieldMapper, 'preprocessorContainer' => [$this->preprocessorInterface], @@ -68,7 +68,7 @@ protected function setUp() */ public function testBuild() { - $query = $this->getMockBuilder('Magento\Framework\Search\Request\Query\Match') + $query = $this->getMockBuilder(\Magento\Framework\Search\Request\Query\Match::class) ->setMethods(['getValue', 'getMatches']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/Test/Unit/SearchAdapter/Query/BuilderTest.php index 318b4d8f53e7e..53250eb4c5992 100644 --- a/Test/Unit/SearchAdapter/Query/BuilderTest.php +++ b/Test/Unit/SearchAdapter/Query/BuilderTest.php @@ -12,6 +12,9 @@ use Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation as AggregationBuilder; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class BuilderTest extends \PHPUnit_Framework_TestCase { /** @@ -55,31 +58,31 @@ class BuilderTest extends \PHPUnit_Framework_TestCase */ public function setUp() { - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->setMethods(['getEntityType']) ->disableOriginalConstructor() ->getMock(); $this->searchIndexNameResolver = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class) ->setMethods(['getIndexName']) ->disableOriginalConstructor() ->getMock(); $this->aggregationBuilder = $this - ->getMockBuilder('Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation') + ->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\Query\Builder\Aggregation::class) ->setMethods(['build']) ->disableOriginalConstructor() ->getMock(); - $this->request = $this->getMockBuilder('Magento\Framework\Search\RequestInterface') + $this->request = $this->getMockBuilder(\Magento\Framework\Search\RequestInterface::class) ->disableOriginalConstructor() ->getMock(); $this->scopeResolver = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeResolverInterface', + \Magento\Framework\App\ScopeResolverInterface::class, [], '', false ); $this->scopeInterface = $this->getMockForAbstractClass( - 'Magento\Framework\App\ScopeInterface', + \Magento\Framework\App\ScopeInterface::class, [], '', false @@ -87,7 +90,7 @@ public function setUp() $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\Query\Builder', + \Magento\Elasticsearch\SearchAdapter\Query\Builder::class, [ 'clientConfig' => $this->clientConfig, 'searchIndexNameResolver' => $this->searchIndexNameResolver, @@ -103,7 +106,7 @@ public function setUp() public function testInitQuery() { $dimensionValue = 1; - $dimension = $this->getMockBuilder('Magento\Framework\Search\Request\Dimension') + $dimension = $this->getMockBuilder(\Magento\Framework\Search\Request\Dimension::class) ->setMethods(['getValue']) ->disableOriginalConstructor() ->getMock(); diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php index aa76c2fbbe47c..f94f60cc45653 100644 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php @@ -13,6 +13,9 @@ use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class StopwordsTest extends \PHPUnit_Framework_TestCase { /** @@ -52,30 +55,30 @@ class StopwordsTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class) ->disableOriginalConstructor() ->getMock(); - $this->localeResolver = $this->getMockBuilder('Magento\Framework\Locale\Resolver') + $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\Resolver::class) ->disableOriginalConstructor() ->setMethods([ 'emulate', 'getLocale', ]) ->getMock(); - $this->readFactory = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\ReadFactory') + $this->readFactory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\ReadFactory::class) ->disableOriginalConstructor() ->setMethods(['create']) ->getMock(); - $this->configCache = $this->getMockBuilder('Magento\Framework\App\Cache\Type\Config') - ->disableOriginalConstructor() - ->getMock(); - $this->esConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface') + $this->configCache = $this->getMockBuilder(\Magento\Framework\App\Cache\Type\Config::class) ->disableOriginalConstructor() ->getMock(); + $this->esConfig = $this->getMockBuilder( + \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface::class + )->disableOriginalConstructor()->getMock(); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - 'Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords', + \Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords::class, [ 'storeManager' => $this->storeManager, 'localeResolver' => $this->localeResolver, @@ -97,7 +100,7 @@ public function testProcess() ->willReturn([ 'default' => 'default.csv', ]); - $storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->storeManager->expects($this->once()) @@ -110,7 +113,7 @@ public function testProcess() ->method('getLocale') ->willReturn('en_US'); - $read = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\Read') + $read = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Read::class) ->disableOriginalConstructor() ->getMock(); $this->readFactory->expects($this->once()) @@ -145,7 +148,7 @@ public function testProcessFromCache() ->willReturn([ 'default' => 'default.csv', ]); - $storeInterface = $this->getMockBuilder('Magento\Store\Api\Data\StoreInterface') + $storeInterface = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class) ->disableOriginalConstructor() ->getMock(); $this->storeManager->expects($this->once()) @@ -158,7 +161,7 @@ public function testProcessFromCache() ->method('getLocale') ->willReturn('en_US'); - $read = $this->getMockBuilder('Magento\Framework\Filesystem\Directory\Read') + $read = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\Read::class) ->disableOriginalConstructor() ->getMock(); $this->readFactory->expects($this->once()) diff --git a/Test/Unit/SearchAdapter/ResponseFactoryTest.php b/Test/Unit/SearchAdapter/ResponseFactoryTest.php index 0eb2431a7803c..2bf3ae8f3b167 100644 --- a/Test/Unit/SearchAdapter/ResponseFactoryTest.php +++ b/Test/Unit/SearchAdapter/ResponseFactoryTest.php @@ -38,21 +38,23 @@ class ResponseFactoryTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->documentFactory = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\DocumentFactory') + $this->documentFactory = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\DocumentFactory::class) ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); - $this->aggregationFactory = $this->getMockBuilder('Magento\Elasticsearch\SearchAdapter\AggregationFactory') + $this->aggregationFactory = $this->getMockBuilder( + \Magento\Elasticsearch\SearchAdapter\AggregationFactory::class + ) ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); - $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface'); + $this->objectManager = $this->getMock(\Magento\Framework\ObjectManagerInterface::class); $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( - '\Magento\Elasticsearch\SearchAdapter\ResponseFactory', + \Magento\Elasticsearch\SearchAdapter\ResponseFactory::class, [ 'objectManager' => $this->objectManager, 'documentFactory' => $this->documentFactory, @@ -115,7 +117,7 @@ public function testCreate() $this->objectManager->expects($this->once())->method('create') ->with( - $this->equalTo('Magento\Framework\Search\Response\QueryResponse'), + $this->equalTo(\Magento\Framework\Search\Response\QueryResponse::class), $this->equalTo(['documents' => ['document1', 'document2'], 'aggregations' => 'aggregationsData']) ) ->will($this->returnValue('QueryResponseObject')); diff --git a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php index d0d6fb0b3a23b..c5d04b7d498fd 100644 --- a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php +++ b/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php @@ -42,7 +42,7 @@ class SearchIndexNameResolverTest extends \PHPUnit_Framework_TestCase */ protected function setUp() { - $this->clientConfig = $this->getMockBuilder('Magento\Elasticsearch\Model\Config') + $this->clientConfig = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class) ->disableOriginalConstructor() ->setMethods([ 'getIndexPrefix', @@ -60,7 +60,7 @@ protected function setUp() $objectManager = new ObjectManagerHelper($this); $this->model = $objectManager->getObject( - '\Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver', + \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver::class, [ 'clientConfig' => $this->clientConfig, ] From 1b445d42d3c9a7042761842032d9067424069eb1 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 16:48:50 -0500 Subject: [PATCH 379/616] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- SearchAdapter/AdapterTest.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index a1354fb177dfe..77cc2b09ccde9 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -19,12 +19,20 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest /** * @var string */ - protected $requestConfig = __DIR__ . '/../_files/requests.xml'; + protected $requestConfig; /** * @var string */ - protected $searchEngine = Config::ENGINE_NAME; + protected $searchEngine; + + protected function setUp() + { + $this->requestConfig = __DIR__ . '/../_files/requests.xml'; + $this->searchEngine = Config::ENGINE_NAME; + // @todo add @ for magentoDataFixture when MAGETWO-44489 is done + $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); + } /** * @return \Magento\Framework\Search\AdapterInterface @@ -34,12 +42,6 @@ protected function createAdapter() return $this->objectManager->create('Magento\Elasticsearch\SearchAdapter\Adapter'); } - protected function setUp() - { - //remember to add @ for magentoDataFixture when MAGETWO-44489 is done - $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); - } - /** * @magentoConfigFixture current_store catalog/search/engine elasticsearch */ From 85ca5cd7f0f7b954f0a948d9b27b09ec312afafd Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 19:12:21 -0500 Subject: [PATCH 380/616] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- SearchAdapter/AdapterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 77cc2b09ccde9..63f42431d0afc 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -24,12 +24,12 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest /** * @var string */ - protected $searchEngine; + protected $searchEngine = Config::ENGINE_NAME; protected function setUp() { + parent::setUp(); $this->requestConfig = __DIR__ . '/../_files/requests.xml'; - $this->searchEngine = Config::ENGINE_NAME; // @todo add @ for magentoDataFixture when MAGETWO-44489 is done $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); } From d23ea8865b3e99837613ca7487978173234b8263 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 19:17:50 -0500 Subject: [PATCH 381/616] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- SearchAdapter/AdapterTest.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 63f42431d0afc..f743092b49a6a 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -16,11 +16,6 @@ */ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest { - /** - * @var string - */ - protected $requestConfig; - /** * @var string */ From 3149feca3f44c8c3a86b7c586aefb8771401d616 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 20:46:38 -0500 Subject: [PATCH 382/616] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- SearchAdapter/AdapterTest.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index f743092b49a6a..fece11d83ad5c 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -16,6 +16,11 @@ */ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest { + /** + * @var string + */ + protected $requestConfig = '/../_files/requests.xml'; + /** * @var string */ @@ -23,8 +28,6 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest protected function setUp() { - parent::setUp(); - $this->requestConfig = __DIR__ . '/../_files/requests.xml'; // @todo add @ for magentoDataFixture when MAGETWO-44489 is done $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); } From 41cbce094fc36db364446364d24033661e866fa8 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Fri, 29 Apr 2016 21:59:48 -0500 Subject: [PATCH 383/616] MAGETWO-52414: [GITHUB] Fix integration test syntax error #4343 Making compatible with PHP 5.5 --- SearchAdapter/AdapterTest.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index fece11d83ad5c..43c381d6c15b0 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -16,11 +16,6 @@ */ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest { - /** - * @var string - */ - protected $requestConfig = '/../_files/requests.xml'; - /** * @var string */ @@ -32,6 +27,16 @@ protected function setUp() $this->markTestSkipped("Skipping until ES is configured on builds - MAGETWO-44489"); } + /** + * Get request config path + * + * @return string + */ + protected function getRequestConfigPath() + { + return __DIR__ . '/../_files/requests.xml'; + } + /** * @return \Magento\Framework\Search\AdapterInterface */ From 6e57e44bcb3a7bdde853d018602a44f75c8f3ae8 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Wed, 4 May 2016 12:06:46 -0500 Subject: [PATCH 384/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - correct data fixture file path --- SearchAdapter/AdapterTest.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index b78896acf1142..d63487445635d 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -46,7 +46,7 @@ protected function createAdapter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testMatchQuery() { @@ -57,7 +57,7 @@ public function testMatchQuery() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testAggregationsQuery() { @@ -68,7 +68,7 @@ public function testAggregationsQuery() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testMatchQueryFilters() { @@ -81,7 +81,7 @@ public function testMatchQueryFilters() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithAllFields() { @@ -94,7 +94,7 @@ public function testRangeFilterWithAllFields() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithoutFromField() { @@ -107,7 +107,7 @@ public function testRangeFilterWithoutFromField() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithoutToField() { @@ -120,7 +120,7 @@ public function testRangeFilterWithoutToField() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testTermFilter() { @@ -133,7 +133,7 @@ public function testTermFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testTermFilterArray() { @@ -146,7 +146,7 @@ public function testTermFilterArray() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testWildcardFilter() { @@ -159,7 +159,7 @@ public function testWildcardFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php * */ public function testSearchLimit() @@ -173,7 +173,7 @@ public function testSearchLimit() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilter() { @@ -186,7 +186,7 @@ public function testBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() { @@ -199,7 +199,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() { @@ -213,7 +213,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testSimpleAdvancedSearch( $nameQuery, @@ -233,7 +233,7 @@ public function testSimpleAdvancedSearch( * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Elasticsearch/_files/search_products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testCustomFilterableAttribute() { From d26a3a84299a717294671a637a0cbafc206e2674 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Wed, 4 May 2016 12:23:09 -0500 Subject: [PATCH 385/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - correct data fixture annotation --- SearchAdapter/AdapterTest.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index d63487445635d..c521bc454f869 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -11,7 +11,7 @@ * Class AdapterTest * * @magentoDbIsolation disabled - * magentoDataFixture Magento/Framework/Search/_files/products.php + * @magentoDataFixture Magento/Framework/Search/_files/products.php * * Important: Please make sure that each integration test file works with unique elastic search index. In order to * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test @@ -46,7 +46,6 @@ protected function createAdapter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testMatchQuery() { @@ -57,7 +56,6 @@ public function testMatchQuery() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testAggregationsQuery() { @@ -68,7 +66,6 @@ public function testAggregationsQuery() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testMatchQueryFilters() { @@ -81,7 +78,6 @@ public function testMatchQueryFilters() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithAllFields() { @@ -94,7 +90,6 @@ public function testRangeFilterWithAllFields() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithoutFromField() { @@ -107,7 +102,6 @@ public function testRangeFilterWithoutFromField() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithoutToField() { @@ -120,7 +114,6 @@ public function testRangeFilterWithoutToField() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testTermFilter() { @@ -133,7 +126,6 @@ public function testTermFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testTermFilterArray() { @@ -146,7 +138,6 @@ public function testTermFilterArray() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testWildcardFilter() { @@ -159,8 +150,7 @@ public function testWildcardFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php - * + * */ public function testSearchLimit() { @@ -173,7 +163,6 @@ public function testSearchLimit() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilter() { @@ -186,7 +175,6 @@ public function testBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() { @@ -199,7 +187,6 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() { @@ -213,7 +200,6 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testSimpleAdvancedSearch( $nameQuery, @@ -233,7 +219,6 @@ public function testSimpleAdvancedSearch( * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest - * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testCustomFilterableAttribute() { From 7a225e5261478394c7222848af8ef1deabc45b7e Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Wed, 4 May 2016 15:55:47 -0500 Subject: [PATCH 386/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - reorder data fixture annotation --- SearchAdapter/AdapterTest.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index c521bc454f869..055eb6c6f95ae 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -11,8 +11,7 @@ * Class AdapterTest * * @magentoDbIsolation disabled - * @magentoDataFixture Magento/Framework/Search/_files/products.php - * + * * Important: Please make sure that each integration test file works with unique elastic search index. In order to * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest' @@ -46,6 +45,7 @@ protected function createAdapter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testMatchQuery() { @@ -56,6 +56,7 @@ public function testMatchQuery() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testAggregationsQuery() { @@ -66,6 +67,7 @@ public function testAggregationsQuery() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testMatchQueryFilters() { @@ -78,6 +80,7 @@ public function testMatchQueryFilters() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithAllFields() { @@ -90,6 +93,7 @@ public function testRangeFilterWithAllFields() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithoutFromField() { @@ -102,6 +106,7 @@ public function testRangeFilterWithoutFromField() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testRangeFilterWithoutToField() { @@ -114,6 +119,7 @@ public function testRangeFilterWithoutToField() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testTermFilter() { @@ -126,6 +132,7 @@ public function testTermFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testTermFilterArray() { @@ -138,6 +145,7 @@ public function testTermFilterArray() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testWildcardFilter() { @@ -150,6 +158,7 @@ public function testWildcardFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php * */ public function testSearchLimit() @@ -163,6 +172,7 @@ public function testSearchLimit() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilter() { @@ -175,6 +185,7 @@ public function testBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilterWithNestedNegativeBoolFilter() { @@ -187,6 +198,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() { @@ -200,6 +212,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testSimpleAdvancedSearch( $nameQuery, @@ -219,6 +232,7 @@ public function testSimpleAdvancedSearch( * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest + * @magentoDataFixture Magento/Framework/Search/_files/products.php */ public function testCustomFilterableAttribute() { From 8b8313ce02fd4cab5e6bb9d1167ce25b1a4f8c1e Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Thu, 5 May 2016 16:24:56 +0300 Subject: [PATCH 387/616] MAGETWO-51975: Product attribute with date type has incorrect value --- SearchAdapter/AdapterTest.php | 15 +++++++++++++++ _files/requests.xml | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 43c381d6c15b0..83fb99b923720 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -190,10 +190,25 @@ public function testSimpleAdvancedSearch( } /** + * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php * @magentoConfigFixture current_store catalog/search/engine elasticsearch */ public function testCustomFilterableAttribute() { parent::testCustomFilterableAttribute(); } + + /** + * Advanced search request using date product attribute + * + * @param $rangeFilter + * @param $expectedRecordsCount + * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @dataProvider dateDataProvider + */ + public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount) + { + parent::testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount); + } } diff --git a/_files/requests.xml b/_files/requests.xml index 33192b212f0a0..b6abb17fea740 100644 --- a/_files/requests.xml +++ b/_files/requests.xml @@ -366,4 +366,25 @@ 0 10 + + + + + + + + + + + + + + + + + + + 0 + 10 + From 71aa24395301adb69cc0bb59718f7b1707f48df5 Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Thu, 5 May 2016 16:24:56 +0300 Subject: [PATCH 388/616] MAGETWO-51975: Product attribute with date type has incorrect value --- Model/Adapter/FieldType/Date.php | 22 +++---------------- .../Unit/Model/Adapter/FieldType/DateTest.php | 8 +------ 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php index ba5ce08220b73..0b4a3440c9f6b 100644 --- a/Model/Adapter/FieldType/Date.php +++ b/Model/Adapter/FieldType/Date.php @@ -27,13 +27,6 @@ class Date */ private $scopeConfig; - /** - * Array of \DateTime objects per store - * - * @var \DateTime[] - */ - protected $dateFormats = []; - /** * Construct * @@ -58,23 +51,14 @@ public function __construct( * @param int $storeId * @param string|null $date * @return string|null + * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ public function formatDate($storeId, $date = null) { if ($this->dateTime->isEmptyDate($date)) { return null; } - if (!array_key_exists($storeId, $this->dateFormats)) { - $timezone = $this->scopeConfig->getValue( - $this->localeDate->getDefaultTimezonePath(), - ScopeInterface::SCOPE_STORE, - $storeId - ); - $dateObj = new \DateTime(); - $dateObj->setTimezone(new \DateTimeZone($timezone)); - $this->dateFormats[$storeId] = $dateObj; - } - $dateObj = $this->dateFormats[$storeId]; - return $dateObj->format('c'); + $dateObj = new \DateTime($date, new \DateTimeZone('UTC')); + return $dateObj->format('c') . 'Z'; } } diff --git a/Test/Unit/Model/Adapter/FieldType/DateTest.php b/Test/Unit/Model/Adapter/FieldType/DateTest.php index 657ba4985dea9..cc9379910dbf0 100644 --- a/Test/Unit/Model/Adapter/FieldType/DateTest.php +++ b/Test/Unit/Model/Adapter/FieldType/DateTest.php @@ -83,12 +83,6 @@ public function testFormatDate() $this->dateTime->expects($this->once()) ->method('isEmptyDate') ->willReturn(false); - $this->localeDate->expects($this->once()) - ->method('getDefaultTimezonePath') - ->willReturn('timezonePath'); - $this->scopeConfig->expects($this->once()) - ->method('getValue') - ->willReturn('Europe/Kiev'); - $this->model->formatDate(1, '1997-12-31'); + $this->assertEquals('1997-12-31T00:00:00+00:00Z', $this->model->formatDate(1, '1997-12-31')); } } From 4be1e5eea1bb90a6602e0af387d45d8f40b47a89 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Tue, 10 May 2016 14:56:30 -0500 Subject: [PATCH 389/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - add beginning wildcard to WildcardFilter, so matches do not have to start at beginning --- SearchAdapter/Filter/Builder/Wildcard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAdapter/Filter/Builder/Wildcard.php b/SearchAdapter/Filter/Builder/Wildcard.php index 4d5d9ebd14c92..4b26c7b533dc6 100644 --- a/SearchAdapter/Filter/Builder/Wildcard.php +++ b/SearchAdapter/Filter/Builder/Wildcard.php @@ -34,7 +34,7 @@ public function buildFilter(RequestFilterInterface $filter) return [ [ 'wildcard' => [ - $fieldName => $filter->getValue() . '*', + $fieldName => '*' . $filter->getValue() . '*', ], ] ]; From da12d280c49aa1542367da50ed5cbe20760cbe3f Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Mon, 16 May 2016 14:06:35 -0500 Subject: [PATCH 390/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - add additional expected results for ES --- SearchAdapter/AdapterTest.php | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 055eb6c6f95ae..cae2832cf038b 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -208,7 +208,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() /** * Sample Advanced search request test * - * @dataProvider advancedSearchDataProvider + * @dataProvider elasticSearchAdvancedSearchDataProvider * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest @@ -228,6 +228,28 @@ public function testSimpleAdvancedSearch( ); } + /** + * Elastic Search specific data provider for advanced search test. + * + * The expected array is for Elastic Search is different that the one for MySQL + * because sometimes more matches are returned. For instance, 3rd index below + * will return 3 matches instead of 1 (which is what MySQL returns). + * + * @return array + */ + public function elasticSearchAdvancedSearchDataProvider() + { + return [ + ['white', 'shorts', ['from' => '16', 'to' => '18'], 0], + ['white', 'shorts',['from' => '12', 'to' => '18'], 1], + ['black', 'tshirts', ['from' => '12', 'to' => '20'], 0], + ['shorts', 'green', ['from' => '12', 'to' => '22'], 3], + //Search with empty fields/values + ['white', ' ', ['from' => '12', 'to' => '22'], 1], + [' ', 'green', ['from' => '12', 'to' => '22'], 2] + ]; + } + /** * @magentoAppIsolation enabled * @magentoConfigFixture current_store catalog/search/engine elasticsearch From 74a5a8ce33d898b0a56c1fb7596526a8db6d0396 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Mon, 16 May 2016 16:43:20 -0500 Subject: [PATCH 391/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Add elastic search index prefix to new integration test --- SearchAdapter/AdapterTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 9c678d26e35fa..391a2fbb6a5ea 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -255,6 +255,7 @@ public function testCustomFilterableAttribute() * @param $expectedRecordsCount * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @dataProvider dateDataProvider */ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount) From 8f633dbfdfcfe739a7036b1d47923271624947f7 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Fri, 20 May 2016 10:52:08 -0700 Subject: [PATCH 392/616] MAGETWO-52874: Magento 2.1.0-rc1 Publication (build 2.1.0-rc1.013) --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 2bac829c11124..451414a8aad9a 100644 --- a/composer.json +++ b/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.22|~5.6.0|~7.0.0", - "magento/module-advanced-search": "100.0.*", - "magento/module-catalog": "100.0.*", - "magento/module-catalog-search": "100.0.*", - "magento/module-customer": "100.0.*", - "magento/module-eav": "100.0.*", - "magento/module-search": "100.0.*", - "magento/module-store": "100.0.*", - "magento/framework": "100.0.*", + "magento/module-advanced-search": "100.1.*", + "magento/module-catalog": "101.0.*", + "magento/module-catalog-search": "100.1.*", + "magento/module-customer": "100.1.*", + "magento/module-eav": "100.1.*", + "magento/module-search": "100.1.*", + "magento/module-store": "100.1.*", + "magento/framework": "100.1.*", "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.0.0", + "version": "100.0.0-rc1", "license": [ "proprietary" ], From ca5e414f959eeb247d43854e89fc6f8bce175752 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Fri, 20 May 2016 10:52:08 -0700 Subject: [PATCH 393/616] MAGETWO-52874: Magento 2.1.0-rc1 Publication (build 2.1.0-rc1.013) --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 2a7cc5f3f66b3..170cc3a09eb3b 100644 --- a/composer.json +++ b/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.22|~5.6.0|~7.0.0", - "magento/framework": "100.0.*", - "magento/module-search": "100.0.*", - "magento/module-backend": "100.0.*", - "magento/module-store": "100.0.*", - "magento/module-catalog": "100.0.*", - "magento/module-catalog-search": "100.0.*", - "magento/module-config": "100.0.*", - "magento/module-customer": "100.0.*" + "magento/framework": "100.1.*", + "magento/module-search": "100.1.*", + "magento/module-backend": "100.1.*", + "magento/module-store": "100.1.*", + "magento/module-catalog": "101.0.*", + "magento/module-catalog-search": "100.1.*", + "magento/module-config": "100.1.*", + "magento/module-customer": "100.1.*" }, "type": "magento2-module", - "version": "100.0.2", + "version": "100.1.0-rc1", "license": [ "proprietary" ], From c759fa1bcfe99be95a6e2197904cb9a07bc7ebac Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 20 May 2016 13:13:52 -0500 Subject: [PATCH 394/616] MAGETWO-52874: Magento 2.1.0-rc1 Publication (build 2.1.0-rc1.014) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 451414a8aad9a..54121a7f4184b 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.0.0-rc1", + "version": "100.1.0-rc1", "license": [ "proprietary" ], From a3de1237669254c95410f9d334c3e286b4763d53 Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Thu, 26 May 2016 11:44:50 -0500 Subject: [PATCH 395/616] MAGETWO-53336: [Elasticsearch] Advanced search not working --- .../Query/Preprocessor/Stopwords.php | 22 ++++++++++++++----- etc/di.xml | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 8f72754c508da..74bd06af5bd23 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -11,6 +11,8 @@ use Magento\Framework\App\Cache\Type\Config as ConfigCache; use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface; +use Magento\Framework\Module\Dir\Reader as ModuleDirReader; +use Magento\Framework\Module\Dir; class Stopwords implements PreprocessorInterface { @@ -49,10 +51,15 @@ class Stopwords implements PreprocessorInterface */ protected $esConfig; + /** + * @var ModuleDirReader + */ + protected $moduleDirReader; + /** * @var string */ - protected $fileDir; + protected $stopwordsModule; /** * @param StoreManagerInterface $storeManager @@ -60,7 +67,8 @@ class Stopwords implements PreprocessorInterface * @param ReadFactory $readFactory * @param ConfigCache $configCache * @param EsConfigInterface $esConfig - * @param string $fileDir + * @param ModuleDirReader $moduleDirReader + * @param string $stopwordsModule */ public function __construct( StoreManagerInterface $storeManager, @@ -68,15 +76,16 @@ public function __construct( ReadFactory $readFactory, ConfigCache $configCache, EsConfigInterface $esConfig, - $fileDir = '' + ModuleDirReader $moduleDirReader, + $stopwordsModule = '' ) { $this->storeManager = $storeManager; $this->localeResolver = $localeResolver; $this->readFactory = $readFactory; $this->configCache = $configCache; $this->esConfig = $esConfig; - $rootDir = preg_replace('/app\/code.*/i', '', dirname(__DIR__)); - $this->fileDir = $rootDir . $fileDir; + $this->moduleDirReader = $moduleDirReader; + $this->stopwordsModule = $stopwordsModule; } /** @@ -98,7 +107,8 @@ public function process($query) protected function getStopwordsList() { $filename = $this->getStopwordsFile(); - $source = $this->readFactory->create($this->fileDir); + $fileDir = $this->moduleDirReader->getModuleDir(Dir::MODULE_ETC_DIR, $this->stopwordsModule) . '/stopwords'; + $source = $this->readFactory->create($fileDir); $fileStats = $source->stat($filename); if (((time() - $fileStats['mtime']) > self::STOPWORDS_FILE_MODIFICATION_TIME_GAP) && ($cachedValue = $this->configCache->load(self::CACHE_ID))) { diff --git a/etc/di.xml b/etc/di.xml index 6236ce5a387b5..14bca64b88f91 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -120,7 +120,7 @@ - app/code/Magento/Elasticsearch/etc/stopwords + Magento_Elasticsearch From 84803426017450e1dcb8dead2a4b1f742460b4e8 Mon Sep 17 00:00:00 2001 From: Volodymyr Kublytskyi Date: Fri, 27 May 2016 14:39:24 +0300 Subject: [PATCH 396/616] MAGETWO-53293: Remove PHP 5.5 from supported versions - Update requirements in composer.json files --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 54121a7f4184b..16d0a3d34a507 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-elasticsearch", "description": "N/A", "require": { - "php": "~5.5.22|~5.6.0|~7.0.0", + "php": "~5.6.0|7.0.2|~7.0.6", "magento/module-advanced-search": "100.1.*", "magento/module-catalog": "101.0.*", "magento/module-catalog-search": "100.1.*", From 4e840dcdced61eb24920865674a740b8cee10f87 Mon Sep 17 00:00:00 2001 From: Volodymyr Kublytskyi Date: Fri, 27 May 2016 14:39:24 +0300 Subject: [PATCH 397/616] MAGETWO-53293: Remove PHP 5.5 from supported versions - Update requirements in composer.json files --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 170cc3a09eb3b..7b42e29ebbb41 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-advanced-search", "description": "N/A", "require": { - "php": "~5.5.22|~5.6.0|~7.0.0", + "php": "~5.6.0|7.0.2|~7.0.6", "magento/framework": "100.1.*", "magento/module-search": "100.1.*", "magento/module-backend": "100.1.*", From 93332507c500b331e1229d2aadd9e8089c2672c7 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Fri, 27 May 2016 11:43:43 -0500 Subject: [PATCH 398/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Reindex elastic search in tests that add new fields --- SearchAdapter/AdapterTest.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index 391a2fbb6a5ea..bf31048db5e6e 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -14,8 +14,11 @@ * @magentoDataFixture Magento/Framework/Search/_files/products.php * * Important: Please make sure that each integration test file works with unique elastic search index. In order to - * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test - * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest' + * achieve this, use @ magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test + * method. E.g. '@ magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest' + * + * In ElasticSearch, a reindex is required if the test includes a new data fixture with new items to search, see + * testAdvancedSearchDateField(). * */ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest @@ -245,6 +248,8 @@ public function elasticSearchAdvancedSearchDataProvider() */ public function testCustomFilterableAttribute() { + // Reindex Elastic Search since filterable_attribute data fixture added new fields to be indexed + $this->reindexAll(); parent::testCustomFilterableAttribute(); } @@ -260,6 +265,22 @@ public function testCustomFilterableAttribute() */ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount) { + // Reindex Elastic Search since date_attribute data fixture added new fields to be indexed + $this->reindexAll(); parent::testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount); } + + /** + * Perform full reindex + * + * @return void + */ + private function reindexAll() + { + $indexer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + 'Magento\Indexer\Model\Indexer' + ); + $indexer->load('catalogsearch_fulltext'); + $indexer->reindexAll(); + } } From 4d81f69cd92053603cf4371295552ba013a45da2 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Tue, 31 May 2016 15:01:25 -0500 Subject: [PATCH 399/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Fix Date format --- Model/Adapter/FieldType/Date.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php index 0b4a3440c9f6b..1cc1d83f6a2eb 100644 --- a/Model/Adapter/FieldType/Date.php +++ b/Model/Adapter/FieldType/Date.php @@ -45,7 +45,7 @@ public function __construct( } /** - * Retrieve date value in elasticsearch format (ISO 8601) with Z + * Retrieve date value in elasticsearch format (ISO 8601) * Example: 1995-12-31T23:59:59Z * * @param int $storeId @@ -59,6 +59,6 @@ public function formatDate($storeId, $date = null) return null; } $dateObj = new \DateTime($date, new \DateTimeZone('UTC')); - return $dateObj->format('c') . 'Z'; + return $dateObj->format('c'); } } From d164f7e1e98f94266f83842ae1ea0bf9ad07691d Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Tue, 31 May 2016 15:13:46 -0500 Subject: [PATCH 400/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Fix Date format unit test --- Test/Unit/Model/Adapter/FieldType/DateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/Unit/Model/Adapter/FieldType/DateTest.php b/Test/Unit/Model/Adapter/FieldType/DateTest.php index cc9379910dbf0..cf23f41838425 100644 --- a/Test/Unit/Model/Adapter/FieldType/DateTest.php +++ b/Test/Unit/Model/Adapter/FieldType/DateTest.php @@ -83,6 +83,6 @@ public function testFormatDate() $this->dateTime->expects($this->once()) ->method('isEmptyDate') ->willReturn(false); - $this->assertEquals('1997-12-31T00:00:00+00:00Z', $this->model->formatDate(1, '1997-12-31')); + $this->assertEquals('1997-12-31T00:00:00+00:00', $this->model->formatDate(1, '1997-12-31')); } } From 2530714e49462b8763d65ca80d5924d0c4c2496b Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Wed, 1 Jun 2016 10:32:12 -0500 Subject: [PATCH 401/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - move reindex call in indexhandler test to fix test --- Model/Indexer/IndexHandlerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 4cb5e55f8e0b3..3fea753a41afa 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -133,9 +133,9 @@ public function testReindexAll() */ public function testReindexRowAfterEdit() { - $this->reindexAll(); $this->productApple->setData('name', 'Simple Product Cucumber'); $this->productApple->save(); + $this->reindexAll(); foreach ($this->storeIds as $storeId) { $products = $this->searchByName('Apple', $storeId); From e484b4292df310fdac7cb4bb19795f26cbc68a83 Mon Sep 17 00:00:00 2001 From: Paul Lewis Date: Wed, 1 Jun 2016 13:45:31 -0500 Subject: [PATCH 402/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - disable dbisolation in indexhandlertest --- Model/Indexer/IndexHandlerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 3fea753a41afa..8d230a2611cd5 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -18,7 +18,7 @@ * achieve this, use @magentoConfigFixture to pass unique value for 'elasticsearch_index_prefix' for every test * method. E.g. '@magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest' * - * @magentoDbIsolation enabled + * @magentoDbIsolation disabled * @magentoDataFixture Magento/Elasticsearch/_files/indexer.php */ class IndexHandlerTest extends \PHPUnit_Framework_TestCase From df88bc50f4f56c18da44952294a5bf4ea2be95c2 Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Thu, 2 Jun 2016 17:33:19 -0500 Subject: [PATCH 403/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Skip IndexHandlerTest::testReindexRowAfterEdit --- Model/Indexer/IndexHandlerTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 8d230a2611cd5..30bf0c379e5a0 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -133,6 +133,11 @@ public function testReindexAll() */ public function testReindexRowAfterEdit() { + // The test executes fine locally. On bamboo there is some issue with parallel test execution or other + // test interaction. It is being marked as skipped until more time is available to investigate and + // fix the issue. + $this->markTestSkipped(); + $this->productApple->setData('name', 'Simple Product Cucumber'); $this->productApple->save(); $this->reindexAll(); From 3f8ebfa20ab56607b25a3ee29f069f5542968ebd Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Fri, 3 Jun 2016 00:28:29 -0500 Subject: [PATCH 404/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Updates based on code review --- Model/Adapter/FieldType/Date.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php index 1cc1d83f6a2eb..6875cd0b9a8cd 100644 --- a/Model/Adapter/FieldType/Date.php +++ b/Model/Adapter/FieldType/Date.php @@ -46,7 +46,7 @@ public function __construct( /** * Retrieve date value in elasticsearch format (ISO 8601) - * Example: 1995-12-31T23:59:59Z + * Example: 1995-12-31T23:59:59 * * @param int $storeId * @param string|null $date From 59cc33a62920c68c5099cedacddc4f63e863be0d Mon Sep 17 00:00:00 2001 From: Ankur Kaneria Date: Fri, 3 Jun 2016 00:28:29 -0500 Subject: [PATCH 405/616] MAGETWO-51926: All Integration Tests for Elasticsearch are Skipped - Updates based on code review --- Model/Indexer/IndexHandlerTest.php | 2 +- SearchAdapter/AdapterTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/Indexer/IndexHandlerTest.php b/Model/Indexer/IndexHandlerTest.php index 30bf0c379e5a0..dc3e326727e71 100755 --- a/Model/Indexer/IndexHandlerTest.php +++ b/Model/Indexer/IndexHandlerTest.php @@ -136,7 +136,7 @@ public function testReindexRowAfterEdit() // The test executes fine locally. On bamboo there is some issue with parallel test execution or other // test interaction. It is being marked as skipped until more time is available to investigate and // fix the issue. - $this->markTestSkipped(); + $this->markTestSkipped('MAGETWO-53851 - Ticket to investiage this test failure on Bamboo and fix it.'); $this->productApple->setData('name', 'Simple Product Cucumber'); $this->productApple->save(); diff --git a/SearchAdapter/AdapterTest.php b/SearchAdapter/AdapterTest.php index bf31048db5e6e..b1f632784c87f 100644 --- a/SearchAdapter/AdapterTest.php +++ b/SearchAdapter/AdapterTest.php @@ -63,7 +63,7 @@ public function testMatchQuery() */ public function testAggregationsQuery() { - $this->markTestSkipped('Range query does not implemented.'); + $this->markTestSkipped('Range query is not supported. Test is skipped intentionally.'); } /** From 9693e0014abe460d4380fcb3eba196dbb540bafd Mon Sep 17 00:00:00 2001 From: Maksym Aposov Date: Sat, 4 Jun 2016 13:27:10 +0300 Subject: [PATCH 406/616] MAGETWO-53530: Performance of category pages significantly degrade when having around 3000 products or more in category --- SearchAdapter/DocumentFactory.php | 27 +++++++----- SearchAdapter/ResponseFactory.php | 2 +- .../SearchAdapter/DocumentFactoryTest.php | 42 ++----------------- 3 files changed, 20 insertions(+), 51 deletions(-) diff --git a/SearchAdapter/DocumentFactory.php b/SearchAdapter/DocumentFactory.php index c40cd31e95162..1e7ddd8625827 100644 --- a/SearchAdapter/DocumentFactory.php +++ b/SearchAdapter/DocumentFactory.php @@ -7,8 +7,11 @@ use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Search\EntityMetadata; -use Magento\Framework\Search\Document; -use Magento\Framework\Search\DocumentField; +use Magento\Framework\Api\AttributeInterface; +use Magento\Framework\Api\AttributeValue; +use Magento\Framework\Api\CustomAttributesDataInterface; +use Magento\Framework\Api\Search\Document; +use Magento\Framework\Api\Search\DocumentInterface; /** * Document Factory @@ -19,6 +22,7 @@ class DocumentFactory * Object Manager instance * * @var ObjectManagerInterface + * @deprecated */ protected $objectManager; @@ -45,26 +49,27 @@ public function __construct(ObjectManagerInterface $objectManager, EntityMetadat */ public function create($rawDocument) { - /** @var DocumentField[] $fields */ - $fields = []; + /** @var AttributeValue[] $fields */ + $attributes = []; $documentId = null; $entityId = $this->entityMetadata->getEntityId(); foreach ($rawDocument as $fieldName => $value) { if ($fieldName === $entityId) { $documentId = $value; } elseif ($fieldName === '_score') { - $fields['score'] = $this->objectManager->create( - 'Magento\Framework\Search\DocumentField', - ['name' => 'score', 'value' => $value] + $attributes['score'] = new AttributeValue( + [ + AttributeInterface::ATTRIBUTE_CODE => $fieldName, + AttributeInterface::VALUE => $value, + ] ); } } - return $this->objectManager->create( - 'Magento\Framework\Search\Document', + return new Document( [ - 'documentId' => $documentId, - 'documentFields' => $fields + DocumentInterface::ID => $documentId, + CustomAttributesDataInterface::CUSTOM_ATTRIBUTES => $attributes, ] ); } diff --git a/SearchAdapter/ResponseFactory.php b/SearchAdapter/ResponseFactory.php index c6b49c9e7548e..ee382a9229dfe 100644 --- a/SearchAdapter/ResponseFactory.php +++ b/SearchAdapter/ResponseFactory.php @@ -58,7 +58,7 @@ public function create($response) { $documents = []; foreach ($response['documents'] as $rawDocument) { - /** @var \Magento\Framework\Search\Document[] $documents */ + /** @var \Magento\Framework\Api\Search\Document[] $documents */ $documents[] = $this->documentFactory->create( $rawDocument ); diff --git a/Test/Unit/SearchAdapter/DocumentFactoryTest.php b/Test/Unit/SearchAdapter/DocumentFactoryTest.php index 066fe64b0e812..af0cee5e49100 100644 --- a/Test/Unit/SearchAdapter/DocumentFactoryTest.php +++ b/Test/Unit/SearchAdapter/DocumentFactoryTest.php @@ -31,16 +31,6 @@ class DocumentFactoryTest extends \PHPUnit_Framework_TestCase */ protected $entityMetadata; - /** - * @var \Magento\Framework\Search\Document|\PHPUnit_Framework_MockObject_MockObject - */ - protected $document; - - /** - * @var \Magento\Framework\Search\DocumentField|\PHPUnit_Framework_MockObject_MockObject - */ - protected $documentField; - /** * Instance name * @@ -61,15 +51,7 @@ protected function setUp() $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface'); - $this->document = $this->getMockBuilder('Magento\Framework\Search\Document') - ->disableOriginalConstructor() - ->getMock(); - - $this->documentField = $this->getMockBuilder('\Magento\Framework\Search\DocumentField') - ->disableOriginalConstructor() - ->getMock(); - - $this->instanceName = '\Magento\Framework\Search\Document'; + $this->instanceName = '\Magento\Framework\Api\Search\Document'; $objectManagerHelper = new ObjectManagerHelper($this); $this->model = $objectManagerHelper->getObject( @@ -86,22 +68,6 @@ protected function setUp() */ public function testCreate() { - /** - * @param string $class - * - * @return \Magento\Framework\Search\Document|\Magento\Framework\Search\DocumentField|null| - * \PHPUnit_Framework_MockObject_MockObject - */ - $closure = function ($class) { - switch ($class) { - case 'Magento\Framework\Search\DocumentField': - return $this->documentField; - case 'Magento\Framework\Search\Document': - return $this->document; - } - return null; - }; - $documents = [ '_id' => 2, '_score' => 1.00, @@ -113,11 +79,9 @@ public function testCreate() ->method('getEntityId') ->willReturn('_id'); - $this->objectManager->expects($this->exactly(2)) - ->method('create') - ->will($this->returnCallback($closure)); - $result = $this->model->create($documents); $this->assertInstanceOf($this->instanceName, $result); + $this->assertEquals($documents['_id'], $result->getId()); + $this->assertEquals($documents['_score'], $result->getCustomAttribute('score')->getValue()); } } From 64f048659c53b8de3c6942076c07f215be2e2331 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Tue, 7 Jun 2016 19:21:46 +0000 Subject: [PATCH 407/616] MAGETWO-53677: Magento 2.1.0-rc2 publication (build 2.1.0-rc2.012) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 54121a7f4184b..24edabee838bd 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.1.0-rc1", + "version": "100.1.0-rc2", "license": [ "proprietary" ], From f5ac02b830813ae9238d0c426567fc7cf0ded476 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Tue, 7 Jun 2016 19:21:46 +0000 Subject: [PATCH 408/616] MAGETWO-53677: Magento 2.1.0-rc2 publication (build 2.1.0-rc2.012) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 170cc3a09eb3b..311042ce69c02 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "magento/module-customer": "100.1.*" }, "type": "magento2-module", - "version": "100.1.0-rc1", + "version": "100.1.0-rc2", "license": [ "proprietary" ], From 20b44e7a27ace4c8e3d95bfd0dd0425c2e59dfe1 Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Wed, 8 Jun 2016 11:22:01 -0500 Subject: [PATCH 409/616] MAGETWO-53336: [Elasticsearch] Advanced search not working --- .../Query/Preprocessor/Stopwords.php | 29 +++++++++++++------ .../Query/Preprocessor/StopwordsTest.php | 3 +- etc/di.xml | 1 + 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 74bd06af5bd23..24a068ee99a7c 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -29,39 +29,46 @@ class Stopwords implements PreprocessorInterface /** * @var StoreManagerInterface */ - protected $storeManager; + private $storeManager; /** * @var LocaleResolver */ - protected $localeResolver; + private $localeResolver; /** * @var ReadFactory */ - protected $readFactory; + private $readFactory; /** * @var ConfigCache */ - protected $configCache; + private $configCache; /** * @var EsConfigInterface */ - protected $esConfig; + private $esConfig; /** * @var ModuleDirReader */ - protected $moduleDirReader; + private $moduleDirReader; /** * @var string */ - protected $stopwordsModule; + private $stopwordsModule; /** + * @var string + */ + private $stopwordsDirectory; + + /** + * Initialize dependencies. + * * @param StoreManagerInterface $storeManager * @param LocaleResolver $localeResolver * @param ReadFactory $readFactory @@ -69,6 +76,7 @@ class Stopwords implements PreprocessorInterface * @param EsConfigInterface $esConfig * @param ModuleDirReader $moduleDirReader * @param string $stopwordsModule + * @param string $stopwordsDirectory */ public function __construct( StoreManagerInterface $storeManager, @@ -77,7 +85,8 @@ public function __construct( ConfigCache $configCache, EsConfigInterface $esConfig, ModuleDirReader $moduleDirReader, - $stopwordsModule = '' + $stopwordsModule = '', + $stopwordsDirectory = '' ) { $this->storeManager = $storeManager; $this->localeResolver = $localeResolver; @@ -86,6 +95,7 @@ public function __construct( $this->esConfig = $esConfig; $this->moduleDirReader = $moduleDirReader; $this->stopwordsModule = $stopwordsModule; + $this->stopwordsDirectory = $stopwordsDirectory; } /** @@ -107,7 +117,8 @@ public function process($query) protected function getStopwordsList() { $filename = $this->getStopwordsFile(); - $fileDir = $this->moduleDirReader->getModuleDir(Dir::MODULE_ETC_DIR, $this->stopwordsModule) . '/stopwords'; + $fileDir = $this->moduleDirReader->getModuleDir(Dir::MODULE_ETC_DIR, $this->stopwordsModule) + . '/' . $this->stopwordsDirectory; $source = $this->readFactory->create($fileDir); $fileStats = $source->stat($filename); if (((time() - $fileStats['mtime']) > self::STOPWORDS_FILE_MODIFICATION_TIME_GAP) diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php index aa76c2fbbe47c..c160b1a38c420 100644 --- a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php +++ b/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php @@ -82,7 +82,8 @@ protected function setUp() 'readFactory' => $this->readFactory, 'configCache' => $this->configCache, 'esConfig' => $this->esConfig, - 'fileDir' => '', + 'stopwordsModule' => '', + 'stopwordsDirectory' => '' ] ); } diff --git a/etc/di.xml b/etc/di.xml index 14bca64b88f91..a97fce3c2715d 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -121,6 +121,7 @@ Magento_Elasticsearch + stopwords From 8d5bb841fcd8eb6a94a597229b1e8751c6cb1fee Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Wed, 8 Jun 2016 15:42:35 -0500 Subject: [PATCH 410/616] MAGETWO-53336: [Elasticsearch] Advanced search not working --- SearchAdapter/Query/Preprocessor/Stopwords.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 24a068ee99a7c..06f17a672b750 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -29,32 +29,32 @@ class Stopwords implements PreprocessorInterface /** * @var StoreManagerInterface */ - private $storeManager; + protected $storeManager; /** * @var LocaleResolver */ - private $localeResolver; + protected $localeResolver; /** * @var ReadFactory */ - private $readFactory; + protected $readFactory; /** * @var ConfigCache */ - private $configCache; + protected $configCache; /** * @var EsConfigInterface */ - private $esConfig; + protected $esConfig; /** * @var ModuleDirReader */ - private $moduleDirReader; + protected $moduleDirReader; /** * @var string From 04df8ebaf6b927dfd911fd2e7d19cc6420efe00b Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Tue, 14 Jun 2016 16:18:18 -0500 Subject: [PATCH 411/616] MAGETWO-54377: Created Gift Card does not apear on Storefront Excluding giftcard_amounts attribute --- Model/Adapter/DataMapper/ProductDataMapper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 981a29c2d2c0d..5c578f07bfb85 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -139,6 +139,7 @@ public function map($productId, array $indexData, $storeId, $context = []) 'tier_price', 'quantity_and_stock_status', 'media_gallery', + 'giftcard_amounts' ] ) ) { From 0fec183194465036d4ba3f2ac950a526869e2f1e Mon Sep 17 00:00:00 2001 From: mage2-team Date: Thu, 16 Jun 2016 16:21:11 +0000 Subject: [PATCH 412/616] MAGETWO-54330: Magento 2.1.0-rc3 Publication (build 2.1.0-rc3.011) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b373835e31d89..5f7f771283769 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.1.0-rc2", + "version": "100.1.0-rc3", "license": [ "proprietary" ], From ee0b876b1713d0b5979624f06325a5cbf913c7a6 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Thu, 16 Jun 2016 16:21:11 +0000 Subject: [PATCH 413/616] MAGETWO-54330: Magento 2.1.0-rc3 Publication (build 2.1.0-rc3.011) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d971a933d373d..3ce08dabcc342 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "magento/module-customer": "100.1.*" }, "type": "magento2-module", - "version": "100.1.0-rc2", + "version": "100.1.0-rc3", "license": [ "proprietary" ], From 4ad00f20fbbcde342396c74c7b1431027234a561 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Thu, 23 Jun 2016 07:59:50 +0000 Subject: [PATCH 414/616] MAGETWO-50211: Magento 2.1.0 Publication (build 2.1.0.051) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5f7f771283769..c0e63a6823730 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.1.0-rc3", + "version": "100.1.0", "license": [ "proprietary" ], From 66a81a9245c4e4f8486849f346bcddc78551d41a Mon Sep 17 00:00:00 2001 From: mage2-team Date: Thu, 23 Jun 2016 07:59:50 +0000 Subject: [PATCH 415/616] MAGETWO-50211: Magento 2.1.0 Publication (build 2.1.0.051) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3ce08dabcc342..3d12822eb795c 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "magento/module-customer": "100.1.*" }, "type": "magento2-module", - "version": "100.1.0-rc3", + "version": "100.1.0", "license": [ "proprietary" ], From edf905d24f8e4ebe54c7ebbc0d080a667195bec5 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Thu, 23 Jun 2016 16:22:25 +0000 Subject: [PATCH 416/616] MAGETWO-54483: Magento 2.2.0-dev Publication (build 2.2.0-dev.001) --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index c0e63a6823730..bded0d1707492 100644 --- a/composer.json +++ b/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.6.0|7.0.2|~7.0.6", - "magento/module-advanced-search": "100.1.*", - "magento/module-catalog": "101.0.*", - "magento/module-catalog-search": "100.1.*", - "magento/module-customer": "100.1.*", - "magento/module-eav": "100.1.*", - "magento/module-search": "100.1.*", - "magento/module-store": "100.1.*", - "magento/framework": "100.1.*", + "magento/module-advanced-search": "100.2.*", + "magento/module-catalog": "101.1.*", + "magento/module-catalog-search": "100.2.*", + "magento/module-customer": "100.2.*", + "magento/module-eav": "100.2.*", + "magento/module-search": "100.2.*", + "magento/module-store": "100.2.*", + "magento/framework": "100.2.*", "elasticsearch/elasticsearch": "~2.0" }, "type": "magento2-module", - "version": "100.1.0", + "version": "100.2.0-dev", "license": [ "proprietary" ], From 0435701ec92882f183d5fd363f2b1be65f3475b9 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Thu, 23 Jun 2016 16:22:25 +0000 Subject: [PATCH 417/616] MAGETWO-54483: Magento 2.2.0-dev Publication (build 2.2.0-dev.001) --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 3d12822eb795c..86a0cbc46d840 100644 --- a/composer.json +++ b/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.6.0|7.0.2|~7.0.6", - "magento/framework": "100.1.*", - "magento/module-search": "100.1.*", - "magento/module-backend": "100.1.*", - "magento/module-store": "100.1.*", - "magento/module-catalog": "101.0.*", - "magento/module-catalog-search": "100.1.*", - "magento/module-config": "100.1.*", - "magento/module-customer": "100.1.*" + "magento/framework": "100.2.*", + "magento/module-search": "100.2.*", + "magento/module-backend": "100.2.*", + "magento/module-store": "100.2.*", + "magento/module-catalog": "101.1.*", + "magento/module-catalog-search": "100.2.*", + "magento/module-config": "100.2.*", + "magento/module-customer": "100.2.*" }, "type": "magento2-module", - "version": "100.1.0", + "version": "100.2.0-dev", "license": [ "proprietary" ], From 4d7db6c81e6511f0fcba227e9c489a64727d0605 Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 5 Jul 2016 14:02:49 +0300 Subject: [PATCH 418/616] MAGETWO-54737: PHP 7.0.4 Support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 86a0cbc46d840..c7b7c8fc7b145 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-advanced-search", "description": "N/A", "require": { - "php": "~5.6.0|7.0.2|~7.0.6", + "php": "~5.6.0|7.0.2|7.0.4|~7.0.6", "magento/framework": "100.2.*", "magento/module-search": "100.2.*", "magento/module-backend": "100.2.*", From 26a996f845cbf03ff4fa74dfec59b637affa83cc Mon Sep 17 00:00:00 2001 From: Bohdan Korablov Date: Tue, 5 Jul 2016 14:02:49 +0300 Subject: [PATCH 419/616] MAGETWO-54737: PHP 7.0.4 Support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bded0d1707492..a54b463d003fa 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-elasticsearch", "description": "N/A", "require": { - "php": "~5.6.0|7.0.2|~7.0.6", + "php": "~5.6.0|7.0.2|7.0.4|~7.0.6", "magento/module-advanced-search": "100.2.*", "magento/module-catalog": "101.1.*", "magento/module-catalog-search": "100.2.*", From 038302ff1146d450b219c26492e1bc45e4acf9e4 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Mon, 11 Jul 2016 21:21:59 -0500 Subject: [PATCH 420/616] MAGETWO-54652: Replace usages of deprecated escaper functions Replacing usages of escapeJsQuote and escapeQuote --- Block/Adminhtml/System/Config/TestConnection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index 89dd559469224..63af6fb8c456a 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -50,7 +50,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract 'button_label' => __($originalData['button_label']), 'html_id' => $element->getHtmlId(), 'ajax_url' => $this->_urlBuilder->getUrl('catalog/search_system_config/testconnection'), - 'field_mapping' => $this->escapeJsQuote(json_encode($this->_getFieldMapping()), '"') + 'field_mapping' => json_encode($this->_getFieldMapping(), JSON_HEX_QUOT | JSON_HEX_APOS) ] ); From 85b67a12c4df5efc46e559f44b3d52234c1b6d82 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Wed, 13 Jul 2016 13:52:07 -0500 Subject: [PATCH 421/616] MAGETWO-54652: Replace usages of deprecated escaper functions Fixing integration tests --- Block/SuggestionsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Block/SuggestionsTest.php b/Block/SuggestionsTest.php index 49e2fc0ce4bfa..4cf0a89caad88 100644 --- a/Block/SuggestionsTest.php +++ b/Block/SuggestionsTest.php @@ -41,6 +41,6 @@ public function testRenderEscaping() $this->assertNotContains('", 1) From a1b2729f4bbb572a1988f481d798ae9de81a8041 Mon Sep 17 00:00:00 2001 From: nmalevanec Date: Mon, 17 Jul 2017 13:37:40 +0300 Subject: [PATCH 524/616] MAGETWO-67048: Cannot add translate attribute into the di.xml --- Block/SearchData.php | 2 +- i18n/en_US.csv | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Block/SearchData.php b/Block/SearchData.php index 70b3a6551b44d..993731b465257 100644 --- a/Block/SearchData.php +++ b/Block/SearchData.php @@ -81,6 +81,6 @@ public function getLink($queryText) */ public function getTitle() { - return $this->title; + return __($this->title); } } diff --git a/i18n/en_US.csv b/i18n/en_US.csv index bde26dd9faeae..f8210d58888ce 100644 --- a/i18n/en_US.csv +++ b/i18n/en_US.csv @@ -11,6 +11,8 @@ button_label,button_label "Enable Search Suggestions","Enable Search Suggestions" "Search Suggestions Count","Search Suggestions Count" "Show Results Count for Each Suggestion","Show Results Count for Each Suggestion" +"Related search terms","Related search terms" +"Did you mean","Did you mean" ID,ID "Search Query","Search Query" Store,Store From 7399887cf4414eefe68ef345aa95d9786ec3819e Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Fri, 28 Jul 2017 14:39:05 -0500 Subject: [PATCH 525/616] MAGETWO-71052: 2.3 version bump --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index d2f6d074ddeb8..0e6143f3f0c11 100644 --- a/composer.json +++ b/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", - "magento/framework": "100.2.*", - "magento/module-search": "100.2.*", - "magento/module-backend": "100.2.*", - "magento/module-store": "100.2.*", - "magento/module-catalog": "101.1.*", - "magento/module-catalog-search": "100.2.*", - "magento/module-config": "100.2.*", - "magento/module-customer": "100.2.*" + "magento/framework": "100.3.*", + "magento/module-search": "100.3.*", + "magento/module-backend": "100.3.*", + "magento/module-store": "100.3.*", + "magento/module-catalog": "101.2.*", + "magento/module-catalog-search": "100.3.*", + "magento/module-config": "100.3.*", + "magento/module-customer": "100.3.*" }, "type": "magento2-module", - "version": "100.2.0-dev", + "version": "100.3.0-dev", "license": [ "proprietary" ], From 8a9e1344b27d08622198d0704883f3f875a2a28b Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 28 Jul 2017 15:51:44 -0500 Subject: [PATCH 526/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - added release number to all existing @deprecated tag in php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup) - added tag @since to all existing php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup) --- .../System/Config/TestConnection.php | 2 ++ .../CategoryFieldsProvider.php | 5 ++++ .../BatchDataMapper/DataMapperFactory.php | 5 ++++ .../BatchDataMapper/DataMapperResolver.php | 6 +++++ .../BatchDataMapper/PriceFieldsProvider.php | 7 +++++ .../BatchDataMapper/ProductDataMapper.php | 18 +++++++++++++ Model/Adapter/BatchDataMapperInterface.php | 2 ++ Model/Adapter/Container/Attribute.php | 11 +++++++- .../Adapter/DataMapper/DataMapperResolver.php | 9 ++++++- .../Adapter/DataMapper/ProductDataMapper.php | 23 +++++++++++++++- Model/Adapter/DataMapperInterface.php | 4 ++- Model/Adapter/Document/Builder.php | 7 +++++ Model/Adapter/Elasticsearch.php | 22 +++++++++++++++- .../FieldMapper/FieldMapperResolver.php | 12 +++++++++ .../FieldMapper/ProductFieldMapper.php | 14 ++++++++++ Model/Adapter/FieldMapperInterface.php | 3 +++ Model/Adapter/FieldType.php | 2 ++ Model/Adapter/FieldType/Date.php | 10 +++++++ Model/Adapter/Index/Builder.php | 15 +++++++++++ Model/Adapter/Index/BuilderInterface.php | 3 +++ Model/Adapter/Index/Config/Converter.php | 6 +++++ Model/Adapter/Index/Config/EsConfig.php | 8 ++++++ .../Index/Config/EsConfigInterface.php | 3 +++ Model/Adapter/Index/Config/SchemaLocator.php | 10 +++++++ Model/Adapter/Index/IndexNameResolver.php | 12 +++++++++ Model/Client/Elasticsearch.php | 20 ++++++++++++++ Model/Config.php | 9 +++++++ Model/DataProvider/Suggestions.php | 18 +++++++++++++ Model/Indexer/IndexStructure.php | 10 +++++++ Model/Indexer/IndexerHandler.php | 18 +++++++++++++ Model/ResourceModel/Engine.php | 9 +++++++ Model/ResourceModel/Index.php | 7 +++++ SearchAdapter/Adapter.php | 8 ++++++ SearchAdapter/Aggregation/Builder.php | 12 +++++++++ .../Builder/BucketBuilderInterface.php | 2 ++ SearchAdapter/Aggregation/Builder/Dynamic.php | 11 ++++++++ SearchAdapter/Aggregation/Builder/Term.php | 6 +++++ .../Aggregation/DataProviderFactory.php | 4 +++ SearchAdapter/Aggregation/Interval.php | 17 ++++++++++++ SearchAdapter/AggregationFactory.php | 5 ++++ SearchAdapter/ConnectionManager.php | 8 ++++++ SearchAdapter/DocumentFactory.php | 7 ++++- SearchAdapter/Dynamic/DataProvider.php | 26 ++++++++++++++++--- SearchAdapter/Filter/Builder.php | 13 ++++++++++ .../Filter/Builder/FilterInterface.php | 2 ++ SearchAdapter/Filter/Builder/Range.php | 8 ++++++ SearchAdapter/Filter/Builder/Term.php | 8 ++++++ SearchAdapter/Filter/Builder/Wildcard.php | 8 ++++++ SearchAdapter/Filter/BuilderInterface.php | 2 ++ SearchAdapter/Mapper.php | 10 +++++++ SearchAdapter/Query/Builder.php | 8 ++++++ SearchAdapter/Query/Builder/Aggregation.php | 5 ++++ SearchAdapter/Query/Builder/Match.php | 12 +++++++++ .../Query/Builder/QueryInterface.php | 2 ++ .../Query/Preprocessor/Stopwords.php | 17 +++++++++++- SearchAdapter/QueryAwareInterface.php | 1 + SearchAdapter/QueryContainer.php | 4 +++ SearchAdapter/ResponseFactory.php | 6 +++++ SearchAdapter/SearchIndexNameResolver.php | 5 ++++ 59 files changed, 516 insertions(+), 11 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index 5dc4476794da7..d1c414bbf9fbc 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -8,11 +8,13 @@ /** * Elasticsearch test connection block * @codeCoverageIgnore + * @since 2.1.0 */ class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection { /** * {@inheritdoc} + * @since 2.1.0 */ protected function _getFieldMapping() { diff --git a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php index e2de4aec717a4..629de9a251244 100644 --- a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php +++ b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php @@ -10,16 +10,19 @@ /** * Provide data mapping for categories fields + * @since 2.2.0 */ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface { /** * @var Index + * @since 2.2.0 */ private $resourceIndex; /** * @param Index $resourceIndex + * @since 2.2.0 */ public function __construct(Index $resourceIndex) { @@ -28,6 +31,7 @@ public function __construct(Index $resourceIndex) /** * {@inheritdoc} + * @since 2.2.0 */ public function getFields(array $productIds, $storeId) { @@ -47,6 +51,7 @@ public function getFields(array $productIds, $storeId) * @param int $productId * @param array $categoryIndexData * @return array + * @since 2.2.0 */ private function getProductCategoryData($productId, array $categoryIndexData) { diff --git a/Model/Adapter/BatchDataMapper/DataMapperFactory.php b/Model/Adapter/BatchDataMapper/DataMapperFactory.php index 29bdb036e206d..a337635cfb1ad 100644 --- a/Model/Adapter/BatchDataMapper/DataMapperFactory.php +++ b/Model/Adapter/BatchDataMapper/DataMapperFactory.php @@ -12,6 +12,7 @@ /** * Data mapper factory + * @since 2.2.0 */ class DataMapperFactory { @@ -19,17 +20,20 @@ class DataMapperFactory * Object Manager instance * * @var ObjectManagerInterface + * @since 2.2.0 */ private $objectManager; /** * @var string[] + * @since 2.2.0 */ private $dataMappers; /** * @param ObjectManagerInterface $objectManager * @param string[] $dataMappers + * @since 2.2.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -46,6 +50,7 @@ public function __construct( * @return BatchDataMapperInterface * @throws NoSuchEntityException * @throws ConfigurationMismatchException + * @since 2.2.0 */ public function create($entityType) { diff --git a/Model/Adapter/BatchDataMapper/DataMapperResolver.php b/Model/Adapter/BatchDataMapper/DataMapperResolver.php index fd7a64eb0c9b7..27b54f970527f 100644 --- a/Model/Adapter/BatchDataMapper/DataMapperResolver.php +++ b/Model/Adapter/BatchDataMapper/DataMapperResolver.php @@ -12,21 +12,25 @@ /** * Map index data to search engine metadata + * @since 2.2.0 */ class DataMapperResolver implements BatchDataMapperInterface { /** * @var BatchDataMapperInterface + * @since 2.2.0 */ private $dataMapperEntity; /** * @var DataMapperFactory + * @since 2.2.0 */ private $dataMapperFactory; /** * @param DataMapperFactory $dataMapperFactory + * @since 2.2.0 */ public function __construct(DataMapperFactory $dataMapperFactory) { @@ -35,6 +39,7 @@ public function __construct(DataMapperFactory $dataMapperFactory) /** * {@inheritdoc} + * @since 2.2.0 */ public function map(array $documentData, $storeId, array $context = []) { @@ -49,6 +54,7 @@ public function map(array $documentData, $storeId, array $context = []) * @return BatchDataMapperInterface * @throws NoSuchEntityException * @throws ConfigurationMismatchException + * @since 2.2.0 */ private function getDataMapper($entityType) { diff --git a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php index aa8965713c32a..83599eab7ee05 100644 --- a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php +++ b/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php @@ -12,21 +12,25 @@ /** * Provide data mapping for price fields + * @since 2.2.0 */ class PriceFieldsProvider implements AdditionalFieldsProviderInterface { /** * @var Index + * @since 2.2.0 */ private $resourceIndex; /** * @var DataProvider + * @since 2.2.0 */ private $dataProvider; /** * @var StoreManagerInterface + * @since 2.2.0 */ private $storeManager; @@ -34,6 +38,7 @@ class PriceFieldsProvider implements AdditionalFieldsProviderInterface * @param Index $resourceIndex * @param DataProvider $dataProvider * @param StoreManagerInterface $storeManager + * @since 2.2.0 */ public function __construct( Index $resourceIndex, @@ -47,6 +52,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.2.0 */ public function getFields(array $productIds, $storeId) { @@ -70,6 +76,7 @@ public function getFields(array $productIds, $storeId) * @param int $websiteId * @param array $priceIndexData * @return array + * @since 2.2.0 */ private function getProductPriceData($productId, $websiteId, array $priceIndexData) { diff --git a/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/Model/Adapter/BatchDataMapper/ProductDataMapper.php index bff9cdd68206a..99ee18523e967 100644 --- a/Model/Adapter/BatchDataMapper/ProductDataMapper.php +++ b/Model/Adapter/BatchDataMapper/ProductDataMapper.php @@ -15,41 +15,49 @@ /** * Map product index data to search engine metadata + * @since 2.2.0 */ class ProductDataMapper implements BatchDataMapperInterface { /** * @var Builder + * @since 2.2.0 */ private $builder; /** * @var FieldMapperInterface + * @since 2.2.0 */ private $fieldMapper; /** * @var DateFieldType + * @since 2.2.0 */ private $dateFieldType; /** * @var array + * @since 2.2.0 */ private $attributeData = []; /** * @var array + * @since 2.2.0 */ private $excludedAttributes; /** * @var AdditionalFieldsProviderInterface + * @since 2.2.0 */ private $additionalFieldsProvider; /** * @var DataProvider + * @since 2.2.0 */ private $dataProvider; @@ -57,6 +65,7 @@ class ProductDataMapper implements BatchDataMapperInterface * List of attributes which will be skipped during mapping * * @var string[] + * @since 2.2.0 */ private $defaultExcludedAttributes = [ 'price', @@ -69,6 +78,7 @@ class ProductDataMapper implements BatchDataMapperInterface /** * @var string[] + * @since 2.2.0 */ private $attributesExcludedFromMerge = [ 'status', @@ -85,6 +95,7 @@ class ProductDataMapper implements BatchDataMapperInterface * @param AdditionalFieldsProviderInterface $additionalFieldsProvider * @param DataProvider $dataProvider * @param array $excludedAttributes + * @since 2.2.0 */ public function __construct( Builder $builder, @@ -104,6 +115,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.2.0 */ public function map(array $documentData, $storeId, array $context = []) { @@ -153,6 +165,7 @@ public function map(array $documentData, $storeId, array $context = []) * @param array $indexData * @param int $storeId * @return array + * @since 2.2.0 */ private function convertToProductData($productId, array $indexData, $storeId) { @@ -186,6 +199,7 @@ private function convertToProductData($productId, array $indexData, $storeId) * @param array $attributeData * @param int $storeId * @return array + * @since 2.2.0 */ private function convertAttribute($productId, $attributeId, $attributeValue, array $attributeData, $storeId) { @@ -246,6 +260,7 @@ private function convertAttribute($productId, $attributeId, $attributeValue, arr * * @param int $attributeId * @return array + * @since 2.2.0 */ private function getAttributeData($attributeId) { @@ -280,6 +295,7 @@ private function getAttributeData($attributeId) * @param array $attributeData * @param string $storeId * @return string + * @since 2.2.0 */ private function formatProductAttributeValue($value, $attributeData, $storeId) { @@ -301,6 +317,7 @@ private function formatProductAttributeValue($value, $attributeData, $storeId) * @param array $attributeValue * @param bool $isSearchable * @return mixed + * @since 2.2.0 */ private function getValueForAttribute($productId, $attributeCode, array $attributeValue, $isSearchable) { @@ -320,6 +337,7 @@ private function getValueForAttribute($productId, $attributeCode, array $attribu * @param array $attributeData * @param array $attributeValue * @return string + * @since 2.2.0 */ private function getValueForAttributeOptions(array $attributeData, array $attributeValue) { diff --git a/Model/Adapter/BatchDataMapperInterface.php b/Model/Adapter/BatchDataMapperInterface.php index 9801d9afbe792..265b2fd2c722d 100644 --- a/Model/Adapter/BatchDataMapperInterface.php +++ b/Model/Adapter/BatchDataMapperInterface.php @@ -9,6 +9,7 @@ * Map index data to search engine metadata * Convert array [[attribute_id => [entity_id => value], ... ]] to applicable for search engine [[attribute => value],] * @api + * @since 2.2.0 */ interface BatchDataMapperInterface { @@ -19,6 +20,7 @@ interface BatchDataMapperInterface * @param int $storeId * @param array $context * @return array + * @since 2.2.0 */ public function map(array $documentData, $storeId, array $context = []); } diff --git a/Model/Adapter/Container/Attribute.php b/Model/Adapter/Container/Attribute.php index d78dd7e116ac8..6d04106aaec8c 100644 --- a/Model/Adapter/Container/Attribute.php +++ b/Model/Adapter/Container/Attribute.php @@ -9,29 +9,34 @@ use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute; /** - * @deprecated + * @deprecated 2.2.0 * This class is used only in deprecated \Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper * and must not be used for new code + * @since 2.1.0 */ class Attribute { /** * @var string[] + * @since 2.1.0 */ private $idToCodeMap = []; /** * @var Collection + * @since 2.1.0 */ private $attributeCollection; /** * @var EavAttribute[] + * @since 2.1.0 */ private $attributes = []; /** * @param Collection $attributeCollection + * @since 2.1.0 */ public function __construct(Collection $attributeCollection) { @@ -41,6 +46,7 @@ public function __construct(Collection $attributeCollection) /** * @param int $attributeId * @return string + * @since 2.1.0 */ public function getAttributeCodeById($attributeId) { @@ -56,6 +62,7 @@ public function getAttributeCodeById($attributeId) /** * @param string $attributeCode * @return int + * @since 2.1.0 */ public function getAttributeIdByCode($attributeCode) { @@ -72,6 +79,7 @@ public function getAttributeIdByCode($attributeCode) /** * @param string $attributeCode * @return EavAttribute|null + * @since 2.1.0 */ public function getAttribute($attributeCode) { @@ -83,6 +91,7 @@ public function getAttribute($attributeCode) /** * @return EavAttribute[] + * @since 2.1.0 */ public function getAttributes() { diff --git a/Model/Adapter/DataMapper/DataMapperResolver.php b/Model/Adapter/DataMapper/DataMapperResolver.php index 6f4fd0c6d2757..58ecd16c244ef 100644 --- a/Model/Adapter/DataMapper/DataMapperResolver.php +++ b/Model/Adapter/DataMapper/DataMapperResolver.php @@ -10,8 +10,9 @@ use Magento\Elasticsearch\Model\Config; /** - * @deprecated + * @deprecated 2.2.0 * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface + * @since 2.1.0 */ class DataMapperResolver implements DataMapperInterface { @@ -19,11 +20,13 @@ class DataMapperResolver implements DataMapperInterface * Object Manager instance * * @var ObjectManagerInterface + * @since 2.1.0 */ private $objectManager; /** * @var string[] + * @since 2.1.0 */ private $dataMappers; @@ -31,12 +34,14 @@ class DataMapperResolver implements DataMapperInterface * Data Mapper instance * * @var DataMapperInterface + * @since 2.1.0 */ private $dataMapperEntity; /** * @param ObjectManagerInterface $objectManager * @param string[] $dataMappers + * @since 2.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -48,6 +53,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function map( $entityId, @@ -65,6 +71,7 @@ public function map( * @param string $entityType * @return DataMapperInterface * @throws \Exception + * @since 2.1.0 */ private function getEntity($entityType = '') { diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 5008a8b0b7718..4b5a0c4b659db 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -16,8 +16,9 @@ use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType; /** - * @deprecated + * @deprecated 2.2.0 * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface + * @since 2.1.0 */ class ProductDataMapper implements DataMapperInterface { @@ -43,31 +44,37 @@ class ProductDataMapper implements DataMapperInterface /** * @var Builder + * @since 2.1.0 */ private $builder; /** * @var AttributeContainer + * @since 2.1.0 */ private $attributeContainer; /** * @var Index + * @since 2.1.0 */ private $resourceIndex; /** * @var FieldMapperInterface + * @since 2.1.0 */ private $fieldMapper; /** * @var StoreManagerInterface + * @since 2.1.0 */ private $storeManager; /** * @var DateFieldType + * @since 2.1.0 */ private $dateFieldType; @@ -75,6 +82,7 @@ class ProductDataMapper implements DataMapperInterface * Media gallery roles * * @var array + * @since 2.1.0 */ protected $mediaGalleryRoles; @@ -87,6 +95,7 @@ class ProductDataMapper implements DataMapperInterface * @param FieldMapperInterface $fieldMapper * @param StoreManagerInterface $storeManager * @param DateFieldType $dateFieldType + * @since 2.1.0 */ public function __construct( Builder $builder, @@ -119,6 +128,7 @@ public function __construct( * @param int $storeId * @param array $context * @return array|false + * @since 2.1.0 */ public function map($productId, array $indexData, $storeId, $context = []) { @@ -171,6 +181,7 @@ public function map($productId, array $indexData, $storeId, $context = []) * @param array $productIndexData * @param int $storeId * @return void + * @since 2.1.0 */ protected function processAdvancedAttributes($productId, array $productIndexData, $storeId) { @@ -207,6 +218,7 @@ protected function processAdvancedAttributes($productId, array $productIndexData * @param Attribute $attribute * @param string $storeId * @return array|mixed|null|string + * @since 2.1.0 */ protected function checkValue($value, $attribute, $storeId) { @@ -225,6 +237,7 @@ protected function checkValue($value, $attribute, $storeId) * * @param array $data * @return array + * @since 2.1.0 */ protected function getProductTierPriceData($data) { @@ -253,6 +266,7 @@ protected function getProductTierPriceData($data) * @param array $media * @param array $roles * @return array + * @since 2.1.0 */ protected function getProductMediaGalleryData($media, $roles) { @@ -296,6 +310,7 @@ protected function getProductMediaGalleryData($media, $roles) * @param string $file * @param array $roles * @return string + * @since 2.1.0 */ protected function getMediaRoleImage($file, $roles) { @@ -306,6 +321,7 @@ protected function getMediaRoleImage($file, $roles) * @param string $file * @param array $roles * @return string + * @since 2.1.0 */ protected function getMediaRoleSmallImage($file, $roles) { @@ -316,6 +332,7 @@ protected function getMediaRoleSmallImage($file, $roles) * @param string $file * @param array $roles * @return string + * @since 2.1.0 */ protected function getMediaRoleThumbnail($file, $roles) { @@ -326,6 +343,7 @@ protected function getMediaRoleThumbnail($file, $roles) * @param string $file * @param array $roles * @return string + * @since 2.1.0 */ protected function getMediaRoleSwatchImage($file, $roles) { @@ -337,6 +355,7 @@ protected function getMediaRoleSwatchImage($file, $roles) * * @param array $data * @return array + * @since 2.1.0 */ protected function getQtyAndStatus($data) { @@ -358,6 +377,7 @@ protected function getQtyAndStatus($data) * @param int $storeId * @param array $priceIndexData * @return array + * @since 2.1.0 */ protected function getProductPriceData($productId, $storeId, array $priceIndexData) { @@ -379,6 +399,7 @@ protected function getProductPriceData($productId, $storeId, array $priceIndexDa * @param int $productId * @param array $categoryIndexData * @return array + * @since 2.1.0 */ protected function getProductCategoryData($productId, array $categoryIndexData) { diff --git a/Model/Adapter/DataMapperInterface.php b/Model/Adapter/DataMapperInterface.php index 301f75027cc19..3be70480d114f 100644 --- a/Model/Adapter/DataMapperInterface.php +++ b/Model/Adapter/DataMapperInterface.php @@ -6,8 +6,9 @@ namespace Magento\Elasticsearch\Model\Adapter; /** - * @deprecated + * @deprecated 2.2.0 * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface + * @since 2.1.0 */ interface DataMapperInterface { @@ -19,6 +20,7 @@ interface DataMapperInterface * @param int $storeId * @param array $context * @return array + * @since 2.1.0 */ public function map($entityId, array $entityIndexData, $storeId, $context = []); } diff --git a/Model/Adapter/Document/Builder.php b/Model/Adapter/Document/Builder.php index c6f3d759f2e85..ecf4d454bdc2a 100644 --- a/Model/Adapter/Document/Builder.php +++ b/Model/Adapter/Document/Builder.php @@ -7,16 +7,19 @@ /** * @api + * @since 2.1.0 */ class Builder { /** * @var array + * @since 2.1.0 */ private $fields = []; /** * @return array + * @since 2.1.0 */ public function build() { @@ -30,6 +33,7 @@ public function build() /** * @return void + * @since 2.1.0 */ private function clear() { @@ -41,6 +45,7 @@ private function clear() * @param string $field * @param string|int|float $value * @return array + * @since 2.1.0 */ private function addFieldToDocument($document, $field, $value) { @@ -65,6 +70,7 @@ private function addFieldToDocument($document, $field, $value) * @param string $field * @param string|array|int|float $value * @return $this + * @since 2.1.0 */ public function addField($field, $value) { @@ -75,6 +81,7 @@ public function addField($field, $value) /** * @param array $fields * @return $this + * @since 2.1.0 */ public function addFields(array $fields) { diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 589d1ad1c0fe8..4631855e40739 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -9,6 +9,7 @@ /** * Elasticsearch adapter + * @since 2.1.0 */ class Elasticsearch { @@ -28,47 +29,56 @@ class Elasticsearch /** * @var DataMapperInterface - * @deprecated Will be replaced with BatchDataMapperInterface + * @deprecated 2.2.0 Will be replaced with BatchDataMapperInterface + * @since 2.1.0 */ protected $documentDataMapper; /** * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver + * @since 2.1.0 */ protected $indexNameResolver; /** * @var FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @var \Magento\Elasticsearch\Model\Config + * @since 2.1.0 */ protected $clientConfig; /** * @var \Magento\Elasticsearch\Model\Client\Elasticsearch + * @since 2.1.0 */ protected $client; /** * @var \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface + * @since 2.1.0 */ protected $indexBuilder; /** * @var \Psr\Log\LoggerInterface + * @since 2.1.0 */ protected $logger; /** * @var array + * @since 2.1.0 */ protected $preparedIndex = []; /** * @var BatchDataMapperInterface + * @since 2.2.0 */ private $batchDocumentDataMapper; @@ -85,6 +95,7 @@ class Elasticsearch * @param array $options * @param BatchDataMapperInterface $batchDocumentDataMapper * @throws \Magento\Framework\Exception\LocalizedException + * @since 2.1.0 */ public function __construct( \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, @@ -122,6 +133,7 @@ public function __construct( * * @return bool * @throws \Magento\Framework\Exception\LocalizedException + * @since 2.1.0 */ public function ping() { @@ -141,6 +153,7 @@ public function ping() * @param array $documentData * @param int $storeId * @return array + * @since 2.1.0 */ public function prepareDocsPerStore(array $documentData, $storeId) { @@ -162,6 +175,7 @@ public function prepareDocsPerStore(array $documentData, $storeId) * @param string $mappedIndexerId * @return $this * @throws \Exception + * @since 2.1.0 */ public function addDocs(array $documents, $storeId, $mappedIndexerId) { @@ -185,6 +199,7 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId) * @param int $storeId * @param string $mappedIndexerId * @return $this + * @since 2.1.0 */ public function cleanIndex($storeId, $mappedIndexerId) { @@ -219,6 +234,7 @@ public function cleanIndex($storeId, $mappedIndexerId) * @param string $mappedIndexerId * @return $this * @throws \Exception + * @since 2.1.0 */ public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId) { @@ -246,6 +262,7 @@ public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId) * @param string $indexName * @param string $action * @return array + * @since 2.1.0 */ protected function getDocsArrayInBulkIndexFormat( $documents, @@ -282,6 +299,7 @@ protected function getDocsArrayInBulkIndexFormat( * @param bool $checkAlias * @param string $mappedIndexerId * @return $this + * @since 2.1.0 */ public function checkIndex( $storeId, @@ -310,6 +328,7 @@ public function checkIndex( * @param int $storeId * @param string $mappedIndexerId * @return $this + * @since 2.1.0 */ public function updateAlias($storeId, $mappedIndexerId) { @@ -343,6 +362,7 @@ public function updateAlias($storeId, $mappedIndexerId) * @param string $indexName * @param string $mappedIndexerId * @return $this + * @since 2.1.0 */ protected function prepareIndex($storeId, $indexName, $mappedIndexerId) { diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/Model/Adapter/FieldMapper/FieldMapperResolver.php index 4d341905b9926..4dfa1acaf32b7 100644 --- a/Model/Adapter/FieldMapper/FieldMapperResolver.php +++ b/Model/Adapter/FieldMapper/FieldMapperResolver.php @@ -9,17 +9,24 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; +/** + * Class \Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver + * + * @since 2.1.0 + */ class FieldMapperResolver implements FieldMapperInterface { /** * Object Manager instance * * @var ObjectManagerInterface + * @since 2.1.0 */ private $objectManager; /** * @var string[] + * @since 2.1.0 */ private $fieldMappers; @@ -27,12 +34,14 @@ class FieldMapperResolver implements FieldMapperInterface * Field Mapper instance * * @var FieldMapperInterface + * @since 2.1.0 */ private $fieldMapperEntity; /** * @param ObjectManagerInterface $objectManager * @param string[] $fieldMappers + * @since 2.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -44,6 +53,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function getFieldName($attributeCode, $context = []) { @@ -53,6 +63,7 @@ public function getFieldName($attributeCode, $context = []) /** * {@inheritdoc} + * @since 2.1.0 */ public function getAllAttributesTypes($context = []) { @@ -66,6 +77,7 @@ public function getAllAttributesTypes($context = []) * @param string $entityType * @return FieldMapperInterface * @throws \Exception + * @since 2.1.0 */ private function getEntity($entityType) { diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 70646a1ee401e..7e12e88d77460 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -15,21 +15,25 @@ /** * Class ProductFieldMapper + * @since 2.1.0 */ class ProductFieldMapper implements FieldMapperInterface { /** * @var Config + * @since 2.1.0 */ protected $eavConfig; /** * @var FieldType + * @since 2.1.0 */ protected $fieldType; /** * @var CustomerSession + * @since 2.1.0 */ protected $customerSession; @@ -37,6 +41,7 @@ class ProductFieldMapper implements FieldMapperInterface * Store manager * * @var StoreManager + * @since 2.1.0 */ protected $storeManager; @@ -44,6 +49,7 @@ class ProductFieldMapper implements FieldMapperInterface * Core registry * * @var Registry + * @since 2.1.0 */ protected $coreRegistry; @@ -53,6 +59,7 @@ class ProductFieldMapper implements FieldMapperInterface * @param CustomerSession $customerSession * @param StoreManager $storeManager * @param Registry $coreRegistry + * @since 2.1.0 */ public function __construct( Config $eavConfig, @@ -70,6 +77,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function getFieldName($attributeCode, $context = []) { @@ -106,6 +114,7 @@ public function getFieldName($attributeCode, $context = []) /** * {@inheritdoc} + * @since 2.1.0 */ public function getAllAttributesTypes($context = []) { @@ -146,6 +155,7 @@ public function getAllAttributesTypes($context = []) /** * @param Object $attribute * @return bool + * @since 2.1.0 */ protected function isAttributeUsedInAdvancedSearch($attribute) { @@ -159,6 +169,7 @@ protected function isAttributeUsedInAdvancedSearch($attribute) * @param string $fieldType * @param string $attributeCode * @return string + * @since 2.1.0 */ protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode) { @@ -171,6 +182,7 @@ protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCod * @param string $fieldType * @param string $attributeCode * @return string + * @since 2.1.0 */ protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode) { @@ -187,6 +199,7 @@ protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeC * * @param array $context * @return string + * @since 2.1.0 */ protected function getPositionFiledName($context) { @@ -205,6 +218,7 @@ protected function getPositionFiledName($context) * * @param array $context * @return string + * @since 2.1.0 */ protected function getPriceFieldName($context) { diff --git a/Model/Adapter/FieldMapperInterface.php b/Model/Adapter/FieldMapperInterface.php index 52337d343703f..e0ab846ec4bec 100644 --- a/Model/Adapter/FieldMapperInterface.php +++ b/Model/Adapter/FieldMapperInterface.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.1.0 */ interface FieldMapperInterface { @@ -24,6 +25,7 @@ interface FieldMapperInterface * @param string $attributeCode * @param array $context * @return string + * @since 2.1.0 */ public function getFieldName($attributeCode, $context = []); @@ -32,6 +34,7 @@ public function getFieldName($attributeCode, $context = []); * * @param array $context * @return array + * @since 2.1.0 */ public function getAllAttributesTypes($context = []); } diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 7c7c336a9d282..02f995cebe6b8 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -10,6 +10,7 @@ /** * Class FieldType * @api + * @since 2.1.0 */ class FieldType { @@ -28,6 +29,7 @@ class FieldType /** * @param AbstractAttribute $attribute * @return string + * @since 2.1.0 */ public function getFieldType($attribute) { diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php index ecae1a4ccca91..53ab4246f83bc 100644 --- a/Model/Adapter/FieldType/Date.php +++ b/Model/Adapter/FieldType/Date.php @@ -9,20 +9,28 @@ use Magento\Framework\Stdlib\DateTime; use Magento\Framework\Stdlib\DateTime\TimezoneInterface; +/** + * Class \Magento\Elasticsearch\Model\Adapter\FieldType\Date + * + * @since 2.1.0 + */ class Date { /** * @var DateTime + * @since 2.1.0 */ private $dateTime; /** * @var TimezoneInterface + * @since 2.1.0 */ private $localeDate; /** * @var ScopeConfigInterface + * @since 2.1.0 */ private $scopeConfig; @@ -32,6 +40,7 @@ class Date * @param DateTime $dateTime * @param TimezoneInterface $localeDate * @param ScopeConfigInterface $scopeConfig + * @since 2.1.0 */ public function __construct( DateTime $dateTime, @@ -51,6 +60,7 @@ public function __construct( * @param string|null $date * @return string|null * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @since 2.1.0 */ public function formatDate($storeId, $date = null) { diff --git a/Model/Adapter/Index/Builder.php b/Model/Adapter/Index/Builder.php index 773faf49f8fda..39d4172df861e 100644 --- a/Model/Adapter/Index/Builder.php +++ b/Model/Adapter/Index/Builder.php @@ -8,15 +8,22 @@ use Magento\Framework\Locale\Resolver as LocaleResolver; use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; +/** + * Class \Magento\Elasticsearch\Model\Adapter\Index\Builder + * + * @since 2.1.0 + */ class Builder implements BuilderInterface { /** * @var LocaleResolver + * @since 2.1.0 */ protected $localeResolver; /** * @var EsConfigInterface + * @since 2.1.0 */ protected $esConfig; @@ -24,12 +31,14 @@ class Builder implements BuilderInterface * Current store ID. * * @var int + * @since 2.1.0 */ protected $storeId; /** * @param LocaleResolver $localeResolver * @param EsConfigInterface $esConfig + * @since 2.1.0 */ public function __construct( LocaleResolver $localeResolver, @@ -41,6 +50,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function build() { @@ -72,6 +82,7 @@ public function build() /** * {@inheritdoc} + * @since 2.1.0 */ public function setStoreId($storeId) { @@ -80,6 +91,7 @@ public function setStoreId($storeId) /** * @return array + * @since 2.1.0 */ protected function getTokenizer() { @@ -93,6 +105,7 @@ protected function getTokenizer() /** * @return array + * @since 2.1.0 */ protected function getFilter() { @@ -108,6 +121,7 @@ protected function getFilter() /** * @return array + * @since 2.1.0 */ protected function getCharFilter() { @@ -121,6 +135,7 @@ protected function getCharFilter() /** * @return array + * @since 2.1.0 */ protected function getStemmerConfig() { diff --git a/Model/Adapter/Index/BuilderInterface.php b/Model/Adapter/Index/BuilderInterface.php index c8d58aa3e2098..fefe76f790e40 100644 --- a/Model/Adapter/Index/BuilderInterface.php +++ b/Model/Adapter/Index/BuilderInterface.php @@ -7,17 +7,20 @@ /** * @api + * @since 2.1.0 */ interface BuilderInterface { /** * @return array + * @since 2.1.0 */ public function build(); /** * @param int $storeId * @return void + * @since 2.1.0 */ public function setStoreId($storeId); } diff --git a/Model/Adapter/Index/Config/Converter.php b/Model/Adapter/Index/Config/Converter.php index 54400b3ea72d7..447e5ced4b12a 100644 --- a/Model/Adapter/Index/Config/Converter.php +++ b/Model/Adapter/Index/Config/Converter.php @@ -7,10 +7,16 @@ use Magento\Framework\Config\ConverterInterface; +/** + * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\Converter + * + * @since 2.1.0 + */ class Converter implements ConverterInterface { /** * {@inheritdoc} + * @since 2.1.0 */ public function convert($source) { diff --git a/Model/Adapter/Index/Config/EsConfig.php b/Model/Adapter/Index/Config/EsConfig.php index f3c9e34d6076e..0ca5cd8676666 100644 --- a/Model/Adapter/Index/Config/EsConfig.php +++ b/Model/Adapter/Index/Config/EsConfig.php @@ -10,6 +10,11 @@ use Magento\Framework\Config\ReaderInterface; use Magento\Framework\Serialize\SerializerInterface; +/** + * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig + * + * @since 2.1.0 + */ class EsConfig extends Data implements EsConfigInterface { /** @@ -17,6 +22,7 @@ class EsConfig extends Data implements EsConfigInterface * @param CacheInterface $cache * @param string $cacheId * @param SerializerInterface|null $serializer + * @since 2.1.0 */ public function __construct( ReaderInterface $reader, @@ -29,6 +35,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function getStemmerInfo() { @@ -37,6 +44,7 @@ public function getStemmerInfo() /** * {@inheritdoc} + * @since 2.1.0 */ public function getStopwordsInfo() { diff --git a/Model/Adapter/Index/Config/EsConfigInterface.php b/Model/Adapter/Index/Config/EsConfigInterface.php index 62ffe85c5a0c4..9bff1a07090c2 100644 --- a/Model/Adapter/Index/Config/EsConfigInterface.php +++ b/Model/Adapter/Index/Config/EsConfigInterface.php @@ -7,16 +7,19 @@ /** * @api + * @since 2.1.0 */ interface EsConfigInterface { /** * @return array + * @since 2.1.0 */ public function getStemmerInfo(); /** * @return array + * @since 2.1.0 */ public function getStopwordsInfo(); } diff --git a/Model/Adapter/Index/Config/SchemaLocator.php b/Model/Adapter/Index/Config/SchemaLocator.php index 182523042e07a..4ba9dc62ca61b 100644 --- a/Model/Adapter/Index/Config/SchemaLocator.php +++ b/Model/Adapter/Index/Config/SchemaLocator.php @@ -8,6 +8,11 @@ use Magento\Framework\Config\SchemaLocatorInterface; use Magento\Framework\Module\Dir; +/** + * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator + * + * @since 2.1.0 + */ class SchemaLocator implements SchemaLocatorInterface { /** @@ -19,17 +24,20 @@ class SchemaLocator implements SchemaLocatorInterface * Path to corresponding XSD file with validation rules for merged config * * @var string + * @since 2.1.0 */ protected $schema = null; /** * Path to corresponding XSD file with validation rules for separate config files * @var string + * @since 2.1.0 */ protected $perFileSchema = null; /** * @param \Magento\Framework\Module\Dir\Reader $moduleReader + * @since 2.1.0 */ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader) { @@ -40,6 +48,7 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader) /** * {@inheritdoc} + * @since 2.1.0 */ public function getSchema() { @@ -48,6 +57,7 @@ public function getSchema() /** * {@inheritdoc} + * @since 2.1.0 */ public function getPerFileSchema() { diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index f04f8b503f989..4285301c96b06 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -15,26 +15,31 @@ /** * Index name resolver * @api + * @since 2.1.0 */ class IndexNameResolver { /** * @var ConnectionManager + * @since 2.1.0 */ protected $connectionManager; /** * @var Config + * @since 2.1.0 */ protected $clientConfig; /** * @var ElasticsearchClient + * @since 2.1.0 */ protected $client; /** * @var LoggerInterface + * @since 2.1.0 */ protected $logger; @@ -46,6 +51,7 @@ class IndexNameResolver * @param LoggerInterface $logger * @param array $options * @throws LocalizedException + * @since 2.1.0 */ public function __construct( ConnectionManager $connectionManager, @@ -71,6 +77,7 @@ public function __construct( * Get index namespace from config * * @return string + * @since 2.1.0 */ protected function getIndexNamespace() { @@ -84,6 +91,7 @@ protected function getIndexNamespace() * @param string $mappedIndexerId * * @return string + * @since 2.1.0 */ public function getIndexNameForAlias($storeId, $mappedIndexerId) { @@ -97,6 +105,7 @@ public function getIndexNameForAlias($storeId, $mappedIndexerId) * @param string $mappedIndexerId * @param array $preparedIndex * @return string + * @since 2.1.0 */ public function getIndexName($storeId, $mappedIndexerId, array $preparedIndex) { @@ -117,6 +126,7 @@ public function getIndexName($storeId, $mappedIndexerId, array $preparedIndex) * @param int $storeId * @param string $mappedIndexerId * @return string + * @since 2.1.0 */ public function getIndexPattern($storeId, $mappedIndexerId) { @@ -129,6 +139,7 @@ public function getIndexPattern($storeId, $mappedIndexerId) * @param int $storeId * @param string $mappedIndexerId * @return string + * @since 2.1.0 */ public function getIndexFromAlias($storeId, $mappedIndexerId) { @@ -153,6 +164,7 @@ public function getIndexFromAlias($storeId, $mappedIndexerId) * * @param string $indexerId * @return string + * @since 2.1.0 */ public function getIndexMapping($indexerId) { diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index eeb210d9edbd5..0ce3a04353392 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -10,6 +10,7 @@ /** * Elasticsearch client + * @since 2.1.0 */ class Elasticsearch implements ClientInterface { @@ -17,16 +18,19 @@ class Elasticsearch implements ClientInterface * Elasticsearch Client instance * * @var \Elasticsearch\Client + * @since 2.1.0 */ protected $client; /** * @var array + * @since 2.1.0 */ protected $clientOptions; /** * @var bool + * @since 2.1.0 */ protected $pingResult; @@ -36,6 +40,7 @@ class Elasticsearch implements ClientInterface * @param array $options * @param \Elasticsearch\Client|null $elasticsearchClient * @throws LocalizedException + * @since 2.1.0 */ public function __construct( $options = [], @@ -60,6 +65,7 @@ public function __construct( * Ping the Elasticsearch client * * @return bool + * @since 2.1.0 */ public function ping() { @@ -73,6 +79,7 @@ public function ping() * Validate connection params * * @return bool + * @since 2.1.0 */ public function testConnection() { @@ -82,6 +89,7 @@ public function testConnection() /** * @param array $options * @return array + * @since 2.1.0 */ private function buildConfig($options = []) { @@ -106,6 +114,7 @@ private function buildConfig($options = []) * * @param array $query * @return void + * @since 2.1.0 */ public function bulkQuery($query) { @@ -118,6 +127,7 @@ public function bulkQuery($query) * @param string $index * @param array $settings * @return void + * @since 2.1.0 */ public function createIndex($index, $settings) { @@ -132,6 +142,7 @@ public function createIndex($index, $settings) * * @param string $index * @return void + * @since 2.1.0 */ public function deleteIndex($index) { @@ -143,6 +154,7 @@ public function deleteIndex($index) * * @param string $index * @return bool + * @since 2.1.0 */ public function isEmptyIndex($index) { @@ -160,6 +172,7 @@ public function isEmptyIndex($index) * @param string $newIndex * @param string $oldIndex * @return void + * @since 2.1.0 */ public function updateAlias($alias, $newIndex, $oldIndex = '') { @@ -179,6 +192,7 @@ public function updateAlias($alias, $newIndex, $oldIndex = '') * * @param string $index * @return bool + * @since 2.1.0 */ public function indexExists($index) { @@ -190,6 +204,7 @@ public function indexExists($index) * @param string $index * * @return bool + * @since 2.1.0 */ public function existsAlias($alias, $index = '') { @@ -204,6 +219,7 @@ public function existsAlias($alias, $index = '') * @param string $alias * * @return array + * @since 2.1.0 */ public function getAlias($alias) { @@ -217,6 +233,7 @@ public function getAlias($alias) * @param string $index * @param string $entityType * @return void + * @since 2.1.0 */ public function addFieldsMapping(array $fields, $index, $entityType) { @@ -275,6 +292,7 @@ public function addFieldsMapping(array $fields, $index, $entityType) * @param string $index * @param string $entityType * @return void + * @since 2.1.0 */ public function deleteMapping($index, $entityType) { @@ -289,6 +307,7 @@ public function deleteMapping($index, $entityType) * * @param array $query * @return array + * @since 2.1.0 */ public function query($query) { @@ -300,6 +319,7 @@ public function query($query) * * @param array $query * @return array + * @since 2.1.0 */ public function suggest($query) { diff --git a/Model/Config.php b/Model/Config.php index 979b7eacbd21c..fcad27df1abf5 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -12,6 +12,7 @@ /** * Elasticsearch config model * @api + * @since 2.1.0 */ class Config implements ClientOptionsInterface { @@ -37,6 +38,7 @@ class Config implements ClientOptionsInterface /** * @var ScopeConfigInterface + * @since 2.1.0 */ protected $scopeConfig; @@ -44,6 +46,7 @@ class Config implements ClientOptionsInterface * Constructor * * @param ScopeConfigInterface $scopeConfig + * @since 2.1.0 */ public function __construct( ScopeConfigInterface $scopeConfig @@ -53,6 +56,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function prepareClientOptions($options = []) { @@ -75,6 +79,7 @@ public function prepareClientOptions($options = []) * @param string $field * @param int $storeId * @return string|int + * @since 2.1.0 */ public function getElasticsearchConfigData($field, $storeId = null) { @@ -87,6 +92,7 @@ public function getElasticsearchConfigData($field, $storeId = null) * @param string $field * @param int|null $storeId * @return string|int + * @since 2.1.0 */ public function getSearchConfigData($field, $storeId = null) { @@ -98,6 +104,7 @@ public function getSearchConfigData($field, $storeId = null) * Return true if third party search engine is used * * @return bool + * @since 2.1.0 */ public function isElasticsearchEnabled() { @@ -108,6 +115,7 @@ public function isElasticsearchEnabled() * Get Elasticsearch index prefix * * @return string + * @since 2.1.0 */ public function getIndexPrefix() { @@ -118,6 +126,7 @@ public function getIndexPrefix() * get Elasticsearch entity type * * @return string + * @since 2.1.0 */ public function getEntityType() { diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 8ebd45596d399..2ee0cba54df93 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -15,6 +15,11 @@ use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; use Magento\Store\Model\StoreManagerInterface as StoreManager; +/** + * Class \Magento\Elasticsearch\Model\DataProvider\Suggestions + * + * @since 2.1.0 + */ class Suggestions implements SuggestedQueriesInterface { /** @@ -37,31 +42,37 @@ class Suggestions implements SuggestedQueriesInterface /** * @var Config + * @since 2.1.0 */ private $config; /** * @var QueryResultFactory + * @since 2.1.0 */ private $queryResultFactory; /** * @var ConnectionManager + * @since 2.1.0 */ private $connectionManager; /** * @var ScopeConfigInterface + * @since 2.1.0 */ private $scopeConfig; /** * @var SearchIndexNameResolver + * @since 2.1.0 */ private $searchIndexNameResolver; /** * @var StoreManager + * @since 2.1.0 */ private $storeManager; @@ -72,6 +83,7 @@ class Suggestions implements SuggestedQueriesInterface * @param ConnectionManager $connectionManager * @param SearchIndexNameResolver $searchIndexNameResolver * @param StoreManager $storeManager + * @since 2.1.0 */ public function __construct( ScopeConfigInterface $scopeConfig, @@ -93,6 +105,7 @@ public function __construct( * {@inheritdoc} * * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @since 2.1.0 */ public function getItems(QueryInterface $query, $limit = null, $additionalFilters = null) { @@ -119,6 +132,7 @@ public function getItems(QueryInterface $query, $limit = null, $additionalFilter /** * {@inheritdoc} + * @since 2.1.0 */ public function isResultsCountEnabled() { @@ -131,6 +145,7 @@ public function isResultsCountEnabled() /** * @param QueryInterface $query * @return array + * @since 2.1.0 */ private function getSuggestions(QueryInterface $query) { @@ -180,6 +195,7 @@ private function getSuggestions(QueryInterface $query) /** * @param array $query * @return array + * @since 2.1.0 */ private function fetchQuery(array $query) { @@ -190,6 +206,7 @@ private function fetchQuery(array $query) * Get search suggestions Max Count from config * * @return int + * @since 2.1.0 */ private function getSearchSuggestionsCount() { @@ -201,6 +218,7 @@ private function getSearchSuggestionsCount() /** * @return bool + * @since 2.1.0 */ private function isSuggestionsAllowed() { diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php index 5a31b3d81d0cc..900397e0d3407 100644 --- a/Model/Indexer/IndexStructure.php +++ b/Model/Indexer/IndexStructure.php @@ -9,21 +9,29 @@ use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; use Magento\Framework\App\ScopeResolverInterface; +/** + * Class \Magento\Elasticsearch\Model\Indexer\IndexStructure + * + * @since 2.1.0 + */ class IndexStructure implements IndexStructureInterface { /** * @var ElasticsearchAdapter + * @since 2.1.0 */ private $adapter; /** * @var ScopeResolverInterface + * @since 2.1.0 */ private $scopeResolver; /** * @param ElasticsearchAdapter $adapter * @param ScopeResolverInterface $scopeResolver + * @since 2.1.0 */ public function __construct( ElasticsearchAdapter $adapter, @@ -35,6 +43,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function delete( $indexerId, @@ -48,6 +57,7 @@ public function delete( /** * {@inheritdoc} * + * @since 2.1.0 */ public function create( $indexerId, diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index cfcdbecb16242..265f445760480 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -12,6 +12,11 @@ use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; use Magento\Framework\App\ScopeResolverInterface; +/** + * Class \Magento\Elasticsearch\Model\Indexer\IndexerHandler + * + * @since 2.1.0 + */ class IndexerHandler implements IndexerInterface { /** @@ -21,36 +26,43 @@ class IndexerHandler implements IndexerInterface /** * @var IndexStructureInterface + * @since 2.1.0 */ private $indexStructure; /** * @var ElasticsearchAdapter + * @since 2.1.0 */ private $adapter; /** * @var IndexNameResolver + * @since 2.1.0 */ private $indexNameResolver; /** * @var Batch + * @since 2.1.0 */ private $batch; /** * @var array + * @since 2.1.0 */ private $data; /** * @var int + * @since 2.1.0 */ private $batchSize; /** * @var ScopeResolverInterface + * @since 2.1.0 */ private $scopeResolver; @@ -62,6 +74,7 @@ class IndexerHandler implements IndexerInterface * @param ScopeResolverInterface $scopeResolver * @param array $data * @param int $batchSize + * @since 2.1.0 */ public function __construct( IndexStructureInterface $indexStructure, @@ -83,6 +96,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function saveIndex($dimensions, \Traversable $documents) { @@ -98,6 +112,7 @@ public function saveIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} + * @since 2.1.0 */ public function deleteIndex($dimensions, \Traversable $documents) { @@ -113,6 +128,7 @@ public function deleteIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} + * @since 2.1.0 */ public function cleanIndex($dimensions) { @@ -123,6 +139,7 @@ public function cleanIndex($dimensions) /** * {@inheritdoc} + * @since 2.1.0 */ public function isAvailable() { @@ -131,6 +148,7 @@ public function isAvailable() /** * @return string + * @since 2.1.0 */ private function getIndexerId() { diff --git a/Model/ResourceModel/Engine.php b/Model/ResourceModel/Engine.php index 0f6c674bcda73..837fac969466e 100644 --- a/Model/ResourceModel/Engine.php +++ b/Model/ResourceModel/Engine.php @@ -11,6 +11,7 @@ /** * Search engine resource model + * @since 2.1.0 */ class Engine implements EngineInterface { @@ -18,11 +19,13 @@ class Engine implements EngineInterface * Catalog product visibility * * @var Visibility + * @since 2.1.0 */ protected $catalogProductVisibility; /** * @var IndexScopeResolver + * @since 2.1.0 */ private $indexScopeResolver; @@ -31,6 +34,7 @@ class Engine implements EngineInterface * * @param Visibility $catalogProductVisibility * @param IndexScopeResolver $indexScopeResolver + * @since 2.1.0 */ public function __construct( Visibility $catalogProductVisibility, @@ -44,6 +48,7 @@ public function __construct( * Retrieve allowed visibility values for current engine * * @return int[] + * @since 2.1.0 */ public function getAllowedVisibility() { @@ -54,6 +59,7 @@ public function getAllowedVisibility() * Define if current search engine supports advanced index * * @return bool + * @since 2.1.0 */ public function allowAdvancedIndex() { @@ -62,6 +68,7 @@ public function allowAdvancedIndex() /** * {@inheritdoc} + * @since 2.1.0 */ public function processAttributeValue($attribute, $value) { @@ -76,6 +83,7 @@ public function processAttributeValue($attribute, $value) * @param string $separator * @return string * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @since 2.1.0 */ public function prepareEntityIndex($index, $separator = ' ') { @@ -84,6 +92,7 @@ public function prepareEntityIndex($index, $separator = ' ') /** * {@inheritdoc} + * @since 2.1.0 */ public function isAvailable() { diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index ac9dabb6ba1c6..40b91fb331c15 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -16,21 +16,25 @@ /** * Elasticsearch index resource model * @api + * @since 2.1.0 */ class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index { /** * @var ProductRepositoryInterface + * @since 2.1.0 */ protected $productRepository; /** * @var CategoryRepositoryInterface + * @since 2.1.0 */ protected $categoryRepository; /** * @var Config + * @since 2.1.0 */ protected $eavConfig; @@ -44,6 +48,7 @@ class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index * @param Config $eavConfig * @param null $connectionName * @SuppressWarnings(Magento.TypeDuplication) + * @since 2.1.0 */ public function __construct( Context $context, @@ -71,6 +76,7 @@ public function __construct( * @param int $productId * @param array $indexData * @return array + * @since 2.1.0 */ public function getFullProductIndexData($productId, $indexData) { @@ -115,6 +121,7 @@ public function getFullProductIndexData($productId, $indexData) * @param int $storeId * @param null|array $productIds * @return array + * @since 2.1.0 */ public function getFullCategoryProductIndexData($storeId = null, $productIds = null) { diff --git a/SearchAdapter/Adapter.php b/SearchAdapter/Adapter.php index 43b2bfe553a98..c7f756d2e4562 100644 --- a/SearchAdapter/Adapter.php +++ b/SearchAdapter/Adapter.php @@ -13,6 +13,7 @@ /** * Elasticsearch Search Adapter + * @since 2.1.0 */ class Adapter implements AdapterInterface { @@ -20,6 +21,7 @@ class Adapter implements AdapterInterface * Mapper instance * * @var Mapper + * @since 2.1.0 */ protected $mapper; @@ -27,21 +29,25 @@ class Adapter implements AdapterInterface * Response Factory * * @var ResponseFactory + * @since 2.1.0 */ protected $responseFactory; /** * @var ConnectionManager + * @since 2.1.0 */ protected $connectionManager; /** * @var AggregationBuilder + * @since 2.1.0 */ protected $aggregationBuilder; /** * @var QueryContainerFactory + * @since 2.2.0 */ private $queryContainerFactory; @@ -51,6 +57,7 @@ class Adapter implements AdapterInterface * @param ResponseFactory $responseFactory * @param AggregationBuilder $aggregationBuilder * @param QueryContainerFactory $queryContainerFactory + * @since 2.1.0 */ public function __construct( ConnectionManager $connectionManager, @@ -70,6 +77,7 @@ public function __construct( /** * @param RequestInterface $request * @return QueryResponse + * @since 2.1.0 */ public function query(RequestInterface $request) { diff --git a/SearchAdapter/Aggregation/Builder.php b/SearchAdapter/Aggregation/Builder.php index 1e9b60da74a5b..e53656de06cde 100644 --- a/SearchAdapter/Aggregation/Builder.php +++ b/SearchAdapter/Aggregation/Builder.php @@ -12,25 +12,34 @@ use Magento\Framework\Search\Dynamic\DataProviderInterface; use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder + * + * @since 2.1.0 + */ class Builder { /** * @var DataProviderInterface[] + * @since 2.1.0 */ protected $dataProviderContainer; /** * @var BucketBuilderInterface[] + * @since 2.1.0 */ protected $aggregationContainer; /** * @var DataProviderFactory + * @since 2.2.0 */ private $dataProviderFactory; /** * @var QueryContainer + * @since 2.2.0 */ private $query = null; @@ -38,6 +47,7 @@ class Builder * @param DataProviderInterface[] $dataProviderContainer * @param BucketBuilderInterface[] $aggregationContainer * @param DataProviderFactory|null $dataProviderFactory + * @since 2.1.0 */ public function __construct( array $dataProviderContainer, @@ -71,6 +81,7 @@ function (BucketBuilderInterface $bucketBuilder) { * @return array * @throws \LogicException thrown by DataProviderFactory for validation issues * @see \Magento\Elasticsearch\SearchAdapter\Aggregation\DataProviderFactory + * @since 2.1.0 */ public function build(RequestInterface $request, array $queryResult) { @@ -101,6 +112,7 @@ public function build(RequestInterface $request, array $queryResult) * * @param QueryContainer $query * @return $this + * @since 2.2.0 */ public function setQuery(QueryContainer $query) { diff --git a/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php b/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php index a390c67420f03..188510d68065d 100644 --- a/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php +++ b/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php @@ -11,6 +11,7 @@ /** * @api + * @since 2.1.0 */ interface BucketBuilderInterface { @@ -20,6 +21,7 @@ interface BucketBuilderInterface * @param array $queryResult * @param DataProviderInterface $dataProvider * @return array + * @since 2.1.0 */ public function build( RequestBucketInterface $bucket, diff --git a/SearchAdapter/Aggregation/Builder/Dynamic.php b/SearchAdapter/Aggregation/Builder/Dynamic.php index 1e106023ea00d..6a41156eb18bc 100644 --- a/SearchAdapter/Aggregation/Builder/Dynamic.php +++ b/SearchAdapter/Aggregation/Builder/Dynamic.php @@ -12,21 +12,29 @@ use Magento\Framework\Search\Request\Aggregation\DynamicBucket; use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic + * + * @since 2.1.0 + */ class Dynamic implements BucketBuilderInterface { /** * @var Repository + * @since 2.1.0 */ private $algorithmRepository; /** * @var EntityStorageFactory + * @since 2.1.0 */ private $entityStorageFactory; /** * @param Repository $algorithmRepository * @param EntityStorageFactory $entityStorageFactory + * @since 2.1.0 */ public function __construct(Repository $algorithmRepository, EntityStorageFactory $entityStorageFactory) { @@ -36,6 +44,7 @@ public function __construct(Repository $algorithmRepository, EntityStorageFactor /** * {@inheritdoc} + * @since 2.1.0 */ public function build( RequestBucketInterface $bucket, @@ -56,6 +65,7 @@ public function build( * * @param array $queryResult * @return EntityStorage + * @since 2.1.0 */ private function getEntityStorage(array $queryResult) { @@ -72,6 +82,7 @@ private function getEntityStorage(array $queryResult) * * @param array $data * @return array + * @since 2.1.0 */ private function prepareData($data) { diff --git a/SearchAdapter/Aggregation/Builder/Term.php b/SearchAdapter/Aggregation/Builder/Term.php index bcfb7f5565b86..2c81ab9e13ecc 100644 --- a/SearchAdapter/Aggregation/Builder/Term.php +++ b/SearchAdapter/Aggregation/Builder/Term.php @@ -8,10 +8,16 @@ use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; use Magento\Framework\Search\Dynamic\DataProviderInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term + * + * @since 2.1.0 + */ class Term implements BucketBuilderInterface { /** * {@inheritdoc} + * @since 2.1.0 */ public function build( RequestBucketInterface $bucket, diff --git a/SearchAdapter/Aggregation/DataProviderFactory.php b/SearchAdapter/Aggregation/DataProviderFactory.php index eca3dcdf86970..b9917fc113f89 100644 --- a/SearchAdapter/Aggregation/DataProviderFactory.php +++ b/SearchAdapter/Aggregation/DataProviderFactory.php @@ -14,6 +14,7 @@ /** * It's a factory which allows to override instance of DataProviderInterface * with the instance of the same class but with injected search query. + * @since 2.2.0 */ class DataProviderFactory { @@ -21,11 +22,13 @@ class DataProviderFactory * Object Manager * * @var ObjectManagerInterface + * @since 2.2.0 */ private $objectManager; /** * @param ObjectManagerInterface $objectManager + * @since 2.2.0 */ public function __construct(ObjectManagerInterface $objectManager) { @@ -51,6 +54,7 @@ public function __construct(ObjectManagerInterface $objectManager) * @param QueryContainer $query * @return DataProviderInterface * @throws \LogicException when the query is missing but it required according to the QueryAwareInterface + * @since 2.2.0 */ public function create(DataProviderInterface $dataProvider, QueryContainer $query = null) { diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 33ab1a4071560..3fa4e18c2d1da 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -12,6 +12,11 @@ use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; use Magento\CatalogSearch\Model\Indexer\Fulltext; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Interval + * + * @since 2.1.0 + */ class Interval implements IntervalInterface { /** @@ -21,36 +26,43 @@ class Interval implements IntervalInterface /** * @var ConnectionManager + * @since 2.1.0 */ protected $connectionManager; /** * @var FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @var Config + * @since 2.1.0 */ protected $clientConfig; /** * @var string + * @since 2.1.0 */ private $fieldName; /** * @var string + * @since 2.1.0 */ private $storeId; /** * @var array + * @since 2.1.0 */ private $entityIds; /** * @var SearchIndexNameResolver + * @since 2.1.0 */ private $searchIndexNameResolver; @@ -62,6 +74,7 @@ class Interval implements IntervalInterface * @param string $fieldName * @param string $storeId * @param array $entityIds + * @since 2.1.0 */ public function __construct( ConnectionManager $connectionManager, @@ -83,6 +96,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function load($limit, $offset = null, $lower = null, $upper = null) { @@ -142,6 +156,7 @@ public function load($limit, $offset = null, $lower = null, $upper = null) /** * {@inheritdoc} + * @since 2.1.0 */ public function loadPrevious($data, $index, $lower = null) { @@ -201,6 +216,7 @@ public function loadPrevious($data, $index, $lower = null) /** * {@inheritdoc} + * @since 2.1.0 */ public function loadNext($data, $rightIndex, $upper = null) { @@ -274,6 +290,7 @@ public function loadNext($data, $rightIndex, $upper = null) * @param string $fieldName * * @return float[] + * @since 2.1.0 */ private function arrayValuesToFloat($hits, $fieldName) { diff --git a/SearchAdapter/AggregationFactory.php b/SearchAdapter/AggregationFactory.php index 1f3c38cd74600..55e01442528b9 100644 --- a/SearchAdapter/AggregationFactory.php +++ b/SearchAdapter/AggregationFactory.php @@ -10,6 +10,7 @@ /** * Aggregation Factory * @api + * @since 2.1.0 */ class AggregationFactory { @@ -17,11 +18,13 @@ class AggregationFactory * Object Manager instance * * @var ObjectManagerInterface + * @since 2.1.0 */ protected $objectManager; /** * @param ObjectManagerInterface $objectManager + * @since 2.1.0 */ public function __construct(ObjectManagerInterface $objectManager) { @@ -33,6 +36,7 @@ public function __construct(ObjectManagerInterface $objectManager) * * @param array $rawAggregation * @return \Magento\Framework\Search\Response\Aggregation + * @since 2.1.0 */ public function create(array $rawAggregation) { @@ -58,6 +62,7 @@ public function create(array $rawAggregation) * * @param array $values * @return \Magento\Framework\Search\Response\Aggregation\Value[] + * @since 2.1.0 */ private function prepareValues(array $values) { diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php index 4d1be97e6058a..c38ae568a62ca 100644 --- a/SearchAdapter/ConnectionManager.php +++ b/SearchAdapter/ConnectionManager.php @@ -12,26 +12,31 @@ /** * @api + * @since 2.1.0 */ class ConnectionManager { /** * @var Elasticsearch + * @since 2.1.0 */ protected $client; /** * @var LoggerInterface + * @since 2.1.0 */ protected $logger; /** * @var ClientFactoryInterface + * @since 2.1.0 */ protected $clientFactory; /** * @var ClientOptionsInterface + * @since 2.1.0 */ protected $clientConfig; @@ -39,6 +44,7 @@ class ConnectionManager * @param ClientFactoryInterface $clientFactory * @param ClientOptionsInterface $clientConfig * @param LoggerInterface $logger + * @since 2.1.0 */ public function __construct( ClientFactoryInterface $clientFactory, @@ -56,6 +62,7 @@ public function __construct( * @param array $options * @throws \RuntimeException * @return Elasticsearch + * @since 2.1.0 */ public function getConnection($options = []) { @@ -72,6 +79,7 @@ public function getConnection($options = []) * @param array $options * @throws \RuntimeException * @return void + * @since 2.1.0 */ private function connect($options) { diff --git a/SearchAdapter/DocumentFactory.php b/SearchAdapter/DocumentFactory.php index 162f2ac41db68..7049f853ee73b 100644 --- a/SearchAdapter/DocumentFactory.php +++ b/SearchAdapter/DocumentFactory.php @@ -16,6 +16,7 @@ /** * Document Factory * @api + * @since 2.1.0 */ class DocumentFactory { @@ -23,18 +24,21 @@ class DocumentFactory * Object Manager instance * * @var ObjectManagerInterface - * @deprecated + * @deprecated 2.1.0 + * @since 2.1.0 */ protected $objectManager; /** * @var EntityMetadata + * @since 2.1.0 */ private $entityMetadata; /** * @param ObjectManagerInterface $objectManager * @param EntityMetadata $entityMetadata + * @since 2.1.0 */ public function __construct(ObjectManagerInterface $objectManager, EntityMetadata $entityMetadata) { @@ -47,6 +51,7 @@ public function __construct(ObjectManagerInterface $objectManager, EntityMetadat * * @param array $rawDocument * @return Document + * @since 2.1.0 */ public function create($rawDocument) { diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index bf88a767e5e72..2fb9ab9dd3d2b 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -10,60 +10,71 @@ /** * @api + * @since 2.1.0 */ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInterface, QueryAwareInterface { /** * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager + * @since 2.1.0 */ protected $connectionManager; /** * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @var \Magento\Catalog\Model\Layer\Filter\Price\Range + * @since 2.1.0 */ protected $range; /** * @var \Magento\Framework\Search\Dynamic\IntervalFactory + * @since 2.1.0 */ protected $intervalFactory; /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 2.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 2.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 2.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 2.1.0 */ protected $indexerId; /** * @var \Magento\Framework\App\ScopeResolverInterface + * @since 2.1.0 */ protected $scopeResolver; /** * @var QueryContainer + * @since 2.2.0 */ private $queryContainer; @@ -80,6 +91,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte * @param QueryContainer|null $queryContainer * * @SuppressWarnings(PHPMD.ExcessiveParameterList) + * @since 2.1.0 */ public function __construct( \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, @@ -107,6 +119,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function getRange() { @@ -115,6 +128,7 @@ public function getRange() /** * {@inheritdoc} + * @since 2.1.0 */ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage $entityStorage) { @@ -153,6 +167,7 @@ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage /** * {@inheritdoc} + * @since 2.1.0 */ public function getInterval( \Magento\Framework\Search\Request\BucketInterface $bucket, @@ -175,6 +190,7 @@ public function getInterval( /** * {@inheritdoc} + * @since 2.1.0 */ public function getAggregation( \Magento\Framework\Search\Request\BucketInterface $bucket, @@ -208,6 +224,7 @@ public function getAggregation( /** * {@inheritdoc} + * @since 2.1.0 */ public function prepareData($range, array $dbRanges) { @@ -245,6 +262,7 @@ public function prepareData($range, array $dbRanges) * @param \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage * @param array $dimensions * @return array + * @since 2.2.0 */ private function getBasicSearchQuery( \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage, diff --git a/SearchAdapter/Filter/Builder.php b/SearchAdapter/Filter/Builder.php index 8efc342d26452..b6e8cc4116f70 100644 --- a/SearchAdapter/Filter/Builder.php +++ b/SearchAdapter/Filter/Builder.php @@ -12,6 +12,11 @@ use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term; use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder + * + * @since 2.1.0 + */ class Builder implements BuilderInterface { /** @@ -36,6 +41,7 @@ class Builder implements BuilderInterface /** * @var FilterInterface[] + * @since 2.1.0 */ protected $filters; @@ -43,6 +49,7 @@ class Builder implements BuilderInterface * @param Range $range * @param Term $term * @param Wildcard $wildcard + * @since 2.1.0 */ public function __construct( Range $range, @@ -58,6 +65,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function build(RequestFilterInterface $filter, $conditionType) { @@ -68,6 +76,7 @@ public function build(RequestFilterInterface $filter, $conditionType) * @param RequestFilterInterface $filter * @param string $conditionType * @return array + * @since 2.1.0 */ protected function processFilter(RequestFilterInterface $filter, $conditionType) { @@ -91,6 +100,7 @@ protected function processFilter(RequestFilterInterface $filter, $conditionType) * @param RequestFilterInterface|BoolExpression $filter * @param bool $isNegation * @return array + * @since 2.1.0 */ protected function processBoolFilter(RequestFilterInterface $filter, $isNegation) { @@ -119,6 +129,7 @@ protected function processBoolFilter(RequestFilterInterface $filter, $isNegation * @param RequestFilterInterface[] $filters * @param string $conditionType * @return string + * @since 2.1.0 */ private function buildFilters(array $filters, $conditionType) { @@ -138,6 +149,7 @@ private function buildFilters(array $filters, $conditionType) /** * @param string $conditionType * @return bool + * @since 2.1.0 */ protected function isNegation($conditionType) { @@ -148,6 +160,7 @@ protected function isNegation($conditionType) * @param string $conditionType * @param bool $isNegation * @return string + * @since 2.1.0 */ private function mapConditionType($conditionType, $isNegation) { diff --git a/SearchAdapter/Filter/Builder/FilterInterface.php b/SearchAdapter/Filter/Builder/FilterInterface.php index f4eaa6a12e711..92b05255a37e2 100644 --- a/SearchAdapter/Filter/Builder/FilterInterface.php +++ b/SearchAdapter/Filter/Builder/FilterInterface.php @@ -9,12 +9,14 @@ /** * @api + * @since 2.1.0 */ interface FilterInterface { /** * @param RequestFilterInterface $filter * @return array + * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter); } diff --git a/SearchAdapter/Filter/Builder/Range.php b/SearchAdapter/Filter/Builder/Range.php index a2cab32ea4e69..44cf40c633a1d 100644 --- a/SearchAdapter/Filter/Builder/Range.php +++ b/SearchAdapter/Filter/Builder/Range.php @@ -9,15 +9,22 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range + * + * @since 2.1.0 + */ class Range implements FilterInterface { /** * @var FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper + * @since 2.1.0 */ public function __construct( FieldMapperInterface $fieldMapper @@ -28,6 +35,7 @@ public function __construct( /** * @param RequestFilterInterface|RangeFilterRequest $filter * @return array + * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter) { diff --git a/SearchAdapter/Filter/Builder/Term.php b/SearchAdapter/Filter/Builder/Term.php index ed8cd049d2915..2a728f2001d6c 100644 --- a/SearchAdapter/Filter/Builder/Term.php +++ b/SearchAdapter/Filter/Builder/Term.php @@ -9,15 +9,22 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term + * + * @since 2.1.0 + */ class Term implements FilterInterface { /** * @var FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper + * @since 2.1.0 */ public function __construct(FieldMapperInterface $fieldMapper) { @@ -27,6 +34,7 @@ public function __construct(FieldMapperInterface $fieldMapper) /** * @param RequestFilterInterface|TermFilterRequest $filter * @return array + * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter) { diff --git a/SearchAdapter/Filter/Builder/Wildcard.php b/SearchAdapter/Filter/Builder/Wildcard.php index 14237152244fa..23c16bfd0bed6 100644 --- a/SearchAdapter/Filter/Builder/Wildcard.php +++ b/SearchAdapter/Filter/Builder/Wildcard.php @@ -9,15 +9,22 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard + * + * @since 2.1.0 + */ class Wildcard implements FilterInterface { /** * @var FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper + * @since 2.1.0 */ public function __construct(FieldMapperInterface $fieldMapper) { @@ -27,6 +34,7 @@ public function __construct(FieldMapperInterface $fieldMapper) /** * @param RequestFilterInterface|WildcardFilterRequest $filter * @return array + * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter) { diff --git a/SearchAdapter/Filter/BuilderInterface.php b/SearchAdapter/Filter/BuilderInterface.php index 29f30fc8c71c5..884a95282437c 100644 --- a/SearchAdapter/Filter/BuilderInterface.php +++ b/SearchAdapter/Filter/BuilderInterface.php @@ -9,6 +9,7 @@ /** * @api + * @since 2.1.0 */ interface BuilderInterface { @@ -22,6 +23,7 @@ interface BuilderInterface * @param RequestFilterInterface $filter * @param string $conditionType * @return string + * @since 2.1.0 */ public function build(RequestFilterInterface $filter, $conditionType); } diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index efdaa63efeb7a..9266064d1b89f 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -17,21 +17,25 @@ /** * Mapper class * @api + * @since 2.1.0 */ class Mapper { /** * @var QueryBuilder + * @since 2.1.0 */ protected $queryBuilder; /** * @var MatchQueryBuilder + * @since 2.1.0 */ protected $matchQueryBuilder; /** * @var FilterBuilder + * @since 2.1.0 */ protected $filterBuilder; @@ -39,6 +43,7 @@ class Mapper * @param QueryBuilder $queryBuilder * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder + * @since 2.1.0 */ public function __construct( QueryBuilder $queryBuilder, @@ -55,6 +60,7 @@ public function __construct( * * @param RequestInterface $request * @return array + * @since 2.1.0 */ public function buildQuery(RequestInterface $request) { @@ -80,6 +86,7 @@ public function buildQuery(RequestInterface $request) * @param string $conditionType * @return array * @throws \InvalidArgumentException + * @since 2.1.0 */ protected function processQuery( RequestQueryInterface $requestQuery, @@ -116,6 +123,7 @@ protected function processQuery( * @param BoolQuery $query * @param array $selectQuery * @return array + * @since 2.1.0 */ protected function processBoolQuery( BoolQuery $query, @@ -149,6 +157,7 @@ protected function processBoolQuery( * @param array $selectQuery * @param string $conditionType * @return array + * @since 2.1.0 */ protected function processBoolQueryCondition( array $subQueryList, @@ -169,6 +178,7 @@ protected function processBoolQueryCondition( * @param array $selectQuery * @param string $conditionType * @return array + * @since 2.1.0 */ private function processFilterQuery( FilterQuery $query, diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index cac81df89a89f..836b322e6f40e 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -13,26 +13,31 @@ /** * @api + * @since 2.1.0 */ class Builder { /** * @var Config + * @since 2.1.0 */ protected $clientConfig; /** * @var SearchIndexNameResolver + * @since 2.1.0 */ protected $searchIndexNameResolver; /** * @var AggregationBuilder + * @since 2.1.0 */ protected $aggregationBuilder; /** * @var ScopeResolverInterface + * @since 2.1.0 */ protected $scopeResolver; @@ -41,6 +46,7 @@ class Builder * @param SearchIndexNameResolver $searchIndexNameResolver * @param AggregationBuilder $aggregationBuilder * @param ScopeResolverInterface $scopeResolver + * @since 2.1.0 */ public function __construct( Config $clientConfig, @@ -59,6 +65,7 @@ public function __construct( * * @param RequestInterface $request * @return array + * @since 2.1.0 */ public function initQuery(RequestInterface $request) { @@ -83,6 +90,7 @@ public function initQuery(RequestInterface $request) * @param RequestInterface $request * @param array $searchQuery * @return array + * @since 2.1.0 */ public function initAggregations( RequestInterface $request, diff --git a/SearchAdapter/Query/Builder/Aggregation.php b/SearchAdapter/Query/Builder/Aggregation.php index 3c8ed624584d9..478e616673c01 100644 --- a/SearchAdapter/Query/Builder/Aggregation.php +++ b/SearchAdapter/Query/Builder/Aggregation.php @@ -11,16 +11,19 @@ /** * @api + * @since 2.1.0 */ class Aggregation { /** * @var FieldMapperInterface + * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper + * @since 2.1.0 */ public function __construct( FieldMapperInterface $fieldMapper @@ -34,6 +37,7 @@ public function __construct( * @param RequestInterface $request * @param array $searchQuery * @return array + * @since 2.1.0 */ public function build( RequestInterface $request, @@ -52,6 +56,7 @@ public function build( * @param array $searchQuery * @param BucketInterface $bucket * @return array + * @since 2.1.0 */ protected function buildBucket( array $searchQuery, diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 61766663ea2e4..397a2309b8241 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -10,6 +10,11 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface; +/** + * Class \Magento\Elasticsearch\SearchAdapter\Query\Builder\Match + * + * @since 2.1.0 + */ class Match implements QueryInterface { /** @@ -19,17 +24,20 @@ class Match implements QueryInterface /** * @var FieldMapperInterface + * @since 2.1.0 */ private $fieldMapper; /** * @var PreprocessorInterface[] + * @since 2.1.0 */ protected $preprocessorContainer; /** * @param FieldMapperInterface $fieldMapper * @param PreprocessorInterface[] $preprocessorContainer + * @since 2.1.0 */ public function __construct( FieldMapperInterface $fieldMapper, @@ -41,6 +49,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $conditionType) { @@ -62,6 +71,7 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $ * @param string $queryValue * @param string $conditionType * @return array + * @since 2.1.0 */ protected function prepareQuery($queryValue, $conditionType) { @@ -90,6 +100,7 @@ protected function prepareQuery($queryValue, $conditionType) * @param array $matches * @param array $queryValue * @return array + * @since 2.1.0 */ protected function buildQueries($matches, $queryValue) { @@ -122,6 +133,7 @@ protected function buildQueries($matches, $queryValue) * * @param string $value * @return string + * @since 2.1.0 */ protected function escape($value) { diff --git a/SearchAdapter/Query/Builder/QueryInterface.php b/SearchAdapter/Query/Builder/QueryInterface.php index bda05b18f1743..a4226fbeb0a2a 100644 --- a/SearchAdapter/Query/Builder/QueryInterface.php +++ b/SearchAdapter/Query/Builder/QueryInterface.php @@ -9,6 +9,7 @@ /** * @api + * @since 2.1.0 */ interface QueryInterface { @@ -17,6 +18,7 @@ interface QueryInterface * @param RequestQueryInterface $requestQuery * @param string $conditionType * @return array + * @since 2.1.0 */ public function build( array $selectQuery, diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 6cf839c103c03..262b525249c3b 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -12,6 +12,7 @@ /** * @api + * @since 2.1.0 */ class Stopwords implements PreprocessorInterface { @@ -27,46 +28,55 @@ class Stopwords implements PreprocessorInterface /** * @var \Magento\Store\Model\StoreManagerInterface + * @since 2.1.0 */ protected $storeManager; /** * @var \Magento\Framework\Locale\Resolver + * @since 2.1.0 */ protected $localeResolver; /** * @var ReadFactory + * @since 2.1.0 */ protected $readFactory; /** * @var \Magento\Framework\App\Cache\Type\Config + * @since 2.1.0 */ protected $configCache; /** * @var EsConfigInterface + * @since 2.1.0 */ protected $esConfig; /** * @var \Magento\Framework\Module\Dir\Reader + * @since 2.1.0 */ protected $moduleDirReader; /** * @var string + * @since 2.1.0 */ private $stopwordsModule; /** * @var string + * @since 2.1.0 */ private $stopwordsDirectory; /** * @var \Magento\Framework\Serialize\SerializerInterface + * @since 2.2.0 */ private $serializer; @@ -81,6 +91,7 @@ class Stopwords implements PreprocessorInterface * @param \Magento\Framework\Module\Dir\Reader $moduleDirReader * @param string $stopwordsModule * @param string $stopwordsDirectory + * @since 2.1.0 */ public function __construct( \Magento\Store\Model\StoreManagerInterface $storeManager, @@ -104,6 +115,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.1.0 */ public function process($query) { @@ -117,6 +129,7 @@ public function process($query) * Get stopwords list for current locale * * @return array + * @since 2.1.0 */ protected function getStopwordsList() { @@ -140,6 +153,7 @@ protected function getStopwordsList() * Get stopwords file for current locale * * @return string + * @since 2.1.0 */ protected function getStopwordsFile() { @@ -155,7 +169,8 @@ protected function getStopwordsFile() * Get serializer * * @return \Magento\Framework\Serialize\SerializerInterface - * @deprecated + * @deprecated 2.2.0 + * @since 2.2.0 */ private function getSerializer() { diff --git a/SearchAdapter/QueryAwareInterface.php b/SearchAdapter/QueryAwareInterface.php index bcc47e932baaa..2a8431badc57b 100644 --- a/SearchAdapter/QueryAwareInterface.php +++ b/SearchAdapter/QueryAwareInterface.php @@ -13,6 +13,7 @@ * Its goal is to mark the fact that a class which implements this interface requires * the QueryContainer object to be passed as constructor argument * with the name 'queryContainer' to work properly + * @since 2.2.0 */ interface QueryAwareInterface { diff --git a/SearchAdapter/QueryContainer.php b/SearchAdapter/QueryContainer.php index aed7f8f4da642..1341f374f49c7 100644 --- a/SearchAdapter/QueryContainer.php +++ b/SearchAdapter/QueryContainer.php @@ -9,16 +9,19 @@ /** * The purpose of this class to be a container for the array with ElasticSearch query. * @codeCoverageIgnore + * @since 2.2.0 */ class QueryContainer { /** * @var array + * @since 2.2.0 */ private $query; /** * @param array $query + * @since 2.2.0 */ public function __construct(array $query) { @@ -29,6 +32,7 @@ public function __construct(array $query) * Returns a query * * @return array + * @since 2.2.0 */ public function getQuery() { diff --git a/SearchAdapter/ResponseFactory.php b/SearchAdapter/ResponseFactory.php index 5c5d37618ea8f..0dca98095239d 100644 --- a/SearchAdapter/ResponseFactory.php +++ b/SearchAdapter/ResponseFactory.php @@ -10,6 +10,7 @@ /** * Response Factory * @api + * @since 2.1.0 */ class ResponseFactory { @@ -17,6 +18,7 @@ class ResponseFactory * Object Manager instance * * @var ObjectManagerInterface + * @since 2.1.0 */ protected $objectManager; @@ -24,6 +26,7 @@ class ResponseFactory * Document Factory * * @var DocumentFactory + * @since 2.1.0 */ protected $documentFactory; @@ -31,6 +34,7 @@ class ResponseFactory * Aggregation Factory * * @var AggregationFactory + * @since 2.1.0 */ protected $aggregationFactory; @@ -38,6 +42,7 @@ class ResponseFactory * @param ObjectManagerInterface $objectManager * @param DocumentFactory $documentFactory * @param AggregationFactory $aggregationFactory + * @since 2.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -54,6 +59,7 @@ public function __construct( * * @param array $response * @return \Magento\Framework\Search\Response\QueryResponse + * @since 2.1.0 */ public function create($response) { diff --git a/SearchAdapter/SearchIndexNameResolver.php b/SearchAdapter/SearchIndexNameResolver.php index 5c637974d4b65..3c66258f955f4 100644 --- a/SearchAdapter/SearchIndexNameResolver.php +++ b/SearchAdapter/SearchIndexNameResolver.php @@ -11,16 +11,19 @@ /** * Alias name resolver * @api + * @since 2.1.0 */ class SearchIndexNameResolver { /** * @var Config + * @since 2.1.0 */ private $clientConfig; /** * @param Config $clientConfig + * @since 2.1.0 */ public function __construct( Config $clientConfig @@ -34,6 +37,7 @@ public function __construct( * @param int $storeId * @param string $indexerId * @return string + * @since 2.1.0 */ public function getIndexName($storeId, $indexerId) { @@ -46,6 +50,7 @@ public function getIndexName($storeId, $indexerId) * * @param string $indexerId * @return string + * @since 2.1.0 */ private function getIndexMapping($indexerId) { From 44fa8b74962e6455a9abaf07575938419596d638 Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 28 Jul 2017 15:51:44 -0500 Subject: [PATCH 527/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - added release number to all existing @deprecated tag in php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup) - added tag @since to all existing php classes, methods and properties (app/code/Magento, lib/internal/Magento, setup/src/Magento/Setup) --- Block/Adminhtml/Search/Edit.php | 2 ++ Block/Adminhtml/Search/Grid.php | 9 +++++++++ Block/Adminhtml/System/Config/TestConnection.php | 5 +++++ Block/Recommendations.php | 1 + Block/SearchData.php | 14 ++++++++++++++ Block/SearchDataInterface.php | 9 +++++++++ Block/Suggestions.php | 1 + .../Search/System/Config/TestConnection.php | 10 ++++++++++ .../DataMapper/AdditionalFieldsProvider.php | 4 ++++ .../AdditionalFieldsProviderInterface.php | 2 ++ Model/Adminhtml/Search/Grid/Options.php | 6 ++++++ Model/Client/ClientFactory.php | 9 +++++++++ Model/Client/ClientFactoryInterface.php | 2 ++ Model/Client/ClientInterface.php | 2 ++ Model/Client/ClientOptionsInterface.php | 2 ++ Model/Client/ClientResolver.php | 10 ++++++++++ Model/DataProvider/Suggestions.php | 7 +++++++ Model/Indexer/Fulltext/Plugin/CustomerGroup.php | 9 +++++++++ Model/Recommendations/DataProvider.php | 15 +++++++++++++++ .../SaveSearchQueryRelationsObserver.php | 8 ++++++++ Model/ResourceModel/Index.php | 9 +++++++++ Model/ResourceModel/Recommendations.php | 8 ++++++++ Model/ResourceModel/Search/Grid/Collection.php | 5 +++++ Model/SuggestedQueries.php | 13 +++++++++++++ Model/SuggestedQueriesInterface.php | 3 +++ Setup/InstallSchema.php | 2 ++ 26 files changed, 167 insertions(+) diff --git a/Block/Adminhtml/Search/Edit.php b/Block/Adminhtml/Search/Edit.php index d9a4b8125ce6a..3a35ea0b575ca 100644 --- a/Block/Adminhtml/Search/Edit.php +++ b/Block/Adminhtml/Search/Edit.php @@ -10,6 +10,7 @@ * * @api * @author Magento Core Team + * @since 2.0.0 */ class Edit extends \Magento\Backend\Block\Widget\Grid\Container { @@ -17,6 +18,7 @@ class Edit extends \Magento\Backend\Block\Widget\Grid\Container * Enable grid container * * @return void + * @since 2.0.0 */ protected function _construct() { diff --git a/Block/Adminhtml/Search/Grid.php b/Block/Adminhtml/Search/Grid.php index a64eb137b6ac2..83f962a4dd924 100644 --- a/Block/Adminhtml/Search/Grid.php +++ b/Block/Adminhtml/Search/Grid.php @@ -10,21 +10,25 @@ * * @api * @author Magento Core Team + * @since 2.0.0 */ class Grid extends \Magento\Backend\Block\Widget\Grid { /** * @var \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options + * @since 2.0.0 */ protected $_options; /** * @var \Magento\Framework\Registry + * @since 2.0.0 */ protected $_registryManager; /** * @var \Magento\Framework\Json\Helper\Data + * @since 2.0.0 */ protected $jsonHelper; @@ -35,6 +39,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid * @param \Magento\Framework\Registry $registry * @param \Magento\Framework\Json\Helper\Data $jsonHelper * @param array $data + * @since 2.0.0 */ public function __construct( \Magento\Backend\Block\Template\Context $context, @@ -55,6 +60,7 @@ public function __construct( * Retrieve a value from registry by a key * * @return mixed + * @since 2.0.0 */ public function getQuery() { @@ -66,6 +72,7 @@ public function getQuery() * * @param \Magento\Backend\Block\Widget\Grid\Column $column * @return $this + * @since 2.0.0 */ protected function _addColumnFilterToCollection($column) { @@ -90,6 +97,7 @@ protected function _addColumnFilterToCollection($column) * Retrieve selected related queries from grid * * @return array + * @since 2.0.0 */ public function getSelectedQueries() { @@ -100,6 +108,7 @@ public function getSelectedQueries() * Get queries json * * @return string + * @since 2.0.0 */ public function getQueriesJson() { diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index c987b99a61514..a71ea15df3686 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -8,6 +8,7 @@ /** * Search engine test connection block * @api + * @since 2.1.0 */ class TestConnection extends \Magento\Config\Block\System\Config\Form\Field { @@ -15,6 +16,7 @@ class TestConnection extends \Magento\Config\Block\System\Config\Form\Field * Set template to itself * * @return $this + * @since 2.1.0 */ protected function _prepareLayout() { @@ -28,6 +30,7 @@ protected function _prepareLayout() * * @param \Magento\Framework\Data\Form\Element\AbstractElement $element * @return string + * @since 2.1.0 */ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) { @@ -41,6 +44,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele * * @param \Magento\Framework\Data\Form\Element\AbstractElement $element * @return string + * @since 2.1.0 */ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) { @@ -61,6 +65,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract * Returns configuration fields required to perform the ping request * * @return array + * @since 2.1.0 */ protected function _getFieldMapping() { diff --git a/Block/Recommendations.php b/Block/Recommendations.php index 6d9fbb795464b..1fdb6d095acc5 100644 --- a/Block/Recommendations.php +++ b/Block/Recommendations.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.0.0 */ class Recommendations extends SearchData { diff --git a/Block/SearchData.php b/Block/SearchData.php index 993731b465257..af42124c05f25 100644 --- a/Block/SearchData.php +++ b/Block/SearchData.php @@ -10,25 +10,34 @@ use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; +/** + * Class \Magento\AdvancedSearch\Block\SearchData + * + * @since 2.0.0 + */ abstract class SearchData extends Template implements SearchDataInterface { /** * @var QueryInterface + * @since 2.0.0 */ private $query; /** * @var string + * @since 2.0.0 */ protected $title; /** * @var SuggestedQueriesInterface + * @since 2.0.0 */ private $searchDataProvider; /** * @var string + * @since 2.0.0 */ protected $_template = 'search_data.phtml'; @@ -38,6 +47,7 @@ abstract class SearchData extends Template implements SearchDataInterface * @param QueryFactoryInterface $queryFactory * @param string $title * @param array $data + * @since 2.0.0 */ public function __construct( Template\Context $context, @@ -54,6 +64,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.0.0 */ public function getItems() { @@ -62,6 +73,7 @@ public function getItems() /** * {@inheritdoc} + * @since 2.0.0 */ public function isShowResultsCount() { @@ -70,6 +82,7 @@ public function isShowResultsCount() /** * {@inheritdoc} + * @since 2.0.0 */ public function getLink($queryText) { @@ -78,6 +91,7 @@ public function getLink($queryText) /** * {@inheritdoc} + * @since 2.0.0 */ public function getTitle() { diff --git a/Block/SearchDataInterface.php b/Block/SearchDataInterface.php index 1c554ca18ab3a..1e43769da641a 100644 --- a/Block/SearchDataInterface.php +++ b/Block/SearchDataInterface.php @@ -5,28 +5,37 @@ */ namespace Magento\AdvancedSearch\Block; +/** + * Interface \Magento\AdvancedSearch\Block\SearchDataInterface + * + * @since 2.0.0 + */ interface SearchDataInterface { /** * Retrieve search suggestions * * @return array + * @since 2.0.0 */ public function getItems(); /** * @return bool + * @since 2.0.0 */ public function isShowResultsCount(); /** * @param string $queryText * @return string + * @since 2.0.0 */ public function getLink($queryText); /** * @return string + * @since 2.0.0 */ public function getTitle(); } diff --git a/Block/Suggestions.php b/Block/Suggestions.php index 4476e10153ebb..e81206af55b6c 100644 --- a/Block/Suggestions.php +++ b/Block/Suggestions.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.0.0 */ class Suggestions extends SearchData { diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index a3cca367c8993..01de5ee9124ec 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -12,20 +12,28 @@ use Magento\Framework\Controller\Result\JsonFactory; use Magento\Framework\Filter\StripTags; +/** + * Class \Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection + * + * @since 2.1.0 + */ class TestConnection extends Action { /** * @var ClientResolver + * @since 2.1.0 */ private $clientResolver; /** * @var JsonFactory + * @since 2.1.0 */ private $resultJsonFactory; /** * @var StripTags + * @since 2.1.0 */ private $tagFilter; @@ -34,6 +42,7 @@ class TestConnection extends Action * @param ClientResolver $clientResolver * @param JsonFactory $resultJsonFactory * @param StripTags $tagFilter + * @since 2.1.0 */ public function __construct( Context $context, @@ -51,6 +60,7 @@ public function __construct( * Check for connection to server * * @return \Magento\Framework\Controller\Result\Json + * @since 2.1.0 */ public function execute() { diff --git a/Model/Adapter/DataMapper/AdditionalFieldsProvider.php b/Model/Adapter/DataMapper/AdditionalFieldsProvider.php index ef1f9890e02d1..30f2ee3a2850c 100644 --- a/Model/Adapter/DataMapper/AdditionalFieldsProvider.php +++ b/Model/Adapter/DataMapper/AdditionalFieldsProvider.php @@ -8,16 +8,19 @@ /** * Provide additional fields for data mapper during search indexer * Must return array with the following format: [[product id] => [field name1 => value1, ...], ...] + * @since 2.2.0 */ class AdditionalFieldsProvider implements AdditionalFieldsProviderInterface { /** * @var AdditionalFieldsProviderInterface[] + * @since 2.2.0 */ private $fieldsProviders; /** * @param AdditionalFieldsProviderInterface[] $fieldsProviders + * @since 2.2.0 */ public function __construct(array $fieldsProviders) { @@ -26,6 +29,7 @@ public function __construct(array $fieldsProviders) /** * {@inheritdoc} + * @since 2.2.0 */ public function getFields(array $productIds, $storeId) { diff --git a/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php b/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php index d830987a0c6a1..1c2a26a5e0c17 100644 --- a/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php +++ b/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php @@ -9,6 +9,7 @@ * Provide additional fields for data mapper during search indexer * Must return array with the following format: [[product id] => [field name1 => value1, ...], ...] * @api + * @since 2.2.0 */ interface AdditionalFieldsProviderInterface { @@ -18,6 +19,7 @@ interface AdditionalFieldsProviderInterface * @param array $productIds * @param int $storeId * @return array + * @since 2.2.0 */ public function getFields(array $productIds, $storeId); } diff --git a/Model/Adminhtml/Search/Grid/Options.php b/Model/Adminhtml/Search/Grid/Options.php index 082540ee307ca..fa5aa29fc22b6 100644 --- a/Model/Adminhtml/Search/Grid/Options.php +++ b/Model/Adminhtml/Search/Grid/Options.php @@ -9,21 +9,25 @@ /** * @api + * @since 2.0.0 */ class Options implements \Magento\Framework\Option\ArrayInterface { /** * @var \Magento\Framework\App\RequestInterface + * @since 2.0.0 */ protected $_request; /** * @var \Magento\Framework\Registry + * @since 2.0.0 */ protected $_registryManager; /** * @var \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $_searchResourceModel + * @since 2.0.0 */ protected $_searchResourceModel; @@ -31,6 +35,7 @@ class Options implements \Magento\Framework\Option\ArrayInterface * @param \Magento\Framework\App\RequestInterface $request * @param \Magento\Framework\Registry $registry * @param \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $searchResourceModel + * @since 2.0.0 */ public function __construct( \Magento\Framework\App\RequestInterface $request, @@ -44,6 +49,7 @@ public function __construct( /** * {@inheritdoc} + * @since 2.0.0 */ public function toOptionArray() { diff --git a/Model/Client/ClientFactory.php b/Model/Client/ClientFactory.php index 05eb513d68399..713c3dbe8bec0 100644 --- a/Model/Client/ClientFactory.php +++ b/Model/Client/ClientFactory.php @@ -7,23 +7,31 @@ use Magento\Framework\ObjectManagerInterface; +/** + * Class \Magento\AdvancedSearch\Model\Client\ClientFactory + * + * @since 2.1.0 + */ class ClientFactory implements ClientFactoryInterface { /** * Object manager * * @var ObjectManagerInterface + * @since 2.1.0 */ protected $objectManager; /** * @var string + * @since 2.1.0 */ private $clientClass; /** * @param ObjectManagerInterface $objectManager * @param string $clientClass + * @since 2.1.0 */ public function __construct(ObjectManagerInterface $objectManager, $clientClass) { @@ -36,6 +44,7 @@ public function __construct(ObjectManagerInterface $objectManager, $clientClass) * * @param array $options * @return ClientInterface + * @since 2.1.0 */ public function create(array $options = []) { diff --git a/Model/Client/ClientFactoryInterface.php b/Model/Client/ClientFactoryInterface.php index 0548e8fa78e19..201b9d16bec4a 100644 --- a/Model/Client/ClientFactoryInterface.php +++ b/Model/Client/ClientFactoryInterface.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.1.0 */ interface ClientFactoryInterface { @@ -15,6 +16,7 @@ interface ClientFactoryInterface * * @param array $options * @return ClientInterface + * @since 2.1.0 */ public function create(array $options = []); } diff --git a/Model/Client/ClientInterface.php b/Model/Client/ClientInterface.php index aeb3f6a93ee2f..cdfba7b4a70fd 100644 --- a/Model/Client/ClientInterface.php +++ b/Model/Client/ClientInterface.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.1.0 */ interface ClientInterface { @@ -14,6 +15,7 @@ interface ClientInterface * Validate connection params for search engine * * @return bool + * @since 2.1.0 */ public function testConnection(); } diff --git a/Model/Client/ClientOptionsInterface.php b/Model/Client/ClientOptionsInterface.php index 6e3f3486ef0f8..4ae57d8c0e2b0 100644 --- a/Model/Client/ClientOptionsInterface.php +++ b/Model/Client/ClientOptionsInterface.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.1.0 */ interface ClientOptionsInterface { @@ -15,6 +16,7 @@ interface ClientOptionsInterface * * @param array $options * @return array + * @since 2.1.0 */ public function prepareClientOptions($options = []); } diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index 7a1cef22ca98e..82e14dc0cb9e7 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -10,6 +10,7 @@ /** * @api + * @since 2.1.0 */ class ClientResolver { @@ -17,6 +18,7 @@ class ClientResolver * Scope configuration * * @var ScopeConfigInterface + * @since 2.1.0 */ protected $scopeConfig; @@ -24,6 +26,7 @@ class ClientResolver * Object Manager instance * * @var ObjectManagerInterface + * @since 2.1.0 */ protected $objectManager; @@ -31,6 +34,7 @@ class ClientResolver * Pool of existing client factories * * @var array + * @since 2.1.0 */ private $clientFactoryPool; @@ -38,6 +42,7 @@ class ClientResolver * Pool of client option classes * * @var array + * @since 2.1.0 */ private $clientOptionsPool; @@ -45,11 +50,13 @@ class ClientResolver * Config path * * @var string + * @since 2.1.0 */ protected $path; /** * Config Scope + * @since 2.1.0 */ protected $scope; @@ -60,6 +67,7 @@ class ClientResolver * @param array $clientOptions * @param string $path * @param string scope + * @since 2.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -81,6 +89,7 @@ public function __construct( * Returns configured search engine * * @return string + * @since 2.1.0 */ public function getCurrentEngine() { @@ -93,6 +102,7 @@ public function getCurrentEngine() * @param string $engine * @param array $data * @return ClientInterface + * @since 2.1.0 */ public function create($engine = '', array $data = []) { diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index c76811c854514..e11a0bfd5b7a7 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -8,10 +8,16 @@ use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; +/** + * Class \Magento\AdvancedSearch\Model\DataProvider\Suggestions + * + * @since 2.1.0 + */ class Suggestions implements SuggestedQueriesInterface { /** * {@inheritdoc} + * @since 2.1.0 */ public function isResultsCountEnabled() { @@ -20,6 +26,7 @@ public function isResultsCountEnabled() /** * {@inheritdoc} + * @since 2.1.0 */ public function getItems(QueryInterface $query) { diff --git a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php index ee38dd851264f..179f5afd6509e 100644 --- a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php +++ b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php @@ -14,15 +14,22 @@ use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; use Magento\Search\Model\EngineResolver; +/** + * Class \Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup + * + * @since 2.1.0 + */ class CustomerGroup extends AbstractPlugin { /** * @var ClientOptionsInterface + * @since 2.1.0 */ protected $clientOptions; /** * @var EngineResolver + * @since 2.1.0 */ protected $engineResolver; @@ -30,6 +37,7 @@ class CustomerGroup extends AbstractPlugin * @param IndexerRegistry $indexerRegistry * @param ClientOptionsInterface $clientOptions * @param EngineResolver $engineResolver + * @since 2.1.0 */ public function __construct( IndexerRegistry $indexerRegistry, @@ -49,6 +57,7 @@ public function __construct( * @param AbstractModel $group * @return Attribute * @SuppressWarnings(PHPMD.UnusedFormalParameter) + * @since 2.1.0 */ public function aroundSave( Group $subject, diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index 546983bb5e5a8..efe73f4cf03c5 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -10,6 +10,11 @@ use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; +/** + * Class \Magento\AdvancedSearch\Model\Recommendations\DataProvider + * + * @since 2.0.0 + */ class DataProvider implements SuggestedQueriesInterface { /** @@ -32,21 +37,25 @@ class DataProvider implements SuggestedQueriesInterface /** * @var \Magento\Search\Model\QueryResultFactory + * @since 2.0.0 */ private $queryResultFactory; /** * @var \Magento\Catalog\Model\Layer + * @since 2.0.0 */ protected $searchLayer; /** * @var ScopeConfigInterface + * @since 2.0.0 */ private $scopeConfig; /** * @var \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory + * @since 2.0.0 */ private $recommendationsFactory; @@ -55,6 +64,7 @@ class DataProvider implements SuggestedQueriesInterface * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver * @param \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory * @param \Magento\Search\Model\QueryResultFactory $queryResultFactory + * @since 2.0.0 */ public function __construct( ScopeConfigInterface $scopeConfig, @@ -70,6 +80,7 @@ public function __construct( /** * @return bool + * @since 2.0.0 */ public function isResultsCountEnabled() { @@ -81,6 +92,7 @@ public function isResultsCountEnabled() /** * {@inheritdoc} + * @since 2.0.0 */ public function getItems(QueryInterface $query) { @@ -104,6 +116,7 @@ public function getItems(QueryInterface $query) /** * @param QueryInterface $query * @return array + * @since 2.0.0 */ private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $query) { @@ -127,6 +140,7 @@ private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $ /** * @return bool + * @since 2.0.0 */ private function isSearchRecommendationsEnabled() { @@ -138,6 +152,7 @@ private function isSearchRecommendationsEnabled() /** * @return int + * @since 2.0.0 */ private function getSearchRecommendationsCount() { diff --git a/Model/Recommendations/SaveSearchQueryRelationsObserver.php b/Model/Recommendations/SaveSearchQueryRelationsObserver.php index 5f5d4122d97a5..946cf2832c2fb 100644 --- a/Model/Recommendations/SaveSearchQueryRelationsObserver.php +++ b/Model/Recommendations/SaveSearchQueryRelationsObserver.php @@ -9,16 +9,23 @@ use Magento\Framework\Event\Observer as EventObserver; use Magento\Framework\Event\ObserverInterface; +/** + * Class \Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver + * + * @since 2.0.0 + */ class SaveSearchQueryRelationsObserver implements ObserverInterface { /** * @var RecommendationsFactory + * @since 2.0.0 */ private $recommendationsFactory; /** * @param RecommendationsFactory $recommendationsFactory + * @since 2.0.0 */ public function __construct(RecommendationsFactory $recommendationsFactory) { @@ -30,6 +37,7 @@ public function __construct(RecommendationsFactory $recommendationsFactory) * * @param EventObserver $observer * @return void + * @since 2.0.0 */ public function execute(EventObserver $observer) { diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index e97a3bbeb33c8..6c4e7d244e1fa 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -13,16 +13,19 @@ /** * @api + * @since 2.1.0 */ class Index extends AbstractDb { /** * @var StoreManagerInterface + * @since 2.1.0 */ protected $storeManager; /** * @var MetadataPool + * @since 2.1.0 */ protected $metadataPool; @@ -32,6 +35,7 @@ class Index extends AbstractDb * @param StoreManagerInterface $storeManager * @param MetadataPool $metadataPool * @param null $connectionName + * @since 2.1.0 */ public function __construct( Context $context, @@ -47,6 +51,7 @@ public function __construct( /** * Implementation of abstract construct * @return void + * @since 2.1.0 */ protected function _construct() { @@ -57,6 +62,7 @@ protected function _construct() * * @param null|array $productIds * @return array + * @since 2.1.0 */ protected function _getCatalogProductPriceData($productIds = null) { @@ -85,6 +91,7 @@ protected function _getCatalogProductPriceData($productIds = null) * @param null|array $productIds * @param int $storeId * @return array + * @since 2.1.0 */ public function getPriceIndexData($productIds, $storeId) { @@ -104,6 +111,7 @@ public function getPriceIndexData($productIds, $storeId) * @param int $storeId * @param null|array $productIds * @return array + * @since 2.1.0 */ public function getCategoryProductIndexData($storeId = null, $productIds = null) { @@ -134,6 +142,7 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null) * * @param int $categoryId * @return array + * @since 2.1.0 */ public function getMovedCategoryProductIds($categoryId) { diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index 8986ebc19bb3b..512469ec46ddf 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -10,6 +10,7 @@ * * @author Magento Core Team * @api + * @since 2.0.0 */ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { @@ -18,6 +19,7 @@ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\Abstract * Search query model * * @var \Magento\Search\Model\Query + * @since 2.0.0 */ protected $_searchQueryModel; @@ -27,6 +29,7 @@ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\Abstract * @param \Magento\Framework\Model\ResourceModel\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory * @param string $connectionName + * @since 2.0.0 */ public function __construct( \Magento\Framework\Model\ResourceModel\Db\Context $context, @@ -41,6 +44,7 @@ public function __construct( * Init main table * * @return void + * @since 2.0.0 */ protected function _construct() { @@ -53,6 +57,7 @@ protected function _construct() * @param int $queryId * @param array $relatedQueries * @return $this + * @since 2.0.0 */ public function saveRelatedQueries($queryId, $relatedQueries = []) { @@ -95,6 +100,7 @@ public function saveRelatedQueries($queryId, $relatedQueries = []) * @param bool $limit * @param bool $order * @return array + * @since 2.0.0 */ public function getRelatedQueries($queryId, $limit = false, $order = false) { @@ -135,6 +141,7 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) * @param array $params * @param int $searchRecommendationsCount * @return array + * @since 2.0.0 */ public function getRecommendationsByQuery($query, $params, $searchRecommendationsCount) { @@ -169,6 +176,7 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation * @param string $query * @param int $searchRecommendationsCount * @return array + * @since 2.0.0 */ protected function loadByQuery($query, $searchRecommendationsCount) { diff --git a/Model/ResourceModel/Search/Grid/Collection.php b/Model/ResourceModel/Search/Grid/Collection.php index 56f672b2b7329..617cc960b3855 100644 --- a/Model/ResourceModel/Search/Grid/Collection.php +++ b/Model/ResourceModel/Search/Grid/Collection.php @@ -7,6 +7,7 @@ /** * @api + * @since 2.0.0 */ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection { @@ -14,6 +15,7 @@ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection * Registry manager * * @var \Magento\Framework\Registry + * @since 2.0.0 */ protected $_registryManager; @@ -27,6 +29,7 @@ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection * @param \Magento\Framework\Registry $registry * @param mixed $connection * @param mixed $resource + * @since 2.0.0 */ public function __construct( \Magento\Framework\Data\Collection\EntityFactory $entityFactory, @@ -56,6 +59,7 @@ public function __construct( * Initialize select * * @return $this + * @since 2.0.0 */ protected function _initSelect() { @@ -71,6 +75,7 @@ protected function _initSelect() * Retrieve a value from registry by a key * * @return \Magento\Search\Model\Query + * @since 2.0.0 */ public function getQuery() { diff --git a/Model/SuggestedQueries.php b/Model/SuggestedQueries.php index 723de6fac614e..2a3805652266e 100644 --- a/Model/SuggestedQueries.php +++ b/Model/SuggestedQueries.php @@ -9,15 +9,22 @@ use Magento\Search\Model\QueryInterface; use Magento\Search\Model\EngineResolver; +/** + * Class \Magento\AdvancedSearch\Model\SuggestedQueries + * + * @since 2.0.0 + */ class SuggestedQueries implements SuggestedQueriesInterface { /** * @var EngineResolver + * @since 2.1.0 */ private $engineResolver; /** * @var ObjectManagerInterface + * @since 2.1.0 */ private $objectManager; @@ -25,11 +32,13 @@ class SuggestedQueries implements SuggestedQueriesInterface * Array of SuggestedQueriesInterface class names. * * @var array + * @since 2.1.0 */ private $data; /** * @var SuggestedQueriesInterface + * @since 2.1.0 */ private $dataProvider; @@ -39,6 +48,7 @@ class SuggestedQueries implements SuggestedQueriesInterface * @param EngineResolver $engineResolver * @param ObjectManagerInterface $objectManager * @param array $data + * @since 2.1.0 */ public function __construct(EngineResolver $engineResolver, ObjectManagerInterface $objectManager, array $data) { @@ -49,6 +59,7 @@ public function __construct(EngineResolver $engineResolver, ObjectManagerInterfa /** * {@inheritdoc} + * @since 2.0.0 */ public function isResultsCountEnabled() { @@ -57,6 +68,7 @@ public function isResultsCountEnabled() /** * {@inheritdoc} + * @since 2.0.0 */ public function getItems(QueryInterface $query) { @@ -68,6 +80,7 @@ public function getItems(QueryInterface $query) * * @return SuggestedQueriesInterface|SuggestedQueriesInterface[] * @throws \Exception + * @since 2.1.0 */ private function getDataProvider() { diff --git a/Model/SuggestedQueriesInterface.php b/Model/SuggestedQueriesInterface.php index fbe069e7cd9b3..fcf4b92d28643 100644 --- a/Model/SuggestedQueriesInterface.php +++ b/Model/SuggestedQueriesInterface.php @@ -9,6 +9,7 @@ /** * @api + * @since 2.0.0 */ interface SuggestedQueriesInterface { @@ -31,11 +32,13 @@ interface SuggestedQueriesInterface /** * @param QueryInterface $query * @return \Magento\Search\Model\QueryResult[] + * @since 2.0.0 */ public function getItems(QueryInterface $query); /** * @return bool + * @since 2.0.0 */ public function isResultsCountEnabled(); } diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index 6c1f17fb17a09..798b48667861c 100644 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -12,11 +12,13 @@ /** * @codeCoverageIgnore + * @since 2.0.0 */ class InstallSchema implements InstallSchemaInterface { /** * {@inheritdoc} + * @since 2.0.0 */ public function install(SchemaSetupInterface $setup, ModuleContextInterface $context) { From 078d30ac0b5a4cf3eea6d654e82ac41061aa106a Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 28 Jul 2017 16:54:36 -0500 Subject: [PATCH 528/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - fixed missing items --- Model/Adapter/Elasticsearch.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 4631855e40739..618d553cf9645 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -24,6 +24,7 @@ class Elasticsearch /** * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager + * @since 2.1.0 */ protected $connectionManager; From ba1898d7a3b304bee0b635eabe662a6c46101cad Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Wed, 2 Aug 2017 14:16:55 -0500 Subject: [PATCH 529/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - removed @since 2.0.0 as it is a base release - updated version in @since and @deprecated tag taking into account all patch releases --- Block/Adminhtml/Search/Edit.php | 2 -- Block/Adminhtml/Search/Grid.php | 9 --------- Block/Recommendations.php | 1 - Block/SearchData.php | 10 ---------- Block/SearchDataInterface.php | 5 ----- Block/Suggestions.php | 1 - Model/Adminhtml/Search/Grid/Options.php | 6 ------ Model/Recommendations/DataProvider.php | 11 ----------- .../SaveSearchQueryRelationsObserver.php | 4 ---- Model/ResourceModel/Recommendations.php | 8 -------- Model/ResourceModel/Search/Grid/Collection.php | 5 ----- Model/SuggestedQueries.php | 3 --- Model/SuggestedQueriesInterface.php | 3 --- Setup/InstallSchema.php | 2 -- 14 files changed, 70 deletions(-) diff --git a/Block/Adminhtml/Search/Edit.php b/Block/Adminhtml/Search/Edit.php index 3a35ea0b575ca..d9a4b8125ce6a 100644 --- a/Block/Adminhtml/Search/Edit.php +++ b/Block/Adminhtml/Search/Edit.php @@ -10,7 +10,6 @@ * * @api * @author Magento Core Team - * @since 2.0.0 */ class Edit extends \Magento\Backend\Block\Widget\Grid\Container { @@ -18,7 +17,6 @@ class Edit extends \Magento\Backend\Block\Widget\Grid\Container * Enable grid container * * @return void - * @since 2.0.0 */ protected function _construct() { diff --git a/Block/Adminhtml/Search/Grid.php b/Block/Adminhtml/Search/Grid.php index 83f962a4dd924..a64eb137b6ac2 100644 --- a/Block/Adminhtml/Search/Grid.php +++ b/Block/Adminhtml/Search/Grid.php @@ -10,25 +10,21 @@ * * @api * @author Magento Core Team - * @since 2.0.0 */ class Grid extends \Magento\Backend\Block\Widget\Grid { /** * @var \Magento\AdvancedSearch\Model\Adminhtml\Search\Grid\Options - * @since 2.0.0 */ protected $_options; /** * @var \Magento\Framework\Registry - * @since 2.0.0 */ protected $_registryManager; /** * @var \Magento\Framework\Json\Helper\Data - * @since 2.0.0 */ protected $jsonHelper; @@ -39,7 +35,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid * @param \Magento\Framework\Registry $registry * @param \Magento\Framework\Json\Helper\Data $jsonHelper * @param array $data - * @since 2.0.0 */ public function __construct( \Magento\Backend\Block\Template\Context $context, @@ -60,7 +55,6 @@ public function __construct( * Retrieve a value from registry by a key * * @return mixed - * @since 2.0.0 */ public function getQuery() { @@ -72,7 +66,6 @@ public function getQuery() * * @param \Magento\Backend\Block\Widget\Grid\Column $column * @return $this - * @since 2.0.0 */ protected function _addColumnFilterToCollection($column) { @@ -97,7 +90,6 @@ protected function _addColumnFilterToCollection($column) * Retrieve selected related queries from grid * * @return array - * @since 2.0.0 */ public function getSelectedQueries() { @@ -108,7 +100,6 @@ public function getSelectedQueries() * Get queries json * * @return string - * @since 2.0.0 */ public function getQueriesJson() { diff --git a/Block/Recommendations.php b/Block/Recommendations.php index 1fdb6d095acc5..6d9fbb795464b 100644 --- a/Block/Recommendations.php +++ b/Block/Recommendations.php @@ -7,7 +7,6 @@ /** * @api - * @since 2.0.0 */ class Recommendations extends SearchData { diff --git a/Block/SearchData.php b/Block/SearchData.php index af42124c05f25..c82b130dbec87 100644 --- a/Block/SearchData.php +++ b/Block/SearchData.php @@ -13,31 +13,26 @@ /** * Class \Magento\AdvancedSearch\Block\SearchData * - * @since 2.0.0 */ abstract class SearchData extends Template implements SearchDataInterface { /** * @var QueryInterface - * @since 2.0.0 */ private $query; /** * @var string - * @since 2.0.0 */ protected $title; /** * @var SuggestedQueriesInterface - * @since 2.0.0 */ private $searchDataProvider; /** * @var string - * @since 2.0.0 */ protected $_template = 'search_data.phtml'; @@ -47,7 +42,6 @@ abstract class SearchData extends Template implements SearchDataInterface * @param QueryFactoryInterface $queryFactory * @param string $title * @param array $data - * @since 2.0.0 */ public function __construct( Template\Context $context, @@ -64,7 +58,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.0.0 */ public function getItems() { @@ -73,7 +66,6 @@ public function getItems() /** * {@inheritdoc} - * @since 2.0.0 */ public function isShowResultsCount() { @@ -82,7 +74,6 @@ public function isShowResultsCount() /** * {@inheritdoc} - * @since 2.0.0 */ public function getLink($queryText) { @@ -91,7 +82,6 @@ public function getLink($queryText) /** * {@inheritdoc} - * @since 2.0.0 */ public function getTitle() { diff --git a/Block/SearchDataInterface.php b/Block/SearchDataInterface.php index 1e43769da641a..299e68e558ad5 100644 --- a/Block/SearchDataInterface.php +++ b/Block/SearchDataInterface.php @@ -8,7 +8,6 @@ /** * Interface \Magento\AdvancedSearch\Block\SearchDataInterface * - * @since 2.0.0 */ interface SearchDataInterface { @@ -16,26 +15,22 @@ interface SearchDataInterface * Retrieve search suggestions * * @return array - * @since 2.0.0 */ public function getItems(); /** * @return bool - * @since 2.0.0 */ public function isShowResultsCount(); /** * @param string $queryText * @return string - * @since 2.0.0 */ public function getLink($queryText); /** * @return string - * @since 2.0.0 */ public function getTitle(); } diff --git a/Block/Suggestions.php b/Block/Suggestions.php index e81206af55b6c..4476e10153ebb 100644 --- a/Block/Suggestions.php +++ b/Block/Suggestions.php @@ -7,7 +7,6 @@ /** * @api - * @since 2.0.0 */ class Suggestions extends SearchData { diff --git a/Model/Adminhtml/Search/Grid/Options.php b/Model/Adminhtml/Search/Grid/Options.php index fa5aa29fc22b6..082540ee307ca 100644 --- a/Model/Adminhtml/Search/Grid/Options.php +++ b/Model/Adminhtml/Search/Grid/Options.php @@ -9,25 +9,21 @@ /** * @api - * @since 2.0.0 */ class Options implements \Magento\Framework\Option\ArrayInterface { /** * @var \Magento\Framework\App\RequestInterface - * @since 2.0.0 */ protected $_request; /** * @var \Magento\Framework\Registry - * @since 2.0.0 */ protected $_registryManager; /** * @var \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $_searchResourceModel - * @since 2.0.0 */ protected $_searchResourceModel; @@ -35,7 +31,6 @@ class Options implements \Magento\Framework\Option\ArrayInterface * @param \Magento\Framework\App\RequestInterface $request * @param \Magento\Framework\Registry $registry * @param \Magento\AdvancedSearch\Model\ResourceModel\Recommendations $searchResourceModel - * @since 2.0.0 */ public function __construct( \Magento\Framework\App\RequestInterface $request, @@ -49,7 +44,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.0.0 */ public function toOptionArray() { diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index efe73f4cf03c5..6f3d42449760e 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -13,7 +13,6 @@ /** * Class \Magento\AdvancedSearch\Model\Recommendations\DataProvider * - * @since 2.0.0 */ class DataProvider implements SuggestedQueriesInterface { @@ -37,25 +36,21 @@ class DataProvider implements SuggestedQueriesInterface /** * @var \Magento\Search\Model\QueryResultFactory - * @since 2.0.0 */ private $queryResultFactory; /** * @var \Magento\Catalog\Model\Layer - * @since 2.0.0 */ protected $searchLayer; /** * @var ScopeConfigInterface - * @since 2.0.0 */ private $scopeConfig; /** * @var \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory - * @since 2.0.0 */ private $recommendationsFactory; @@ -64,7 +59,6 @@ class DataProvider implements SuggestedQueriesInterface * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver * @param \Magento\AdvancedSearch\Model\ResourceModel\RecommendationsFactory $recommendationsFactory * @param \Magento\Search\Model\QueryResultFactory $queryResultFactory - * @since 2.0.0 */ public function __construct( ScopeConfigInterface $scopeConfig, @@ -80,7 +74,6 @@ public function __construct( /** * @return bool - * @since 2.0.0 */ public function isResultsCountEnabled() { @@ -92,7 +85,6 @@ public function isResultsCountEnabled() /** * {@inheritdoc} - * @since 2.0.0 */ public function getItems(QueryInterface $query) { @@ -116,7 +108,6 @@ public function getItems(QueryInterface $query) /** * @param QueryInterface $query * @return array - * @since 2.0.0 */ private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $query) { @@ -140,7 +131,6 @@ private function getSearchRecommendations(\Magento\Search\Model\QueryInterface $ /** * @return bool - * @since 2.0.0 */ private function isSearchRecommendationsEnabled() { @@ -152,7 +142,6 @@ private function isSearchRecommendationsEnabled() /** * @return int - * @since 2.0.0 */ private function getSearchRecommendationsCount() { diff --git a/Model/Recommendations/SaveSearchQueryRelationsObserver.php b/Model/Recommendations/SaveSearchQueryRelationsObserver.php index 946cf2832c2fb..2ac9cb73c912a 100644 --- a/Model/Recommendations/SaveSearchQueryRelationsObserver.php +++ b/Model/Recommendations/SaveSearchQueryRelationsObserver.php @@ -12,20 +12,17 @@ /** * Class \Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver * - * @since 2.0.0 */ class SaveSearchQueryRelationsObserver implements ObserverInterface { /** * @var RecommendationsFactory - * @since 2.0.0 */ private $recommendationsFactory; /** * @param RecommendationsFactory $recommendationsFactory - * @since 2.0.0 */ public function __construct(RecommendationsFactory $recommendationsFactory) { @@ -37,7 +34,6 @@ public function __construct(RecommendationsFactory $recommendationsFactory) * * @param EventObserver $observer * @return void - * @since 2.0.0 */ public function execute(EventObserver $observer) { diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index 512469ec46ddf..8986ebc19bb3b 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -10,7 +10,6 @@ * * @author Magento Core Team * @api - * @since 2.0.0 */ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { @@ -19,7 +18,6 @@ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\Abstract * Search query model * * @var \Magento\Search\Model\Query - * @since 2.0.0 */ protected $_searchQueryModel; @@ -29,7 +27,6 @@ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\Abstract * @param \Magento\Framework\Model\ResourceModel\Db\Context $context * @param \Magento\Search\Model\QueryFactory $queryFactory * @param string $connectionName - * @since 2.0.0 */ public function __construct( \Magento\Framework\Model\ResourceModel\Db\Context $context, @@ -44,7 +41,6 @@ public function __construct( * Init main table * * @return void - * @since 2.0.0 */ protected function _construct() { @@ -57,7 +53,6 @@ protected function _construct() * @param int $queryId * @param array $relatedQueries * @return $this - * @since 2.0.0 */ public function saveRelatedQueries($queryId, $relatedQueries = []) { @@ -100,7 +95,6 @@ public function saveRelatedQueries($queryId, $relatedQueries = []) * @param bool $limit * @param bool $order * @return array - * @since 2.0.0 */ public function getRelatedQueries($queryId, $limit = false, $order = false) { @@ -141,7 +135,6 @@ public function getRelatedQueries($queryId, $limit = false, $order = false) * @param array $params * @param int $searchRecommendationsCount * @return array - * @since 2.0.0 */ public function getRecommendationsByQuery($query, $params, $searchRecommendationsCount) { @@ -176,7 +169,6 @@ public function getRecommendationsByQuery($query, $params, $searchRecommendation * @param string $query * @param int $searchRecommendationsCount * @return array - * @since 2.0.0 */ protected function loadByQuery($query, $searchRecommendationsCount) { diff --git a/Model/ResourceModel/Search/Grid/Collection.php b/Model/ResourceModel/Search/Grid/Collection.php index 617cc960b3855..56f672b2b7329 100644 --- a/Model/ResourceModel/Search/Grid/Collection.php +++ b/Model/ResourceModel/Search/Grid/Collection.php @@ -7,7 +7,6 @@ /** * @api - * @since 2.0.0 */ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection { @@ -15,7 +14,6 @@ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection * Registry manager * * @var \Magento\Framework\Registry - * @since 2.0.0 */ protected $_registryManager; @@ -29,7 +27,6 @@ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection * @param \Magento\Framework\Registry $registry * @param mixed $connection * @param mixed $resource - * @since 2.0.0 */ public function __construct( \Magento\Framework\Data\Collection\EntityFactory $entityFactory, @@ -59,7 +56,6 @@ public function __construct( * Initialize select * * @return $this - * @since 2.0.0 */ protected function _initSelect() { @@ -75,7 +71,6 @@ protected function _initSelect() * Retrieve a value from registry by a key * * @return \Magento\Search\Model\Query - * @since 2.0.0 */ public function getQuery() { diff --git a/Model/SuggestedQueries.php b/Model/SuggestedQueries.php index 2a3805652266e..ea4aa2f949ee2 100644 --- a/Model/SuggestedQueries.php +++ b/Model/SuggestedQueries.php @@ -12,7 +12,6 @@ /** * Class \Magento\AdvancedSearch\Model\SuggestedQueries * - * @since 2.0.0 */ class SuggestedQueries implements SuggestedQueriesInterface { @@ -59,7 +58,6 @@ public function __construct(EngineResolver $engineResolver, ObjectManagerInterfa /** * {@inheritdoc} - * @since 2.0.0 */ public function isResultsCountEnabled() { @@ -68,7 +66,6 @@ public function isResultsCountEnabled() /** * {@inheritdoc} - * @since 2.0.0 */ public function getItems(QueryInterface $query) { diff --git a/Model/SuggestedQueriesInterface.php b/Model/SuggestedQueriesInterface.php index fcf4b92d28643..fbe069e7cd9b3 100644 --- a/Model/SuggestedQueriesInterface.php +++ b/Model/SuggestedQueriesInterface.php @@ -9,7 +9,6 @@ /** * @api - * @since 2.0.0 */ interface SuggestedQueriesInterface { @@ -32,13 +31,11 @@ interface SuggestedQueriesInterface /** * @param QueryInterface $query * @return \Magento\Search\Model\QueryResult[] - * @since 2.0.0 */ public function getItems(QueryInterface $query); /** * @return bool - * @since 2.0.0 */ public function isResultsCountEnabled(); } diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php index 798b48667861c..6c1f17fb17a09 100644 --- a/Setup/InstallSchema.php +++ b/Setup/InstallSchema.php @@ -12,13 +12,11 @@ /** * @codeCoverageIgnore - * @since 2.0.0 */ class InstallSchema implements InstallSchemaInterface { /** * {@inheritdoc} - * @since 2.0.0 */ public function install(SchemaSetupInterface $setup, ModuleContextInterface $context) { From ffa74651547c02ea264c850f4ca52c6335ebe2ac Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 4 Aug 2017 19:17:23 -0500 Subject: [PATCH 530/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - replaced release version with package version in @since and @depreacated tags - removed @since tag from private properties/methods and non @api classes --- .../System/Config/TestConnection.php | 2 - .../CategoryFieldsProvider.php | 5 --- .../BatchDataMapper/DataMapperFactory.php | 5 --- .../BatchDataMapper/DataMapperResolver.php | 6 --- .../BatchDataMapper/PriceFieldsProvider.php | 7 ---- .../BatchDataMapper/ProductDataMapper.php | 18 -------- Model/Adapter/BatchDataMapperInterface.php | 4 +- Model/Adapter/Container/Attribute.php | 11 +---- .../Adapter/DataMapper/DataMapperResolver.php | 9 +--- .../Adapter/DataMapper/ProductDataMapper.php | 23 +--------- Model/Adapter/DataMapperInterface.php | 4 +- Model/Adapter/Document/Builder.php | 11 ++--- Model/Adapter/Elasticsearch.php | 27 +----------- .../FieldMapper/FieldMapperResolver.php | 8 ---- .../FieldMapper/ProductFieldMapper.php | 14 ------- Model/Adapter/FieldMapperInterface.php | 6 +-- Model/Adapter/FieldType.php | 4 +- Model/Adapter/FieldType/Date.php | 6 --- Model/Adapter/Index/Builder.php | 11 ----- Model/Adapter/Index/BuilderInterface.php | 6 +-- Model/Adapter/Index/Config/Converter.php | 2 - Model/Adapter/Index/Config/EsConfig.php | 4 -- .../Index/Config/EsConfigInterface.php | 6 +-- Model/Adapter/Index/Config/SchemaLocator.php | 6 --- Model/Adapter/Index/IndexNameResolver.php | 24 +++++------ Model/Client/Elasticsearch.php | 20 --------- Model/Config.php | 18 ++++---- Model/DataProvider/Suggestions.php | 14 ------- Model/Indexer/IndexStructure.php | 6 --- Model/Indexer/IndexerHandler.php | 14 ------- Model/ResourceModel/Engine.php | 9 ---- Model/ResourceModel/Index.php | 14 +++---- SearchAdapter/Adapter.php | 8 ---- SearchAdapter/Aggregation/Builder.php | 8 ---- .../Builder/BucketBuilderInterface.php | 4 +- SearchAdapter/Aggregation/Builder/Dynamic.php | 7 ---- SearchAdapter/Aggregation/Builder/Term.php | 2 - .../Aggregation/DataProviderFactory.php | 4 -- SearchAdapter/Aggregation/Interval.php | 13 ------ SearchAdapter/AggregationFactory.php | 9 ++-- SearchAdapter/ConnectionManager.php | 15 ++++--- SearchAdapter/DocumentFactory.php | 11 +++-- SearchAdapter/Dynamic/DataProvider.php | 42 +++++++++---------- SearchAdapter/Filter/Builder.php | 9 ---- .../Filter/Builder/FilterInterface.php | 4 +- SearchAdapter/Filter/Builder/Range.php | 4 -- SearchAdapter/Filter/Builder/Term.php | 4 -- SearchAdapter/Filter/Builder/Wildcard.php | 4 -- SearchAdapter/Filter/BuilderInterface.php | 4 +- SearchAdapter/Mapper.php | 19 ++++----- SearchAdapter/Query/Builder.php | 16 +++---- SearchAdapter/Query/Builder/Aggregation.php | 10 ++--- SearchAdapter/Query/Builder/Match.php | 8 ---- .../Query/Builder/QueryInterface.php | 4 +- .../Query/Preprocessor/Stopwords.php | 28 ++++++------- SearchAdapter/QueryAwareInterface.php | 1 - SearchAdapter/QueryContainer.php | 4 -- SearchAdapter/ResponseFactory.php | 12 +++--- SearchAdapter/SearchIndexNameResolver.php | 8 ++-- 59 files changed, 138 insertions(+), 448 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index d1c414bbf9fbc..5dc4476794da7 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -8,13 +8,11 @@ /** * Elasticsearch test connection block * @codeCoverageIgnore - * @since 2.1.0 */ class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection { /** * {@inheritdoc} - * @since 2.1.0 */ protected function _getFieldMapping() { diff --git a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php index 629de9a251244..e2de4aec717a4 100644 --- a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php +++ b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php @@ -10,19 +10,16 @@ /** * Provide data mapping for categories fields - * @since 2.2.0 */ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface { /** * @var Index - * @since 2.2.0 */ private $resourceIndex; /** * @param Index $resourceIndex - * @since 2.2.0 */ public function __construct(Index $resourceIndex) { @@ -31,7 +28,6 @@ public function __construct(Index $resourceIndex) /** * {@inheritdoc} - * @since 2.2.0 */ public function getFields(array $productIds, $storeId) { @@ -51,7 +47,6 @@ public function getFields(array $productIds, $storeId) * @param int $productId * @param array $categoryIndexData * @return array - * @since 2.2.0 */ private function getProductCategoryData($productId, array $categoryIndexData) { diff --git a/Model/Adapter/BatchDataMapper/DataMapperFactory.php b/Model/Adapter/BatchDataMapper/DataMapperFactory.php index a337635cfb1ad..29bdb036e206d 100644 --- a/Model/Adapter/BatchDataMapper/DataMapperFactory.php +++ b/Model/Adapter/BatchDataMapper/DataMapperFactory.php @@ -12,7 +12,6 @@ /** * Data mapper factory - * @since 2.2.0 */ class DataMapperFactory { @@ -20,20 +19,17 @@ class DataMapperFactory * Object Manager instance * * @var ObjectManagerInterface - * @since 2.2.0 */ private $objectManager; /** * @var string[] - * @since 2.2.0 */ private $dataMappers; /** * @param ObjectManagerInterface $objectManager * @param string[] $dataMappers - * @since 2.2.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -50,7 +46,6 @@ public function __construct( * @return BatchDataMapperInterface * @throws NoSuchEntityException * @throws ConfigurationMismatchException - * @since 2.2.0 */ public function create($entityType) { diff --git a/Model/Adapter/BatchDataMapper/DataMapperResolver.php b/Model/Adapter/BatchDataMapper/DataMapperResolver.php index 27b54f970527f..fd7a64eb0c9b7 100644 --- a/Model/Adapter/BatchDataMapper/DataMapperResolver.php +++ b/Model/Adapter/BatchDataMapper/DataMapperResolver.php @@ -12,25 +12,21 @@ /** * Map index data to search engine metadata - * @since 2.2.0 */ class DataMapperResolver implements BatchDataMapperInterface { /** * @var BatchDataMapperInterface - * @since 2.2.0 */ private $dataMapperEntity; /** * @var DataMapperFactory - * @since 2.2.0 */ private $dataMapperFactory; /** * @param DataMapperFactory $dataMapperFactory - * @since 2.2.0 */ public function __construct(DataMapperFactory $dataMapperFactory) { @@ -39,7 +35,6 @@ public function __construct(DataMapperFactory $dataMapperFactory) /** * {@inheritdoc} - * @since 2.2.0 */ public function map(array $documentData, $storeId, array $context = []) { @@ -54,7 +49,6 @@ public function map(array $documentData, $storeId, array $context = []) * @return BatchDataMapperInterface * @throws NoSuchEntityException * @throws ConfigurationMismatchException - * @since 2.2.0 */ private function getDataMapper($entityType) { diff --git a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php index 83599eab7ee05..aa8965713c32a 100644 --- a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php +++ b/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php @@ -12,25 +12,21 @@ /** * Provide data mapping for price fields - * @since 2.2.0 */ class PriceFieldsProvider implements AdditionalFieldsProviderInterface { /** * @var Index - * @since 2.2.0 */ private $resourceIndex; /** * @var DataProvider - * @since 2.2.0 */ private $dataProvider; /** * @var StoreManagerInterface - * @since 2.2.0 */ private $storeManager; @@ -38,7 +34,6 @@ class PriceFieldsProvider implements AdditionalFieldsProviderInterface * @param Index $resourceIndex * @param DataProvider $dataProvider * @param StoreManagerInterface $storeManager - * @since 2.2.0 */ public function __construct( Index $resourceIndex, @@ -52,7 +47,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.2.0 */ public function getFields(array $productIds, $storeId) { @@ -76,7 +70,6 @@ public function getFields(array $productIds, $storeId) * @param int $websiteId * @param array $priceIndexData * @return array - * @since 2.2.0 */ private function getProductPriceData($productId, $websiteId, array $priceIndexData) { diff --git a/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/Model/Adapter/BatchDataMapper/ProductDataMapper.php index 99ee18523e967..bff9cdd68206a 100644 --- a/Model/Adapter/BatchDataMapper/ProductDataMapper.php +++ b/Model/Adapter/BatchDataMapper/ProductDataMapper.php @@ -15,49 +15,41 @@ /** * Map product index data to search engine metadata - * @since 2.2.0 */ class ProductDataMapper implements BatchDataMapperInterface { /** * @var Builder - * @since 2.2.0 */ private $builder; /** * @var FieldMapperInterface - * @since 2.2.0 */ private $fieldMapper; /** * @var DateFieldType - * @since 2.2.0 */ private $dateFieldType; /** * @var array - * @since 2.2.0 */ private $attributeData = []; /** * @var array - * @since 2.2.0 */ private $excludedAttributes; /** * @var AdditionalFieldsProviderInterface - * @since 2.2.0 */ private $additionalFieldsProvider; /** * @var DataProvider - * @since 2.2.0 */ private $dataProvider; @@ -65,7 +57,6 @@ class ProductDataMapper implements BatchDataMapperInterface * List of attributes which will be skipped during mapping * * @var string[] - * @since 2.2.0 */ private $defaultExcludedAttributes = [ 'price', @@ -78,7 +69,6 @@ class ProductDataMapper implements BatchDataMapperInterface /** * @var string[] - * @since 2.2.0 */ private $attributesExcludedFromMerge = [ 'status', @@ -95,7 +85,6 @@ class ProductDataMapper implements BatchDataMapperInterface * @param AdditionalFieldsProviderInterface $additionalFieldsProvider * @param DataProvider $dataProvider * @param array $excludedAttributes - * @since 2.2.0 */ public function __construct( Builder $builder, @@ -115,7 +104,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.2.0 */ public function map(array $documentData, $storeId, array $context = []) { @@ -165,7 +153,6 @@ public function map(array $documentData, $storeId, array $context = []) * @param array $indexData * @param int $storeId * @return array - * @since 2.2.0 */ private function convertToProductData($productId, array $indexData, $storeId) { @@ -199,7 +186,6 @@ private function convertToProductData($productId, array $indexData, $storeId) * @param array $attributeData * @param int $storeId * @return array - * @since 2.2.0 */ private function convertAttribute($productId, $attributeId, $attributeValue, array $attributeData, $storeId) { @@ -260,7 +246,6 @@ private function convertAttribute($productId, $attributeId, $attributeValue, arr * * @param int $attributeId * @return array - * @since 2.2.0 */ private function getAttributeData($attributeId) { @@ -295,7 +280,6 @@ private function getAttributeData($attributeId) * @param array $attributeData * @param string $storeId * @return string - * @since 2.2.0 */ private function formatProductAttributeValue($value, $attributeData, $storeId) { @@ -317,7 +301,6 @@ private function formatProductAttributeValue($value, $attributeData, $storeId) * @param array $attributeValue * @param bool $isSearchable * @return mixed - * @since 2.2.0 */ private function getValueForAttribute($productId, $attributeCode, array $attributeValue, $isSearchable) { @@ -337,7 +320,6 @@ private function getValueForAttribute($productId, $attributeCode, array $attribu * @param array $attributeData * @param array $attributeValue * @return string - * @since 2.2.0 */ private function getValueForAttributeOptions(array $attributeData, array $attributeValue) { diff --git a/Model/Adapter/BatchDataMapperInterface.php b/Model/Adapter/BatchDataMapperInterface.php index 265b2fd2c722d..fcc5a32d339e9 100644 --- a/Model/Adapter/BatchDataMapperInterface.php +++ b/Model/Adapter/BatchDataMapperInterface.php @@ -9,7 +9,7 @@ * Map index data to search engine metadata * Convert array [[attribute_id => [entity_id => value], ... ]] to applicable for search engine [[attribute => value],] * @api - * @since 2.2.0 + * @since 100.2.0 */ interface BatchDataMapperInterface { @@ -20,7 +20,7 @@ interface BatchDataMapperInterface * @param int $storeId * @param array $context * @return array - * @since 2.2.0 + * @since 100.2.0 */ public function map(array $documentData, $storeId, array $context = []); } diff --git a/Model/Adapter/Container/Attribute.php b/Model/Adapter/Container/Attribute.php index 6d04106aaec8c..12ca1e1a741ff 100644 --- a/Model/Adapter/Container/Attribute.php +++ b/Model/Adapter/Container/Attribute.php @@ -9,34 +9,29 @@ use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute; /** - * @deprecated 2.2.0 + * @deprecated 100.2.0 * This class is used only in deprecated \Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper * and must not be used for new code - * @since 2.1.0 */ class Attribute { /** * @var string[] - * @since 2.1.0 */ private $idToCodeMap = []; /** * @var Collection - * @since 2.1.0 */ private $attributeCollection; /** * @var EavAttribute[] - * @since 2.1.0 */ private $attributes = []; /** * @param Collection $attributeCollection - * @since 2.1.0 */ public function __construct(Collection $attributeCollection) { @@ -46,7 +41,6 @@ public function __construct(Collection $attributeCollection) /** * @param int $attributeId * @return string - * @since 2.1.0 */ public function getAttributeCodeById($attributeId) { @@ -62,7 +56,6 @@ public function getAttributeCodeById($attributeId) /** * @param string $attributeCode * @return int - * @since 2.1.0 */ public function getAttributeIdByCode($attributeCode) { @@ -79,7 +72,6 @@ public function getAttributeIdByCode($attributeCode) /** * @param string $attributeCode * @return EavAttribute|null - * @since 2.1.0 */ public function getAttribute($attributeCode) { @@ -91,7 +83,6 @@ public function getAttribute($attributeCode) /** * @return EavAttribute[] - * @since 2.1.0 */ public function getAttributes() { diff --git a/Model/Adapter/DataMapper/DataMapperResolver.php b/Model/Adapter/DataMapper/DataMapperResolver.php index 58ecd16c244ef..dbb37f3363b3d 100644 --- a/Model/Adapter/DataMapper/DataMapperResolver.php +++ b/Model/Adapter/DataMapper/DataMapperResolver.php @@ -10,9 +10,8 @@ use Magento\Elasticsearch\Model\Config; /** - * @deprecated 2.2.0 + * @deprecated 100.2.0 * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface - * @since 2.1.0 */ class DataMapperResolver implements DataMapperInterface { @@ -20,13 +19,11 @@ class DataMapperResolver implements DataMapperInterface * Object Manager instance * * @var ObjectManagerInterface - * @since 2.1.0 */ private $objectManager; /** * @var string[] - * @since 2.1.0 */ private $dataMappers; @@ -34,14 +31,12 @@ class DataMapperResolver implements DataMapperInterface * Data Mapper instance * * @var DataMapperInterface - * @since 2.1.0 */ private $dataMapperEntity; /** * @param ObjectManagerInterface $objectManager * @param string[] $dataMappers - * @since 2.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -53,7 +48,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function map( $entityId, @@ -71,7 +65,6 @@ public function map( * @param string $entityType * @return DataMapperInterface * @throws \Exception - * @since 2.1.0 */ private function getEntity($entityType = '') { diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index 4b5a0c4b659db..b91885b465c85 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -16,9 +16,8 @@ use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType; /** - * @deprecated 2.2.0 + * @deprecated 100.2.0 * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface - * @since 2.1.0 */ class ProductDataMapper implements DataMapperInterface { @@ -44,37 +43,31 @@ class ProductDataMapper implements DataMapperInterface /** * @var Builder - * @since 2.1.0 */ private $builder; /** * @var AttributeContainer - * @since 2.1.0 */ private $attributeContainer; /** * @var Index - * @since 2.1.0 */ private $resourceIndex; /** * @var FieldMapperInterface - * @since 2.1.0 */ private $fieldMapper; /** * @var StoreManagerInterface - * @since 2.1.0 */ private $storeManager; /** * @var DateFieldType - * @since 2.1.0 */ private $dateFieldType; @@ -82,7 +75,6 @@ class ProductDataMapper implements DataMapperInterface * Media gallery roles * * @var array - * @since 2.1.0 */ protected $mediaGalleryRoles; @@ -95,7 +87,6 @@ class ProductDataMapper implements DataMapperInterface * @param FieldMapperInterface $fieldMapper * @param StoreManagerInterface $storeManager * @param DateFieldType $dateFieldType - * @since 2.1.0 */ public function __construct( Builder $builder, @@ -128,7 +119,6 @@ public function __construct( * @param int $storeId * @param array $context * @return array|false - * @since 2.1.0 */ public function map($productId, array $indexData, $storeId, $context = []) { @@ -181,7 +171,6 @@ public function map($productId, array $indexData, $storeId, $context = []) * @param array $productIndexData * @param int $storeId * @return void - * @since 2.1.0 */ protected function processAdvancedAttributes($productId, array $productIndexData, $storeId) { @@ -218,7 +207,6 @@ protected function processAdvancedAttributes($productId, array $productIndexData * @param Attribute $attribute * @param string $storeId * @return array|mixed|null|string - * @since 2.1.0 */ protected function checkValue($value, $attribute, $storeId) { @@ -237,7 +225,6 @@ protected function checkValue($value, $attribute, $storeId) * * @param array $data * @return array - * @since 2.1.0 */ protected function getProductTierPriceData($data) { @@ -266,7 +253,6 @@ protected function getProductTierPriceData($data) * @param array $media * @param array $roles * @return array - * @since 2.1.0 */ protected function getProductMediaGalleryData($media, $roles) { @@ -310,7 +296,6 @@ protected function getProductMediaGalleryData($media, $roles) * @param string $file * @param array $roles * @return string - * @since 2.1.0 */ protected function getMediaRoleImage($file, $roles) { @@ -321,7 +306,6 @@ protected function getMediaRoleImage($file, $roles) * @param string $file * @param array $roles * @return string - * @since 2.1.0 */ protected function getMediaRoleSmallImage($file, $roles) { @@ -332,7 +316,6 @@ protected function getMediaRoleSmallImage($file, $roles) * @param string $file * @param array $roles * @return string - * @since 2.1.0 */ protected function getMediaRoleThumbnail($file, $roles) { @@ -343,7 +326,6 @@ protected function getMediaRoleThumbnail($file, $roles) * @param string $file * @param array $roles * @return string - * @since 2.1.0 */ protected function getMediaRoleSwatchImage($file, $roles) { @@ -355,7 +337,6 @@ protected function getMediaRoleSwatchImage($file, $roles) * * @param array $data * @return array - * @since 2.1.0 */ protected function getQtyAndStatus($data) { @@ -377,7 +358,6 @@ protected function getQtyAndStatus($data) * @param int $storeId * @param array $priceIndexData * @return array - * @since 2.1.0 */ protected function getProductPriceData($productId, $storeId, array $priceIndexData) { @@ -399,7 +379,6 @@ protected function getProductPriceData($productId, $storeId, array $priceIndexDa * @param int $productId * @param array $categoryIndexData * @return array - * @since 2.1.0 */ protected function getProductCategoryData($productId, array $categoryIndexData) { diff --git a/Model/Adapter/DataMapperInterface.php b/Model/Adapter/DataMapperInterface.php index 3be70480d114f..e43a4da065314 100644 --- a/Model/Adapter/DataMapperInterface.php +++ b/Model/Adapter/DataMapperInterface.php @@ -6,9 +6,8 @@ namespace Magento\Elasticsearch\Model\Adapter; /** - * @deprecated 2.2.0 + * @deprecated 100.2.0 * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface - * @since 2.1.0 */ interface DataMapperInterface { @@ -20,7 +19,6 @@ interface DataMapperInterface * @param int $storeId * @param array $context * @return array - * @since 2.1.0 */ public function map($entityId, array $entityIndexData, $storeId, $context = []); } diff --git a/Model/Adapter/Document/Builder.php b/Model/Adapter/Document/Builder.php index ecf4d454bdc2a..943261bca2790 100644 --- a/Model/Adapter/Document/Builder.php +++ b/Model/Adapter/Document/Builder.php @@ -7,19 +7,18 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class Builder { /** * @var array - * @since 2.1.0 */ private $fields = []; /** * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function build() { @@ -33,7 +32,6 @@ public function build() /** * @return void - * @since 2.1.0 */ private function clear() { @@ -45,7 +43,6 @@ private function clear() * @param string $field * @param string|int|float $value * @return array - * @since 2.1.0 */ private function addFieldToDocument($document, $field, $value) { @@ -70,7 +67,7 @@ private function addFieldToDocument($document, $field, $value) * @param string $field * @param string|array|int|float $value * @return $this - * @since 2.1.0 + * @since 100.1.0 */ public function addField($field, $value) { @@ -81,7 +78,7 @@ public function addField($field, $value) /** * @param array $fields * @return $this - * @since 2.1.0 + * @since 100.1.0 */ public function addFields(array $fields) { diff --git a/Model/Adapter/Elasticsearch.php b/Model/Adapter/Elasticsearch.php index 618d553cf9645..bbe0d0a6cac7d 100644 --- a/Model/Adapter/Elasticsearch.php +++ b/Model/Adapter/Elasticsearch.php @@ -9,7 +9,6 @@ /** * Elasticsearch adapter - * @since 2.1.0 */ class Elasticsearch { @@ -22,64 +21,52 @@ class Elasticsearch const BULK_ACTION_UPDATE = 'update'; /**#@-*/ - /** - * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager - * @since 2.1.0 - */ + /**#@-*/ protected $connectionManager; /** * @var DataMapperInterface - * @deprecated 2.2.0 Will be replaced with BatchDataMapperInterface - * @since 2.1.0 + * @deprecated 100.2.0 Will be replaced with BatchDataMapperInterface */ protected $documentDataMapper; /** * @var \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver - * @since 2.1.0 */ protected $indexNameResolver; /** * @var FieldMapperInterface - * @since 2.1.0 */ protected $fieldMapper; /** * @var \Magento\Elasticsearch\Model\Config - * @since 2.1.0 */ protected $clientConfig; /** * @var \Magento\Elasticsearch\Model\Client\Elasticsearch - * @since 2.1.0 */ protected $client; /** * @var \Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface - * @since 2.1.0 */ protected $indexBuilder; /** * @var \Psr\Log\LoggerInterface - * @since 2.1.0 */ protected $logger; /** * @var array - * @since 2.1.0 */ protected $preparedIndex = []; /** * @var BatchDataMapperInterface - * @since 2.2.0 */ private $batchDocumentDataMapper; @@ -96,7 +83,6 @@ class Elasticsearch * @param array $options * @param BatchDataMapperInterface $batchDocumentDataMapper * @throws \Magento\Framework\Exception\LocalizedException - * @since 2.1.0 */ public function __construct( \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, @@ -134,7 +120,6 @@ public function __construct( * * @return bool * @throws \Magento\Framework\Exception\LocalizedException - * @since 2.1.0 */ public function ping() { @@ -154,7 +139,6 @@ public function ping() * @param array $documentData * @param int $storeId * @return array - * @since 2.1.0 */ public function prepareDocsPerStore(array $documentData, $storeId) { @@ -176,7 +160,6 @@ public function prepareDocsPerStore(array $documentData, $storeId) * @param string $mappedIndexerId * @return $this * @throws \Exception - * @since 2.1.0 */ public function addDocs(array $documents, $storeId, $mappedIndexerId) { @@ -200,7 +183,6 @@ public function addDocs(array $documents, $storeId, $mappedIndexerId) * @param int $storeId * @param string $mappedIndexerId * @return $this - * @since 2.1.0 */ public function cleanIndex($storeId, $mappedIndexerId) { @@ -235,7 +217,6 @@ public function cleanIndex($storeId, $mappedIndexerId) * @param string $mappedIndexerId * @return $this * @throws \Exception - * @since 2.1.0 */ public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId) { @@ -263,7 +244,6 @@ public function deleteDocs(array $documentIds, $storeId, $mappedIndexerId) * @param string $indexName * @param string $action * @return array - * @since 2.1.0 */ protected function getDocsArrayInBulkIndexFormat( $documents, @@ -300,7 +280,6 @@ protected function getDocsArrayInBulkIndexFormat( * @param bool $checkAlias * @param string $mappedIndexerId * @return $this - * @since 2.1.0 */ public function checkIndex( $storeId, @@ -329,7 +308,6 @@ public function checkIndex( * @param int $storeId * @param string $mappedIndexerId * @return $this - * @since 2.1.0 */ public function updateAlias($storeId, $mappedIndexerId) { @@ -363,7 +341,6 @@ public function updateAlias($storeId, $mappedIndexerId) * @param string $indexName * @param string $mappedIndexerId * @return $this - * @since 2.1.0 */ protected function prepareIndex($storeId, $indexName, $mappedIndexerId) { diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/Model/Adapter/FieldMapper/FieldMapperResolver.php index 4dfa1acaf32b7..34c83cc4d5e13 100644 --- a/Model/Adapter/FieldMapper/FieldMapperResolver.php +++ b/Model/Adapter/FieldMapper/FieldMapperResolver.php @@ -12,7 +12,6 @@ /** * Class \Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver * - * @since 2.1.0 */ class FieldMapperResolver implements FieldMapperInterface { @@ -20,13 +19,11 @@ class FieldMapperResolver implements FieldMapperInterface * Object Manager instance * * @var ObjectManagerInterface - * @since 2.1.0 */ private $objectManager; /** * @var string[] - * @since 2.1.0 */ private $fieldMappers; @@ -34,14 +31,12 @@ class FieldMapperResolver implements FieldMapperInterface * Field Mapper instance * * @var FieldMapperInterface - * @since 2.1.0 */ private $fieldMapperEntity; /** * @param ObjectManagerInterface $objectManager * @param string[] $fieldMappers - * @since 2.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -53,7 +48,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function getFieldName($attributeCode, $context = []) { @@ -63,7 +57,6 @@ public function getFieldName($attributeCode, $context = []) /** * {@inheritdoc} - * @since 2.1.0 */ public function getAllAttributesTypes($context = []) { @@ -77,7 +70,6 @@ public function getAllAttributesTypes($context = []) * @param string $entityType * @return FieldMapperInterface * @throws \Exception - * @since 2.1.0 */ private function getEntity($entityType) { diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 7e12e88d77460..70646a1ee401e 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -15,25 +15,21 @@ /** * Class ProductFieldMapper - * @since 2.1.0 */ class ProductFieldMapper implements FieldMapperInterface { /** * @var Config - * @since 2.1.0 */ protected $eavConfig; /** * @var FieldType - * @since 2.1.0 */ protected $fieldType; /** * @var CustomerSession - * @since 2.1.0 */ protected $customerSession; @@ -41,7 +37,6 @@ class ProductFieldMapper implements FieldMapperInterface * Store manager * * @var StoreManager - * @since 2.1.0 */ protected $storeManager; @@ -49,7 +44,6 @@ class ProductFieldMapper implements FieldMapperInterface * Core registry * * @var Registry - * @since 2.1.0 */ protected $coreRegistry; @@ -59,7 +53,6 @@ class ProductFieldMapper implements FieldMapperInterface * @param CustomerSession $customerSession * @param StoreManager $storeManager * @param Registry $coreRegistry - * @since 2.1.0 */ public function __construct( Config $eavConfig, @@ -77,7 +70,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function getFieldName($attributeCode, $context = []) { @@ -114,7 +106,6 @@ public function getFieldName($attributeCode, $context = []) /** * {@inheritdoc} - * @since 2.1.0 */ public function getAllAttributesTypes($context = []) { @@ -155,7 +146,6 @@ public function getAllAttributesTypes($context = []) /** * @param Object $attribute * @return bool - * @since 2.1.0 */ protected function isAttributeUsedInAdvancedSearch($attribute) { @@ -169,7 +159,6 @@ protected function isAttributeUsedInAdvancedSearch($attribute) * @param string $fieldType * @param string $attributeCode * @return string - * @since 2.1.0 */ protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCode) { @@ -182,7 +171,6 @@ protected function getRefinedFieldName($frontendInput, $fieldType, $attributeCod * @param string $fieldType * @param string $attributeCode * @return string - * @since 2.1.0 */ protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode) { @@ -199,7 +187,6 @@ protected function getQueryTypeFieldName($frontendInput, $fieldType, $attributeC * * @param array $context * @return string - * @since 2.1.0 */ protected function getPositionFiledName($context) { @@ -218,7 +205,6 @@ protected function getPositionFiledName($context) * * @param array $context * @return string - * @since 2.1.0 */ protected function getPriceFieldName($context) { diff --git a/Model/Adapter/FieldMapperInterface.php b/Model/Adapter/FieldMapperInterface.php index e0ab846ec4bec..0c73a3a206942 100644 --- a/Model/Adapter/FieldMapperInterface.php +++ b/Model/Adapter/FieldMapperInterface.php @@ -7,7 +7,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface FieldMapperInterface { @@ -25,7 +25,7 @@ interface FieldMapperInterface * @param string $attributeCode * @param array $context * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getFieldName($attributeCode, $context = []); @@ -34,7 +34,7 @@ public function getFieldName($attributeCode, $context = []); * * @param array $context * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getAllAttributesTypes($context = []); } diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 02f995cebe6b8..4315597a3cf58 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -10,7 +10,7 @@ /** * Class FieldType * @api - * @since 2.1.0 + * @since 100.1.0 */ class FieldType { @@ -29,7 +29,7 @@ class FieldType /** * @param AbstractAttribute $attribute * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getFieldType($attribute) { diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php index 53ab4246f83bc..6133e4de1b53e 100644 --- a/Model/Adapter/FieldType/Date.php +++ b/Model/Adapter/FieldType/Date.php @@ -12,25 +12,21 @@ /** * Class \Magento\Elasticsearch\Model\Adapter\FieldType\Date * - * @since 2.1.0 */ class Date { /** * @var DateTime - * @since 2.1.0 */ private $dateTime; /** * @var TimezoneInterface - * @since 2.1.0 */ private $localeDate; /** * @var ScopeConfigInterface - * @since 2.1.0 */ private $scopeConfig; @@ -40,7 +36,6 @@ class Date * @param DateTime $dateTime * @param TimezoneInterface $localeDate * @param ScopeConfigInterface $scopeConfig - * @since 2.1.0 */ public function __construct( DateTime $dateTime, @@ -60,7 +55,6 @@ public function __construct( * @param string|null $date * @return string|null * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @since 2.1.0 */ public function formatDate($storeId, $date = null) { diff --git a/Model/Adapter/Index/Builder.php b/Model/Adapter/Index/Builder.php index 39d4172df861e..5e98caf7a4e37 100644 --- a/Model/Adapter/Index/Builder.php +++ b/Model/Adapter/Index/Builder.php @@ -11,19 +11,16 @@ /** * Class \Magento\Elasticsearch\Model\Adapter\Index\Builder * - * @since 2.1.0 */ class Builder implements BuilderInterface { /** * @var LocaleResolver - * @since 2.1.0 */ protected $localeResolver; /** * @var EsConfigInterface - * @since 2.1.0 */ protected $esConfig; @@ -31,14 +28,12 @@ class Builder implements BuilderInterface * Current store ID. * * @var int - * @since 2.1.0 */ protected $storeId; /** * @param LocaleResolver $localeResolver * @param EsConfigInterface $esConfig - * @since 2.1.0 */ public function __construct( LocaleResolver $localeResolver, @@ -50,7 +45,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function build() { @@ -82,7 +76,6 @@ public function build() /** * {@inheritdoc} - * @since 2.1.0 */ public function setStoreId($storeId) { @@ -91,7 +84,6 @@ public function setStoreId($storeId) /** * @return array - * @since 2.1.0 */ protected function getTokenizer() { @@ -105,7 +97,6 @@ protected function getTokenizer() /** * @return array - * @since 2.1.0 */ protected function getFilter() { @@ -121,7 +112,6 @@ protected function getFilter() /** * @return array - * @since 2.1.0 */ protected function getCharFilter() { @@ -135,7 +125,6 @@ protected function getCharFilter() /** * @return array - * @since 2.1.0 */ protected function getStemmerConfig() { diff --git a/Model/Adapter/Index/BuilderInterface.php b/Model/Adapter/Index/BuilderInterface.php index fefe76f790e40..d185fb25c9703 100644 --- a/Model/Adapter/Index/BuilderInterface.php +++ b/Model/Adapter/Index/BuilderInterface.php @@ -7,20 +7,20 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface BuilderInterface { /** * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function build(); /** * @param int $storeId * @return void - * @since 2.1.0 + * @since 100.1.0 */ public function setStoreId($storeId); } diff --git a/Model/Adapter/Index/Config/Converter.php b/Model/Adapter/Index/Config/Converter.php index 447e5ced4b12a..40ca03506ba73 100644 --- a/Model/Adapter/Index/Config/Converter.php +++ b/Model/Adapter/Index/Config/Converter.php @@ -10,13 +10,11 @@ /** * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\Converter * - * @since 2.1.0 */ class Converter implements ConverterInterface { /** * {@inheritdoc} - * @since 2.1.0 */ public function convert($source) { diff --git a/Model/Adapter/Index/Config/EsConfig.php b/Model/Adapter/Index/Config/EsConfig.php index 0ca5cd8676666..b4966011b5ac5 100644 --- a/Model/Adapter/Index/Config/EsConfig.php +++ b/Model/Adapter/Index/Config/EsConfig.php @@ -13,7 +13,6 @@ /** * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig * - * @since 2.1.0 */ class EsConfig extends Data implements EsConfigInterface { @@ -22,7 +21,6 @@ class EsConfig extends Data implements EsConfigInterface * @param CacheInterface $cache * @param string $cacheId * @param SerializerInterface|null $serializer - * @since 2.1.0 */ public function __construct( ReaderInterface $reader, @@ -35,7 +33,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function getStemmerInfo() { @@ -44,7 +41,6 @@ public function getStemmerInfo() /** * {@inheritdoc} - * @since 2.1.0 */ public function getStopwordsInfo() { diff --git a/Model/Adapter/Index/Config/EsConfigInterface.php b/Model/Adapter/Index/Config/EsConfigInterface.php index 9bff1a07090c2..61cdf89d348c6 100644 --- a/Model/Adapter/Index/Config/EsConfigInterface.php +++ b/Model/Adapter/Index/Config/EsConfigInterface.php @@ -7,19 +7,19 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface EsConfigInterface { /** * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getStemmerInfo(); /** * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getStopwordsInfo(); } diff --git a/Model/Adapter/Index/Config/SchemaLocator.php b/Model/Adapter/Index/Config/SchemaLocator.php index 4ba9dc62ca61b..16acbd907ac76 100644 --- a/Model/Adapter/Index/Config/SchemaLocator.php +++ b/Model/Adapter/Index/Config/SchemaLocator.php @@ -11,7 +11,6 @@ /** * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator * - * @since 2.1.0 */ class SchemaLocator implements SchemaLocatorInterface { @@ -24,20 +23,17 @@ class SchemaLocator implements SchemaLocatorInterface * Path to corresponding XSD file with validation rules for merged config * * @var string - * @since 2.1.0 */ protected $schema = null; /** * Path to corresponding XSD file with validation rules for separate config files * @var string - * @since 2.1.0 */ protected $perFileSchema = null; /** * @param \Magento\Framework\Module\Dir\Reader $moduleReader - * @since 2.1.0 */ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader) { @@ -48,7 +44,6 @@ public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader) /** * {@inheritdoc} - * @since 2.1.0 */ public function getSchema() { @@ -57,7 +52,6 @@ public function getSchema() /** * {@inheritdoc} - * @since 2.1.0 */ public function getPerFileSchema() { diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 4285301c96b06..5daf1e151d067 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -15,31 +15,31 @@ /** * Index name resolver * @api - * @since 2.1.0 + * @since 100.1.0 */ class IndexNameResolver { /** * @var ConnectionManager - * @since 2.1.0 + * @since 100.1.0 */ protected $connectionManager; /** * @var Config - * @since 2.1.0 + * @since 100.1.0 */ protected $clientConfig; /** * @var ElasticsearchClient - * @since 2.1.0 + * @since 100.1.0 */ protected $client; /** * @var LoggerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $logger; @@ -51,7 +51,7 @@ class IndexNameResolver * @param LoggerInterface $logger * @param array $options * @throws LocalizedException - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( ConnectionManager $connectionManager, @@ -77,7 +77,7 @@ public function __construct( * Get index namespace from config * * @return string - * @since 2.1.0 + * @since 100.1.0 */ protected function getIndexNamespace() { @@ -91,7 +91,7 @@ protected function getIndexNamespace() * @param string $mappedIndexerId * * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexNameForAlias($storeId, $mappedIndexerId) { @@ -105,7 +105,7 @@ public function getIndexNameForAlias($storeId, $mappedIndexerId) * @param string $mappedIndexerId * @param array $preparedIndex * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexName($storeId, $mappedIndexerId, array $preparedIndex) { @@ -126,7 +126,7 @@ public function getIndexName($storeId, $mappedIndexerId, array $preparedIndex) * @param int $storeId * @param string $mappedIndexerId * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexPattern($storeId, $mappedIndexerId) { @@ -139,7 +139,7 @@ public function getIndexPattern($storeId, $mappedIndexerId) * @param int $storeId * @param string $mappedIndexerId * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexFromAlias($storeId, $mappedIndexerId) { @@ -164,7 +164,7 @@ public function getIndexFromAlias($storeId, $mappedIndexerId) * * @param string $indexerId * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexMapping($indexerId) { diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 0ce3a04353392..eeb210d9edbd5 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -10,7 +10,6 @@ /** * Elasticsearch client - * @since 2.1.0 */ class Elasticsearch implements ClientInterface { @@ -18,19 +17,16 @@ class Elasticsearch implements ClientInterface * Elasticsearch Client instance * * @var \Elasticsearch\Client - * @since 2.1.0 */ protected $client; /** * @var array - * @since 2.1.0 */ protected $clientOptions; /** * @var bool - * @since 2.1.0 */ protected $pingResult; @@ -40,7 +36,6 @@ class Elasticsearch implements ClientInterface * @param array $options * @param \Elasticsearch\Client|null $elasticsearchClient * @throws LocalizedException - * @since 2.1.0 */ public function __construct( $options = [], @@ -65,7 +60,6 @@ public function __construct( * Ping the Elasticsearch client * * @return bool - * @since 2.1.0 */ public function ping() { @@ -79,7 +73,6 @@ public function ping() * Validate connection params * * @return bool - * @since 2.1.0 */ public function testConnection() { @@ -89,7 +82,6 @@ public function testConnection() /** * @param array $options * @return array - * @since 2.1.0 */ private function buildConfig($options = []) { @@ -114,7 +106,6 @@ private function buildConfig($options = []) * * @param array $query * @return void - * @since 2.1.0 */ public function bulkQuery($query) { @@ -127,7 +118,6 @@ public function bulkQuery($query) * @param string $index * @param array $settings * @return void - * @since 2.1.0 */ public function createIndex($index, $settings) { @@ -142,7 +132,6 @@ public function createIndex($index, $settings) * * @param string $index * @return void - * @since 2.1.0 */ public function deleteIndex($index) { @@ -154,7 +143,6 @@ public function deleteIndex($index) * * @param string $index * @return bool - * @since 2.1.0 */ public function isEmptyIndex($index) { @@ -172,7 +160,6 @@ public function isEmptyIndex($index) * @param string $newIndex * @param string $oldIndex * @return void - * @since 2.1.0 */ public function updateAlias($alias, $newIndex, $oldIndex = '') { @@ -192,7 +179,6 @@ public function updateAlias($alias, $newIndex, $oldIndex = '') * * @param string $index * @return bool - * @since 2.1.0 */ public function indexExists($index) { @@ -204,7 +190,6 @@ public function indexExists($index) * @param string $index * * @return bool - * @since 2.1.0 */ public function existsAlias($alias, $index = '') { @@ -219,7 +204,6 @@ public function existsAlias($alias, $index = '') * @param string $alias * * @return array - * @since 2.1.0 */ public function getAlias($alias) { @@ -233,7 +217,6 @@ public function getAlias($alias) * @param string $index * @param string $entityType * @return void - * @since 2.1.0 */ public function addFieldsMapping(array $fields, $index, $entityType) { @@ -292,7 +275,6 @@ public function addFieldsMapping(array $fields, $index, $entityType) * @param string $index * @param string $entityType * @return void - * @since 2.1.0 */ public function deleteMapping($index, $entityType) { @@ -307,7 +289,6 @@ public function deleteMapping($index, $entityType) * * @param array $query * @return array - * @since 2.1.0 */ public function query($query) { @@ -319,7 +300,6 @@ public function query($query) * * @param array $query * @return array - * @since 2.1.0 */ public function suggest($query) { diff --git a/Model/Config.php b/Model/Config.php index fcad27df1abf5..80598acfec32e 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -12,7 +12,7 @@ /** * Elasticsearch config model * @api - * @since 2.1.0 + * @since 100.1.0 */ class Config implements ClientOptionsInterface { @@ -38,7 +38,7 @@ class Config implements ClientOptionsInterface /** * @var ScopeConfigInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $scopeConfig; @@ -46,7 +46,7 @@ class Config implements ClientOptionsInterface * Constructor * * @param ScopeConfigInterface $scopeConfig - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( ScopeConfigInterface $scopeConfig @@ -56,7 +56,7 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function prepareClientOptions($options = []) { @@ -79,7 +79,7 @@ public function prepareClientOptions($options = []) * @param string $field * @param int $storeId * @return string|int - * @since 2.1.0 + * @since 100.1.0 */ public function getElasticsearchConfigData($field, $storeId = null) { @@ -92,7 +92,7 @@ public function getElasticsearchConfigData($field, $storeId = null) * @param string $field * @param int|null $storeId * @return string|int - * @since 2.1.0 + * @since 100.1.0 */ public function getSearchConfigData($field, $storeId = null) { @@ -104,7 +104,7 @@ public function getSearchConfigData($field, $storeId = null) * Return true if third party search engine is used * * @return bool - * @since 2.1.0 + * @since 100.1.0 */ public function isElasticsearchEnabled() { @@ -115,7 +115,7 @@ public function isElasticsearchEnabled() * Get Elasticsearch index prefix * * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexPrefix() { @@ -126,7 +126,7 @@ public function getIndexPrefix() * get Elasticsearch entity type * * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getEntityType() { diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 2ee0cba54df93..86c6f5ad0ae61 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -18,7 +18,6 @@ /** * Class \Magento\Elasticsearch\Model\DataProvider\Suggestions * - * @since 2.1.0 */ class Suggestions implements SuggestedQueriesInterface { @@ -42,37 +41,31 @@ class Suggestions implements SuggestedQueriesInterface /** * @var Config - * @since 2.1.0 */ private $config; /** * @var QueryResultFactory - * @since 2.1.0 */ private $queryResultFactory; /** * @var ConnectionManager - * @since 2.1.0 */ private $connectionManager; /** * @var ScopeConfigInterface - * @since 2.1.0 */ private $scopeConfig; /** * @var SearchIndexNameResolver - * @since 2.1.0 */ private $searchIndexNameResolver; /** * @var StoreManager - * @since 2.1.0 */ private $storeManager; @@ -83,7 +76,6 @@ class Suggestions implements SuggestedQueriesInterface * @param ConnectionManager $connectionManager * @param SearchIndexNameResolver $searchIndexNameResolver * @param StoreManager $storeManager - * @since 2.1.0 */ public function __construct( ScopeConfigInterface $scopeConfig, @@ -105,7 +97,6 @@ public function __construct( * {@inheritdoc} * * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @since 2.1.0 */ public function getItems(QueryInterface $query, $limit = null, $additionalFilters = null) { @@ -132,7 +123,6 @@ public function getItems(QueryInterface $query, $limit = null, $additionalFilter /** * {@inheritdoc} - * @since 2.1.0 */ public function isResultsCountEnabled() { @@ -145,7 +135,6 @@ public function isResultsCountEnabled() /** * @param QueryInterface $query * @return array - * @since 2.1.0 */ private function getSuggestions(QueryInterface $query) { @@ -195,7 +184,6 @@ private function getSuggestions(QueryInterface $query) /** * @param array $query * @return array - * @since 2.1.0 */ private function fetchQuery(array $query) { @@ -206,7 +194,6 @@ private function fetchQuery(array $query) * Get search suggestions Max Count from config * * @return int - * @since 2.1.0 */ private function getSearchSuggestionsCount() { @@ -218,7 +205,6 @@ private function getSearchSuggestionsCount() /** * @return bool - * @since 2.1.0 */ private function isSuggestionsAllowed() { diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php index 900397e0d3407..b029403528c31 100644 --- a/Model/Indexer/IndexStructure.php +++ b/Model/Indexer/IndexStructure.php @@ -12,26 +12,22 @@ /** * Class \Magento\Elasticsearch\Model\Indexer\IndexStructure * - * @since 2.1.0 */ class IndexStructure implements IndexStructureInterface { /** * @var ElasticsearchAdapter - * @since 2.1.0 */ private $adapter; /** * @var ScopeResolverInterface - * @since 2.1.0 */ private $scopeResolver; /** * @param ElasticsearchAdapter $adapter * @param ScopeResolverInterface $scopeResolver - * @since 2.1.0 */ public function __construct( ElasticsearchAdapter $adapter, @@ -43,7 +39,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function delete( $indexerId, @@ -57,7 +52,6 @@ public function delete( /** * {@inheritdoc} * - * @since 2.1.0 */ public function create( $indexerId, diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 265f445760480..18712ee82e313 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -15,7 +15,6 @@ /** * Class \Magento\Elasticsearch\Model\Indexer\IndexerHandler * - * @since 2.1.0 */ class IndexerHandler implements IndexerInterface { @@ -26,43 +25,36 @@ class IndexerHandler implements IndexerInterface /** * @var IndexStructureInterface - * @since 2.1.0 */ private $indexStructure; /** * @var ElasticsearchAdapter - * @since 2.1.0 */ private $adapter; /** * @var IndexNameResolver - * @since 2.1.0 */ private $indexNameResolver; /** * @var Batch - * @since 2.1.0 */ private $batch; /** * @var array - * @since 2.1.0 */ private $data; /** * @var int - * @since 2.1.0 */ private $batchSize; /** * @var ScopeResolverInterface - * @since 2.1.0 */ private $scopeResolver; @@ -74,7 +66,6 @@ class IndexerHandler implements IndexerInterface * @param ScopeResolverInterface $scopeResolver * @param array $data * @param int $batchSize - * @since 2.1.0 */ public function __construct( IndexStructureInterface $indexStructure, @@ -96,7 +87,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function saveIndex($dimensions, \Traversable $documents) { @@ -112,7 +102,6 @@ public function saveIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} - * @since 2.1.0 */ public function deleteIndex($dimensions, \Traversable $documents) { @@ -128,7 +117,6 @@ public function deleteIndex($dimensions, \Traversable $documents) /** * {@inheritdoc} - * @since 2.1.0 */ public function cleanIndex($dimensions) { @@ -139,7 +127,6 @@ public function cleanIndex($dimensions) /** * {@inheritdoc} - * @since 2.1.0 */ public function isAvailable() { @@ -148,7 +135,6 @@ public function isAvailable() /** * @return string - * @since 2.1.0 */ private function getIndexerId() { diff --git a/Model/ResourceModel/Engine.php b/Model/ResourceModel/Engine.php index 837fac969466e..0f6c674bcda73 100644 --- a/Model/ResourceModel/Engine.php +++ b/Model/ResourceModel/Engine.php @@ -11,7 +11,6 @@ /** * Search engine resource model - * @since 2.1.0 */ class Engine implements EngineInterface { @@ -19,13 +18,11 @@ class Engine implements EngineInterface * Catalog product visibility * * @var Visibility - * @since 2.1.0 */ protected $catalogProductVisibility; /** * @var IndexScopeResolver - * @since 2.1.0 */ private $indexScopeResolver; @@ -34,7 +31,6 @@ class Engine implements EngineInterface * * @param Visibility $catalogProductVisibility * @param IndexScopeResolver $indexScopeResolver - * @since 2.1.0 */ public function __construct( Visibility $catalogProductVisibility, @@ -48,7 +44,6 @@ public function __construct( * Retrieve allowed visibility values for current engine * * @return int[] - * @since 2.1.0 */ public function getAllowedVisibility() { @@ -59,7 +54,6 @@ public function getAllowedVisibility() * Define if current search engine supports advanced index * * @return bool - * @since 2.1.0 */ public function allowAdvancedIndex() { @@ -68,7 +62,6 @@ public function allowAdvancedIndex() /** * {@inheritdoc} - * @since 2.1.0 */ public function processAttributeValue($attribute, $value) { @@ -83,7 +76,6 @@ public function processAttributeValue($attribute, $value) * @param string $separator * @return string * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @since 2.1.0 */ public function prepareEntityIndex($index, $separator = ' ') { @@ -92,7 +84,6 @@ public function prepareEntityIndex($index, $separator = ' ') /** * {@inheritdoc} - * @since 2.1.0 */ public function isAvailable() { diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 40b91fb331c15..8fed7ba32788a 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -16,25 +16,25 @@ /** * Elasticsearch index resource model * @api - * @since 2.1.0 + * @since 100.1.0 */ class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index { /** * @var ProductRepositoryInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $productRepository; /** * @var CategoryRepositoryInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $categoryRepository; /** * @var Config - * @since 2.1.0 + * @since 100.1.0 */ protected $eavConfig; @@ -48,7 +48,7 @@ class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index * @param Config $eavConfig * @param null $connectionName * @SuppressWarnings(Magento.TypeDuplication) - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( Context $context, @@ -76,7 +76,7 @@ public function __construct( * @param int $productId * @param array $indexData * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getFullProductIndexData($productId, $indexData) { @@ -121,7 +121,7 @@ public function getFullProductIndexData($productId, $indexData) * @param int $storeId * @param null|array $productIds * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getFullCategoryProductIndexData($storeId = null, $productIds = null) { diff --git a/SearchAdapter/Adapter.php b/SearchAdapter/Adapter.php index c7f756d2e4562..43b2bfe553a98 100644 --- a/SearchAdapter/Adapter.php +++ b/SearchAdapter/Adapter.php @@ -13,7 +13,6 @@ /** * Elasticsearch Search Adapter - * @since 2.1.0 */ class Adapter implements AdapterInterface { @@ -21,7 +20,6 @@ class Adapter implements AdapterInterface * Mapper instance * * @var Mapper - * @since 2.1.0 */ protected $mapper; @@ -29,25 +27,21 @@ class Adapter implements AdapterInterface * Response Factory * * @var ResponseFactory - * @since 2.1.0 */ protected $responseFactory; /** * @var ConnectionManager - * @since 2.1.0 */ protected $connectionManager; /** * @var AggregationBuilder - * @since 2.1.0 */ protected $aggregationBuilder; /** * @var QueryContainerFactory - * @since 2.2.0 */ private $queryContainerFactory; @@ -57,7 +51,6 @@ class Adapter implements AdapterInterface * @param ResponseFactory $responseFactory * @param AggregationBuilder $aggregationBuilder * @param QueryContainerFactory $queryContainerFactory - * @since 2.1.0 */ public function __construct( ConnectionManager $connectionManager, @@ -77,7 +70,6 @@ public function __construct( /** * @param RequestInterface $request * @return QueryResponse - * @since 2.1.0 */ public function query(RequestInterface $request) { diff --git a/SearchAdapter/Aggregation/Builder.php b/SearchAdapter/Aggregation/Builder.php index e53656de06cde..56a6b709d1a4d 100644 --- a/SearchAdapter/Aggregation/Builder.php +++ b/SearchAdapter/Aggregation/Builder.php @@ -15,31 +15,26 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder * - * @since 2.1.0 */ class Builder { /** * @var DataProviderInterface[] - * @since 2.1.0 */ protected $dataProviderContainer; /** * @var BucketBuilderInterface[] - * @since 2.1.0 */ protected $aggregationContainer; /** * @var DataProviderFactory - * @since 2.2.0 */ private $dataProviderFactory; /** * @var QueryContainer - * @since 2.2.0 */ private $query = null; @@ -47,7 +42,6 @@ class Builder * @param DataProviderInterface[] $dataProviderContainer * @param BucketBuilderInterface[] $aggregationContainer * @param DataProviderFactory|null $dataProviderFactory - * @since 2.1.0 */ public function __construct( array $dataProviderContainer, @@ -81,7 +75,6 @@ function (BucketBuilderInterface $bucketBuilder) { * @return array * @throws \LogicException thrown by DataProviderFactory for validation issues * @see \Magento\Elasticsearch\SearchAdapter\Aggregation\DataProviderFactory - * @since 2.1.0 */ public function build(RequestInterface $request, array $queryResult) { @@ -112,7 +105,6 @@ public function build(RequestInterface $request, array $queryResult) * * @param QueryContainer $query * @return $this - * @since 2.2.0 */ public function setQuery(QueryContainer $query) { diff --git a/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php b/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php index 188510d68065d..7577114140c7d 100644 --- a/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php +++ b/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php @@ -11,7 +11,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface BucketBuilderInterface { @@ -21,7 +21,7 @@ interface BucketBuilderInterface * @param array $queryResult * @param DataProviderInterface $dataProvider * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function build( RequestBucketInterface $bucket, diff --git a/SearchAdapter/Aggregation/Builder/Dynamic.php b/SearchAdapter/Aggregation/Builder/Dynamic.php index 6a41156eb18bc..80136ec04bbd1 100644 --- a/SearchAdapter/Aggregation/Builder/Dynamic.php +++ b/SearchAdapter/Aggregation/Builder/Dynamic.php @@ -15,26 +15,22 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic * - * @since 2.1.0 */ class Dynamic implements BucketBuilderInterface { /** * @var Repository - * @since 2.1.0 */ private $algorithmRepository; /** * @var EntityStorageFactory - * @since 2.1.0 */ private $entityStorageFactory; /** * @param Repository $algorithmRepository * @param EntityStorageFactory $entityStorageFactory - * @since 2.1.0 */ public function __construct(Repository $algorithmRepository, EntityStorageFactory $entityStorageFactory) { @@ -44,7 +40,6 @@ public function __construct(Repository $algorithmRepository, EntityStorageFactor /** * {@inheritdoc} - * @since 2.1.0 */ public function build( RequestBucketInterface $bucket, @@ -65,7 +60,6 @@ public function build( * * @param array $queryResult * @return EntityStorage - * @since 2.1.0 */ private function getEntityStorage(array $queryResult) { @@ -82,7 +76,6 @@ private function getEntityStorage(array $queryResult) * * @param array $data * @return array - * @since 2.1.0 */ private function prepareData($data) { diff --git a/SearchAdapter/Aggregation/Builder/Term.php b/SearchAdapter/Aggregation/Builder/Term.php index 2c81ab9e13ecc..9123abb7c0686 100644 --- a/SearchAdapter/Aggregation/Builder/Term.php +++ b/SearchAdapter/Aggregation/Builder/Term.php @@ -11,13 +11,11 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term * - * @since 2.1.0 */ class Term implements BucketBuilderInterface { /** * {@inheritdoc} - * @since 2.1.0 */ public function build( RequestBucketInterface $bucket, diff --git a/SearchAdapter/Aggregation/DataProviderFactory.php b/SearchAdapter/Aggregation/DataProviderFactory.php index b9917fc113f89..eca3dcdf86970 100644 --- a/SearchAdapter/Aggregation/DataProviderFactory.php +++ b/SearchAdapter/Aggregation/DataProviderFactory.php @@ -14,7 +14,6 @@ /** * It's a factory which allows to override instance of DataProviderInterface * with the instance of the same class but with injected search query. - * @since 2.2.0 */ class DataProviderFactory { @@ -22,13 +21,11 @@ class DataProviderFactory * Object Manager * * @var ObjectManagerInterface - * @since 2.2.0 */ private $objectManager; /** * @param ObjectManagerInterface $objectManager - * @since 2.2.0 */ public function __construct(ObjectManagerInterface $objectManager) { @@ -54,7 +51,6 @@ public function __construct(ObjectManagerInterface $objectManager) * @param QueryContainer $query * @return DataProviderInterface * @throws \LogicException when the query is missing but it required according to the QueryAwareInterface - * @since 2.2.0 */ public function create(DataProviderInterface $dataProvider, QueryContainer $query = null) { diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 3fa4e18c2d1da..691e2df1c7763 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -15,7 +15,6 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Interval * - * @since 2.1.0 */ class Interval implements IntervalInterface { @@ -26,43 +25,36 @@ class Interval implements IntervalInterface /** * @var ConnectionManager - * @since 2.1.0 */ protected $connectionManager; /** * @var FieldMapperInterface - * @since 2.1.0 */ protected $fieldMapper; /** * @var Config - * @since 2.1.0 */ protected $clientConfig; /** * @var string - * @since 2.1.0 */ private $fieldName; /** * @var string - * @since 2.1.0 */ private $storeId; /** * @var array - * @since 2.1.0 */ private $entityIds; /** * @var SearchIndexNameResolver - * @since 2.1.0 */ private $searchIndexNameResolver; @@ -74,7 +66,6 @@ class Interval implements IntervalInterface * @param string $fieldName * @param string $storeId * @param array $entityIds - * @since 2.1.0 */ public function __construct( ConnectionManager $connectionManager, @@ -96,7 +87,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function load($limit, $offset = null, $lower = null, $upper = null) { @@ -156,7 +146,6 @@ public function load($limit, $offset = null, $lower = null, $upper = null) /** * {@inheritdoc} - * @since 2.1.0 */ public function loadPrevious($data, $index, $lower = null) { @@ -216,7 +205,6 @@ public function loadPrevious($data, $index, $lower = null) /** * {@inheritdoc} - * @since 2.1.0 */ public function loadNext($data, $rightIndex, $upper = null) { @@ -290,7 +278,6 @@ public function loadNext($data, $rightIndex, $upper = null) * @param string $fieldName * * @return float[] - * @since 2.1.0 */ private function arrayValuesToFloat($hits, $fieldName) { diff --git a/SearchAdapter/AggregationFactory.php b/SearchAdapter/AggregationFactory.php index 55e01442528b9..287d9a00b6e0d 100644 --- a/SearchAdapter/AggregationFactory.php +++ b/SearchAdapter/AggregationFactory.php @@ -10,7 +10,7 @@ /** * Aggregation Factory * @api - * @since 2.1.0 + * @since 100.1.0 */ class AggregationFactory { @@ -18,13 +18,13 @@ class AggregationFactory * Object Manager instance * * @var ObjectManagerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $objectManager; /** * @param ObjectManagerInterface $objectManager - * @since 2.1.0 + * @since 100.1.0 */ public function __construct(ObjectManagerInterface $objectManager) { @@ -36,7 +36,7 @@ public function __construct(ObjectManagerInterface $objectManager) * * @param array $rawAggregation * @return \Magento\Framework\Search\Response\Aggregation - * @since 2.1.0 + * @since 100.1.0 */ public function create(array $rawAggregation) { @@ -62,7 +62,6 @@ public function create(array $rawAggregation) * * @param array $values * @return \Magento\Framework\Search\Response\Aggregation\Value[] - * @since 2.1.0 */ private function prepareValues(array $values) { diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php index c38ae568a62ca..7e644ca80f640 100644 --- a/SearchAdapter/ConnectionManager.php +++ b/SearchAdapter/ConnectionManager.php @@ -12,31 +12,31 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class ConnectionManager { /** * @var Elasticsearch - * @since 2.1.0 + * @since 100.1.0 */ protected $client; /** * @var LoggerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $logger; /** * @var ClientFactoryInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $clientFactory; /** * @var ClientOptionsInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $clientConfig; @@ -44,7 +44,7 @@ class ConnectionManager * @param ClientFactoryInterface $clientFactory * @param ClientOptionsInterface $clientConfig * @param LoggerInterface $logger - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( ClientFactoryInterface $clientFactory, @@ -62,7 +62,7 @@ public function __construct( * @param array $options * @throws \RuntimeException * @return Elasticsearch - * @since 2.1.0 + * @since 100.1.0 */ public function getConnection($options = []) { @@ -79,7 +79,6 @@ public function getConnection($options = []) * @param array $options * @throws \RuntimeException * @return void - * @since 2.1.0 */ private function connect($options) { diff --git a/SearchAdapter/DocumentFactory.php b/SearchAdapter/DocumentFactory.php index 7049f853ee73b..f019e8c695624 100644 --- a/SearchAdapter/DocumentFactory.php +++ b/SearchAdapter/DocumentFactory.php @@ -16,7 +16,7 @@ /** * Document Factory * @api - * @since 2.1.0 + * @since 100.1.0 */ class DocumentFactory { @@ -24,21 +24,20 @@ class DocumentFactory * Object Manager instance * * @var ObjectManagerInterface - * @deprecated 2.1.0 - * @since 2.1.0 + * @deprecated 100.1.0 + * @since 100.1.0 */ protected $objectManager; /** * @var EntityMetadata - * @since 2.1.0 */ private $entityMetadata; /** * @param ObjectManagerInterface $objectManager * @param EntityMetadata $entityMetadata - * @since 2.1.0 + * @since 100.1.0 */ public function __construct(ObjectManagerInterface $objectManager, EntityMetadata $entityMetadata) { @@ -51,7 +50,7 @@ public function __construct(ObjectManagerInterface $objectManager, EntityMetadat * * @param array $rawDocument * @return Document - * @since 2.1.0 + * @since 100.1.0 */ public function create($rawDocument) { diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 2fb9ab9dd3d2b..821bae83acdc6 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -10,71 +10,70 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInterface, QueryAwareInterface { /** * @var \Magento\Elasticsearch\SearchAdapter\ConnectionManager - * @since 2.1.0 + * @since 100.1.0 */ protected $connectionManager; /** * @var \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $fieldMapper; /** * @var \Magento\Catalog\Model\Layer\Filter\Price\Range - * @since 2.1.0 + * @since 100.1.0 */ protected $range; /** * @var \Magento\Framework\Search\Dynamic\IntervalFactory - * @since 2.1.0 + * @since 100.1.0 */ protected $intervalFactory; /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query - * @since 2.1.0 + * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 100.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query - * @since 2.1.0 + * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query - * @since 2.1.0 + * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated 2.2.0 as this class shouldn't be responsible for query building and should only modify existing query - * @since 2.1.0 + * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @since 100.1.0 */ protected $indexerId; /** * @var \Magento\Framework\App\ScopeResolverInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $scopeResolver; /** * @var QueryContainer - * @since 2.2.0 */ private $queryContainer; @@ -91,7 +90,7 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte * @param QueryContainer|null $queryContainer * * @SuppressWarnings(PHPMD.ExcessiveParameterList) - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, @@ -119,7 +118,7 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function getRange() { @@ -128,7 +127,7 @@ public function getRange() /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage $entityStorage) { @@ -167,7 +166,7 @@ public function getAggregations(\Magento\Framework\Search\Dynamic\EntityStorage /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function getInterval( \Magento\Framework\Search\Request\BucketInterface $bucket, @@ -190,7 +189,7 @@ public function getInterval( /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function getAggregation( \Magento\Framework\Search\Request\BucketInterface $bucket, @@ -224,7 +223,7 @@ public function getAggregation( /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function prepareData($range, array $dbRanges) { @@ -262,7 +261,6 @@ public function prepareData($range, array $dbRanges) * @param \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage * @param array $dimensions * @return array - * @since 2.2.0 */ private function getBasicSearchQuery( \Magento\Framework\Search\Dynamic\EntityStorage $entityStorage, diff --git a/SearchAdapter/Filter/Builder.php b/SearchAdapter/Filter/Builder.php index b6e8cc4116f70..5f192f5aa445f 100644 --- a/SearchAdapter/Filter/Builder.php +++ b/SearchAdapter/Filter/Builder.php @@ -15,7 +15,6 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder * - * @since 2.1.0 */ class Builder implements BuilderInterface { @@ -41,7 +40,6 @@ class Builder implements BuilderInterface /** * @var FilterInterface[] - * @since 2.1.0 */ protected $filters; @@ -49,7 +47,6 @@ class Builder implements BuilderInterface * @param Range $range * @param Term $term * @param Wildcard $wildcard - * @since 2.1.0 */ public function __construct( Range $range, @@ -65,7 +62,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function build(RequestFilterInterface $filter, $conditionType) { @@ -76,7 +72,6 @@ public function build(RequestFilterInterface $filter, $conditionType) * @param RequestFilterInterface $filter * @param string $conditionType * @return array - * @since 2.1.0 */ protected function processFilter(RequestFilterInterface $filter, $conditionType) { @@ -100,7 +95,6 @@ protected function processFilter(RequestFilterInterface $filter, $conditionType) * @param RequestFilterInterface|BoolExpression $filter * @param bool $isNegation * @return array - * @since 2.1.0 */ protected function processBoolFilter(RequestFilterInterface $filter, $isNegation) { @@ -129,7 +123,6 @@ protected function processBoolFilter(RequestFilterInterface $filter, $isNegation * @param RequestFilterInterface[] $filters * @param string $conditionType * @return string - * @since 2.1.0 */ private function buildFilters(array $filters, $conditionType) { @@ -149,7 +142,6 @@ private function buildFilters(array $filters, $conditionType) /** * @param string $conditionType * @return bool - * @since 2.1.0 */ protected function isNegation($conditionType) { @@ -160,7 +152,6 @@ protected function isNegation($conditionType) * @param string $conditionType * @param bool $isNegation * @return string - * @since 2.1.0 */ private function mapConditionType($conditionType, $isNegation) { diff --git a/SearchAdapter/Filter/Builder/FilterInterface.php b/SearchAdapter/Filter/Builder/FilterInterface.php index 92b05255a37e2..095d65f7aef2c 100644 --- a/SearchAdapter/Filter/Builder/FilterInterface.php +++ b/SearchAdapter/Filter/Builder/FilterInterface.php @@ -9,14 +9,14 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface FilterInterface { /** * @param RequestFilterInterface $filter * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function buildFilter(RequestFilterInterface $filter); } diff --git a/SearchAdapter/Filter/Builder/Range.php b/SearchAdapter/Filter/Builder/Range.php index 44cf40c633a1d..2be9659331d76 100644 --- a/SearchAdapter/Filter/Builder/Range.php +++ b/SearchAdapter/Filter/Builder/Range.php @@ -12,19 +12,16 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range * - * @since 2.1.0 */ class Range implements FilterInterface { /** * @var FieldMapperInterface - * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper - * @since 2.1.0 */ public function __construct( FieldMapperInterface $fieldMapper @@ -35,7 +32,6 @@ public function __construct( /** * @param RequestFilterInterface|RangeFilterRequest $filter * @return array - * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter) { diff --git a/SearchAdapter/Filter/Builder/Term.php b/SearchAdapter/Filter/Builder/Term.php index 2a728f2001d6c..2ccbac1210ec6 100644 --- a/SearchAdapter/Filter/Builder/Term.php +++ b/SearchAdapter/Filter/Builder/Term.php @@ -12,19 +12,16 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term * - * @since 2.1.0 */ class Term implements FilterInterface { /** * @var FieldMapperInterface - * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper - * @since 2.1.0 */ public function __construct(FieldMapperInterface $fieldMapper) { @@ -34,7 +31,6 @@ public function __construct(FieldMapperInterface $fieldMapper) /** * @param RequestFilterInterface|TermFilterRequest $filter * @return array - * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter) { diff --git a/SearchAdapter/Filter/Builder/Wildcard.php b/SearchAdapter/Filter/Builder/Wildcard.php index 23c16bfd0bed6..816e23b8dd37a 100644 --- a/SearchAdapter/Filter/Builder/Wildcard.php +++ b/SearchAdapter/Filter/Builder/Wildcard.php @@ -12,19 +12,16 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard * - * @since 2.1.0 */ class Wildcard implements FilterInterface { /** * @var FieldMapperInterface - * @since 2.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper - * @since 2.1.0 */ public function __construct(FieldMapperInterface $fieldMapper) { @@ -34,7 +31,6 @@ public function __construct(FieldMapperInterface $fieldMapper) /** * @param RequestFilterInterface|WildcardFilterRequest $filter * @return array - * @since 2.1.0 */ public function buildFilter(RequestFilterInterface $filter) { diff --git a/SearchAdapter/Filter/BuilderInterface.php b/SearchAdapter/Filter/BuilderInterface.php index 884a95282437c..b4885a8f8a2f4 100644 --- a/SearchAdapter/Filter/BuilderInterface.php +++ b/SearchAdapter/Filter/BuilderInterface.php @@ -9,7 +9,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface BuilderInterface { @@ -23,7 +23,7 @@ interface BuilderInterface * @param RequestFilterInterface $filter * @param string $conditionType * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function build(RequestFilterInterface $filter, $conditionType); } diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 9266064d1b89f..a77f127c123bc 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -17,25 +17,25 @@ /** * Mapper class * @api - * @since 2.1.0 + * @since 100.1.0 */ class Mapper { /** * @var QueryBuilder - * @since 2.1.0 + * @since 100.1.0 */ protected $queryBuilder; /** * @var MatchQueryBuilder - * @since 2.1.0 + * @since 100.1.0 */ protected $matchQueryBuilder; /** * @var FilterBuilder - * @since 2.1.0 + * @since 100.1.0 */ protected $filterBuilder; @@ -43,7 +43,7 @@ class Mapper * @param QueryBuilder $queryBuilder * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( QueryBuilder $queryBuilder, @@ -60,7 +60,7 @@ public function __construct( * * @param RequestInterface $request * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function buildQuery(RequestInterface $request) { @@ -86,7 +86,7 @@ public function buildQuery(RequestInterface $request) * @param string $conditionType * @return array * @throws \InvalidArgumentException - * @since 2.1.0 + * @since 100.1.0 */ protected function processQuery( RequestQueryInterface $requestQuery, @@ -123,7 +123,7 @@ protected function processQuery( * @param BoolQuery $query * @param array $selectQuery * @return array - * @since 2.1.0 + * @since 100.1.0 */ protected function processBoolQuery( BoolQuery $query, @@ -157,7 +157,7 @@ protected function processBoolQuery( * @param array $selectQuery * @param string $conditionType * @return array - * @since 2.1.0 + * @since 100.1.0 */ protected function processBoolQueryCondition( array $subQueryList, @@ -178,7 +178,6 @@ protected function processBoolQueryCondition( * @param array $selectQuery * @param string $conditionType * @return array - * @since 2.1.0 */ private function processFilterQuery( FilterQuery $query, diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index 836b322e6f40e..afbedf4296339 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -13,31 +13,31 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class Builder { /** * @var Config - * @since 2.1.0 + * @since 100.1.0 */ protected $clientConfig; /** * @var SearchIndexNameResolver - * @since 2.1.0 + * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var AggregationBuilder - * @since 2.1.0 + * @since 100.1.0 */ protected $aggregationBuilder; /** * @var ScopeResolverInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $scopeResolver; @@ -46,7 +46,7 @@ class Builder * @param SearchIndexNameResolver $searchIndexNameResolver * @param AggregationBuilder $aggregationBuilder * @param ScopeResolverInterface $scopeResolver - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( Config $clientConfig, @@ -65,7 +65,7 @@ public function __construct( * * @param RequestInterface $request * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function initQuery(RequestInterface $request) { @@ -90,7 +90,7 @@ public function initQuery(RequestInterface $request) * @param RequestInterface $request * @param array $searchQuery * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function initAggregations( RequestInterface $request, diff --git a/SearchAdapter/Query/Builder/Aggregation.php b/SearchAdapter/Query/Builder/Aggregation.php index 478e616673c01..95734030210d0 100644 --- a/SearchAdapter/Query/Builder/Aggregation.php +++ b/SearchAdapter/Query/Builder/Aggregation.php @@ -11,19 +11,19 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class Aggregation { /** * @var FieldMapperInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $fieldMapper; /** * @param FieldMapperInterface $fieldMapper - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( FieldMapperInterface $fieldMapper @@ -37,7 +37,7 @@ public function __construct( * @param RequestInterface $request * @param array $searchQuery * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function build( RequestInterface $request, @@ -56,7 +56,7 @@ public function build( * @param array $searchQuery * @param BucketInterface $bucket * @return array - * @since 2.1.0 + * @since 100.1.0 */ protected function buildBucket( array $searchQuery, diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 397a2309b8241..788efc8a9f66c 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -13,7 +13,6 @@ /** * Class \Magento\Elasticsearch\SearchAdapter\Query\Builder\Match * - * @since 2.1.0 */ class Match implements QueryInterface { @@ -24,20 +23,17 @@ class Match implements QueryInterface /** * @var FieldMapperInterface - * @since 2.1.0 */ private $fieldMapper; /** * @var PreprocessorInterface[] - * @since 2.1.0 */ protected $preprocessorContainer; /** * @param FieldMapperInterface $fieldMapper * @param PreprocessorInterface[] $preprocessorContainer - * @since 2.1.0 */ public function __construct( FieldMapperInterface $fieldMapper, @@ -49,7 +45,6 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 */ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $conditionType) { @@ -71,7 +66,6 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $ * @param string $queryValue * @param string $conditionType * @return array - * @since 2.1.0 */ protected function prepareQuery($queryValue, $conditionType) { @@ -100,7 +94,6 @@ protected function prepareQuery($queryValue, $conditionType) * @param array $matches * @param array $queryValue * @return array - * @since 2.1.0 */ protected function buildQueries($matches, $queryValue) { @@ -133,7 +126,6 @@ protected function buildQueries($matches, $queryValue) * * @param string $value * @return string - * @since 2.1.0 */ protected function escape($value) { diff --git a/SearchAdapter/Query/Builder/QueryInterface.php b/SearchAdapter/Query/Builder/QueryInterface.php index a4226fbeb0a2a..df1e0c304185b 100644 --- a/SearchAdapter/Query/Builder/QueryInterface.php +++ b/SearchAdapter/Query/Builder/QueryInterface.php @@ -9,7 +9,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface QueryInterface { @@ -18,7 +18,7 @@ interface QueryInterface * @param RequestQueryInterface $requestQuery * @param string $conditionType * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function build( array $selectQuery, diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index 262b525249c3b..af3809c903020 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -12,7 +12,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class Stopwords implements PreprocessorInterface { @@ -28,55 +28,52 @@ class Stopwords implements PreprocessorInterface /** * @var \Magento\Store\Model\StoreManagerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Framework\Locale\Resolver - * @since 2.1.0 + * @since 100.1.0 */ protected $localeResolver; /** * @var ReadFactory - * @since 2.1.0 + * @since 100.1.0 */ protected $readFactory; /** * @var \Magento\Framework\App\Cache\Type\Config - * @since 2.1.0 + * @since 100.1.0 */ protected $configCache; /** * @var EsConfigInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $esConfig; /** * @var \Magento\Framework\Module\Dir\Reader - * @since 2.1.0 + * @since 100.1.0 */ protected $moduleDirReader; /** * @var string - * @since 2.1.0 */ private $stopwordsModule; /** * @var string - * @since 2.1.0 */ private $stopwordsDirectory; /** * @var \Magento\Framework\Serialize\SerializerInterface - * @since 2.2.0 */ private $serializer; @@ -91,7 +88,7 @@ class Stopwords implements PreprocessorInterface * @param \Magento\Framework\Module\Dir\Reader $moduleDirReader * @param string $stopwordsModule * @param string $stopwordsDirectory - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( \Magento\Store\Model\StoreManagerInterface $storeManager, @@ -115,7 +112,7 @@ public function __construct( /** * {@inheritdoc} - * @since 2.1.0 + * @since 100.1.0 */ public function process($query) { @@ -129,7 +126,7 @@ public function process($query) * Get stopwords list for current locale * * @return array - * @since 2.1.0 + * @since 100.1.0 */ protected function getStopwordsList() { @@ -153,7 +150,7 @@ protected function getStopwordsList() * Get stopwords file for current locale * * @return string - * @since 2.1.0 + * @since 100.1.0 */ protected function getStopwordsFile() { @@ -169,8 +166,7 @@ protected function getStopwordsFile() * Get serializer * * @return \Magento\Framework\Serialize\SerializerInterface - * @deprecated 2.2.0 - * @since 2.2.0 + * @deprecated 100.2.0 */ private function getSerializer() { diff --git a/SearchAdapter/QueryAwareInterface.php b/SearchAdapter/QueryAwareInterface.php index 2a8431badc57b..bcc47e932baaa 100644 --- a/SearchAdapter/QueryAwareInterface.php +++ b/SearchAdapter/QueryAwareInterface.php @@ -13,7 +13,6 @@ * Its goal is to mark the fact that a class which implements this interface requires * the QueryContainer object to be passed as constructor argument * with the name 'queryContainer' to work properly - * @since 2.2.0 */ interface QueryAwareInterface { diff --git a/SearchAdapter/QueryContainer.php b/SearchAdapter/QueryContainer.php index 1341f374f49c7..aed7f8f4da642 100644 --- a/SearchAdapter/QueryContainer.php +++ b/SearchAdapter/QueryContainer.php @@ -9,19 +9,16 @@ /** * The purpose of this class to be a container for the array with ElasticSearch query. * @codeCoverageIgnore - * @since 2.2.0 */ class QueryContainer { /** * @var array - * @since 2.2.0 */ private $query; /** * @param array $query - * @since 2.2.0 */ public function __construct(array $query) { @@ -32,7 +29,6 @@ public function __construct(array $query) * Returns a query * * @return array - * @since 2.2.0 */ public function getQuery() { diff --git a/SearchAdapter/ResponseFactory.php b/SearchAdapter/ResponseFactory.php index 0dca98095239d..7bd2d49e84826 100644 --- a/SearchAdapter/ResponseFactory.php +++ b/SearchAdapter/ResponseFactory.php @@ -10,7 +10,7 @@ /** * Response Factory * @api - * @since 2.1.0 + * @since 100.1.0 */ class ResponseFactory { @@ -18,7 +18,7 @@ class ResponseFactory * Object Manager instance * * @var ObjectManagerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $objectManager; @@ -26,7 +26,7 @@ class ResponseFactory * Document Factory * * @var DocumentFactory - * @since 2.1.0 + * @since 100.1.0 */ protected $documentFactory; @@ -34,7 +34,7 @@ class ResponseFactory * Aggregation Factory * * @var AggregationFactory - * @since 2.1.0 + * @since 100.1.0 */ protected $aggregationFactory; @@ -42,7 +42,7 @@ class ResponseFactory * @param ObjectManagerInterface $objectManager * @param DocumentFactory $documentFactory * @param AggregationFactory $aggregationFactory - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -59,7 +59,7 @@ public function __construct( * * @param array $response * @return \Magento\Framework\Search\Response\QueryResponse - * @since 2.1.0 + * @since 100.1.0 */ public function create($response) { diff --git a/SearchAdapter/SearchIndexNameResolver.php b/SearchAdapter/SearchIndexNameResolver.php index 3c66258f955f4..5d223cdc7300b 100644 --- a/SearchAdapter/SearchIndexNameResolver.php +++ b/SearchAdapter/SearchIndexNameResolver.php @@ -11,19 +11,18 @@ /** * Alias name resolver * @api - * @since 2.1.0 + * @since 100.1.0 */ class SearchIndexNameResolver { /** * @var Config - * @since 2.1.0 */ private $clientConfig; /** * @param Config $clientConfig - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( Config $clientConfig @@ -37,7 +36,7 @@ public function __construct( * @param int $storeId * @param string $indexerId * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getIndexName($storeId, $indexerId) { @@ -50,7 +49,6 @@ public function getIndexName($storeId, $indexerId) * * @param string $indexerId * @return string - * @since 2.1.0 */ private function getIndexMapping($indexerId) { From 1b5fcf4f73990ad8f7fcdddd7b19a665a186cd78 Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 4 Aug 2017 19:17:23 -0500 Subject: [PATCH 531/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - replaced release version with package version in @since and @depreacated tags - removed @since tag from private properties/methods and non @api classes --- .../Adminhtml/System/Config/TestConnection.php | 10 +++++----- .../Search/System/Config/TestConnection.php | 6 ------ .../DataMapper/AdditionalFieldsProvider.php | 4 ---- .../AdditionalFieldsProviderInterface.php | 4 ++-- Model/Client/ClientFactory.php | 5 ----- Model/Client/ClientFactoryInterface.php | 4 ++-- Model/Client/ClientInterface.php | 4 ++-- Model/Client/ClientOptionsInterface.php | 4 ++-- Model/Client/ClientResolver.php | 18 ++++++++---------- Model/DataProvider/Suggestions.php | 3 --- .../Indexer/Fulltext/Plugin/CustomerGroup.php | 5 ----- Model/ResourceModel/Index.php | 18 +++++++++--------- Model/SuggestedQueries.php | 6 ------ 13 files changed, 30 insertions(+), 61 deletions(-) diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/Block/Adminhtml/System/Config/TestConnection.php index a71ea15df3686..a546cfb126ba7 100644 --- a/Block/Adminhtml/System/Config/TestConnection.php +++ b/Block/Adminhtml/System/Config/TestConnection.php @@ -8,7 +8,7 @@ /** * Search engine test connection block * @api - * @since 2.1.0 + * @since 100.1.0 */ class TestConnection extends \Magento\Config\Block\System\Config\Form\Field { @@ -16,7 +16,7 @@ class TestConnection extends \Magento\Config\Block\System\Config\Form\Field * Set template to itself * * @return $this - * @since 2.1.0 + * @since 100.1.0 */ protected function _prepareLayout() { @@ -30,7 +30,7 @@ protected function _prepareLayout() * * @param \Magento\Framework\Data\Form\Element\AbstractElement $element * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element) { @@ -44,7 +44,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele * * @param \Magento\Framework\Data\Form\Element\AbstractElement $element * @return string - * @since 2.1.0 + * @since 100.1.0 */ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element) { @@ -65,7 +65,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract * Returns configuration fields required to perform the ping request * * @return array - * @since 2.1.0 + * @since 100.1.0 */ protected function _getFieldMapping() { diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index 01de5ee9124ec..a1b25da27c6b1 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -15,25 +15,21 @@ /** * Class \Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection * - * @since 2.1.0 */ class TestConnection extends Action { /** * @var ClientResolver - * @since 2.1.0 */ private $clientResolver; /** * @var JsonFactory - * @since 2.1.0 */ private $resultJsonFactory; /** * @var StripTags - * @since 2.1.0 */ private $tagFilter; @@ -42,7 +38,6 @@ class TestConnection extends Action * @param ClientResolver $clientResolver * @param JsonFactory $resultJsonFactory * @param StripTags $tagFilter - * @since 2.1.0 */ public function __construct( Context $context, @@ -60,7 +55,6 @@ public function __construct( * Check for connection to server * * @return \Magento\Framework\Controller\Result\Json - * @since 2.1.0 */ public function execute() { diff --git a/Model/Adapter/DataMapper/AdditionalFieldsProvider.php b/Model/Adapter/DataMapper/AdditionalFieldsProvider.php index 30f2ee3a2850c..ef1f9890e02d1 100644 --- a/Model/Adapter/DataMapper/AdditionalFieldsProvider.php +++ b/Model/Adapter/DataMapper/AdditionalFieldsProvider.php @@ -8,19 +8,16 @@ /** * Provide additional fields for data mapper during search indexer * Must return array with the following format: [[product id] => [field name1 => value1, ...], ...] - * @since 2.2.0 */ class AdditionalFieldsProvider implements AdditionalFieldsProviderInterface { /** * @var AdditionalFieldsProviderInterface[] - * @since 2.2.0 */ private $fieldsProviders; /** * @param AdditionalFieldsProviderInterface[] $fieldsProviders - * @since 2.2.0 */ public function __construct(array $fieldsProviders) { @@ -29,7 +26,6 @@ public function __construct(array $fieldsProviders) /** * {@inheritdoc} - * @since 2.2.0 */ public function getFields(array $productIds, $storeId) { diff --git a/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php b/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php index 1c2a26a5e0c17..d7151236c6170 100644 --- a/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php +++ b/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php @@ -9,7 +9,7 @@ * Provide additional fields for data mapper during search indexer * Must return array with the following format: [[product id] => [field name1 => value1, ...], ...] * @api - * @since 2.2.0 + * @since 100.2.0 */ interface AdditionalFieldsProviderInterface { @@ -19,7 +19,7 @@ interface AdditionalFieldsProviderInterface * @param array $productIds * @param int $storeId * @return array - * @since 2.2.0 + * @since 100.2.0 */ public function getFields(array $productIds, $storeId); } diff --git a/Model/Client/ClientFactory.php b/Model/Client/ClientFactory.php index 713c3dbe8bec0..a13a42486e807 100644 --- a/Model/Client/ClientFactory.php +++ b/Model/Client/ClientFactory.php @@ -10,7 +10,6 @@ /** * Class \Magento\AdvancedSearch\Model\Client\ClientFactory * - * @since 2.1.0 */ class ClientFactory implements ClientFactoryInterface { @@ -18,20 +17,17 @@ class ClientFactory implements ClientFactoryInterface * Object manager * * @var ObjectManagerInterface - * @since 2.1.0 */ protected $objectManager; /** * @var string - * @since 2.1.0 */ private $clientClass; /** * @param ObjectManagerInterface $objectManager * @param string $clientClass - * @since 2.1.0 */ public function __construct(ObjectManagerInterface $objectManager, $clientClass) { @@ -44,7 +40,6 @@ public function __construct(ObjectManagerInterface $objectManager, $clientClass) * * @param array $options * @return ClientInterface - * @since 2.1.0 */ public function create(array $options = []) { diff --git a/Model/Client/ClientFactoryInterface.php b/Model/Client/ClientFactoryInterface.php index 201b9d16bec4a..acacbb1c093fa 100644 --- a/Model/Client/ClientFactoryInterface.php +++ b/Model/Client/ClientFactoryInterface.php @@ -7,7 +7,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface ClientFactoryInterface { @@ -16,7 +16,7 @@ interface ClientFactoryInterface * * @param array $options * @return ClientInterface - * @since 2.1.0 + * @since 100.1.0 */ public function create(array $options = []); } diff --git a/Model/Client/ClientInterface.php b/Model/Client/ClientInterface.php index cdfba7b4a70fd..3bbd62813f188 100644 --- a/Model/Client/ClientInterface.php +++ b/Model/Client/ClientInterface.php @@ -7,7 +7,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface ClientInterface { @@ -15,7 +15,7 @@ interface ClientInterface * Validate connection params for search engine * * @return bool - * @since 2.1.0 + * @since 100.1.0 */ public function testConnection(); } diff --git a/Model/Client/ClientOptionsInterface.php b/Model/Client/ClientOptionsInterface.php index 4ae57d8c0e2b0..8b25829666b61 100644 --- a/Model/Client/ClientOptionsInterface.php +++ b/Model/Client/ClientOptionsInterface.php @@ -7,7 +7,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ interface ClientOptionsInterface { @@ -16,7 +16,7 @@ interface ClientOptionsInterface * * @param array $options * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function prepareClientOptions($options = []); } diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index 82e14dc0cb9e7..79202fd9be3e4 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -10,7 +10,7 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class ClientResolver { @@ -18,7 +18,7 @@ class ClientResolver * Scope configuration * * @var ScopeConfigInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $scopeConfig; @@ -26,7 +26,7 @@ class ClientResolver * Object Manager instance * * @var ObjectManagerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $objectManager; @@ -34,7 +34,6 @@ class ClientResolver * Pool of existing client factories * * @var array - * @since 2.1.0 */ private $clientFactoryPool; @@ -42,7 +41,6 @@ class ClientResolver * Pool of client option classes * * @var array - * @since 2.1.0 */ private $clientOptionsPool; @@ -50,13 +48,13 @@ class ClientResolver * Config path * * @var string - * @since 2.1.0 + * @since 100.1.0 */ protected $path; /** * Config Scope - * @since 2.1.0 + * @since 100.1.0 */ protected $scope; @@ -67,7 +65,7 @@ class ClientResolver * @param array $clientOptions * @param string $path * @param string scope - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( ObjectManagerInterface $objectManager, @@ -89,7 +87,7 @@ public function __construct( * Returns configured search engine * * @return string - * @since 2.1.0 + * @since 100.1.0 */ public function getCurrentEngine() { @@ -102,7 +100,7 @@ public function getCurrentEngine() * @param string $engine * @param array $data * @return ClientInterface - * @since 2.1.0 + * @since 100.1.0 */ public function create($engine = '', array $data = []) { diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index e11a0bfd5b7a7..653b2e02548b2 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -11,13 +11,11 @@ /** * Class \Magento\AdvancedSearch\Model\DataProvider\Suggestions * - * @since 2.1.0 */ class Suggestions implements SuggestedQueriesInterface { /** * {@inheritdoc} - * @since 2.1.0 */ public function isResultsCountEnabled() { @@ -26,7 +24,6 @@ public function isResultsCountEnabled() /** * {@inheritdoc} - * @since 2.1.0 */ public function getItems(QueryInterface $query) { diff --git a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php index 179f5afd6509e..fe4b91873d786 100644 --- a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php +++ b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php @@ -17,19 +17,16 @@ /** * Class \Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup * - * @since 2.1.0 */ class CustomerGroup extends AbstractPlugin { /** * @var ClientOptionsInterface - * @since 2.1.0 */ protected $clientOptions; /** * @var EngineResolver - * @since 2.1.0 */ protected $engineResolver; @@ -37,7 +34,6 @@ class CustomerGroup extends AbstractPlugin * @param IndexerRegistry $indexerRegistry * @param ClientOptionsInterface $clientOptions * @param EngineResolver $engineResolver - * @since 2.1.0 */ public function __construct( IndexerRegistry $indexerRegistry, @@ -57,7 +53,6 @@ public function __construct( * @param AbstractModel $group * @return Attribute * @SuppressWarnings(PHPMD.UnusedFormalParameter) - * @since 2.1.0 */ public function aroundSave( Group $subject, diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 6c4e7d244e1fa..816b147de6ea6 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -13,19 +13,19 @@ /** * @api - * @since 2.1.0 + * @since 100.1.0 */ class Index extends AbstractDb { /** * @var StoreManagerInterface - * @since 2.1.0 + * @since 100.1.0 */ protected $storeManager; /** * @var MetadataPool - * @since 2.1.0 + * @since 100.1.0 */ protected $metadataPool; @@ -35,7 +35,7 @@ class Index extends AbstractDb * @param StoreManagerInterface $storeManager * @param MetadataPool $metadataPool * @param null $connectionName - * @since 2.1.0 + * @since 100.1.0 */ public function __construct( Context $context, @@ -51,7 +51,7 @@ public function __construct( /** * Implementation of abstract construct * @return void - * @since 2.1.0 + * @since 100.1.0 */ protected function _construct() { @@ -62,7 +62,7 @@ protected function _construct() * * @param null|array $productIds * @return array - * @since 2.1.0 + * @since 100.1.0 */ protected function _getCatalogProductPriceData($productIds = null) { @@ -91,7 +91,7 @@ protected function _getCatalogProductPriceData($productIds = null) * @param null|array $productIds * @param int $storeId * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getPriceIndexData($productIds, $storeId) { @@ -111,7 +111,7 @@ public function getPriceIndexData($productIds, $storeId) * @param int $storeId * @param null|array $productIds * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getCategoryProductIndexData($storeId = null, $productIds = null) { @@ -142,7 +142,7 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null) * * @param int $categoryId * @return array - * @since 2.1.0 + * @since 100.1.0 */ public function getMovedCategoryProductIds($categoryId) { diff --git a/Model/SuggestedQueries.php b/Model/SuggestedQueries.php index ea4aa2f949ee2..21fbc1ba33eb2 100644 --- a/Model/SuggestedQueries.php +++ b/Model/SuggestedQueries.php @@ -17,13 +17,11 @@ class SuggestedQueries implements SuggestedQueriesInterface { /** * @var EngineResolver - * @since 2.1.0 */ private $engineResolver; /** * @var ObjectManagerInterface - * @since 2.1.0 */ private $objectManager; @@ -31,13 +29,11 @@ class SuggestedQueries implements SuggestedQueriesInterface * Array of SuggestedQueriesInterface class names. * * @var array - * @since 2.1.0 */ private $data; /** * @var SuggestedQueriesInterface - * @since 2.1.0 */ private $dataProvider; @@ -47,7 +43,6 @@ class SuggestedQueries implements SuggestedQueriesInterface * @param EngineResolver $engineResolver * @param ObjectManagerInterface $objectManager * @param array $data - * @since 2.1.0 */ public function __construct(EngineResolver $engineResolver, ObjectManagerInterface $objectManager, array $data) { @@ -77,7 +72,6 @@ public function getItems(QueryInterface $query) * * @return SuggestedQueriesInterface|SuggestedQueriesInterface[] * @throws \Exception - * @since 2.1.0 */ private function getDataProvider() { From 538ffaff8b7203604d28c707e0a41d6b8336eea2 Mon Sep 17 00:00:00 2001 From: Igor Melnikov Date: Mon, 7 Aug 2017 10:26:44 -0500 Subject: [PATCH 532/616] MAGETWO-71391: Incorrect Class Name in Unit Tests - fix class name --- .../Model/Adapter/BatchDataMapper/DataMapperResolverTest.php | 2 +- .../Model/Adapter/BatchDataMapper/ProductDataMapperTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php b/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php index 7e958fd8ae559..f9610ff21967a 100644 --- a/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php +++ b/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php @@ -10,7 +10,7 @@ use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver; -class DataMapperResolverTest extends \PHPUnit\Framework\Testcase +class DataMapperResolverTest extends \PHPUnit\Framework\TestCase { /** * @var DataMapperResolver diff --git a/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php b/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php index 2eba21c23dc11..ca478550fa684 100644 --- a/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php +++ b/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php @@ -17,7 +17,7 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class ProductDataMapperTest extends \PHPUnit\Framework\Testcase +class ProductDataMapperTest extends \PHPUnit\Framework\TestCase { /** * @var ProductDataMapper From c05a571b82adf9c19e4194e09a982ad2feff6d22 Mon Sep 17 00:00:00 2001 From: RomanKis Date: Tue, 8 Aug 2017 12:31:03 +0300 Subject: [PATCH 533/616] MAGETWO-71400: "ST-EE-L64" fails on 2.2-develop --- SearchAdapter/Dynamic/DataProvider.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 821bae83acdc6..6819bd033aeae 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -40,28 +40,29 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class should only modify existing query and not be responsible for query building. * @since 100.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class should only modify existing query and not be responsible for query building. + * * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class should only modify existing query and not be responsible for query building. * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class should only modify existing query and not be responsible for query building. * @since 100.1.0 */ protected $indexerId; From df24cd37c00176d02b0cb7b83a684be59bf8ce6e Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Tue, 8 Aug 2017 13:37:49 +0300 Subject: [PATCH 534/616] MQE-130: [MTF1.0] Modify test grouping so that tests run around 10 minutes - Fix static test --- SearchAdapter/Dynamic/DataProvider.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 821bae83acdc6..57af0a1c4ba38 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -40,28 +40,32 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $indexerId; From bbfe5d89a2e7096d404f46249f3368dae240ba5f Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Wed, 9 Aug 2017 12:29:32 +0300 Subject: [PATCH 535/616] MAGETWO-70705: [GitHub] Installation error in Tax module #10138 --- SearchAdapter/Dynamic/DataProvider.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 821bae83acdc6..57af0a1c4ba38 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -40,28 +40,32 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $indexerId; From 57cbacb4098003630a9117e069cf91a9479a5b19 Mon Sep 17 00:00:00 2001 From: Cristian Partica Date: Wed, 9 Aug 2017 14:26:50 -0500 Subject: [PATCH 536/616] MAGETWO-71223: Deprecate getResource and getCollection - fix static --- SearchAdapter/Dynamic/DataProvider.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 821bae83acdc6..57af0a1c4ba38 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -40,28 +40,32 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $indexerId; From f53032e15bf9630152a4cec66060a379f554533d Mon Sep 17 00:00:00 2001 From: Dmytro Vilchynskyi Date: Thu, 10 Aug 2017 13:43:14 +0300 Subject: [PATCH 537/616] MAGETWO-70571: There is no possibility to activate DEBUG logging in production mode - fixed failed L1 & static tests for failed L3 --- SearchAdapter/Dynamic/DataProvider.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 821bae83acdc6..57af0a1c4ba38 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -40,28 +40,32 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte /** * @var \Magento\Elasticsearch\Model\Config - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $clientConfig; /** * @var \Magento\Store\Model\StoreManagerInterface - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $storeManager; /** * @var \Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $searchIndexNameResolver; /** * @var string - * @deprecated 100.2.0 as this class shouldn't be responsible for query building and should only modify existing query + * @deprecated 100.2.0 as this class shouldn't be responsible for query building + * and should only modify existing query * @since 100.1.0 */ protected $indexerId; From 6b4d96ef05185860e46b3adacd256df4a8df754c Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 11 Aug 2017 15:27:24 -0500 Subject: [PATCH 538/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - added @since tag to all @api classes --- Block/Adminhtml/Search/Edit.php | 1 + Block/Adminhtml/Search/Grid.php | 1 + Block/Recommendations.php | 1 + Block/Suggestions.php | 1 + Model/Adminhtml/Search/Grid/Options.php | 1 + Model/ResourceModel/Recommendations.php | 1 + Model/ResourceModel/Search/Grid/Collection.php | 1 + Model/SuggestedQueriesInterface.php | 1 + 8 files changed, 8 insertions(+) diff --git a/Block/Adminhtml/Search/Edit.php b/Block/Adminhtml/Search/Edit.php index d9a4b8125ce6a..403a4d12cc17b 100644 --- a/Block/Adminhtml/Search/Edit.php +++ b/Block/Adminhtml/Search/Edit.php @@ -10,6 +10,7 @@ * * @api * @author Magento Core Team + * @since 100.0.2 */ class Edit extends \Magento\Backend\Block\Widget\Grid\Container { diff --git a/Block/Adminhtml/Search/Grid.php b/Block/Adminhtml/Search/Grid.php index a64eb137b6ac2..6bdfd3b0dd143 100644 --- a/Block/Adminhtml/Search/Grid.php +++ b/Block/Adminhtml/Search/Grid.php @@ -10,6 +10,7 @@ * * @api * @author Magento Core Team + * @since 100.0.2 */ class Grid extends \Magento\Backend\Block\Widget\Grid { diff --git a/Block/Recommendations.php b/Block/Recommendations.php index 6d9fbb795464b..1a23ea554bd91 100644 --- a/Block/Recommendations.php +++ b/Block/Recommendations.php @@ -7,6 +7,7 @@ /** * @api + * @since 100.0.2 */ class Recommendations extends SearchData { diff --git a/Block/Suggestions.php b/Block/Suggestions.php index 4476e10153ebb..1f7b54d68dab4 100644 --- a/Block/Suggestions.php +++ b/Block/Suggestions.php @@ -7,6 +7,7 @@ /** * @api + * @since 100.0.2 */ class Suggestions extends SearchData { diff --git a/Model/Adminhtml/Search/Grid/Options.php b/Model/Adminhtml/Search/Grid/Options.php index 082540ee307ca..b139689dbc234 100644 --- a/Model/Adminhtml/Search/Grid/Options.php +++ b/Model/Adminhtml/Search/Grid/Options.php @@ -9,6 +9,7 @@ /** * @api + * @since 100.0.2 */ class Options implements \Magento\Framework\Option\ArrayInterface { diff --git a/Model/ResourceModel/Recommendations.php b/Model/ResourceModel/Recommendations.php index 8986ebc19bb3b..c19c1d67d81f7 100644 --- a/Model/ResourceModel/Recommendations.php +++ b/Model/ResourceModel/Recommendations.php @@ -10,6 +10,7 @@ * * @author Magento Core Team * @api + * @since 100.0.2 */ class Recommendations extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/Model/ResourceModel/Search/Grid/Collection.php b/Model/ResourceModel/Search/Grid/Collection.php index 56f672b2b7329..59263f308117c 100644 --- a/Model/ResourceModel/Search/Grid/Collection.php +++ b/Model/ResourceModel/Search/Grid/Collection.php @@ -7,6 +7,7 @@ /** * @api + * @since 100.0.2 */ class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection { diff --git a/Model/SuggestedQueriesInterface.php b/Model/SuggestedQueriesInterface.php index fbe069e7cd9b3..64ab45ceb145e 100644 --- a/Model/SuggestedQueriesInterface.php +++ b/Model/SuggestedQueriesInterface.php @@ -9,6 +9,7 @@ /** * @api + * @since 100.0.2 */ interface SuggestedQueriesInterface { From b57fc9731ca37cfa13ae4cc2478548e4db9187ff Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 11 Aug 2017 15:40:58 -0500 Subject: [PATCH 539/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - removed useless class docBlocks --- Model/Adapter/FieldMapper/FieldMapperResolver.php | 4 ---- Model/Adapter/FieldType/Date.php | 4 ---- Model/Adapter/Index/Builder.php | 4 ---- Model/Adapter/Index/Config/Converter.php | 4 ---- Model/Adapter/Index/Config/EsConfig.php | 4 ---- Model/Adapter/Index/Config/SchemaLocator.php | 4 ---- Model/DataProvider/Suggestions.php | 4 ---- Model/Indexer/IndexStructure.php | 4 ---- Model/Indexer/IndexerHandler.php | 4 ---- SearchAdapter/Aggregation/Builder.php | 4 ---- SearchAdapter/Aggregation/Builder/Dynamic.php | 4 ---- SearchAdapter/Aggregation/Builder/Term.php | 4 ---- SearchAdapter/Aggregation/Interval.php | 4 ---- SearchAdapter/Filter/Builder.php | 4 ---- SearchAdapter/Filter/Builder/Range.php | 4 ---- SearchAdapter/Filter/Builder/Term.php | 4 ---- SearchAdapter/Filter/Builder/Wildcard.php | 4 ---- SearchAdapter/Query/Builder/Match.php | 4 ---- 18 files changed, 72 deletions(-) diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/Model/Adapter/FieldMapper/FieldMapperResolver.php index 34c83cc4d5e13..4d341905b9926 100644 --- a/Model/Adapter/FieldMapper/FieldMapperResolver.php +++ b/Model/Adapter/FieldMapper/FieldMapperResolver.php @@ -9,10 +9,6 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\Model\Config; -/** - * Class \Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver - * - */ class FieldMapperResolver implements FieldMapperInterface { /** diff --git a/Model/Adapter/FieldType/Date.php b/Model/Adapter/FieldType/Date.php index 6133e4de1b53e..ecae1a4ccca91 100644 --- a/Model/Adapter/FieldType/Date.php +++ b/Model/Adapter/FieldType/Date.php @@ -9,10 +9,6 @@ use Magento\Framework\Stdlib\DateTime; use Magento\Framework\Stdlib\DateTime\TimezoneInterface; -/** - * Class \Magento\Elasticsearch\Model\Adapter\FieldType\Date - * - */ class Date { /** diff --git a/Model/Adapter/Index/Builder.php b/Model/Adapter/Index/Builder.php index 5e98caf7a4e37..773faf49f8fda 100644 --- a/Model/Adapter/Index/Builder.php +++ b/Model/Adapter/Index/Builder.php @@ -8,10 +8,6 @@ use Magento\Framework\Locale\Resolver as LocaleResolver; use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface; -/** - * Class \Magento\Elasticsearch\Model\Adapter\Index\Builder - * - */ class Builder implements BuilderInterface { /** diff --git a/Model/Adapter/Index/Config/Converter.php b/Model/Adapter/Index/Config/Converter.php index 40ca03506ba73..54400b3ea72d7 100644 --- a/Model/Adapter/Index/Config/Converter.php +++ b/Model/Adapter/Index/Config/Converter.php @@ -7,10 +7,6 @@ use Magento\Framework\Config\ConverterInterface; -/** - * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\Converter - * - */ class Converter implements ConverterInterface { /** diff --git a/Model/Adapter/Index/Config/EsConfig.php b/Model/Adapter/Index/Config/EsConfig.php index b4966011b5ac5..f3c9e34d6076e 100644 --- a/Model/Adapter/Index/Config/EsConfig.php +++ b/Model/Adapter/Index/Config/EsConfig.php @@ -10,10 +10,6 @@ use Magento\Framework\Config\ReaderInterface; use Magento\Framework\Serialize\SerializerInterface; -/** - * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfig - * - */ class EsConfig extends Data implements EsConfigInterface { /** diff --git a/Model/Adapter/Index/Config/SchemaLocator.php b/Model/Adapter/Index/Config/SchemaLocator.php index 16acbd907ac76..182523042e07a 100644 --- a/Model/Adapter/Index/Config/SchemaLocator.php +++ b/Model/Adapter/Index/Config/SchemaLocator.php @@ -8,10 +8,6 @@ use Magento\Framework\Config\SchemaLocatorInterface; use Magento\Framework\Module\Dir; -/** - * Class \Magento\Elasticsearch\Model\Adapter\Index\Config\SchemaLocator - * - */ class SchemaLocator implements SchemaLocatorInterface { /** diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 86c6f5ad0ae61..8ebd45596d399 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -15,10 +15,6 @@ use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; use Magento\Store\Model\StoreManagerInterface as StoreManager; -/** - * Class \Magento\Elasticsearch\Model\DataProvider\Suggestions - * - */ class Suggestions implements SuggestedQueriesInterface { /** diff --git a/Model/Indexer/IndexStructure.php b/Model/Indexer/IndexStructure.php index b029403528c31..5a31b3d81d0cc 100644 --- a/Model/Indexer/IndexStructure.php +++ b/Model/Indexer/IndexStructure.php @@ -9,10 +9,6 @@ use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter; use Magento\Framework\App\ScopeResolverInterface; -/** - * Class \Magento\Elasticsearch\Model\Indexer\IndexStructure - * - */ class IndexStructure implements IndexStructureInterface { /** diff --git a/Model/Indexer/IndexerHandler.php b/Model/Indexer/IndexerHandler.php index 18712ee82e313..cfcdbecb16242 100644 --- a/Model/Indexer/IndexerHandler.php +++ b/Model/Indexer/IndexerHandler.php @@ -12,10 +12,6 @@ use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver; use Magento\Framework\App\ScopeResolverInterface; -/** - * Class \Magento\Elasticsearch\Model\Indexer\IndexerHandler - * - */ class IndexerHandler implements IndexerInterface { /** diff --git a/SearchAdapter/Aggregation/Builder.php b/SearchAdapter/Aggregation/Builder.php index 56a6b709d1a4d..1e9b60da74a5b 100644 --- a/SearchAdapter/Aggregation/Builder.php +++ b/SearchAdapter/Aggregation/Builder.php @@ -12,10 +12,6 @@ use Magento\Framework\Search\Dynamic\DataProviderInterface; use Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\BucketBuilderInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder - * - */ class Builder { /** diff --git a/SearchAdapter/Aggregation/Builder/Dynamic.php b/SearchAdapter/Aggregation/Builder/Dynamic.php index 80136ec04bbd1..1e106023ea00d 100644 --- a/SearchAdapter/Aggregation/Builder/Dynamic.php +++ b/SearchAdapter/Aggregation/Builder/Dynamic.php @@ -12,10 +12,6 @@ use Magento\Framework\Search\Request\Aggregation\DynamicBucket; use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Dynamic - * - */ class Dynamic implements BucketBuilderInterface { /** diff --git a/SearchAdapter/Aggregation/Builder/Term.php b/SearchAdapter/Aggregation/Builder/Term.php index 9123abb7c0686..bcfb7f5565b86 100644 --- a/SearchAdapter/Aggregation/Builder/Term.php +++ b/SearchAdapter/Aggregation/Builder/Term.php @@ -8,10 +8,6 @@ use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface; use Magento\Framework\Search\Dynamic\DataProviderInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Builder\Term - * - */ class Term implements BucketBuilderInterface { /** diff --git a/SearchAdapter/Aggregation/Interval.php b/SearchAdapter/Aggregation/Interval.php index 691e2df1c7763..33ab1a4071560 100644 --- a/SearchAdapter/Aggregation/Interval.php +++ b/SearchAdapter/Aggregation/Interval.php @@ -12,10 +12,6 @@ use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver; use Magento\CatalogSearch\Model\Indexer\Fulltext; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Aggregation\Interval - * - */ class Interval implements IntervalInterface { /** diff --git a/SearchAdapter/Filter/Builder.php b/SearchAdapter/Filter/Builder.php index 5f192f5aa445f..8efc342d26452 100644 --- a/SearchAdapter/Filter/Builder.php +++ b/SearchAdapter/Filter/Builder.php @@ -12,10 +12,6 @@ use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term; use Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder - * - */ class Builder implements BuilderInterface { /** diff --git a/SearchAdapter/Filter/Builder/Range.php b/SearchAdapter/Filter/Builder/Range.php index 2be9659331d76..a2cab32ea4e69 100644 --- a/SearchAdapter/Filter/Builder/Range.php +++ b/SearchAdapter/Filter/Builder/Range.php @@ -9,10 +9,6 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Range - * - */ class Range implements FilterInterface { /** diff --git a/SearchAdapter/Filter/Builder/Term.php b/SearchAdapter/Filter/Builder/Term.php index 2ccbac1210ec6..ed8cd049d2915 100644 --- a/SearchAdapter/Filter/Builder/Term.php +++ b/SearchAdapter/Filter/Builder/Term.php @@ -9,10 +9,6 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Term - * - */ class Term implements FilterInterface { /** diff --git a/SearchAdapter/Filter/Builder/Wildcard.php b/SearchAdapter/Filter/Builder/Wildcard.php index 816e23b8dd37a..14237152244fa 100644 --- a/SearchAdapter/Filter/Builder/Wildcard.php +++ b/SearchAdapter/Filter/Builder/Wildcard.php @@ -9,10 +9,6 @@ use Magento\Framework\Search\Request\FilterInterface as RequestFilterInterface; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Filter\Builder\Wildcard - * - */ class Wildcard implements FilterInterface { /** diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 788efc8a9f66c..61766663ea2e4 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -10,10 +10,6 @@ use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface; -/** - * Class \Magento\Elasticsearch\SearchAdapter\Query\Builder\Match - * - */ class Match implements QueryInterface { /** From 1cbc3658328bb00a6f2f9633c01abc883e64c04f Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 11 Aug 2017 15:40:58 -0500 Subject: [PATCH 540/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - removed useless class docBlocks --- Block/SearchData.php | 4 ---- Controller/Adminhtml/Search/System/Config/TestConnection.php | 4 ---- Model/Client/ClientFactory.php | 4 ---- Model/DataProvider/Suggestions.php | 4 ---- Model/Indexer/Fulltext/Plugin/CustomerGroup.php | 4 ---- Model/Recommendations/DataProvider.php | 4 ---- Model/Recommendations/SaveSearchQueryRelationsObserver.php | 4 ---- Model/SuggestedQueries.php | 4 ---- 8 files changed, 32 deletions(-) diff --git a/Block/SearchData.php b/Block/SearchData.php index c82b130dbec87..993731b465257 100644 --- a/Block/SearchData.php +++ b/Block/SearchData.php @@ -10,10 +10,6 @@ use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; -/** - * Class \Magento\AdvancedSearch\Block\SearchData - * - */ abstract class SearchData extends Template implements SearchDataInterface { /** diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index a1b25da27c6b1..a3cca367c8993 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -12,10 +12,6 @@ use Magento\Framework\Controller\Result\JsonFactory; use Magento\Framework\Filter\StripTags; -/** - * Class \Magento\AdvancedSearch\Controller\Adminhtml\Search\System\Config\TestConnection - * - */ class TestConnection extends Action { /** diff --git a/Model/Client/ClientFactory.php b/Model/Client/ClientFactory.php index a13a42486e807..05eb513d68399 100644 --- a/Model/Client/ClientFactory.php +++ b/Model/Client/ClientFactory.php @@ -7,10 +7,6 @@ use Magento\Framework\ObjectManagerInterface; -/** - * Class \Magento\AdvancedSearch\Model\Client\ClientFactory - * - */ class ClientFactory implements ClientFactoryInterface { /** diff --git a/Model/DataProvider/Suggestions.php b/Model/DataProvider/Suggestions.php index 653b2e02548b2..c76811c854514 100644 --- a/Model/DataProvider/Suggestions.php +++ b/Model/DataProvider/Suggestions.php @@ -8,10 +8,6 @@ use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; -/** - * Class \Magento\AdvancedSearch\Model\DataProvider\Suggestions - * - */ class Suggestions implements SuggestedQueriesInterface { /** diff --git a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php index fe4b91873d786..ee38dd851264f 100644 --- a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php +++ b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php @@ -14,10 +14,6 @@ use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; use Magento\Search\Model\EngineResolver; -/** - * Class \Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup - * - */ class CustomerGroup extends AbstractPlugin { /** diff --git a/Model/Recommendations/DataProvider.php b/Model/Recommendations/DataProvider.php index 6f3d42449760e..546983bb5e5a8 100644 --- a/Model/Recommendations/DataProvider.php +++ b/Model/Recommendations/DataProvider.php @@ -10,10 +10,6 @@ use Magento\Search\Model\QueryInterface; use Magento\AdvancedSearch\Model\SuggestedQueriesInterface; -/** - * Class \Magento\AdvancedSearch\Model\Recommendations\DataProvider - * - */ class DataProvider implements SuggestedQueriesInterface { /** diff --git a/Model/Recommendations/SaveSearchQueryRelationsObserver.php b/Model/Recommendations/SaveSearchQueryRelationsObserver.php index 2ac9cb73c912a..5f5d4122d97a5 100644 --- a/Model/Recommendations/SaveSearchQueryRelationsObserver.php +++ b/Model/Recommendations/SaveSearchQueryRelationsObserver.php @@ -9,10 +9,6 @@ use Magento\Framework\Event\Observer as EventObserver; use Magento\Framework\Event\ObserverInterface; -/** - * Class \Magento\AdvancedSearch\Model\Recommendations\SaveSearchQueryRelationsObserver - * - */ class SaveSearchQueryRelationsObserver implements ObserverInterface { diff --git a/Model/SuggestedQueries.php b/Model/SuggestedQueries.php index 21fbc1ba33eb2..723de6fac614e 100644 --- a/Model/SuggestedQueries.php +++ b/Model/SuggestedQueries.php @@ -9,10 +9,6 @@ use Magento\Search\Model\QueryInterface; use Magento\Search\Model\EngineResolver; -/** - * Class \Magento\AdvancedSearch\Model\SuggestedQueries - * - */ class SuggestedQueries implements SuggestedQueriesInterface { /** From 775ab58baca64ffa232c0d8dca8f3d7c118ded0b Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 11 Aug 2017 17:11:06 -0500 Subject: [PATCH 541/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - removed @since tag from class constructors --- Model/Adapter/Index/IndexNameResolver.php | 1 - Model/Config.php | 1 - Model/ResourceModel/Index.php | 1 - SearchAdapter/AggregationFactory.php | 1 - SearchAdapter/ConnectionManager.php | 1 - SearchAdapter/DocumentFactory.php | 1 - SearchAdapter/Dynamic/DataProvider.php | 1 - SearchAdapter/Mapper.php | 1 - SearchAdapter/Query/Builder.php | 1 - SearchAdapter/Query/Builder/Aggregation.php | 1 - SearchAdapter/Query/Preprocessor/Stopwords.php | 1 - SearchAdapter/ResponseFactory.php | 1 - SearchAdapter/SearchIndexNameResolver.php | 1 - 13 files changed, 13 deletions(-) diff --git a/Model/Adapter/Index/IndexNameResolver.php b/Model/Adapter/Index/IndexNameResolver.php index 5daf1e151d067..c2edc616e8609 100644 --- a/Model/Adapter/Index/IndexNameResolver.php +++ b/Model/Adapter/Index/IndexNameResolver.php @@ -51,7 +51,6 @@ class IndexNameResolver * @param LoggerInterface $logger * @param array $options * @throws LocalizedException - * @since 100.1.0 */ public function __construct( ConnectionManager $connectionManager, diff --git a/Model/Config.php b/Model/Config.php index 80598acfec32e..c48aa14252759 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -46,7 +46,6 @@ class Config implements ClientOptionsInterface * Constructor * * @param ScopeConfigInterface $scopeConfig - * @since 100.1.0 */ public function __construct( ScopeConfigInterface $scopeConfig diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 8fed7ba32788a..49489f1cdb43d 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -48,7 +48,6 @@ class Index extends \Magento\AdvancedSearch\Model\ResourceModel\Index * @param Config $eavConfig * @param null $connectionName * @SuppressWarnings(Magento.TypeDuplication) - * @since 100.1.0 */ public function __construct( Context $context, diff --git a/SearchAdapter/AggregationFactory.php b/SearchAdapter/AggregationFactory.php index 287d9a00b6e0d..f46e72223bfec 100644 --- a/SearchAdapter/AggregationFactory.php +++ b/SearchAdapter/AggregationFactory.php @@ -24,7 +24,6 @@ class AggregationFactory /** * @param ObjectManagerInterface $objectManager - * @since 100.1.0 */ public function __construct(ObjectManagerInterface $objectManager) { diff --git a/SearchAdapter/ConnectionManager.php b/SearchAdapter/ConnectionManager.php index 7e644ca80f640..77c42077323d4 100644 --- a/SearchAdapter/ConnectionManager.php +++ b/SearchAdapter/ConnectionManager.php @@ -44,7 +44,6 @@ class ConnectionManager * @param ClientFactoryInterface $clientFactory * @param ClientOptionsInterface $clientConfig * @param LoggerInterface $logger - * @since 100.1.0 */ public function __construct( ClientFactoryInterface $clientFactory, diff --git a/SearchAdapter/DocumentFactory.php b/SearchAdapter/DocumentFactory.php index f019e8c695624..83652e08d4246 100644 --- a/SearchAdapter/DocumentFactory.php +++ b/SearchAdapter/DocumentFactory.php @@ -37,7 +37,6 @@ class DocumentFactory /** * @param ObjectManagerInterface $objectManager * @param EntityMetadata $entityMetadata - * @since 100.1.0 */ public function __construct(ObjectManagerInterface $objectManager, EntityMetadata $entityMetadata) { diff --git a/SearchAdapter/Dynamic/DataProvider.php b/SearchAdapter/Dynamic/DataProvider.php index 57af0a1c4ba38..0add517ba94ad 100644 --- a/SearchAdapter/Dynamic/DataProvider.php +++ b/SearchAdapter/Dynamic/DataProvider.php @@ -94,7 +94,6 @@ class DataProvider implements \Magento\Framework\Search\Dynamic\DataProviderInte * @param QueryContainer|null $queryContainer * * @SuppressWarnings(PHPMD.ExcessiveParameterList) - * @since 100.1.0 */ public function __construct( \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager, diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index a77f127c123bc..48992e3829ba9 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -43,7 +43,6 @@ class Mapper * @param QueryBuilder $queryBuilder * @param MatchQueryBuilder $matchQueryBuilder * @param FilterBuilder $filterBuilder - * @since 100.1.0 */ public function __construct( QueryBuilder $queryBuilder, diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index afbedf4296339..d22129d2a9531 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -46,7 +46,6 @@ class Builder * @param SearchIndexNameResolver $searchIndexNameResolver * @param AggregationBuilder $aggregationBuilder * @param ScopeResolverInterface $scopeResolver - * @since 100.1.0 */ public function __construct( Config $clientConfig, diff --git a/SearchAdapter/Query/Builder/Aggregation.php b/SearchAdapter/Query/Builder/Aggregation.php index 95734030210d0..cad32eb727e16 100644 --- a/SearchAdapter/Query/Builder/Aggregation.php +++ b/SearchAdapter/Query/Builder/Aggregation.php @@ -23,7 +23,6 @@ class Aggregation /** * @param FieldMapperInterface $fieldMapper - * @since 100.1.0 */ public function __construct( FieldMapperInterface $fieldMapper diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/SearchAdapter/Query/Preprocessor/Stopwords.php index af3809c903020..d8d1a071611c1 100644 --- a/SearchAdapter/Query/Preprocessor/Stopwords.php +++ b/SearchAdapter/Query/Preprocessor/Stopwords.php @@ -88,7 +88,6 @@ class Stopwords implements PreprocessorInterface * @param \Magento\Framework\Module\Dir\Reader $moduleDirReader * @param string $stopwordsModule * @param string $stopwordsDirectory - * @since 100.1.0 */ public function __construct( \Magento\Store\Model\StoreManagerInterface $storeManager, diff --git a/SearchAdapter/ResponseFactory.php b/SearchAdapter/ResponseFactory.php index 7bd2d49e84826..33fda48f4af57 100644 --- a/SearchAdapter/ResponseFactory.php +++ b/SearchAdapter/ResponseFactory.php @@ -42,7 +42,6 @@ class ResponseFactory * @param ObjectManagerInterface $objectManager * @param DocumentFactory $documentFactory * @param AggregationFactory $aggregationFactory - * @since 100.1.0 */ public function __construct( ObjectManagerInterface $objectManager, diff --git a/SearchAdapter/SearchIndexNameResolver.php b/SearchAdapter/SearchIndexNameResolver.php index 5d223cdc7300b..24e8eb069c7d0 100644 --- a/SearchAdapter/SearchIndexNameResolver.php +++ b/SearchAdapter/SearchIndexNameResolver.php @@ -22,7 +22,6 @@ class SearchIndexNameResolver /** * @param Config $clientConfig - * @since 100.1.0 */ public function __construct( Config $clientConfig From bbd2ff6e633b0e2ff2261e383906a0d9c01c917c Mon Sep 17 00:00:00 2001 From: Oleksii Korshenko Date: Fri, 11 Aug 2017 17:11:06 -0500 Subject: [PATCH 542/616] MAGETWO-71174: Update doc block information in php classes with @deprecated and @since tags - removed @since tag from class constructors --- Model/Client/ClientResolver.php | 3 +-- Model/ResourceModel/Index.php | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index 79202fd9be3e4..b717e5aa56679 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -64,8 +64,7 @@ class ClientResolver * @param array $clientFactories * @param array $clientOptions * @param string $path - * @param string scope - * @since 100.1.0 + * @param string $scopeType */ public function __construct( ObjectManagerInterface $objectManager, diff --git a/Model/ResourceModel/Index.php b/Model/ResourceModel/Index.php index 816b147de6ea6..8721b600ed396 100644 --- a/Model/ResourceModel/Index.php +++ b/Model/ResourceModel/Index.php @@ -35,7 +35,6 @@ class Index extends AbstractDb * @param StoreManagerInterface $storeManager * @param MetadataPool $metadataPool * @param null $connectionName - * @since 100.1.0 */ public function __construct( Context $context, From 3e697d2192e3730c468dfd255acb089eda9fde1c Mon Sep 17 00:00:00 2001 From: Robert He Date: Tue, 12 Sep 2017 20:36:49 -0500 Subject: [PATCH 543/616] MAGETWO-70580: Merged fixes --- .../Adminhtml/Search/System/Config/TestConnection.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/Controller/Adminhtml/Search/System/Config/TestConnection.php index a3cca367c8993..be72d0a82822d 100644 --- a/Controller/Adminhtml/Search/System/Config/TestConnection.php +++ b/Controller/Adminhtml/Search/System/Config/TestConnection.php @@ -14,6 +14,13 @@ class TestConnection extends Action { + /** + * Authorization level of a basic admin session. + * + * @see _isAllowed() + */ + const ADMIN_RESOURCE = 'Magento_CatalogSearch::config_catalog_search'; + /** * @var ClientResolver */ From fb2aec6cec8be4fcc584639b202a9c5b8f861544 Mon Sep 17 00:00:00 2001 From: Leonid Poluyanov Date: Mon, 18 Sep 2017 18:38:30 +0300 Subject: [PATCH 544/616] MAGETWO-72267: Cannot see grouped product in category with enabled elastic search --- Model/Adapter/BatchDataMapper/ProductDataMapper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/Model/Adapter/BatchDataMapper/ProductDataMapper.php index bff9cdd68206a..4d329f212dd84 100644 --- a/Model/Adapter/BatchDataMapper/ProductDataMapper.php +++ b/Model/Adapter/BatchDataMapper/ProductDataMapper.php @@ -308,6 +308,8 @@ private function getValueForAttribute($productId, $attributeCode, array $attribu && isset($attributeValue[$productId]) ) { $value = $attributeValue[$productId]; + } elseif (in_array($attributeCode, $this->attributesExcludedFromMerge) && !isset($attributeValue[$productId])) { + $value = ''; } else { $value = implode(' ', $attributeValue); } From 3b27c911d763aa03f9056c585b1e1d9fba575454 Mon Sep 17 00:00:00 2001 From: Leonid Poluyanov Date: Mon, 18 Sep 2017 18:38:30 +0300 Subject: [PATCH 545/616] MAGETWO-72267: Cannot see grouped product in category with enabled elastic search --- .../ReindexAllTest.php | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) rename Model/Indexer/{ConfigurableProduct => }/ReindexAllTest.php (79%) diff --git a/Model/Indexer/ConfigurableProduct/ReindexAllTest.php b/Model/Indexer/ReindexAllTest.php similarity index 79% rename from Model/Indexer/ConfigurableProduct/ReindexAllTest.php rename to Model/Indexer/ReindexAllTest.php index 567c45c08d727..5122e3c1dfca1 100644 --- a/Model/Indexer/ConfigurableProduct/ReindexAllTest.php +++ b/Model/Indexer/ReindexAllTest.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Indexer\ConfigurableProduct; +namespace Magento\Elasticsearch\Model\Indexer; use Magento\Catalog\Api\ProductRepositoryInterface; use Magento\Indexer\Model\Indexer; @@ -22,7 +22,6 @@ * * @magentoDbIsolation disabled * @magentoAppIsolation enabled - * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php */ class ReindexAllTest extends \PHPUnit\Framework\TestCase { @@ -64,12 +63,6 @@ protected function setUp() $this->clientConfig = Bootstrap::getObjectManager()->create(Config::class); $this->searchIndexNameResolver = Bootstrap::getObjectManager()->create(SearchIndexNameResolver::class); $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class); - - // Perform full reindex - /** @var Indexer $indexer */ - $indexer = Bootstrap::getObjectManager()->create(Indexer::class); - $indexer->load('catalogsearch_fulltext'); - $indexer->reindexAll(); } /** @@ -77,9 +70,11 @@ protected function setUp() * * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable + * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php */ public function testSearchAll() { + $this->reindexAll(); $result = $this->searchByName('Configurable Product'); self::assertGreaterThanOrEqual(2, $result); } @@ -89,9 +84,11 @@ public function testSearchAll() * * @magentoConfigFixture current_store catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable + * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php */ public function testSearchSpecificProduct() { + $this->reindexAll(); $result = $this->searchByName('12345'); self::assertCount(1, $result); @@ -99,6 +96,22 @@ public function testSearchSpecificProduct() self::assertEquals($specificProduct->getId(), $result[0]['_id']); } + /** + * Test search of grouped product after full reindex + * + * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped_with_simple.php + * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_grouped + */ + public function testSearchGroupedProduct() + { + $expectedProductName = 'Grouped Product Simple 11 Simple 22'; + $this->reindexAll(); + $result = $this->searchByName('Grouped Product'); + self::assertCount(1, $result); + self::assertEquals($expectedProductName, $result[0]['_source']['name']); + } + /** * @param string $text * @return array @@ -127,4 +140,18 @@ private function searchByName($text) $queryResult = $this->client->query($searchQuery); return isset($queryResult['hits']['hits']) ? $queryResult['hits']['hits'] : []; } + + /** + * Make fulltext catalog search reindex + * + * @return void + */ + private function reindexAll() + { + // Perform full reindex + /** @var Indexer $indexer */ + $indexer = Bootstrap::getObjectManager()->create(Indexer::class); + $indexer->load('catalogsearch_fulltext'); + $indexer->reindexAll(); + } } From 07b7fbb5cf2c889c60a5484499cd04de0cd0d1bd Mon Sep 17 00:00:00 2001 From: mage2-team Date: Fri, 22 Sep 2017 12:10:03 -0700 Subject: [PATCH 546/616] MAGETWO-70580: Magento 2.2.0 Publication (build 2.2.0.032) --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 0efe81ddb1759..621a7fc9f9eca 100644 --- a/composer.json +++ b/composer.json @@ -4,20 +4,20 @@ "require": { "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", "magento/module-advanced-search": "100.2.*", - "magento/module-catalog": "101.1.*", + "magento/module-catalog": "102.0.*", "magento/module-catalog-search": "100.2.*", - "magento/module-customer": "100.2.*", - "magento/module-eav": "100.2.*", + "magento/module-customer": "101.0.*", + "magento/module-eav": "101.0.*", "magento/module-search": "100.2.*", "magento/module-store": "100.2.*", - "magento/framework": "100.2.*", + "magento/framework": "101.0.*", "elasticsearch/elasticsearch": "~2.0" }, "suggest": { - "magento/module-config": "100.2.*" + "magento/module-config": "101.0.*" }, "type": "magento2-module", - "version": "100.2.0-dev", + "version": "100.2.0", "license": [ "proprietary" ], From 16a42c027a94f376b0b4f2f7868e606fba8c2e63 Mon Sep 17 00:00:00 2001 From: Erik Hansen Date: Tue, 26 Sep 2017 11:13:55 -0500 Subject: [PATCH 547/616] Fix scope type ID --- Model/Adapter/BatchDataMapper/PriceFieldsProvider.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php index aa8965713c32a..f5e8a23525a07 100644 --- a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php +++ b/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php @@ -50,9 +50,8 @@ public function __construct( */ public function getFields(array $productIds, $storeId) { - $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId(); $priceData = $this->dataProvider->getSearchableAttribute('price') - ? $this->resourceIndex->getPriceIndexData($productIds, $websiteId) + ? $this->resourceIndex->getPriceIndexData($productIds, $storeId) : []; $fields = []; From cce7db3e7e359dcbc550501a71f4cd8fa5b67388 Mon Sep 17 00:00:00 2001 From: Alex Paliarush Date: Mon, 2 Oct 2017 17:15:37 -0500 Subject: [PATCH 548/616] MAGETWO-80581: Merge code from 2.2.0 release branches into "2.2-develop" branches --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 621a7fc9f9eca..822ea4020a1d0 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "magento/module-config": "101.0.*" }, "type": "magento2-module", - "version": "100.2.0", + "version": "100.2.0-dev", "license": [ "proprietary" ], From 69cd9a7c503c3d6786e530665fe1d1a95ff96e46 Mon Sep 17 00:00:00 2001 From: Vitaliy Honcharenko Date: Wed, 4 Oct 2017 14:27:52 +0300 Subject: [PATCH 549/616] MAGETWO-80811: Remove '-dev' suffix from magento/2.2-develop modules version - Revert "MAGETWO-80581: Merge code from 2.2.0 release branches into "2.2-develop" branches" - This reverts commit 65a6677fb4972ab78e4b29fe2fc5c40f1ac344d1. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 822ea4020a1d0..621a7fc9f9eca 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "magento/module-config": "101.0.*" }, "type": "magento2-module", - "version": "100.2.0-dev", + "version": "100.2.0", "license": [ "proprietary" ], From b1fc937296b2d4d7cca261703e747023fe6a51de Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Thu, 5 Oct 2017 15:16:52 -0500 Subject: [PATCH 550/616] MQE-417: Create acceptance test modules for EE. --- LICENSE_EE.txt | 437 +++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 + composer.json | 49 ++++++ 3 files changed, 489 insertions(+) create mode 100644 LICENSE_EE.txt create mode 100644 README.md create mode 100644 composer.json diff --git a/LICENSE_EE.txt b/LICENSE_EE.txt new file mode 100644 index 0000000000000..2bddf5feda6ba --- /dev/null +++ b/LICENSE_EE.txt @@ -0,0 +1,437 @@ +MAGENTO(tm) ENTERPRISE EDITION +END USER LICENSE AGREEMENT + +This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. +through its Magento division ("Magento"), and the Licensee executing the Magento Order Form +(defined below). The parties agree as follows: + +TERMS AND CONDITIONS + +1. License + 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with + other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, + non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of + installing and using it on a computer and solely for internal purposes, in accordance with the + Software's technical documentation and solely during the periods and on the maximum number + of Designated Servers specified in one or more applicable Magento or Magento-authorized + reseller ordering schedules (the "Magento Order Form") executed with Licensee. + + 1.2. In the event that Licensee's actual number of Servers of a particular Software license + exceeds the licensed number of Designated Servers on such license, Licensee shall promptly + provide Magento with written notice and pay Magento the fees required to license such + additional Server(s) in accordance with the commercial terms set out in the Magento Order + Form. + + 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the + maximum number of licensed Servers of the Software. Magento reserves the right to audit + Licensee's use of the Software during normal business hours and with reasonable notice and to + include means within the Software to limit Licensee's use of the Software to the licensed + number of Servers. + + 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated + technical documentation, for use by Licensee in accordance with this Agreement. Subject to + Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server + copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights + under this Agreement. + + 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a + temporary basis without charge any time a Designated Server is inoperative due to a + malfunction beyond the control of Licensee. Licensee may transfer the Software on a + permanent basis to a single replacement Server without charge. Licensee agrees to provide + Magento with written notice, including the Server type and operating system, of any such + transfer to a backup or replacement Server within five (5) days thereafter. + + 1.6. Licensee acknowledges that portions of the Software are also freely available to the public + under Magento's open source version of the Software, known as Magento Community Edition, + subject to certain conditions, with limited warranties and other limited assurances, and without + service or support. As an express condition for the license granted hereunder, Licensee agrees + that any use during the term of this Agreement of such open source versions of the Software, + whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed + use of the Software for purposes of the calculation of fees payable under the Agreement. + + 1.7. Magento also grants Licensee the right to modify and create derivative works of the + Software. Licensee may contribute the rights in any of those derivative works back to Magento. + Licensee may contact Magento for more information regarding contributions of derivative + works rights to Magento. Regardless of whether Licensee contributes such derivative works + rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of + the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and + royalty-free license to reproduce, create derivative works of, distribute, perform, and display + any derivative works of the Software developed by or for Licensee, and to use, make, have + made, sell, offer to sell, import, export, and otherwise exploit any product based on any such + derivative works. + +2. License Exclusions + 2.1 Except as expressly authorized herein, Licensee shall not: + a. use or deploy the Software on any Server in excess of the number of Designated Servers + specified in the applicable Magento Order Form; + + b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, + networking, batch processing or transfer of, the Software to any third party, or permit any + person or entity to have access to the Software by means of a time sharing, remote + computing services, networking, batch processing, service bureau or time sharing + arrangement; + + c. export the Software in violation of U.S. Department of Commerce export administration + regulations. + + 2.2. No license, right or interest in any Magento trademark, trade name or service mark is + granted hereunder. + +3. Fees and Payment Terms + Licensee agrees to the fees and payment terms that are described in each Magento Order Form + executed by Licensee. + +4. Title and Protection + 4.1. Magento (or its third party providers) retains title to all portions of the Software and other + Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable + proprietary information, and Licensee shall not disclose them to anyone other than those of its + employees or consultants under written nondisclosure obligations at least as restrictive as + those contained in this Agreement, having a need to know for purposes consistent with this + Agreement. Licensee shall be responsible for the compliance of such employees or consultants. + Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright + and proprietary information notices as were affixed to the original. The obligations set forth in + this Section shall survive termination of this Agreement. + + 4.2. Licensee acknowledges that the Software includes certain open source software which is + governed by the applicable license terms thereof. A list of such open source software, as + amended from time to time, including the links applicable to such open source software is + specified in the product software bundled within the Software, and the Software is subject to + the provisions of such license agreements, and in the event of any contradiction between the + provisions of this Agreement and the provisions of such applicable license agreement, the + provisions of the applicable open source license agreement shall prevail solely with respect to + such open source software products. + + 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the + "Government"), the Government agrees that such Product is "commercial computer software" + or "commercial computer software documentation" and that, absent a written agreement to + the contrary, the Government's rights with respect thereto are limited by the terms of this + Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. + +5. Patent and Copyright Indemnity + Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support + Services (as defined below), Magento shall indemnify and defend Licensee against any claims made + by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section + 5, means the Software as delivered by Magento, excluding the open source software programs + described in Section 4.2) as permitted in this Agreement directly infringes such third party's United + States patent or copyright, provided that Licensee complies with the requirements of this Section. + Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any + intellectual property rights, (b) provide Magento with all information and assistance requested of it + with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or + settle any and all such claims. + + In the event that a court holds that the Software, or if Magento believes a court may hold that the + Software, infringes the intellectual property rights of any third party, Magento may (but is not + obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue + using the Software, replace or modify the Software so that it becomes non-infringing while providing + substantially equivalent performance or, accept return of the Software, terminate this Agreement, + and refund Licensee an amount equal to the license fees paid to Magento multiplied by the + percentage of the term of the license for the Software that Licensee did not enjoy due to the early + termination by Magento. + + Magento shall have no liability or obligation under this Agreement to the extent the alleged + infringement is based on (i) a modification or derivative work of the Software developed by anyone + other than Magento; (ii), a combination of the Software with any product or service not provided by + Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) + use of the Software other than in accordance with this Agreement or the documentation; (iv) + indirect or willful infringement; or (v) any open source code, as described in Section 4.2. + + This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement + related to the Software. + +6. Default and Termination + 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its + obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) + Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in + Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party + fails to perform any other material obligation under this Agreement and such failure remains + uncured for more than thirty (30) days after receipt of written notice thereof. + + 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights + available to it under the law, may terminate this Agreement and all licenses granted hereunder + by written notice to the defaulting party. + + 6.3. Within thirty (30) days after termination of the Software license or this Agreement or + expiration of the license term as specified in the Magento Order Form, Licensee shall certify in + writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that + all copies or embodiments thereof in any form, including partial copies within modified + versions, have been destroyed. + +7. Warranty + 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days + commencing upon Magento's electronic delivery of the Software to Licensee that the Software, + as delivered, will in all material respects perform the functions described in the specifications + contained in the documentation provided with the Software. In the event that the Software + does not, in all material respects, perform the functions therein described, Magento or its + authorized reseller will undertake to correct any reported error in accordance with the Support + Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire + liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant + that the Software will meet Licensee's requirements, that the Software will operate in the + combinations which Licensee may select for use, that the operation of the Software will be + uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED + IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". + + 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY + WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. + MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR + TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, + ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR + AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING + TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. + +8. Limitation of Liability + 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS + OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE + USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; + LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; + OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES + (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A + CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR + UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING + OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER + TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, + FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. + + 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN + WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH + RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE + LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, + THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE + SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. + +9. Support Services Terms and Conditions + For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide + support services and Updates for the Software as described in Magento's standard Support Services + Terms and Conditions, which follow. Magento will have no obligation to provide support for any + modifications or derivative works of the Software developed by anyone other than Magento. + +10. Customer References + Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer + lists and other related marketing materials. The parties shall cooperate to undertake mutually- + agreed joint marketing activities. + +11. Notices + All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by + facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order + Form, or such other address as either party may indicate by at least ten (10) days prior written + notice to the other party. Notices to Magento shall be sent to the Contracts Administration + Department. + +12. Assignment + Licensee may not assign this Agreement without the prior written consent of Magento; provided + that such consent shall not be required for assignment to a purchaser of all or substantially all of the + assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and + conditions of this Agreement. Any prohibited assignment shall be null and void. + +13. Entire Agreement + Along with Magento's standard Support Services Terms and Conditions, which follow, and the + Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, + which supersedes all proposals or prior agreements, oral or written, including any online (click- + through) agreement which Licensee may have accepted in conjunction with the downloading of the + Software, and all other communications between the parties relating to the subject matter hereof. + No purchase order, other ordering document or any hand written or typewritten text which purports + to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the + terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both + parties, all such proposed variations or additions are objected to and shall have no force or effect. + +14. General + This Agreement is made in and shall be governed by the laws of the State of California, without + giving effect to any principles that provide for the application of the law of another jurisdiction. All + proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, + California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. + The United Nations Convention for the International Sale of Goods shall not apply. The section + headings herein are provided for convenience only and have no substantive effect on the + construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall + be liable for any failure to perform due to causes beyond its reasonable control. If any provision of + this Agreement is held to be unenforceable, this Agreement shall be construed without such + provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such + party's right to exercise such right or any other right in the future. This Agreement may be amended + only by a written document executed by a duly authorized representative of each of the parties. The + parties agree to receive electronic documents and accept electronic signatures (information + attached or logically associated with such document and clicked or otherwise adopted with an intent + to sign) including in counterparts which shall be valid substitutes for paper-based documents and + signatures, and the legal validity of a transaction will not be denied on the ground that it is not in + writing. + +15. Definitions + "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a + particular Software license. Such Server may be that of a third-party under nondisclosure obligations + that will host the Software for the benefit of Licensee. + + "Modifications" means any code developed by Licensee or any third party, including without + limitation, configuration, integrations, implementations, or localizations to the external layer of the + core, baseline Software product. The term "Modifications" excludes Updates. + + "Proprietary Material" means the Software, related documentation, and all parts, copies and + modifications thereof, and any other information, in whatever form, received by Licensee + hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is + or becomes a part of the public domain through no act or omission of Licensee; or (b) was in + Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from + Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or + (d) is independently developed by Licensee without reference to or use of Magento's Proprietary + Material. + + "Server" means each physical or virtual server from which a single instance of the Software is + accessed and used either for production purposes ("Production Server Instance") or for non- + production purposes, such as development, testing, training and other non-operational business + transactions ("Non-Production Server Instance"). For example, if one server contains two (2) + instances of the Software, i.e., one Production Server Instance and one Non-Production Server + Instance, then a Server license is required for each of such instances; development in-house and by + third-party consultants requires licenses for two Non-Production Server Instances. + + "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) + Enterprise Edition, provided solely in source code, including associated technical documentation, + and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise + specified herein, the term Software includes certain open source software programs described in + Section 4.2. "Software" does not include any Modifications. + + "Updates" means all published revisions and corrections to the printed documentation and + corrections and new releases of the Software which are generally made available to Magento's + supported customers at no additional cost or for media and handling charges only. Updates shall not + include any options or future products which Magento sells separately. + + +SUPPORT SERVICES TERMS AND CONDITIONS + +Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the +Agreement. + +1. "Support Services" consists of: + a. Advice regarding the downloading, installation and configuration of the Software (including + Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to + the Software), when used by Licensee on systems that meet the Software's "System + Requirements" specified on Magento's website at www.magentocommerce.com/system- + requirements. + + b. Facilities for bug tracking, escalation of problems for priority attention, and access to + community-supported FAQs and Forums relating to the Software. + + c. Assistance with troubleshooting to diagnose and fix errors in the Software. + + d. Access to Magento documentation relating to the Software, including authorization to make + copies of that documentation for internal use as specified in the Agreement. + +2. Exclusions from Support Services. + Magento shall have no obligation to support (i) versions of the + Software other than the then-current and immediately previous releases, which are operated on a + supported hardware/operating system platform specified in the release notes for the Software; (ii) + altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by + Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with + Magento's instructions. Magento is not responsible for hardware changes necessitated by changes + to the Software. Support Services does not include: + a. Assistance in the development or debugging of Licensee's system, including the operating + system and support tools. + + b. Information and assistance on technical issues related to the installation, administration, and + use of enabling technologies such as databases, computer networks, and communications. + + c. Assistance with the installation and configuration of hardware including, but not limited to + computers, hard disks, networks, and printers. + +3. Subcontractors. + Magento or its authorized resellers reserve the right to subcontract any or all of + the work to be performed under these Support Terms, and Magento retains responsibility for any + work so subcontracted. + +4. Licensee Responsibilities. + Licensee shall provide commercially reasonable cooperation and full + information to Magento or its authorized resellers with respect to the furnishing of Support Services + under this Agreement. + +5. Support Contacts. + Licensee shall designate one or more support contacts that are authorized to + submit Software problems. If Licensee has purchased the license from a Magento-authorized + reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license + directly from Magento, Licensee may contact Magento on the www.magentocommere.com website + or at its toll-free Support telephone number. + +6. Problem Priority. + Upon receipt of a properly submitted Software problem, as specified on + Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall + prioritize it in accordance with the guidelines below: + + a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely + impacts the Licensee's Production Server Instance, or because of which Licensee's Production + Server Instance is down or not functioning, or that results in a loss of production data and no + work around exists. P1 problems must be reported on Magento's toll-free support telephone + number in order to expedite resolution. Magento will use continuous efforts during its normal + hours of operation, with appropriate escalation to senior management, to provide a resolution + for any P1 problem as soon as is commercially reasonable. + + b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is + functioning but in a reduced capacity, or the Problem is causing significant impact to portions of + the Licensee's business operations and productivity, or the Software is exposed to potential loss + or interruption of service. Problems existing in a non-production environment that would + otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P2 + problem as soon as is commercially reasonable. + + c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- + critical loss of functionality, or that impairs some operations but allows Licensee's operations to + continue to function. Problems for which there is limited or no loss or functionality or impact to + Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P3 + problem in time for the next minor release of the Software. + + d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature + or documentation related, but the Software works without normal hours of operation to + provide a resolution for any P4 problem in time for the next major release of the Software. + + e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or + modification to add official support and documentation for unsupported or undocumented + feature, or features that do not exist in the Software. Magento will take ERs into consideration + in the product management process, but has no obligation to deliver enhancements based on + any ER. + +7. Response Times. + Magento or its authorized reseller shall exercise commercially reasonable efforts + to meet the response times specified below for Gold Support (unless Licensee has upgraded to + Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem + properly submitted by Licensee: + + Magento GOLD Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + North American Telephone Support Hours M-F 08:00 - 17:00 (PT) + European Telephone Support Hours M-F 08:30 - 17:30 (CET) + Telephone Response Time P1 Issues* 4 business hours + Response Time P2-P4 Issues* 24 business hours + *From initial contact + + + Magento PLATINUM Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + Telephone Support Hours 24 hours + Telephone Response Time P1 Issues* Up to 2 hours + Response Time P2-P4 Issues* 4 business hours + *From initial contact + + +8. Prohibited Use. + As a condition of Licensee's use of the Forums, Licensee will not use (and will + prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or + regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, + defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software + viruses or any other computer code, files or programs that may interrupt, destroy or limit the + functionality of any computer software or hardware or telecommunications equipment; (iv) to + infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any + third party; or (v) use the Forums for any purpose other than their intended use. + +9. Term and Termination. + Magento will provide Support Services and any Updates to Licensee + during the periods identified in the Magento Order Form, subject to Licensee's payment of the + applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee + materially breaches the Support Services provisions and does not cure such breach within thirty (30) + days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. + +10. General. + Magento shall not be liable for any failure or delay in performance under these Support + Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be + severed from these Support Terms. Licensee agrees that any information received pursuant to these + Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the + License Agreement. Licensee's obligation of payment of moneys due under these Support Terms + shall survive termination of these Support Terms or the License Agreement. These Support Terms + state the entire agreement regarding provision of Support Services to Licensee and may be amended + only by a written amendment set forth on a separate document executed by authorized + representatives of both parties. diff --git a/README.md b/README.md new file mode 100644 index 0000000000000..991eef5a5cfe1 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Magento 2 Acceptance Tests + +The Acceptance Tests Module for **Magento_AdvancedSearch** Module. diff --git a/composer.json b/composer.json new file mode 100644 index 0000000000000..8e61296e2d051 --- /dev/null +++ b/composer.json @@ -0,0 +1,49 @@ +{ + "name": "magento/magento2-functional-test-advanced-search", + "description": "Magento 2 Acceptance Test Module Advanced Search", + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:magento/magento2-functional-testing-framework.git" + } + ], + "require": { + "php": "~7.0", + "codeception/codeception": "2.2|2.3", + "allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d", + "consolidation/robo": "^1.0.0", + "henrikbjorn/lurker": "^1.2", + "vlucas/phpdotenv": "~2.4", + "magento/magento2-functional-testing-framework": "dev-develop" + }, + "suggest": { + "magento/magento2-functional-test-module-search": "dev-master", + "magento/magento2-functional-test-module-backend": "dev-master", + "magento/magento2-functional-test-module-store": "dev-master", + "magento/magento2-functional-test-module-catalog": "dev-master", + "magento/magento2-functional-test-module-catalog-search": "dev-master", + "magento/magento2-functional-test-module-config": "dev-master", + "magento/magento2-functional-test-module-customer": "dev-master" + }, + "type": "magento2-test-module", + "version": "dev-master", + "license": [ + "proprietary" + ], + "autoload": { + "psr-4": { + "Magento\\FunctionalTest\\": [ + "tests/functional/Magento/FunctionalTest", + "generated/Magento/FunctionalTest" + ] + } + }, + "extra": { + "map": [ + [ + "*", + "tests/functional/Magento/FunctionalTest/AdvancedSearch" + ] + ] + } +} From f6ddcc55a1e09a389ded8a7934254edd9481f341 Mon Sep 17 00:00:00 2001 From: Volodymyr Kublytskyi Date: Fri, 6 Oct 2017 14:19:45 +0300 Subject: [PATCH 551/616] MAGETWO-80287: Add static test to detect blocks without name attribute #11092 - fixed test failures --- view/adminhtml/layout/catalog_search_block.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/view/adminhtml/layout/catalog_search_block.xml b/view/adminhtml/layout/catalog_search_block.xml index b043fcbe38c1e..b6ef596281e51 100644 --- a/view/adminhtml/layout/catalog_search_block.xml +++ b/view/adminhtml/layout/catalog_search_block.xml @@ -29,7 +29,7 @@ - + query_id query_id_selected @@ -38,7 +38,7 @@ - + ID query_id @@ -46,13 +46,13 @@ col-id - + Search Query query_text - + Store store_id @@ -61,27 +61,27 @@ 0 - + Results num_results number - + Uses popularity number - + Redirect URL redirect - + Suggested Term 1 @@ -99,7 +99,7 @@ - + Action catalog From e13c86d1557bec1bf071f5f3d73c665f94dce4a9 Mon Sep 17 00:00:00 2001 From: David Manners Date: Wed, 11 Oct 2017 14:52:28 +0000 Subject: [PATCH 552/616] Update the composer.json files to use "sort-packages": true as part of the config --- composer.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 0e6143f3f0c11..2d549c12235db 100644 --- a/composer.json +++ b/composer.json @@ -1,16 +1,19 @@ { "name": "magento/module-advanced-search", "description": "N/A", + "config": { + "sort-packages": true + }, "require": { - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", "magento/framework": "100.3.*", - "magento/module-search": "100.3.*", "magento/module-backend": "100.3.*", - "magento/module-store": "100.3.*", "magento/module-catalog": "101.2.*", "magento/module-catalog-search": "100.3.*", "magento/module-config": "100.3.*", - "magento/module-customer": "100.3.*" + "magento/module-customer": "100.3.*", + "magento/module-search": "100.3.*", + "magento/module-store": "100.3.*", + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "type": "magento2-module", "version": "100.3.0-dev", From dbf202f001445ff1bbbf1c22593768db5ae350e7 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Wed, 1 Nov 2017 09:51:33 -0700 Subject: [PATCH 553/616] MAGETWO-80558: Magento 2.2.1 Publication (build 2.2.1.041) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 621a7fc9f9eca..7f6ddd509770c 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "magento/module-config": "101.0.*" }, "type": "magento2-module", - "version": "100.2.0", + "version": "100.2.1", "license": [ "proprietary" ], From 513e458c008c132a7e0586c251e1c3d5144fab3b Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Thu, 7 Dec 2017 10:01:30 -0600 Subject: [PATCH 554/616] MQE-583: set release version to 1.0.0 and updated composer dependencies. --- README.md | 4 ++-- composer.json | 44 +++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 991eef5a5cfe1..d01404e4a1e9a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# Magento 2 Acceptance Tests +# Magento 2 Functional Tests -The Acceptance Tests Module for **Magento_AdvancedSearch** Module. +The Functional Tests Module for **Magento_AdvancedSearch** Module. diff --git a/composer.json b/composer.json index 8e61296e2d051..b8b9e709d4ec9 100644 --- a/composer.json +++ b/composer.json @@ -1,48 +1,42 @@ { - "name": "magento/magento2-functional-test-advanced-search", - "description": "Magento 2 Acceptance Test Module Advanced Search", - "repositories": [ - { - "type": "vcs", - "url": "git@github.com:magento/magento2-functional-testing-framework.git" - } - ], + "name": "magento/magento2-functional-test-module-advanced-search", + "description": "Magento 2 Functional Test Module Advanced Search", + "config": { + "sort-packages": true + }, "require": { - "php": "~7.0", - "codeception/codeception": "2.2|2.3", "allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d", + "codeception/codeception": "~2.3.4", "consolidation/robo": "^1.0.0", "henrikbjorn/lurker": "^1.2", - "vlucas/phpdotenv": "~2.4", - "magento/magento2-functional-testing-framework": "dev-develop" + "magento/magento2-functional-testing-framework": "1.0.0", + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", + "vlucas/phpdotenv": "~2.4" }, "suggest": { - "magento/magento2-functional-test-module-search": "dev-master", - "magento/magento2-functional-test-module-backend": "dev-master", - "magento/magento2-functional-test-module-store": "dev-master", - "magento/magento2-functional-test-module-catalog": "dev-master", - "magento/magento2-functional-test-module-catalog-search": "dev-master", - "magento/magento2-functional-test-module-config": "dev-master", - "magento/magento2-functional-test-module-customer": "dev-master" + "magento/magento2-functional-test-module-backend": "1.0.0", + "magento/magento2-functional-test-module-catalog": "1.0.0", + "magento/magento2-functional-test-module-catalog-search": "1.0.0", + "magento/magento2-functional-test-module-config": "1.0.0", + "magento/magento2-functional-test-module-customer": "1.0.0", + "magento/magento2-functional-test-module-search": "1.0.0", + "magento/magento2-functional-test-module-store": "1.0.0" }, "type": "magento2-test-module", - "version": "dev-master", + "version": "1.0.0", "license": [ "proprietary" ], "autoload": { "psr-4": { - "Magento\\FunctionalTest\\": [ - "tests/functional/Magento/FunctionalTest", - "generated/Magento/FunctionalTest" - ] + "Magento\\": ["tests/functional/Magento", "generated/Magento"] } }, "extra": { "map": [ [ "*", - "tests/functional/Magento/FunctionalTest/AdvancedSearch" + "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch" ] ] } From f44feb55451620a1b69344c4ed64ac6b703bb181 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 8 Dec 2017 15:09:20 +0200 Subject: [PATCH 555/616] MQE-599: Move composer.json, README.MD, etc to CE - updated compose.json files prepared to MFTF release --- composer.json | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index b8b9e709d4ec9..90995d04f34fd 100644 --- a/composer.json +++ b/composer.json @@ -5,31 +5,26 @@ "sort-packages": true }, "require": { - "allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d", - "codeception/codeception": "~2.3.4", - "consolidation/robo": "^1.0.0", - "henrikbjorn/lurker": "^1.2", "magento/magento2-functional-testing-framework": "1.0.0", - "php": "7.0.2|7.0.4|~7.0.6|~7.1.0", - "vlucas/phpdotenv": "~2.4" + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { - "magento/magento2-functional-test-module-backend": "1.0.0", - "magento/magento2-functional-test-module-catalog": "1.0.0", - "magento/magento2-functional-test-module-catalog-search": "1.0.0", - "magento/magento2-functional-test-module-config": "1.0.0", - "magento/magento2-functional-test-module-customer": "1.0.0", - "magento/magento2-functional-test-module-search": "1.0.0", - "magento/magento2-functional-test-module-store": "1.0.0" + "magento/magento2-functional-test-module-backend": "1.0.0-dev", + "magento/magento2-functional-test-module-catalog": "1.0.0-dev", + "magento/magento2-functional-test-module-catalog-search": "1.0.0-dev", + "magento/magento2-functional-test-module-config": "1.0.0-dev", + "magento/magento2-functional-test-module-customer": "1.0.0-dev", + "magento/magento2-functional-test-module-search": "1.0.0-dev", + "magento/magento2-functional-test-module-store": "1.0.0-dev" }, "type": "magento2-test-module", - "version": "1.0.0", + "version": "1.0.0-dev", "license": [ - "proprietary" + "proprietary" ], "autoload": { "psr-4": { - "Magento\\": ["tests/functional/Magento", "generated/Magento"] + "Magento\\AdvancedSearch\\": "" } }, "extra": { From b8a7e85d386063fab462fde7b498b7306db30e84 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 8 Dec 2017 16:29:36 +0200 Subject: [PATCH 556/616] MQE-599: Move composer.json, README.MD, etc to CE - updated compose.json files prepared to MFTF release --- composer.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 90995d04f34fd..730653d9bbc86 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,11 @@ { "name": "magento/magento2-functional-test-module-advanced-search", "description": "Magento 2 Functional Test Module Advanced Search", + "type": "magento2-test-module", + "version": "100.0.0-dev", + "license": [ + "proprietary" + ], "config": { "sort-packages": true }, @@ -9,22 +14,17 @@ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" }, "suggest": { - "magento/magento2-functional-test-module-backend": "1.0.0-dev", - "magento/magento2-functional-test-module-catalog": "1.0.0-dev", - "magento/magento2-functional-test-module-catalog-search": "1.0.0-dev", - "magento/magento2-functional-test-module-config": "1.0.0-dev", - "magento/magento2-functional-test-module-customer": "1.0.0-dev", - "magento/magento2-functional-test-module-search": "1.0.0-dev", - "magento/magento2-functional-test-module-store": "1.0.0-dev" + "magento/magento2-functional-test-module-backend": "100.0.0-dev", + "magento/magento2-functional-test-module-catalog": "100.0.0-dev", + "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev", + "magento/magento2-functional-test-module-config": "100.0.0-dev", + "magento/magento2-functional-test-module-customer": "100.0.0-dev", + "magento/magento2-functional-test-module-search": "100.0.0-dev", + "magento/magento2-functional-test-module-store": "100.0.0-dev" }, - "type": "magento2-test-module", - "version": "1.0.0-dev", - "license": [ - "proprietary" - ], "autoload": { "psr-4": { - "Magento\\AdvancedSearch\\": "" + "Magento\\FunctionalTest\\AdvancedSearch\\": "" } }, "extra": { From 30269027086b33686053a2179f69f52aab9dfd55 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 8 Dec 2017 18:57:56 +0200 Subject: [PATCH 557/616] MQE-599: Move composer.json, README.MD, etc --- README.md | 3 +++ composer.json | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 README.md create mode 100644 composer.json diff --git a/README.md b/README.md new file mode 100644 index 0000000000000..dab22d5d01827 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Magento 2 Functional Tests + +The Functional Tests Module for **Magento_Elasticsearch** Module. diff --git a/composer.json b/composer.json new file mode 100644 index 0000000000000..26dcd83a4dda4 --- /dev/null +++ b/composer.json @@ -0,0 +1,38 @@ +{ + "name": "magento/magento2-functional-test-module-elasticsearch", + "description": "Magento 2 Functional Test Module Elasticsearch", + "type": "magento2-test-module", + "version": "100.0.0-dev", + "license": [ + "proprietary" + ], + "config": { + "sort-packages": true + }, + "require": { + "magento/magento2-functional-testing-framework": "1.0.0", + "php": "7.0.2|7.0.4|~7.0.6|~7.1.0" + }, + "suggest": { + "magento/magento2-functional-test-module-advanced-search": "100.0.0-dev", + "magento/magento2-functional-test-module-catalog": "100.0.0-dev", + "magento/magento2-functional-test-module-catalog-search": "100.0.0-dev", + "magento/magento2-functional-test-module-customer": "100.0.0-dev", + "magento/magento2-functional-test-module-eav": "100.0.0-dev", + "magento/magento2-functional-test-module-search": "100.0.0-dev", + "magento/magento2-functional-test-module-store": "100.0.0-dev" + }, + "autoload": { + "psr-4": { + "Magento\\FunctionalTest\\Elasticsearch\\": "" + } + }, + "extra": { + "map": [ + [ + "*", + "dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch" + ] + ] + } +} From 5952d3cca945e6c86afeee450f4e50b8e26cb68e Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Fri, 8 Dec 2017 19:03:06 +0200 Subject: [PATCH 558/616] MQE-599: Move composer.json, README.MD, etc - update licenses --- LICENSE_EE.txt | 437 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 437 insertions(+) create mode 100644 LICENSE_EE.txt diff --git a/LICENSE_EE.txt b/LICENSE_EE.txt new file mode 100644 index 0000000000000..2bddf5feda6ba --- /dev/null +++ b/LICENSE_EE.txt @@ -0,0 +1,437 @@ +MAGENTO(tm) ENTERPRISE EDITION +END USER LICENSE AGREEMENT + +This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. +through its Magento division ("Magento"), and the Licensee executing the Magento Order Form +(defined below). The parties agree as follows: + +TERMS AND CONDITIONS + +1. License + 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with + other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, + non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of + installing and using it on a computer and solely for internal purposes, in accordance with the + Software's technical documentation and solely during the periods and on the maximum number + of Designated Servers specified in one or more applicable Magento or Magento-authorized + reseller ordering schedules (the "Magento Order Form") executed with Licensee. + + 1.2. In the event that Licensee's actual number of Servers of a particular Software license + exceeds the licensed number of Designated Servers on such license, Licensee shall promptly + provide Magento with written notice and pay Magento the fees required to license such + additional Server(s) in accordance with the commercial terms set out in the Magento Order + Form. + + 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the + maximum number of licensed Servers of the Software. Magento reserves the right to audit + Licensee's use of the Software during normal business hours and with reasonable notice and to + include means within the Software to limit Licensee's use of the Software to the licensed + number of Servers. + + 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated + technical documentation, for use by Licensee in accordance with this Agreement. Subject to + Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server + copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights + under this Agreement. + + 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a + temporary basis without charge any time a Designated Server is inoperative due to a + malfunction beyond the control of Licensee. Licensee may transfer the Software on a + permanent basis to a single replacement Server without charge. Licensee agrees to provide + Magento with written notice, including the Server type and operating system, of any such + transfer to a backup or replacement Server within five (5) days thereafter. + + 1.6. Licensee acknowledges that portions of the Software are also freely available to the public + under Magento's open source version of the Software, known as Magento Community Edition, + subject to certain conditions, with limited warranties and other limited assurances, and without + service or support. As an express condition for the license granted hereunder, Licensee agrees + that any use during the term of this Agreement of such open source versions of the Software, + whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed + use of the Software for purposes of the calculation of fees payable under the Agreement. + + 1.7. Magento also grants Licensee the right to modify and create derivative works of the + Software. Licensee may contribute the rights in any of those derivative works back to Magento. + Licensee may contact Magento for more information regarding contributions of derivative + works rights to Magento. Regardless of whether Licensee contributes such derivative works + rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of + the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and + royalty-free license to reproduce, create derivative works of, distribute, perform, and display + any derivative works of the Software developed by or for Licensee, and to use, make, have + made, sell, offer to sell, import, export, and otherwise exploit any product based on any such + derivative works. + +2. License Exclusions + 2.1 Except as expressly authorized herein, Licensee shall not: + a. use or deploy the Software on any Server in excess of the number of Designated Servers + specified in the applicable Magento Order Form; + + b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, + networking, batch processing or transfer of, the Software to any third party, or permit any + person or entity to have access to the Software by means of a time sharing, remote + computing services, networking, batch processing, service bureau or time sharing + arrangement; + + c. export the Software in violation of U.S. Department of Commerce export administration + regulations. + + 2.2. No license, right or interest in any Magento trademark, trade name or service mark is + granted hereunder. + +3. Fees and Payment Terms + Licensee agrees to the fees and payment terms that are described in each Magento Order Form + executed by Licensee. + +4. Title and Protection + 4.1. Magento (or its third party providers) retains title to all portions of the Software and other + Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable + proprietary information, and Licensee shall not disclose them to anyone other than those of its + employees or consultants under written nondisclosure obligations at least as restrictive as + those contained in this Agreement, having a need to know for purposes consistent with this + Agreement. Licensee shall be responsible for the compliance of such employees or consultants. + Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright + and proprietary information notices as were affixed to the original. The obligations set forth in + this Section shall survive termination of this Agreement. + + 4.2. Licensee acknowledges that the Software includes certain open source software which is + governed by the applicable license terms thereof. A list of such open source software, as + amended from time to time, including the links applicable to such open source software is + specified in the product software bundled within the Software, and the Software is subject to + the provisions of such license agreements, and in the event of any contradiction between the + provisions of this Agreement and the provisions of such applicable license agreement, the + provisions of the applicable open source license agreement shall prevail solely with respect to + such open source software products. + + 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the + "Government"), the Government agrees that such Product is "commercial computer software" + or "commercial computer software documentation" and that, absent a written agreement to + the contrary, the Government's rights with respect thereto are limited by the terms of this + Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. + +5. Patent and Copyright Indemnity + Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support + Services (as defined below), Magento shall indemnify and defend Licensee against any claims made + by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section + 5, means the Software as delivered by Magento, excluding the open source software programs + described in Section 4.2) as permitted in this Agreement directly infringes such third party's United + States patent or copyright, provided that Licensee complies with the requirements of this Section. + Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any + intellectual property rights, (b) provide Magento with all information and assistance requested of it + with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or + settle any and all such claims. + + In the event that a court holds that the Software, or if Magento believes a court may hold that the + Software, infringes the intellectual property rights of any third party, Magento may (but is not + obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue + using the Software, replace or modify the Software so that it becomes non-infringing while providing + substantially equivalent performance or, accept return of the Software, terminate this Agreement, + and refund Licensee an amount equal to the license fees paid to Magento multiplied by the + percentage of the term of the license for the Software that Licensee did not enjoy due to the early + termination by Magento. + + Magento shall have no liability or obligation under this Agreement to the extent the alleged + infringement is based on (i) a modification or derivative work of the Software developed by anyone + other than Magento; (ii), a combination of the Software with any product or service not provided by + Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) + use of the Software other than in accordance with this Agreement or the documentation; (iv) + indirect or willful infringement; or (v) any open source code, as described in Section 4.2. + + This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement + related to the Software. + +6. Default and Termination + 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its + obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) + Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in + Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party + fails to perform any other material obligation under this Agreement and such failure remains + uncured for more than thirty (30) days after receipt of written notice thereof. + + 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights + available to it under the law, may terminate this Agreement and all licenses granted hereunder + by written notice to the defaulting party. + + 6.3. Within thirty (30) days after termination of the Software license or this Agreement or + expiration of the license term as specified in the Magento Order Form, Licensee shall certify in + writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that + all copies or embodiments thereof in any form, including partial copies within modified + versions, have been destroyed. + +7. Warranty + 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days + commencing upon Magento's electronic delivery of the Software to Licensee that the Software, + as delivered, will in all material respects perform the functions described in the specifications + contained in the documentation provided with the Software. In the event that the Software + does not, in all material respects, perform the functions therein described, Magento or its + authorized reseller will undertake to correct any reported error in accordance with the Support + Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire + liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant + that the Software will meet Licensee's requirements, that the Software will operate in the + combinations which Licensee may select for use, that the operation of the Software will be + uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED + IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". + + 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY + WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. + MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR + TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, + ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR + PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR + AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING + TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. + +8. Limitation of Liability + 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS + OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE + USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; + LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; + OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES + (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A + CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR + UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING + OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER + TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, + FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. + + 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN + WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH + RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE + LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, + THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE + SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. + +9. Support Services Terms and Conditions + For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide + support services and Updates for the Software as described in Magento's standard Support Services + Terms and Conditions, which follow. Magento will have no obligation to provide support for any + modifications or derivative works of the Software developed by anyone other than Magento. + +10. Customer References + Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer + lists and other related marketing materials. The parties shall cooperate to undertake mutually- + agreed joint marketing activities. + +11. Notices + All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by + facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order + Form, or such other address as either party may indicate by at least ten (10) days prior written + notice to the other party. Notices to Magento shall be sent to the Contracts Administration + Department. + +12. Assignment + Licensee may not assign this Agreement without the prior written consent of Magento; provided + that such consent shall not be required for assignment to a purchaser of all or substantially all of the + assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and + conditions of this Agreement. Any prohibited assignment shall be null and void. + +13. Entire Agreement + Along with Magento's standard Support Services Terms and Conditions, which follow, and the + Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, + which supersedes all proposals or prior agreements, oral or written, including any online (click- + through) agreement which Licensee may have accepted in conjunction with the downloading of the + Software, and all other communications between the parties relating to the subject matter hereof. + No purchase order, other ordering document or any hand written or typewritten text which purports + to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the + terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both + parties, all such proposed variations or additions are objected to and shall have no force or effect. + +14. General + This Agreement is made in and shall be governed by the laws of the State of California, without + giving effect to any principles that provide for the application of the law of another jurisdiction. All + proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, + California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. + The United Nations Convention for the International Sale of Goods shall not apply. The section + headings herein are provided for convenience only and have no substantive effect on the + construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall + be liable for any failure to perform due to causes beyond its reasonable control. If any provision of + this Agreement is held to be unenforceable, this Agreement shall be construed without such + provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such + party's right to exercise such right or any other right in the future. This Agreement may be amended + only by a written document executed by a duly authorized representative of each of the parties. The + parties agree to receive electronic documents and accept electronic signatures (information + attached or logically associated with such document and clicked or otherwise adopted with an intent + to sign) including in counterparts which shall be valid substitutes for paper-based documents and + signatures, and the legal validity of a transaction will not be denied on the ground that it is not in + writing. + +15. Definitions + "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a + particular Software license. Such Server may be that of a third-party under nondisclosure obligations + that will host the Software for the benefit of Licensee. + + "Modifications" means any code developed by Licensee or any third party, including without + limitation, configuration, integrations, implementations, or localizations to the external layer of the + core, baseline Software product. The term "Modifications" excludes Updates. + + "Proprietary Material" means the Software, related documentation, and all parts, copies and + modifications thereof, and any other information, in whatever form, received by Licensee + hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is + or becomes a part of the public domain through no act or omission of Licensee; or (b) was in + Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from + Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or + (d) is independently developed by Licensee without reference to or use of Magento's Proprietary + Material. + + "Server" means each physical or virtual server from which a single instance of the Software is + accessed and used either for production purposes ("Production Server Instance") or for non- + production purposes, such as development, testing, training and other non-operational business + transactions ("Non-Production Server Instance"). For example, if one server contains two (2) + instances of the Software, i.e., one Production Server Instance and one Non-Production Server + Instance, then a Server license is required for each of such instances; development in-house and by + third-party consultants requires licenses for two Non-Production Server Instances. + + "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) + Enterprise Edition, provided solely in source code, including associated technical documentation, + and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise + specified herein, the term Software includes certain open source software programs described in + Section 4.2. "Software" does not include any Modifications. + + "Updates" means all published revisions and corrections to the printed documentation and + corrections and new releases of the Software which are generally made available to Magento's + supported customers at no additional cost or for media and handling charges only. Updates shall not + include any options or future products which Magento sells separately. + + +SUPPORT SERVICES TERMS AND CONDITIONS + +Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the +Agreement. + +1. "Support Services" consists of: + a. Advice regarding the downloading, installation and configuration of the Software (including + Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to + the Software), when used by Licensee on systems that meet the Software's "System + Requirements" specified on Magento's website at www.magentocommerce.com/system- + requirements. + + b. Facilities for bug tracking, escalation of problems for priority attention, and access to + community-supported FAQs and Forums relating to the Software. + + c. Assistance with troubleshooting to diagnose and fix errors in the Software. + + d. Access to Magento documentation relating to the Software, including authorization to make + copies of that documentation for internal use as specified in the Agreement. + +2. Exclusions from Support Services. + Magento shall have no obligation to support (i) versions of the + Software other than the then-current and immediately previous releases, which are operated on a + supported hardware/operating system platform specified in the release notes for the Software; (ii) + altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by + Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with + Magento's instructions. Magento is not responsible for hardware changes necessitated by changes + to the Software. Support Services does not include: + a. Assistance in the development or debugging of Licensee's system, including the operating + system and support tools. + + b. Information and assistance on technical issues related to the installation, administration, and + use of enabling technologies such as databases, computer networks, and communications. + + c. Assistance with the installation and configuration of hardware including, but not limited to + computers, hard disks, networks, and printers. + +3. Subcontractors. + Magento or its authorized resellers reserve the right to subcontract any or all of + the work to be performed under these Support Terms, and Magento retains responsibility for any + work so subcontracted. + +4. Licensee Responsibilities. + Licensee shall provide commercially reasonable cooperation and full + information to Magento or its authorized resellers with respect to the furnishing of Support Services + under this Agreement. + +5. Support Contacts. + Licensee shall designate one or more support contacts that are authorized to + submit Software problems. If Licensee has purchased the license from a Magento-authorized + reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license + directly from Magento, Licensee may contact Magento on the www.magentocommere.com website + or at its toll-free Support telephone number. + +6. Problem Priority. + Upon receipt of a properly submitted Software problem, as specified on + Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall + prioritize it in accordance with the guidelines below: + + a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely + impacts the Licensee's Production Server Instance, or because of which Licensee's Production + Server Instance is down or not functioning, or that results in a loss of production data and no + work around exists. P1 problems must be reported on Magento's toll-free support telephone + number in order to expedite resolution. Magento will use continuous efforts during its normal + hours of operation, with appropriate escalation to senior management, to provide a resolution + for any P1 problem as soon as is commercially reasonable. + + b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is + functioning but in a reduced capacity, or the Problem is causing significant impact to portions of + the Licensee's business operations and productivity, or the Software is exposed to potential loss + or interruption of service. Problems existing in a non-production environment that would + otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P2 + problem as soon as is commercially reasonable. + + c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- + critical loss of functionality, or that impairs some operations but allows Licensee's operations to + continue to function. Problems for which there is limited or no loss or functionality or impact to + Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use + reasonable efforts during its normal hours of operation to provide a resolution for any P3 + problem in time for the next minor release of the Software. + + d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature + or documentation related, but the Software works without normal hours of operation to + provide a resolution for any P4 problem in time for the next major release of the Software. + + e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or + modification to add official support and documentation for unsupported or undocumented + feature, or features that do not exist in the Software. Magento will take ERs into consideration + in the product management process, but has no obligation to deliver enhancements based on + any ER. + +7. Response Times. + Magento or its authorized reseller shall exercise commercially reasonable efforts + to meet the response times specified below for Gold Support (unless Licensee has upgraded to + Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem + properly submitted by Licensee: + + Magento GOLD Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + North American Telephone Support Hours M-F 08:00 - 17:00 (PT) + European Telephone Support Hours M-F 08:30 - 17:30 (CET) + Telephone Response Time P1 Issues* 4 business hours + Response Time P2-P4 Issues* 24 business hours + *From initial contact + + + Magento PLATINUM Support Response Times + WEB Ticket Submission 24 x 7 x 365 + WEB Ticket Response Time* 24 business hours + Telephone Support Hours 24 hours + Telephone Response Time P1 Issues* Up to 2 hours + Response Time P2-P4 Issues* 4 business hours + *From initial contact + + +8. Prohibited Use. + As a condition of Licensee's use of the Forums, Licensee will not use (and will + prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or + regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, + defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software + viruses or any other computer code, files or programs that may interrupt, destroy or limit the + functionality of any computer software or hardware or telecommunications equipment; (iv) to + infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any + third party; or (v) use the Forums for any purpose other than their intended use. + +9. Term and Termination. + Magento will provide Support Services and any Updates to Licensee + during the periods identified in the Magento Order Form, subject to Licensee's payment of the + applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee + materially breaches the Support Services provisions and does not cure such breach within thirty (30) + days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. + +10. General. + Magento shall not be liable for any failure or delay in performance under these Support + Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be + severed from these Support Terms. Licensee agrees that any information received pursuant to these + Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the + License Agreement. Licensee's obligation of payment of moneys due under these Support Terms + shall survive termination of these Support Terms or the License Agreement. These Support Terms + state the entire agreement regarding provision of Support Services to Licensee and may be amended + only by a written amendment set forth on a separate document executed by authorized + representatives of both parties. From d6484c34b270dbda010b5a937c0cc57130f86775 Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Mon, 18 Dec 2017 16:03:39 -0600 Subject: [PATCH 559/616] MAGETWO-66191: Refactor Search to use single Search Resolver --- Model/Client/ClientResolver.php | 37 +++-------- .../Indexer/Fulltext/Plugin/CustomerGroup.php | 7 ++- Model/SuggestedQueries.php | 12 ++-- Test/Unit/Model/Client/ClientResolverTest.php | 62 ++++++++----------- .../Fulltext/Plugin/CustomerGroupTest.php | 3 +- ...viderTest.php => SuggestedQueriesTest.php} | 6 +- etc/di.xml | 6 -- 7 files changed, 50 insertions(+), 83 deletions(-) rename Test/Unit/Model/{DataProviderTest.php => SuggestedQueriesTest.php} (95%) diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index b717e5aa56679..5d03e96c905af 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -6,7 +6,7 @@ namespace Magento\AdvancedSearch\Model\Client; use \Magento\Framework\ObjectManagerInterface; -use \Magento\Framework\App\Config\ScopeConfigInterface; +use Magento\Framework\Search\EngineResolverInterface; /** * @api @@ -14,14 +14,6 @@ */ class ClientResolver { - /** - * Scope configuration - * - * @var ScopeConfigInterface - * @since 100.1.0 - */ - protected $scopeConfig; - /** * Object Manager instance * @@ -45,41 +37,26 @@ class ClientResolver private $clientOptionsPool; /** - * Config path - * - * @var string - * @since 100.1.0 - */ - protected $path; - - /** - * Config Scope - * @since 100.1.0 + * @var EngineResolver */ - protected $scope; + private $engineResolver; /** * @param ObjectManagerInterface $objectManager - * @param ScopeConfigInterface $scopeConfig, * @param array $clientFactories * @param array $clientOptions - * @param string $path - * @param string $scopeType + * @param EngineResolverInterface $engineResolver */ public function __construct( ObjectManagerInterface $objectManager, - ScopeConfigInterface $scopeConfig, array $clientFactories, array $clientOptions, - $path, - $scopeType + EngineResolverInterface $engineResolver ) { $this->objectManager = $objectManager; - $this->scopeConfig = $scopeConfig; $this->clientFactoryPool = $clientFactories; $this->clientOptionsPool = $clientOptions; - $this->path = $path; - $this->scope = $scopeType; + $this->engineResolver = $engineResolver; } /** @@ -90,7 +67,7 @@ public function __construct( */ public function getCurrentEngine() { - return $this->scopeConfig->getValue($this->path, $this->scope); + return $this->engineResolver->getCurrentSearchEngine(); } /** diff --git a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php index ee38dd851264f..421c309d3ed06 100644 --- a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php +++ b/Model/Indexer/Fulltext/Plugin/CustomerGroup.php @@ -12,6 +12,7 @@ use Magento\Framework\Model\AbstractModel; use Magento\Catalog\Model\ResourceModel\Attribute; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; +use Magento\Framework\Search\EngineResolverInterface; use Magento\Search\Model\EngineResolver; class CustomerGroup extends AbstractPlugin @@ -22,19 +23,19 @@ class CustomerGroup extends AbstractPlugin protected $clientOptions; /** - * @var EngineResolver + * @var EngineResolverInterface */ protected $engineResolver; /** * @param IndexerRegistry $indexerRegistry * @param ClientOptionsInterface $clientOptions - * @param EngineResolver $engineResolver + * @param EngineResolverInterface $engineResolver */ public function __construct( IndexerRegistry $indexerRegistry, ClientOptionsInterface $clientOptions, - EngineResolver $engineResolver + EngineResolverInterface $engineResolver ) { parent::__construct($indexerRegistry); $this->clientOptions = $clientOptions; diff --git a/Model/SuggestedQueries.php b/Model/SuggestedQueries.php index 723de6fac614e..f2a3cc5890832 100644 --- a/Model/SuggestedQueries.php +++ b/Model/SuggestedQueries.php @@ -6,13 +6,14 @@ namespace Magento\AdvancedSearch\Model; use Magento\Framework\ObjectManagerInterface; +use Magento\Framework\Search\EngineResolverInterface; use Magento\Search\Model\QueryInterface; use Magento\Search\Model\EngineResolver; class SuggestedQueries implements SuggestedQueriesInterface { /** - * @var EngineResolver + * @var EngineResolverInterface */ private $engineResolver; @@ -36,12 +37,15 @@ class SuggestedQueries implements SuggestedQueriesInterface /** * SuggestedQueries constructor. * - * @param EngineResolver $engineResolver + * @param EngineResolverInterface $engineResolver * @param ObjectManagerInterface $objectManager * @param array $data */ - public function __construct(EngineResolver $engineResolver, ObjectManagerInterface $objectManager, array $data) - { + public function __construct( + EngineResolverInterface $engineResolver, + ObjectManagerInterface $objectManager, + array $data + ) { $this->engineResolver = $engineResolver; $this->objectManager = $objectManager; $this->data = $data; diff --git a/Test/Unit/Model/Client/ClientResolverTest.php b/Test/Unit/Model/Client/ClientResolverTest.php index 42fe0cfe36169..0cad0a2e8301c 100644 --- a/Test/Unit/Model/Client/ClientResolverTest.php +++ b/Test/Unit/Model/Client/ClientResolverTest.php @@ -6,64 +6,55 @@ namespace Magento\AdvancedSearch\Test\Unit\Model\Client; -use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; +use Magento\AdvancedSearch\Model\Client\ClientFactoryInterface; +use Magento\AdvancedSearch\Model\Client\ClientInterface; +use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; +use Magento\AdvancedSearch\Model\Client\ClientResolver; +use Magento\Framework\ObjectManagerInterface; +use Magento\Framework\Search\EngineResolverInterface; class ClientResolverTest extends \PHPUnit\Framework\TestCase { /** - * @var \Magento\AdvancedSearch\Model\Client\ClientResolver|\PHPUnit_Framework_MockObject_MockObject + * @var ClientResolver|\PHPUnit_Framework_MockObject_MockObject */ private $model; /** - * @var \Magento\Framework\ObjectManagerInterface |\PHPUnit_Framework_MockObject_MockObject + * @var ObjectManagerInterface |\PHPUnit_Framework_MockObject_MockObject */ private $objectManager; /** - * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager + * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */ - private $helper; - - /** - * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject - */ - private $scopeConfig; + private $engineResolverMock; protected function setUp() { - $this->helper = new ObjectManager($this); - - $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class) - ->disableOriginalConstructor() - ->getMock(); - - $this->objectManager = $this->createMock(\Magento\Framework\ObjectManagerInterface::class); - - $this->model= $this->helper->getObject( - \Magento\AdvancedSearch\Model\Client\ClientResolver::class, - [ - 'objectManager' => $this->objectManager, - 'scopeConfig' => $this->scopeConfig, - 'clientFactories' => ['engineName' => 'engineFactoryClass'], - 'clientOptions' => ['engineName' => 'engineOptionClass'], - 'path' => 'some_path', - 'scopeType' => 'some_scopeType' - ] + $this->engineResolverMock = $this->getMockBuilder(EngineResolverInterface::class) + ->getMockForAbstractClass(); + + $this->objectManager = $this->createMock(ObjectManagerInterface::class); + + $this->model = new ClientResolver( + $this->objectManager, + ['engineName' => 'engineFactoryClass'], + ['engineName' => 'engineOptionClass'], + $this->engineResolverMock ); } public function testCreate() { - $this->scopeConfig->expects($this->once())->method('getValue') - ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) + $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine') ->will($this->returnValue('engineName')); - $factoryMock = $this->createMock(\Magento\AdvancedSearch\Model\Client\ClientFactoryInterface::class); + $factoryMock = $this->createMock(ClientFactoryInterface::class); - $clientMock = $this->createMock(\Magento\AdvancedSearch\Model\Client\ClientInterface::class); + $clientMock = $this->createMock(ClientInterface::class); - $clientOptionsMock = $this->createMock(\Magento\AdvancedSearch\Model\Client\ClientOptionsInterface::class); + $clientOptionsMock = $this->createMock(ClientOptionsInterface::class); $this->objectManager->expects($this->exactly(2))->method('create') ->withConsecutive( @@ -84,7 +75,7 @@ public function testCreate() ->will($this->returnValue($clientMock)); $result = $this->model->create(); - $this->assertInstanceOf(\Magento\AdvancedSearch\Model\Client\ClientInterface::class, $result); + $this->assertInstanceOf(ClientInterface::class, $result); } /** @@ -109,8 +100,7 @@ public function testCreateLogicException() public function testGetCurrentEngine() { - $this->scopeConfig->expects($this->once())->method('getValue') - ->with($this->equalTo('some_path'), $this->equalTo('some_scopeType')) + $this->engineResolverMock->expects($this->once())->method('getCurrentSearchEngine') ->will($this->returnValue('engineName')); $this->assertEquals('engineName', $this->model->getCurrentEngine()); diff --git a/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php b/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php index 8a485e23a94a7..e6de135aab473 100644 --- a/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php +++ b/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php @@ -7,6 +7,7 @@ namespace Magento\AdvancedSearch\Test\Unit\Model\Indexer\Fulltext\Plugin; use Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup; +use Magento\Framework\Search\EngineResolverInterface; class CustomerGroupTest extends \PHPUnit\Framework\TestCase { @@ -31,7 +32,7 @@ class CustomerGroupTest extends \PHPUnit\Framework\TestCase protected $indexerRegistryMock; /** - * @var \Magento\Search\Model\EngineResolver|\PHPUnit_Framework_MockObject_MockObject + * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $engineResolverMock; diff --git a/Test/Unit/Model/DataProviderTest.php b/Test/Unit/Model/SuggestedQueriesTest.php similarity index 95% rename from Test/Unit/Model/DataProviderTest.php rename to Test/Unit/Model/SuggestedQueriesTest.php index 9814349a9f5f5..d349ed3e3ce93 100644 --- a/Test/Unit/Model/DataProviderTest.php +++ b/Test/Unit/Model/SuggestedQueriesTest.php @@ -5,11 +5,11 @@ */ namespace Magento\AdvancedSearch\Test\Unit\Model; +use Magento\Framework\Search\EngineResolverInterface; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; -use Magento\Search\Model\EngineResolver; use Magento\Framework\ObjectManagerInterface; -class DataProviderTest extends \PHPUnit\Framework\TestCase +class SuggestedQueriesTest extends \PHPUnit\Framework\TestCase { /** * @var \Magento\AdvancedSearch\Model\SuggestedQueries; @@ -17,7 +17,7 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase protected $model; /** - * @var EngineResolver|\PHPUnit_Framework_MockObject_MockObject + * @var EngineResolverInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $engineResolverMock; diff --git a/etc/di.xml b/etc/di.xml index 25e31ac79916a..9ec75f56bbf7b 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -19,12 +19,6 @@ Did you mean - - - Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH - \Magento\Store\Model\ScopeInterface::SCOPE_STORE - - From eee80223ac9801095fc46b026c407e35dbc623ad Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Mon, 18 Dec 2017 16:43:30 -0600 Subject: [PATCH 560/616] MAGETWO-66191: Refactor Search to use single Search Resolver --- Model/Client/ClientResolver.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Model/Client/ClientResolver.php b/Model/Client/ClientResolver.php index 5d03e96c905af..fbcaf412e3562 100644 --- a/Model/Client/ClientResolver.php +++ b/Model/Client/ClientResolver.php @@ -14,6 +14,15 @@ */ class ClientResolver { + /** + * Scope configuration + * + * @var ScopeConfigInterface + * @since 100.1.0 + * @deprecated since it is not used anymore + */ + protected $scopeConfig; + /** * Object Manager instance * @@ -41,6 +50,22 @@ class ClientResolver */ private $engineResolver; + /** + * Config path + * + * @var string + * @since 100.1.0 + * @deprecated since it is not used anymore + */ + protected $path; + + /** + * Config Scope + * @since 100.1.0 + * @deprecated since it is not used anymore + */ + protected $scope; + /** * @param ObjectManagerInterface $objectManager * @param array $clientFactories From b13af5d59880ae2d39f0bc7464e9e0cfa3e5a292 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Thu, 4 Jan 2018 16:07:09 +0200 Subject: [PATCH 561/616] MAGETWO-85326: Tool for generating schema --add staging schema --- etc/db_schema.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 etc/db_schema.xml diff --git a/etc/db_schema.xml b/etc/db_schema.xml new file mode 100644 index 0000000000000..f6b9fd2ec04d2 --- /dev/null +++ b/etc/db_schema.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + +
+ From 68c8cab2ee5f2469604f04a321a392fd0407dd1a Mon Sep 17 00:00:00 2001 From: Sviatoslav Mankivskyi Date: Thu, 4 Jan 2018 16:53:20 -0600 Subject: [PATCH 562/616] MAGETWO-66191: [SWAT] remove Solr from mainline/2.3 code base as it's sunsetted functionality per messaging at Imagine 2016 (1 year sunset period for Solr) --- Model/SuggestedQueries.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Model/SuggestedQueries.php b/Model/SuggestedQueries.php index f2a3cc5890832..60f76682fc164 100644 --- a/Model/SuggestedQueries.php +++ b/Model/SuggestedQueries.php @@ -8,7 +8,6 @@ use Magento\Framework\ObjectManagerInterface; use Magento\Framework\Search\EngineResolverInterface; use Magento\Search\Model\QueryInterface; -use Magento\Search\Model\EngineResolver; class SuggestedQueries implements SuggestedQueriesInterface { From 150afea1386ec85cc56aecb50d492cbe0cdd00d2 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Fri, 12 Jan 2018 14:04:15 +0200 Subject: [PATCH 563/616] MAGETWO-85326: Tool for generating schema --working on EE stuff --- etc/db_schema.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/db_schema.xml b/etc/db_schema.xml index f6b9fd2ec04d2..0d7f9a02414d2 100644 --- a/etc/db_schema.xml +++ b/etc/db_schema.xml @@ -1,9 +1,9 @@ - - - - +
+ + + From 95d66b998200805397d2ab54e91cce602f3fbc4c Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Fri, 12 Jan 2018 18:48:33 +0200 Subject: [PATCH 564/616] MAGETWO-81032: Create whitelist of tables --working on CE stuff --- etc/db_schema_whitelist.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 etc/db_schema_whitelist.json diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json new file mode 100644 index 0000000000000..6326d4b7b5b8c --- /dev/null +++ b/etc/db_schema_whitelist.json @@ -0,0 +1 @@ +{"catalogsearch_recommendations":{"column":{"id":true,"query_id":true,"relation_id":true},"constraint":{"PRIMARY":true,"CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID":true,"CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID":true}}} \ No newline at end of file From e1155c92be8057fd9c8323d01abb354a1a42b8be Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Thu, 18 Jan 2018 18:09:05 +0200 Subject: [PATCH 565/616] MAGETWO-81032: Create whitelist of tables --add comments --- etc/db_schema.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/db_schema.xml b/etc/db_schema.xml index 0d7f9a02414d2..00ef55e0cbfe7 100644 --- a/etc/db_schema.xml +++ b/etc/db_schema.xml @@ -1,9 +1,9 @@ -
- - - +
+ + + From bde13413e5d7db9fa159e6a8d841b4e6ff318897 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Mon, 22 Jan 2018 15:32:20 +0200 Subject: [PATCH 566/616] MAGETWO-81032: Create whitelist of tables --format db_schema.xml --- etc/db_schema.xml | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/etc/db_schema.xml b/etc/db_schema.xml index 00ef55e0cbfe7..eeb86aa0f40b5 100644 --- a/etc/db_schema.xml +++ b/etc/db_schema.xml @@ -1,13 +1,21 @@ - -
- - - - - - - - -
+ + + + + + + + + + +
From b29430d6861aec27fc5d0a56be5756b44a8295ab Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Mon, 22 Jan 2018 15:50:54 +0200 Subject: [PATCH 567/616] MAGETWO-81032: Create whitelist of tables --remove whitelists --- etc/db_schema_whitelist.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json index 6326d4b7b5b8c..eaf7f3d616736 100644 --- a/etc/db_schema_whitelist.json +++ b/etc/db_schema_whitelist.json @@ -1 +1,14 @@ -{"catalogsearch_recommendations":{"column":{"id":true,"query_id":true,"relation_id":true},"constraint":{"PRIMARY":true,"CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID":true,"CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID":true}}} \ No newline at end of file +{ + "catalogsearch_recommendations": { + "column": { + "id": true, + "query_id": true, + "relation_id": true + }, + "constraint": { + "PRIMARY": true, + "CATALOGSEARCH_RECOMMENDATIONS_QUERY_ID_SEARCH_QUERY_QUERY_ID": true, + "CATALOGSEARCH_RECOMMENDATIONS_RELATION_ID_SEARCH_QUERY_QUERY_ID": true + } + } +} \ No newline at end of file From 34387d75b4d2d49462f9a27013d8833503b543e6 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Mon, 22 Jan 2018 15:58:55 +0200 Subject: [PATCH 568/616] MAGETWO-81032: Create whitelist of tables --add copyrights --- etc/db_schema.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/db_schema.xml b/etc/db_schema.xml index eeb86aa0f40b5..4ed21f2a989d7 100644 --- a/etc/db_schema.xml +++ b/etc/db_schema.xml @@ -1,4 +1,10 @@ + Date: Tue, 23 Jan 2018 17:12:11 +0200 Subject: [PATCH 569/616] MAGETWO-86895: Inspect all old scripts and remove them --- Setup/InstallSchema.php | 64 ----------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 Setup/InstallSchema.php diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php deleted file mode 100644 index 6c1f17fb17a09..0000000000000 --- a/Setup/InstallSchema.php +++ /dev/null @@ -1,64 +0,0 @@ -startSetup(); - - $table = $installer->getConnection()->newTable( - $installer->getTable('catalogsearch_recommendations') - )->addColumn( - 'id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true], - 'Id' - )->addColumn( - 'query_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Query Id' - )->addColumn( - 'relation_id', - \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, - null, - ['unsigned' => true, 'nullable' => false, 'default' => '0'], - 'Relation Id' - )->addForeignKey( - $installer->getFkName('catalogsearch_recommendations', 'query_id', 'search_query', 'query_id'), - 'query_id', - $installer->getTable('search_query'), - 'query_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->addForeignKey( - $installer->getFkName('catalogsearch_recommendations', 'relation_id', 'search_query', 'query_id'), - 'relation_id', - $installer->getTable('search_query'), - 'query_id', - \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE - )->setComment('Advanced Search Recommendations'); - $installer->getConnection()->createTable($table); - - $installer->endSetup(); - } -} From 636566b45479697aeab5e5e0b3458de758efce49 Mon Sep 17 00:00:00 2001 From: Ievgen Sentiabov Date: Tue, 6 Feb 2018 23:58:33 +0200 Subject: [PATCH 570/616] - Removed dependency of AbstractMethod - Replaced usage of deprecated Vault factories --- .../Response/PayPal/VaultDetailsHandler.php | 12 +- .../Gateway/Response/VaultDetailsHandler.php | 20 +- .../Model/Adminhtml/Source/PaymentAction.php | 6 +- .../PayPal/VaultDetailsHandlerTest.php | 105 +++----- .../Response/VaultDetailsHandlerTest.php | 226 +++++++++--------- .../Payment/Model/Method/AbstractMethod.php | 23 -- .../Magento/Payment/Model/MethodInterface.php | 26 ++ 7 files changed, 197 insertions(+), 221 deletions(-) diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php index 766b385851ab8..ae7287c7f23e0 100644 --- a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php +++ b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php @@ -12,8 +12,8 @@ use Magento\Payment\Model\InfoInterface; use Magento\Sales\Api\Data\OrderPaymentExtensionInterface; use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory; +use Magento\Vault\Api\Data\PaymentTokenFactoryInterface; use Magento\Vault\Api\Data\PaymentTokenInterface; -use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory; /** * Vault Details Handler @@ -21,7 +21,7 @@ class VaultDetailsHandler implements HandlerInterface { /** - * @var PaymentTokenInterfaceFactory + * @var PaymentTokenFactoryInterface */ private $paymentTokenFactory; @@ -41,15 +41,13 @@ class VaultDetailsHandler implements HandlerInterface private $dateTimeFactory; /** - * Constructor - * - * @param PaymentTokenInterfaceFactory $paymentTokenFactory + * @param PaymentTokenFactoryInterface $paymentTokenFactory * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory * @param SubjectReader $subjectReader * @param DateTimeFactory $dateTimeFactory */ public function __construct( - PaymentTokenInterfaceFactory $paymentTokenFactory, + PaymentTokenFactoryInterface $paymentTokenFactory, OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory, SubjectReader $subjectReader, DateTimeFactory $dateTimeFactory @@ -92,7 +90,7 @@ private function getVaultPaymentToken(Transaction $transaction) } /** @var PaymentTokenInterface $paymentToken */ - $paymentToken = $this->paymentTokenFactory->create(); + $paymentToken = $this->paymentTokenFactory->create(PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT); $paymentToken->setGatewayToken($token); $paymentToken->setExpiresAt($this->getExpirationDate()); $details = json_encode([ diff --git a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php index a8332b9409f78..0a561ff5cc291 100644 --- a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php +++ b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php @@ -8,12 +8,14 @@ use Braintree\Transaction; use Magento\Braintree\Gateway\Config\Config; use Magento\Braintree\Gateway\Helper\SubjectReader; +use Magento\Framework\App\ObjectManager; +use Magento\Framework\Serialize\Serializer\Json; use Magento\Payment\Gateway\Response\HandlerInterface; use Magento\Payment\Model\InfoInterface; use Magento\Sales\Api\Data\OrderPaymentExtensionInterface; use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory; +use Magento\Vault\Api\Data\PaymentTokenFactoryInterface; use Magento\Vault\Api\Data\PaymentTokenInterface; -use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory; /** * Vault Details Handler @@ -22,7 +24,7 @@ class VaultDetailsHandler implements HandlerInterface { /** - * @var PaymentTokenInterfaceFactory + * @var PaymentTokenFactoryInterface */ protected $paymentTokenFactory; @@ -49,26 +51,26 @@ class VaultDetailsHandler implements HandlerInterface /** * VaultDetailsHandler constructor. * - * @param PaymentTokenInterfaceFactory $paymentTokenFactory + * @param PaymentTokenFactoryInterface $paymentTokenFactory * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory * @param Config $config * @param SubjectReader $subjectReader - * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer + * @param Json|null $serializer * @throws \RuntimeException */ public function __construct( - PaymentTokenInterfaceFactory $paymentTokenFactory, + PaymentTokenFactoryInterface $paymentTokenFactory, OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory, Config $config, SubjectReader $subjectReader, - \Magento\Framework\Serialize\Serializer\Json $serializer = null + Json $serializer = null ) { $this->paymentTokenFactory = $paymentTokenFactory; $this->paymentExtensionFactory = $paymentExtensionFactory; $this->config = $config; $this->subjectReader = $subjectReader; - $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance() - ->get(\Magento\Framework\Serialize\Serializer\Json::class); + $this->serializer = $serializer ?: ObjectManager::getInstance() + ->get(Json::class); } /** @@ -103,7 +105,7 @@ protected function getVaultPaymentToken(Transaction $transaction) } /** @var PaymentTokenInterface $paymentToken */ - $paymentToken = $this->paymentTokenFactory->create(); + $paymentToken = $this->paymentTokenFactory->create(PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD); $paymentToken->setGatewayToken($token); $paymentToken->setExpiresAt($this->getExpirationDate($transaction)); diff --git a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php index e0d684a7aa976..595d8b4792a62 100644 --- a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php +++ b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php @@ -6,7 +6,7 @@ namespace Magento\Braintree\Model\Adminhtml\Source; use Magento\Framework\Option\ArrayInterface; -use Magento\Payment\Model\Method\AbstractMethod; +use Magento\Payment\Model\MethodInterface; /** * Class PaymentAction @@ -22,11 +22,11 @@ public function toOptionArray() { return [ [ - 'value' => AbstractMethod::ACTION_AUTHORIZE, + 'value' => MethodInterface::ACTION_AUTHORIZE, 'label' => __('Authorize'), ], [ - 'value' => AbstractMethod::ACTION_AUTHORIZE_CAPTURE, + 'value' => MethodInterface::ACTION_AUTHORIZE_CAPTURE, 'label' => __('Authorize and Capture'), ] ]; diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php index fdf3dc941bd77..7630b03a1c3af 100644 --- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php @@ -5,6 +5,7 @@ */ namespace Magento\Braintree\Test\Unit\Gateway\Response\PayPal; +use Braintree\Result\Successful; use Braintree\Transaction; use Braintree\Transaction\PayPalDetails; use Magento\Braintree\Gateway\Helper\SubjectReader; @@ -15,24 +16,23 @@ use Magento\Sales\Api\Data\OrderPaymentExtensionInterface; use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory; use Magento\Sales\Model\Order\Payment; +use Magento\Vault\Api\Data\PaymentTokenFactoryInterface; use Magento\Vault\Api\Data\PaymentTokenInterface; -use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory; -use Magento\Vault\Model\AccountPaymentTokenFactory; use Magento\Vault\Model\PaymentToken; +use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject as MockObject; /** * Class VaultDetailsHandlerTest * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class VaultDetailsHandlerTest extends \PHPUnit\Framework\TestCase +class VaultDetailsHandlerTest extends TestCase { private static $transactionId = '1n2suy'; - /** - * @var SubjectReader|MockObject - */ - private $subjectReader; + private static $token = 'rc39al'; + + private static $payerEmail = 'john.doe@example.com'; /** * @var PaymentDataObjectInterface|MockObject @@ -45,7 +45,7 @@ class VaultDetailsHandlerTest extends \PHPUnit\Framework\TestCase private $paymentInfo; /** - * @var AccountPaymentTokenFactory|MockObject + * @var PaymentTokenFactoryInterface|MockObject */ private $paymentTokenFactory; @@ -92,7 +92,7 @@ protected function setUp() $this->paymentToken = $objectManager->getObject(PaymentToken::class); - $this->paymentTokenFactory = $this->getMockBuilder(AccountPaymentTokenFactory::class) + $this->paymentTokenFactory = $this->getMockBuilder(PaymentTokenFactoryInterface::class) ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); @@ -109,14 +109,6 @@ protected function setUp() $this->subject = [ 'payment' => $this->paymentDataObject, ]; - $this->subjectReader = $this->getMockBuilder(SubjectReader::class) - ->disableOriginalConstructor() - ->setMethods(['readPayment', 'readTransaction']) - ->getMock(); - $this->subjectReader->expects(static::once()) - ->method('readPayment') - ->with($this->subject) - ->willReturn($this->paymentDataObject); $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class) ->disableOriginalConstructor() @@ -126,103 +118,80 @@ protected function setUp() $this->handler = new VaultDetailsHandler( $this->paymentTokenFactory, $this->paymentExtensionFactory, - $this->subjectReader, + new SubjectReader(), $this->dateTimeFactory ); } - /** - * @covers \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler::handle - */ public function testHandle() { - /** @var Transaction $transaction */ $transaction = $this->getTransaction(); $response = [ 'object' => $transaction ]; - $this->paymentExtension->expects(static::once()) - ->method('setVaultPaymentToken') + $this->paymentExtension->method('setVaultPaymentToken') ->with($this->paymentToken); - $this->paymentExtension->expects(static::once()) - ->method('getVaultPaymentToken') + $this->paymentExtension->method('getVaultPaymentToken') ->willReturn($this->paymentToken); - - $this->subjectReader->expects(static::once()) - ->method('readTransaction') - ->with($response) - ->willReturn($transaction); - $this->paymentDataObject->expects(static::once()) - ->method('getPayment') + $this->paymentDataObject->method('getPayment') ->willReturn($this->paymentInfo); - $this->paymentTokenFactory->expects(static::once()) - ->method('create') + $this->paymentTokenFactory->method('create') + ->with(PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT) ->willReturn($this->paymentToken); - $this->paymentExtensionFactory->expects(static::once()) - ->method('create') + $this->paymentExtensionFactory->method('create') ->willReturn($this->paymentExtension); $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC')); $expirationDate = '2017-07-05 00:00:00'; - $this->dateTimeFactory->expects(static::once()) - ->method('create') + $this->dateTimeFactory->method('create') ->willReturn($dateTime); $this->handler->handle($this->subject, $response); $extensionAttributes = $this->paymentInfo->getExtensionAttributes(); - /** @var PaymentTokenInterface $paymentToken */ $paymentToken = $extensionAttributes->getVaultPaymentToken(); - static::assertNotNull($paymentToken); + self::assertNotNull($paymentToken); $tokenDetails = json_decode($paymentToken->getTokenDetails(), true); - static::assertSame($this->paymentToken, $paymentToken); - static::assertEquals($transaction->paypalDetails->token, $paymentToken->getGatewayToken()); - static::assertEquals($transaction->paypalDetails->payerEmail, $tokenDetails['payerEmail']); - static::assertEquals($expirationDate, $paymentToken->getExpiresAt()); + self::assertSame($this->paymentToken, $paymentToken); + self::assertEquals(self::$token, $paymentToken->getGatewayToken()); + self::assertEquals(self::$payerEmail, $tokenDetails['payerEmail']); + self::assertEquals($expirationDate, $paymentToken->getExpiresAt()); } - /** - * @covers \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler::handle - */ public function testHandleWithoutToken() { $transaction = $this->getTransaction(); - $transaction->paypalDetails->token = null; + $transaction->transaction->paypalDetails->token = null; $response = [ 'object' => $transaction ]; - $this->subjectReader->expects(static::once()) - ->method('readTransaction') - ->with($response) - ->willReturn($transaction); - - $this->paymentDataObject->expects(static::once()) - ->method('getPayment') + $this->paymentDataObject->method('getPayment') ->willReturn($this->paymentInfo); - $this->paymentTokenFactory->expects(static::never()) + $this->paymentTokenFactory->expects(self::never()) ->method('create'); - $this->dateTimeFactory->expects(static::never()) + $this->dateTimeFactory->expects(self::never()) ->method('create'); $this->handler->handle($this->subject, $response); - static::assertNull($this->paymentInfo->getExtensionAttributes()); + self::assertNull($this->paymentInfo->getExtensionAttributes()); } /** - * Create Braintree transaction - * @return Transaction + * Creates Braintree transaction. + * + * @return Successful */ - private function getTransaction() + private function getTransaction(): Successful { $attributes = [ 'id' => self::$transactionId, @@ -230,19 +199,21 @@ private function getTransaction() ]; $transaction = Transaction::factory($attributes); + $result = new Successful(['transaction' => $transaction]); - return $transaction; + return $result; } /** - * Get PayPal transaction details + * Gets PayPal transaction details. + * * @return PayPalDetails */ - private function getPayPalDetails() + private function getPayPalDetails(): PayPalDetails { $attributes = [ - 'token' => 'rc39al', - 'payerEmail' => 'john.doe@example.com' + 'token' => self::$token, + 'payerEmail' => self::$payerEmail ]; $details = new PayPalDetails($attributes); diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php index fb8f507bf1214..0131b1dda9541 100644 --- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php +++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php @@ -5,19 +5,23 @@ */ namespace Magento\Braintree\Test\Unit\Gateway\Response; +use Braintree\Result\Successful; use Braintree\Transaction; use Braintree\Transaction\CreditCardDetails; use Magento\Braintree\Gateway\Config\Config; use Magento\Braintree\Gateway\Helper\SubjectReader; +use Magento\Braintree\Gateway\Response\PaymentDetailsHandler; use Magento\Braintree\Gateway\Response\VaultDetailsHandler; -use Magento\Framework\DataObject; +use Magento\Framework\Serialize\Serializer\Json; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; use Magento\Payment\Gateway\Data\PaymentDataObject; +use Magento\Sales\Api\Data\OrderPaymentExtension; use Magento\Sales\Api\Data\OrderPaymentExtensionInterface; use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory; -use Magento\Sales\Model\Order; use Magento\Sales\Model\Order\Payment; -use Magento\Vault\Api\Data\PaymentTokenInterface; -use Magento\Vault\Model\CreditCardTokenFactory; +use Magento\Vault\Api\Data\PaymentTokenFactoryInterface; +use Magento\Vault\Model\PaymentToken; +use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject as MockObject; /** @@ -25,193 +29,141 @@ * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ -class VaultDetailsHandlerTest extends \PHPUnit\Framework\TestCase +class VaultDetailsHandlerTest extends TestCase { - const TRANSACTION_ID = '432erwwe'; + private static $transactionId = '432erwwe'; + + private static $token = 'rh3gd4'; /** - * @var \Magento\Braintree\Gateway\Response\PaymentDetailsHandler + * @var PaymentDetailsHandler */ private $paymentHandler; /** - * @var \Magento\Sales\Model\Order\Payment|MockObject + * @var Payment|MockObject */ private $payment; /** - * @var CreditCardTokenFactory|MockObject + * @var PaymentTokenFactoryInterface|MockObject */ private $paymentTokenFactory; /** - * @var PaymentTokenInterface|MockObject - */ - protected $paymentToken; - - /** - * @var \Magento\Sales\Api\Data\OrderPaymentExtension|MockObject + * @var OrderPaymentExtension|MockObject */ private $paymentExtension; /** - * @var \Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory|MockObject + * @var OrderPaymentExtensionInterfaceFactory|MockObject */ private $paymentExtensionFactory; - /** - * @var SubjectReader|MockObject - */ - private $subjectReader; - - /** - * @var Config|MockObject - */ - private $config; - protected function setUp() { - $this->paymentToken = $this->createMock(PaymentTokenInterface::class); - $this->paymentTokenFactory = $this->getMockBuilder(CreditCardTokenFactory::class) + $objectManager = new ObjectManager($this); + $paymentToken = $objectManager->getObject(PaymentToken::class); + $this->paymentTokenFactory = $this->getMockBuilder(PaymentTokenFactoryInterface::class) ->setMethods(['create']) ->disableOriginalConstructor() ->getMock(); - $this->paymentTokenFactory->expects(self::once()) - ->method('create') - ->willReturn($this->paymentToken); + $this->paymentTokenFactory->method('create') + ->with(PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD) + ->willReturn($paymentToken); - $this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class) - ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken']) - ->disableOriginalConstructor() - ->getMock(); - $this->paymentExtensionFactory = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class) - ->disableOriginalConstructor() - ->setMethods(['create']) - ->getMock(); - $this->paymentExtensionFactory->expects(self::once()) - ->method('create') - ->willReturn($this->paymentExtension); + $this->initPaymentExtensionAttributesMock(); + $this->paymentExtension->method('setVaultPaymentToken') + ->with($paymentToken); + $this->paymentExtension->method('getVaultPaymentToken') + ->willReturn($paymentToken); $this->payment = $this->getMockBuilder(Payment::class) ->disableOriginalConstructor() ->setMethods(['__wakeup']) ->getMock(); - $this->subjectReader = $this->getMockBuilder(SubjectReader::class) - ->disableOriginalConstructor() - ->getMock(); - - $mapperArray = [ - "american-express" => "AE", - "discover" => "DI", - "jcb" => "JCB", - "mastercard" => "MC", - "master-card" => "MC", - "visa" => "VI", - "maestro" => "MI", - "diners-club" => "DN", - "unionpay" => "CUP" - ]; - - $this->config = $this->getMockBuilder(Config::class) - ->setMethods(['getCctypesMapper']) - ->disableOriginalConstructor() - ->getMock(); - - $this->config->expects(self::once()) - ->method('getCctypesMapper') - ->willReturn($mapperArray); - - $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class); + $config = $this->getConfigMock(); $this->paymentHandler = new VaultDetailsHandler( $this->paymentTokenFactory, $this->paymentExtensionFactory, - $this->config, - $this->subjectReader, - $this->serializer + $config, + new SubjectReader(), + new Json() ); } - /** - * @covers \Magento\Braintree\Gateway\Response\VaultDetailsHandler::handle - */ public function testHandle() { - $this->paymentExtension->expects(self::once()) - ->method('setVaultPaymentToken') - ->with($this->paymentToken); - $this->paymentExtension->expects(self::once()) - ->method('getVaultPaymentToken') - ->willReturn($this->paymentToken); - $paymentData = $this->getPaymentDataObjectMock(); - $transaction = $this->getBraintreeTransaction(); $subject = ['payment' => $paymentData]; - $response = ['object' => $transaction]; - - $this->subjectReader->expects(self::once()) - ->method('readPayment') - ->with($subject) - ->willReturn($paymentData); - $this->subjectReader->expects(self::once()) - ->method('readTransaction') - ->with($response) - ->willReturn($transaction); - $this->paymentToken->expects(static::once()) - ->method('setGatewayToken') - ->with('rh3gd4'); - $this->paymentToken->expects(static::once()) - ->method('setExpiresAt') - ->with('2022-01-01 00:00:00'); + $response = ['object' => $this->getBraintreeTransaction()]; $this->paymentHandler->handle($subject, $response); - $this->assertSame($this->paymentToken, $this->payment->getExtensionAttributes()->getVaultPaymentToken()); + $paymentToken = $this->payment->getExtensionAttributes() + ->getVaultPaymentToken(); + + self::assertEquals(self::$token, $paymentToken->getGatewayToken()); + self::assertEquals('2022-01-01 00:00:00', $paymentToken->getExpiresAt()); + + $details = json_decode($paymentToken->getTokenDetails(), true); + self::assertEquals( + [ + 'type' => 'AE', + 'maskedCC' => 1231, + 'expirationDate' => '12/2021' + ], + $details + ); } /** - * Create mock for payment data object and order payment - * @return MockObject + * Creates mock for payment data object and order payment. + * + * @return PaymentDataObject|MockObject */ - private function getPaymentDataObjectMock() + private function getPaymentDataObjectMock(): PaymentDataObject { $mock = $this->getMockBuilder(PaymentDataObject::class) ->setMethods(['getPayment']) ->disableOriginalConstructor() ->getMock(); - $mock->expects($this->once()) - ->method('getPayment') + $mock->method('getPayment') ->willReturn($this->payment); return $mock; } /** - * Create Braintree transaction - * @return MockObject + * Creates Braintree transaction. + * + * @return Successful */ private function getBraintreeTransaction() { $attributes = [ - 'id' => self::TRANSACTION_ID, + 'id' => self::$transactionId, 'creditCardDetails' => $this->getCreditCardDetails() ]; $transaction = Transaction::factory($attributes); + $result = new Successful(['transaction' => $transaction]); - return $transaction; + return $result; } /** - * Create Braintree transaction - * @return \Braintree\Transaction\CreditCardDetails + * Creates Braintree transaction. + * + * @return CreditCardDetails */ - private function getCreditCardDetails() + private function getCreditCardDetails(): CreditCardDetails { $attributes = [ - 'token' => 'rh3gd4', + 'token' => self::$token, 'bin' => '5421', 'cardType' => 'American Express', 'expirationMonth' => 12, @@ -223,4 +175,54 @@ private function getCreditCardDetails() return $creditCardDetails; } + + /** + * Creates mock of config class. + * + * @return Config|MockObject + */ + private function getConfigMock(): Config + { + $mapperArray = [ + 'american-express' => 'AE', + 'discover' => 'DI', + 'jcb' => 'JCB', + 'mastercard' => 'MC', + 'master-card' => 'MC', + 'visa' => 'VI', + 'maestro' => 'MI', + 'diners-club' => 'DN', + 'unionpay' => 'CUP' + ]; + + $config = $this->getMockBuilder(Config::class) + ->setMethods(['getCctypesMapper']) + ->disableOriginalConstructor() + ->getMock(); + + $config->method('getCctypesMapper') + ->willReturn($mapperArray); + + return $config; + } + + /** + * Initializes payment extension attributes mocks. + * + * @return void + */ + private function initPaymentExtensionAttributesMock() + { + $this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class) + ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken']) + ->disableOriginalConstructor() + ->getMock(); + + $this->paymentExtensionFactory = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class) + ->disableOriginalConstructor() + ->setMethods(['create']) + ->getMock(); + $this->paymentExtensionFactory->method('create') + ->willReturn($this->paymentExtension); + } } diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php index 00ada033f2210..6e6a6773bd5f2 100644 --- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php +++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php @@ -29,12 +29,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl MethodInterface, PaymentMethodInterface { - const ACTION_ORDER = 'order'; - - const ACTION_AUTHORIZE = 'authorize'; - - const ACTION_AUTHORIZE_CAPTURE = 'authorize_capture'; - const STATUS_UNKNOWN = 'UNKNOWN'; const STATUS_APPROVED = 'APPROVED'; @@ -47,23 +41,6 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl const STATUS_SUCCESS = 'SUCCESS'; - /** - * Different payment method checks. - */ - const CHECK_USE_FOR_COUNTRY = 'country'; - - const CHECK_USE_FOR_CURRENCY = 'currency'; - - const CHECK_USE_CHECKOUT = 'checkout'; - - const CHECK_USE_INTERNAL = 'internal'; - - const CHECK_ORDER_TOTAL_MIN_MAX = 'total'; - - const CHECK_ZERO_TOTAL = 'zero_total'; - - const GROUP_OFFLINE = 'offline'; - /** * @var string */ diff --git a/app/code/Magento/Payment/Model/MethodInterface.php b/app/code/Magento/Payment/Model/MethodInterface.php index f756ed564c066..fe80bb25c77ee 100644 --- a/app/code/Magento/Payment/Model/MethodInterface.php +++ b/app/code/Magento/Payment/Model/MethodInterface.php @@ -15,6 +15,32 @@ */ interface MethodInterface { + /** + * Different payment actions. + */ + const ACTION_ORDER = 'order'; + + const ACTION_AUTHORIZE = 'authorize'; + + const ACTION_AUTHORIZE_CAPTURE = 'authorize_capture'; + + /** + * Different payment method checks. + */ + const CHECK_USE_FOR_COUNTRY = 'country'; + + const CHECK_USE_FOR_CURRENCY = 'currency'; + + const CHECK_USE_CHECKOUT = 'checkout'; + + const CHECK_USE_INTERNAL = 'internal'; + + const CHECK_ORDER_TOTAL_MIN_MAX = 'total'; + + const CHECK_ZERO_TOTAL = 'zero_total'; + + const GROUP_OFFLINE = 'offline'; + /** * Retrieve payment method code * From 5b7e1d161c35ead453f37fb9140908d27f6cf137 Mon Sep 17 00:00:00 2001 From: Sergii Kovalenko Date: Tue, 13 Feb 2018 17:54:06 +0200 Subject: [PATCH 571/616] MAGETWO-87551: Convert existing data install/upgrade scripts --fix L2 EE-Setup --- etc/module.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/module.xml b/etc/module.xml index e18acbf2b8344..cc0c97f43d542 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -7,7 +7,7 @@ --> - + From 4700853d5687c21ebbf97bf18a06049c63e7ee6b Mon Sep 17 00:00:00 2001 From: Jeroen Date: Wed, 14 Feb 2018 12:18:29 +0100 Subject: [PATCH 572/616] Update Store getConfig() to respect valid false return value Using a config setting Yes/No will return string '0' when No is saved. Method will therefore fetch default config value because '0' equals false. --- app/code/Magento/Store/Model/Store.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php index 34d338b1b3448..078da6d63ba6c 100644 --- a/app/code/Magento/Store/Model/Store.php +++ b/app/code/Magento/Store/Model/Store.php @@ -535,8 +535,8 @@ public function setName($name) public function getConfig($path) { $data = $this->_config->getValue($path, ScopeInterface::SCOPE_STORE, $this->getCode()); - if (!$data) { - $data = $this->_config->getValue($path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT); + if ($data === null) { + $data = $this->_config->getValue($path); } return $data === false ? null : $data; } From c36fb765a26f91a92bddfc23c65766fbc561e9ec Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Thu, 15 Feb 2018 23:01:50 -0500 Subject: [PATCH 573/616] #13685: Upgraded jquery.mobile.custom to 1.5.0-alpha.1 --- lib/web/jquery/jquery.mobile.custom.js | 1853 +++++++++++++----------- 1 file changed, 1025 insertions(+), 828 deletions(-) diff --git a/lib/web/jquery/jquery.mobile.custom.js b/lib/web/jquery/jquery.mobile.custom.js index f289b97b91d83..3b02f5346484c 100644 --- a/lib/web/jquery/jquery.mobile.custom.js +++ b/lib/web/jquery/jquery.mobile.custom.js @@ -1,25 +1,141 @@ /* -* jQuery Mobile v1.4.3 +* jQuery Mobile v1.5.0-alpha.1 * http://jquerymobile.com * -* Copyright 2010, 2014 jQuery Foundation, Inc. and other contributors +* Copyright jQuery Foundation, Inc. and other contributors * Released under the MIT license. * http://jquery.org/license * */ (function ( root, doc, factory ) { - if ( typeof define === "function" && define.amd ) { - // AMD. Register as an anonymous module. - define( [ "jquery" ], function ( $ ) { - factory( $, root, doc ); - return $.mobile; - }); - } else { - // Browser globals - factory( root.jQuery, root, doc ); - } -}( this, document, function ( jQuery, window, document, undefined ) {// This plugin is an experiment for abstracting away the touch and mouse + if ( typeof define === "function" && define.amd ) { + // AMD. Register as an anonymous module. + define( [ "jquery" ], function ( $ ) { + factory( $, root, doc ); + return $.mobile; + }); + } else { + // Browser globals + factory( root.jQuery, root, doc ); + } +}( this, document, function ( jQuery, window, document, undefined ) {/*! + * jQuery Mobile Scroll Events @VERSION + * http://jquerymobile.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ + +//>>label: Scroll +//>>group: Events +//>>description: Scroll events including: scrollstart, scrollstop + + ( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( 'events/scroll',[ "jquery" ], factory ); + } else { + + // Browser globals + factory( jQuery ); + } + } )( function( $ ) { + + var scrollEvent = "touchmove scroll"; + +// setup new event shortcuts + $.each( [ "scrollstart", "scrollstop" ], function( i, name ) { + + $.fn[ name ] = function( fn ) { + return fn ? this.bind( name, fn ) : this.trigger( name ); + }; + + // jQuery < 1.8 + if ( $.attrFn ) { + $.attrFn[ name ] = true; + } + } ); + +// also handles scrollstop + $.event.special.scrollstart = { + + enabled: true, + setup: function() { + + var thisObject = this, + $this = $( thisObject ), + scrolling, + timer; + + function trigger( event, state ) { + var originalEventType = event.type; + + scrolling = state; + + event.type = scrolling ? "scrollstart" : "scrollstop"; + $.event.dispatch.call( thisObject, event ); + event.type = originalEventType; + } + + var scrollStartHandler = $.event.special.scrollstart.handler = function ( event ) { + + if ( !$.event.special.scrollstart.enabled ) { + return; + } + + if ( !scrolling ) { + trigger( event, true ); + } + + clearTimeout( timer ); + timer = setTimeout( function() { + trigger( event, false ); + }, 50 ); + }; + + // iPhone triggers scroll after a small delay; use touchmove instead + $this.on( scrollEvent, scrollStartHandler ); + }, + teardown: function() { + $( this ).off( scrollEvent, $.event.special.scrollstart.handler ); + } + }; + + $.each( { + scrollstop: "scrollstart" + }, function( event, sourceEvent ) { + + $.event.special[ event ] = { + setup: function() { + $( this ).bind( sourceEvent, $.noop ); + }, + teardown: function() { + $( this ).unbind( sourceEvent ); + } + }; + } ); + + return $.event.special; + } ); + + /*! + * jQuery Mobile Virtual Mouse @VERSION + * http://jquerymobile.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ + +//>>label: Virtual Mouse (vmouse) Bindings +//>>group: Core +//>>description: Normalizes touch/mouse events. +//>>docs: http://api.jquerymobile.com/?s=vmouse + +// This plugin is an experiment for abstracting away the touch and mouse // events so that developers don't have to worry about which method of input // the device their document is loaded on supports. // @@ -34,831 +150,912 @@ // The current version exposes the following virtual events to jQuery bind methods: // "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel" -(function( $, window, document, undefined ) { - -var dataPropertyName = "virtualMouseBindings", - touchTargetPropertyName = "virtualTouchID", - virtualEventNames = "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split( " " ), - touchEventProps = "clientX clientY pageX pageY screenX screenY".split( " " ), - mouseHookProps = $.event.mouseHooks ? $.event.mouseHooks.props : [], - mouseEventProps = $.event.props.concat( mouseHookProps ), - activeDocHandlers = {}, - resetTimerID = 0, - startX = 0, - startY = 0, - didScroll = false, - clickBlockList = [], - blockMouseTriggers = false, - blockTouchTriggers = false, - eventCaptureSupported = "addEventListener" in document, - $document = $( document ), - nextTouchID = 1, - lastTouchID = 0, threshold, - i; - -$.vmouse = { - moveDistanceThreshold: 10, - clickDistanceThreshold: 10, - resetTimerDuration: 1500 -}; - -function getNativeEvent( event ) { - - while ( event && typeof event.originalEvent !== "undefined" ) { - event = event.originalEvent; - } - return event; -} - -function createVirtualEvent( event, eventType ) { - - var t = event.type, - oe, props, ne, prop, ct, touch, i, j, len; - - event = $.Event( event ); - event.type = eventType; - - oe = event.originalEvent; - props = $.event.props; - - // addresses separation of $.event.props in to $.event.mouseHook.props and Issue 3280 - // https://github.com/jquery/jquery-mobile/issues/3280 - if ( t.search( /^(mouse|click)/ ) > -1 ) { - props = mouseEventProps; - } - - // copy original event properties over to the new event - // this would happen if we could call $.event.fix instead of $.Event - // but we don't have a way to force an event to be fixed multiple times - if ( oe ) { - for ( i = props.length, prop; i; ) { - prop = props[ --i ]; - event[ prop ] = oe[ prop ]; - } - } - - // make sure that if the mouse and click virtual events are generated - // without a .which one is defined - if ( t.search(/mouse(down|up)|click/) > -1 && !event.which ) { - event.which = 1; - } - - if ( t.search(/^touch/) !== -1 ) { - ne = getNativeEvent( oe ); - t = ne.touches; - ct = ne.changedTouches; - touch = ( t && t.length ) ? t[0] : ( ( ct && ct.length ) ? ct[ 0 ] : undefined ); - - if ( touch ) { - for ( j = 0, len = touchEventProps.length; j < len; j++) { - prop = touchEventProps[ j ]; - event[ prop ] = touch[ prop ]; - } - } - } - - return event; -} - -function getVirtualBindingFlags( element ) { - - var flags = {}, - b, k; - - while ( element ) { - - b = $.data( element, dataPropertyName ); - - for ( k in b ) { - if ( b[ k ] ) { - flags[ k ] = flags.hasVirtualBinding = true; - } - } - element = element.parentNode; - } - return flags; -} - -function getClosestElementWithVirtualBinding( element, eventType ) { - var b; - while ( element ) { - - b = $.data( element, dataPropertyName ); - - if ( b && ( !eventType || b[ eventType ] ) ) { - return element; - } - element = element.parentNode; - } - return null; -} - -function enableTouchBindings() { - blockTouchTriggers = false; -} - -function disableTouchBindings() { - blockTouchTriggers = true; -} - -function enableMouseBindings() { - lastTouchID = 0; - clickBlockList.length = 0; - blockMouseTriggers = false; - - // When mouse bindings are enabled, our - // touch bindings are disabled. - disableTouchBindings(); -} - -function disableMouseBindings() { - // When mouse bindings are disabled, our - // touch bindings are enabled. - enableTouchBindings(); -} - -function startResetTimer() { - clearResetTimer(); - resetTimerID = setTimeout( function() { - resetTimerID = 0; - enableMouseBindings(); - }, $.vmouse.resetTimerDuration ); -} - -function clearResetTimer() { - if ( resetTimerID ) { - clearTimeout( resetTimerID ); - resetTimerID = 0; - } -} - -function triggerVirtualEvent( eventType, event, flags ) { - var ve; - - if ( ( flags && flags[ eventType ] ) || - ( !flags && getClosestElementWithVirtualBinding( event.target, eventType ) ) ) { - - ve = createVirtualEvent( event, eventType ); - - $( event.target).trigger( ve ); - } - - return ve; -} - -function mouseEventCallback( event ) { - var touchID = $.data( event.target, touchTargetPropertyName ), - ve; - - if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ) { - ve = triggerVirtualEvent( "v" + event.type, event ); - if ( ve ) { - if ( ve.isDefaultPrevented() ) { - event.preventDefault(); - } - if ( ve.isPropagationStopped() ) { - event.stopPropagation(); - } - if ( ve.isImmediatePropagationStopped() ) { - event.stopImmediatePropagation(); - } - } - } -} - -function handleTouchStart( event ) { - - var touches = getNativeEvent( event ).touches, - target, flags, t; - - if ( touches && touches.length === 1 ) { - - target = event.target; - flags = getVirtualBindingFlags( target ); - - if ( flags.hasVirtualBinding ) { - - lastTouchID = nextTouchID++; - $.data( target, touchTargetPropertyName, lastTouchID ); - - clearResetTimer(); - - disableMouseBindings(); - didScroll = false; - - t = getNativeEvent( event ).touches[ 0 ]; - startX = t.pageX; - startY = t.pageY; - - triggerVirtualEvent( "vmouseover", event, flags ); - triggerVirtualEvent( "vmousedown", event, flags ); - } - } -} - -function handleScroll( event ) { - if ( blockTouchTriggers ) { - return; - } - - if ( !didScroll ) { - triggerVirtualEvent( "vmousecancel", event, getVirtualBindingFlags( event.target ) ); - } - - didScroll = true; - startResetTimer(); -} - -function handleTouchMove( event ) { - if ( blockTouchTriggers ) { - return; - } - - var t = getNativeEvent( event ).touches[ 0 ], - didCancel = didScroll, - moveThreshold = $.vmouse.moveDistanceThreshold, - flags = getVirtualBindingFlags( event.target ); - - didScroll = didScroll || - ( Math.abs( t.pageX - startX ) > moveThreshold || - Math.abs( t.pageY - startY ) > moveThreshold ); - - if ( didScroll && !didCancel ) { - triggerVirtualEvent( "vmousecancel", event, flags ); - } - - triggerVirtualEvent( "vmousemove", event, flags ); - startResetTimer(); -} - -function handleTouchEnd( event ) { - if ( blockTouchTriggers ) { - return; - } - - disableTouchBindings(); - - var flags = getVirtualBindingFlags( event.target ), - ve, t; - triggerVirtualEvent( "vmouseup", event, flags ); - - if ( !didScroll ) { - ve = triggerVirtualEvent( "vclick", event, flags ); - if ( ve && ve.isDefaultPrevented() ) { - // The target of the mouse events that follow the touchend - // event don't necessarily match the target used during the - // touch. This means we need to rely on coordinates for blocking - // any click that is generated. - t = getNativeEvent( event ).changedTouches[ 0 ]; - clickBlockList.push({ - touchID: lastTouchID, - x: t.clientX, - y: t.clientY - }); - - // Prevent any mouse events that follow from triggering - // virtual event notifications. - blockMouseTriggers = true; - } - } - triggerVirtualEvent( "vmouseout", event, flags); - didScroll = false; - - startResetTimer(); -} - -function hasVirtualBindings( ele ) { - var bindings = $.data( ele, dataPropertyName ), - k; - - if ( bindings ) { - for ( k in bindings ) { - if ( bindings[ k ] ) { - return true; - } - } - } - return false; -} - -function dummyMouseHandler() {} - -function getSpecialEventObject( eventType ) { - var realType = eventType.substr( 1 ); - - return { - setup: function(/* data, namespace */) { - // If this is the first virtual mouse binding for this element, - // add a bindings object to its data. - - if ( !hasVirtualBindings( this ) ) { - $.data( this, dataPropertyName, {} ); - } - - // If setup is called, we know it is the first binding for this - // eventType, so initialize the count for the eventType to zero. - var bindings = $.data( this, dataPropertyName ); - bindings[ eventType ] = true; - - // If this is the first virtual mouse event for this type, - // register a global handler on the document. - - activeDocHandlers[ eventType ] = ( activeDocHandlers[ eventType ] || 0 ) + 1; - - if ( activeDocHandlers[ eventType ] === 1 ) { - $document.bind( realType, mouseEventCallback ); - } - - // Some browsers, like Opera Mini, won't dispatch mouse/click events - // for elements unless they actually have handlers registered on them. - // To get around this, we register dummy handlers on the elements. - - $( this ).bind( realType, dummyMouseHandler ); - - // For now, if event capture is not supported, we rely on mouse handlers. - if ( eventCaptureSupported ) { - // If this is the first virtual mouse binding for the document, - // register our touchstart handler on the document. - - activeDocHandlers[ "touchstart" ] = ( activeDocHandlers[ "touchstart" ] || 0) + 1; - - if ( activeDocHandlers[ "touchstart" ] === 1 ) { - $document.bind( "touchstart", handleTouchStart ) - .bind( "touchend", handleTouchEnd ) - - // On touch platforms, touching the screen and then dragging your finger - // causes the window content to scroll after some distance threshold is - // exceeded. On these platforms, a scroll prevents a click event from being - // dispatched, and on some platforms, even the touchend is suppressed. To - // mimic the suppression of the click event, we need to watch for a scroll - // event. Unfortunately, some platforms like iOS don't dispatch scroll - // events until *AFTER* the user lifts their finger (touchend). This means - // we need to watch both scroll and touchmove events to figure out whether - // or not a scroll happenens before the touchend event is fired. - - .bind( "touchmove", handleTouchMove ) - .bind( "scroll", handleScroll ); - } - } - }, - - teardown: function(/* data, namespace */) { - // If this is the last virtual binding for this eventType, - // remove its global handler from the document. - - --activeDocHandlers[ eventType ]; - - if ( !activeDocHandlers[ eventType ] ) { - $document.unbind( realType, mouseEventCallback ); - } - - if ( eventCaptureSupported ) { - // If this is the last virtual mouse binding in existence, - // remove our document touchstart listener. - - --activeDocHandlers[ "touchstart" ]; - - if ( !activeDocHandlers[ "touchstart" ] ) { - $document.unbind( "touchstart", handleTouchStart ) - .unbind( "touchmove", handleTouchMove ) - .unbind( "touchend", handleTouchEnd ) - .unbind( "scroll", handleScroll ); - } - } - - var $this = $( this ), - bindings = $.data( this, dataPropertyName ); - - // teardown may be called when an element was - // removed from the DOM. If this is the case, - // jQuery core may have already stripped the element - // of any data bindings so we need to check it before - // using it. - if ( bindings ) { - bindings[ eventType ] = false; - } + ( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( 'vmouse',[ "jquery" ], factory ); + } else { + + // Browser globals + factory( jQuery ); + } + } )( function( $ ) { + + var dataPropertyName = "virtualMouseBindings", + touchTargetPropertyName = "virtualTouchID", + touchEventProps = "clientX clientY pageX pageY screenX screenY".split( " " ), + virtualEventNames = "vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split( " " ), + generalProps = ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + + "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ), + mouseHookProps = $.event.mouseHooks ? $.event.mouseHooks.props : [], + mouseEventProps = generalProps.concat( mouseHookProps ), + activeDocHandlers = {}, + resetTimerID = 0, + startX = 0, + startY = 0, + didScroll = false, + clickBlockList = [], + blockMouseTriggers = false, + blockTouchTriggers = false, + eventCaptureSupported = "addEventListener" in document, + $document = $( document ), + nextTouchID = 1, + lastTouchID = 0, threshold, + i; + + $.vmouse = { + moveDistanceThreshold: 10, + clickDistanceThreshold: 10, + resetTimerDuration: 1500, + maximumTimeBetweenTouches: 100 + }; + + function getNativeEvent( event ) { + + while ( event && typeof event.originalEvent !== "undefined" ) { + event = event.originalEvent; + } + return event; + } + + function createVirtualEvent( event, eventType ) { + + var t = event.type, + oe, props, ne, prop, ct, touch, i, j, len; + + event = $.Event( event ); + event.type = eventType; + + oe = event.originalEvent; + props = generalProps; + + // addresses separation of $.event.props in to $.event.mouseHook.props and Issue 3280 + // https://github.com/jquery/jquery-mobile/issues/3280 + if ( t.search( /^(mouse|click)/ ) > -1 ) { + props = mouseEventProps; + } + + // copy original event properties over to the new event + // this would happen if we could call $.event.fix instead of $.Event + // but we don't have a way to force an event to be fixed multiple times + if ( oe ) { + for ( i = props.length; i; ) { + prop = props[ --i ]; + event[ prop ] = oe[ prop ]; + } + } + + // make sure that if the mouse and click virtual events are generated + // without a .which one is defined + if ( t.search( /mouse(down|up)|click/ ) > -1 && !event.which ) { + event.which = 1; + } + + if ( t.search( /^touch/ ) !== -1 ) { + ne = getNativeEvent( oe ); + t = ne.touches; + ct = ne.changedTouches; + touch = ( t && t.length ) ? t[ 0 ] : ( ( ct && ct.length ) ? ct[ 0 ] : undefined ); + + if ( touch ) { + for ( j = 0, len = touchEventProps.length; j < len; j++ ) { + prop = touchEventProps[ j ]; + event[ prop ] = touch[ prop ]; + } + } + } + + return event; + } + + function getVirtualBindingFlags( element ) { + + var flags = {}, + b, k; + + while ( element ) { + + b = $.data( element, dataPropertyName ); + + for ( k in b ) { + if ( b[ k ] ) { + flags[ k ] = flags.hasVirtualBinding = true; + } + } + element = element.parentNode; + } + return flags; + } + + function getClosestElementWithVirtualBinding( element, eventType ) { + var b; + while ( element ) { + + b = $.data( element, dataPropertyName ); + + if ( b && ( !eventType || b[ eventType ] ) ) { + return element; + } + element = element.parentNode; + } + return null; + } + + function enableTouchBindings() { + blockTouchTriggers = false; + } + + function disableTouchBindings() { + blockTouchTriggers = true; + } + + function enableMouseBindings() { + lastTouchID = 0; + clickBlockList.length = 0; + blockMouseTriggers = false; + + // When mouse bindings are enabled, our + // touch bindings are disabled. + disableTouchBindings(); + } + + function disableMouseBindings() { + // When mouse bindings are disabled, our + // touch bindings are enabled. + enableTouchBindings(); + } + + function clearResetTimer() { + if ( resetTimerID ) { + clearTimeout( resetTimerID ); + resetTimerID = 0; + } + } + + function startResetTimer() { + clearResetTimer(); + resetTimerID = setTimeout( function() { + resetTimerID = 0; + enableMouseBindings(); + }, $.vmouse.resetTimerDuration ); + } + + function triggerVirtualEvent( eventType, event, flags ) { + var ve; + + if ( ( flags && flags[ eventType ] ) || + ( !flags && getClosestElementWithVirtualBinding( event.target, eventType ) ) ) { + + ve = createVirtualEvent( event, eventType ); + + $( event.target ).trigger( ve ); + } + + return ve; + } + + function mouseEventCallback( event ) { + var touchID = $.data( event.target, touchTargetPropertyName ), + ve; + + // It is unexpected if a click event is received before a touchend + // or touchmove event, however this is a known behavior in Mobile + // Safari when Mobile VoiceOver (as of iOS 8) is enabled and the user + // double taps to activate a link element. In these cases if a touch + // event is not received within the maximum time between touches, + // re-enable mouse bindings and call the mouse event handler again. + if ( event.type === "click" && $.data( event.target, "lastTouchType" ) === "touchstart" ) { + setTimeout( function() { + if ( $.data( event.target, "lastTouchType" ) === "touchstart" ) { + enableMouseBindings(); + delete $.data( event.target ).lastTouchType; + mouseEventCallback( event ); + } + }, $.vmouse.maximumTimeBetweenTouches ); + } + + if ( !blockMouseTriggers && ( !lastTouchID || lastTouchID !== touchID ) ) { + ve = triggerVirtualEvent( "v" + event.type, event ); + if ( ve ) { + if ( ve.isDefaultPrevented() ) { + event.preventDefault(); + } + if ( ve.isPropagationStopped() ) { + event.stopPropagation(); + } + if ( ve.isImmediatePropagationStopped() ) { + event.stopImmediatePropagation(); + } + } + } + } + + function handleTouchStart( event ) { + + var touches = getNativeEvent( event ).touches, + target, flags, t; + + if ( touches && touches.length === 1 ) { + + target = event.target; + flags = getVirtualBindingFlags( target ); + + $.data( event.target, "lastTouchType", event.type ); + + if ( flags.hasVirtualBinding ) { + + lastTouchID = nextTouchID++; + $.data( target, touchTargetPropertyName, lastTouchID ); + + clearResetTimer(); + + disableMouseBindings(); + didScroll = false; + + t = getNativeEvent( event ).touches[ 0 ]; + startX = t.pageX; + startY = t.pageY; + + triggerVirtualEvent( "vmouseover", event, flags ); + triggerVirtualEvent( "vmousedown", event, flags ); + } + } + } + + function handleScroll( event ) { + if ( blockTouchTriggers ) { + return; + } + + if ( !didScroll ) { + triggerVirtualEvent( "vmousecancel", event, getVirtualBindingFlags( event.target ) ); + } + + $.data( event.target, "lastTouchType", event.type ); + + didScroll = true; + startResetTimer(); + } + + function handleTouchMove( event ) { + if ( blockTouchTriggers ) { + return; + } + + var t = getNativeEvent( event ).touches[ 0 ], + didCancel = didScroll, + moveThreshold = $.vmouse.moveDistanceThreshold, + flags = getVirtualBindingFlags( event.target ); + + $.data( event.target, "lastTouchType", event.type ); + + didScroll = didScroll || + ( Math.abs( t.pageX - startX ) > moveThreshold || + Math.abs( t.pageY - startY ) > moveThreshold ); + + if ( didScroll && !didCancel ) { + triggerVirtualEvent( "vmousecancel", event, flags ); + } + + triggerVirtualEvent( "vmousemove", event, flags ); + startResetTimer(); + } + + function handleTouchEnd( event ) { + if ( blockTouchTriggers || $.data( event.target, "lastTouchType" ) === undefined ) { + return; + } + + disableTouchBindings(); + delete $.data( event.target ).lastTouchType; + + var flags = getVirtualBindingFlags( event.target ), + ve, t; + triggerVirtualEvent( "vmouseup", event, flags ); + + if ( !didScroll ) { + ve = triggerVirtualEvent( "vclick", event, flags ); + if ( ve && ve.isDefaultPrevented() ) { + // The target of the mouse events that follow the touchend + // event don't necessarily match the target used during the + // touch. This means we need to rely on coordinates for blocking + // any click that is generated. + t = getNativeEvent( event ).changedTouches[ 0 ]; + clickBlockList.push( { + touchID: lastTouchID, + x: t.clientX, + y: t.clientY + } ); + + // Prevent any mouse events that follow from triggering + // virtual event notifications. + blockMouseTriggers = true; + } + } + triggerVirtualEvent( "vmouseout", event, flags ); + didScroll = false; + + startResetTimer(); + } + + function hasVirtualBindings( ele ) { + var bindings = $.data( ele, dataPropertyName ), + k; + + if ( bindings ) { + for ( k in bindings ) { + if ( bindings[ k ] ) { + return true; + } + } + } + return false; + } + + function dummyMouseHandler() { + } + + function getSpecialEventObject( eventType ) { + var realType = eventType.substr( 1 ); + + return { + setup: function( /* data, namespace */ ) { + // If this is the first virtual mouse binding for this element, + // add a bindings object to its data. + + if ( !hasVirtualBindings( this ) ) { + $.data( this, dataPropertyName, {} ); + } + + // If setup is called, we know it is the first binding for this + // eventType, so initialize the count for the eventType to zero. + var bindings = $.data( this, dataPropertyName ); + bindings[ eventType ] = true; + + // If this is the first virtual mouse event for this type, + // register a global handler on the document. + + activeDocHandlers[ eventType ] = ( activeDocHandlers[ eventType ] || 0 ) + 1; + + if ( activeDocHandlers[ eventType ] === 1 ) { + $document.bind( realType, mouseEventCallback ); + } + + // Some browsers, like Opera Mini, won't dispatch mouse/click events + // for elements unless they actually have handlers registered on them. + // To get around this, we register dummy handlers on the elements. + + $( this ).bind( realType, dummyMouseHandler ); + + // For now, if event capture is not supported, we rely on mouse handlers. + if ( eventCaptureSupported ) { + // If this is the first virtual mouse binding for the document, + // register our touchstart handler on the document. + + activeDocHandlers[ "touchstart" ] = ( activeDocHandlers[ "touchstart" ] || 0 ) + 1; + + if ( activeDocHandlers[ "touchstart" ] === 1 ) { + $document.bind( "touchstart", handleTouchStart ) + .bind( "touchend", handleTouchEnd ) + + // On touch platforms, touching the screen and then dragging your finger + // causes the window content to scroll after some distance threshold is + // exceeded. On these platforms, a scroll prevents a click event from being + // dispatched, and on some platforms, even the touchend is suppressed. To + // mimic the suppression of the click event, we need to watch for a scroll + // event. Unfortunately, some platforms like iOS don't dispatch scroll + // events until *AFTER* the user lifts their finger (touchend). This means + // we need to watch both scroll and touchmove events to figure out whether + // or not a scroll happenens before the touchend event is fired. + + .bind( "touchmove", handleTouchMove ) + .bind( "scroll", handleScroll ); + } + } + }, + + teardown: function( /* data, namespace */ ) { + // If this is the last virtual binding for this eventType, + // remove its global handler from the document. + + --activeDocHandlers[eventType]; + + if ( !activeDocHandlers[ eventType ] ) { + $document.unbind( realType, mouseEventCallback ); + } + + if ( eventCaptureSupported ) { + // If this is the last virtual mouse binding in existence, + // remove our document touchstart listener. + + --activeDocHandlers["touchstart"]; + + if ( !activeDocHandlers[ "touchstart" ] ) { + $document.unbind( "touchstart", handleTouchStart ) + .unbind( "touchmove", handleTouchMove ) + .unbind( "touchend", handleTouchEnd ) + .unbind( "scroll", handleScroll ); + } + } + + var $this = $( this ), + bindings = $.data( this, dataPropertyName ); + + // teardown may be called when an element was + // removed from the DOM. If this is the case, + // jQuery core may have already stripped the element + // of any data bindings so we need to check it before + // using it. + if ( bindings ) { + bindings[ eventType ] = false; + } - // Unregister the dummy event handler. + // Unregister the dummy event handler. - $this.unbind( realType, dummyMouseHandler ); + $this.unbind( realType, dummyMouseHandler ); - // If this is the last virtual mouse binding on the - // element, remove the binding data from the element. - - if ( !hasVirtualBindings( this ) ) { - $this.removeData( dataPropertyName ); - } - } - }; -} + // If this is the last virtual mouse binding on the + // element, remove the binding data from the element. + + if ( !hasVirtualBindings( this ) ) { + $this.removeData( dataPropertyName ); + } + } + }; + } // Expose our custom events to the jQuery bind/unbind mechanism. -for ( i = 0; i < virtualEventNames.length; i++ ) { - $.event.special[ virtualEventNames[ i ] ] = getSpecialEventObject( virtualEventNames[ i ] ); -} + for ( i = 0; i < virtualEventNames.length; i++ ) { + $.event.special[ virtualEventNames[ i ] ] = getSpecialEventObject( virtualEventNames[ i ] ); + } // Add a capture click handler to block clicks. // Note that we require event capture support for this so if the device // doesn't support it, we punt for now and rely solely on mouse events. -if ( eventCaptureSupported ) { - document.addEventListener( "click", function( e ) { - var cnt = clickBlockList.length, - target = e.target, - x, y, ele, i, o, touchID; - - if ( cnt ) { - x = e.clientX; - y = e.clientY; - threshold = $.vmouse.clickDistanceThreshold; - - // The idea here is to run through the clickBlockList to see if - // the current click event is in the proximity of one of our - // vclick events that had preventDefault() called on it. If we find - // one, then we block the click. - // - // Why do we have to rely on proximity? - // - // Because the target of the touch event that triggered the vclick - // can be different from the target of the click event synthesized - // by the browser. The target of a mouse/click event that is synthesized - // from a touch event seems to be implementation specific. For example, - // some browsers will fire mouse/click events for a link that is near - // a touch event, even though the target of the touchstart/touchend event - // says the user touched outside the link. Also, it seems that with most - // browsers, the target of the mouse/click event is not calculated until the - // time it is dispatched, so if you replace an element that you touched - // with another element, the target of the mouse/click will be the new - // element underneath that point. - // - // Aside from proximity, we also check to see if the target and any - // of its ancestors were the ones that blocked a click. This is necessary - // because of the strange mouse/click target calculation done in the - // Android 2.1 browser, where if you click on an element, and there is a - // mouse/click handler on one of its ancestors, the target will be the - // innermost child of the touched element, even if that child is no where - // near the point of touch. - - ele = target; - - while ( ele ) { - for ( i = 0; i < cnt; i++ ) { - o = clickBlockList[ i ]; - touchID = 0; - - if ( ( ele === target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) || - $.data( ele, touchTargetPropertyName ) === o.touchID ) { - // XXX: We may want to consider removing matches from the block list - // instead of waiting for the reset timer to fire. - e.preventDefault(); - e.stopPropagation(); - return; - } - } - ele = ele.parentNode; - } - } - }, true); -} -})( jQuery, window, document ); - -(function( $ ) { - $.mobile = {}; -}( jQuery )); - - (function( $, undefined ) { - var support = { - touch: "ontouchend" in document - }; - - $.mobile.support = $.mobile.support || {}; - $.extend( $.support, support ); - $.extend( $.mobile.support, support ); - }( jQuery )); - - -(function( $, window, undefined ) { - var $document = $( document ), - supportTouch = $.mobile.support.touch, - scrollEvent = "touchmove scroll", - touchStartEvent = supportTouch ? "touchstart" : "mousedown", - touchStopEvent = supportTouch ? "touchend" : "mouseup", - touchMoveEvent = supportTouch ? "touchmove" : "mousemove"; - - // setup new event shortcuts - $.each( ( "touchstart touchmove touchend " + - "tap taphold " + - "swipe swipeleft swiperight " + - "scrollstart scrollstop" ).split( " " ), function( i, name ) { - - $.fn[ name ] = function( fn ) { - return fn ? this.bind( name, fn ) : this.trigger( name ); - }; - - // jQuery < 1.8 - if ( $.attrFn ) { - $.attrFn[ name ] = true; - } - }); - - function triggerCustomEvent( obj, eventType, event, bubble ) { - var originalType = event.type; - event.type = eventType; - if ( bubble ) { - $.event.trigger( event, undefined, obj ); - } else { - $.event.dispatch.call( obj, event ); - } - event.type = originalType; - } - - // also handles scrollstop - $.event.special.scrollstart = { - - enabled: true, - setup: function() { - - var thisObject = this, - $this = $( thisObject ), - scrolling, - timer; - - function trigger( event, state ) { - scrolling = state; - triggerCustomEvent( thisObject, scrolling ? "scrollstart" : "scrollstop", event ); - } - - // iPhone triggers scroll after a small delay; use touchmove instead - $this.bind( scrollEvent, function( event ) { - - if ( !$.event.special.scrollstart.enabled ) { - return; - } - - if ( !scrolling ) { - trigger( event, true ); - } - - clearTimeout( timer ); - timer = setTimeout( function() { - trigger( event, false ); - }, 50 ); - }); - }, - teardown: function() { - $( this ).unbind( scrollEvent ); - } - }; - - // also handles taphold - $.event.special.tap = { - tapholdThreshold: 750, - emitTapOnTaphold: true, - setup: function() { - var thisObject = this, - $this = $( thisObject ), - isTaphold = false; - - $this.bind( "vmousedown", function( event ) { - isTaphold = false; - if ( event.which && event.which !== 1 ) { - return false; - } - - var origTarget = event.target, - timer; - - function clearTapTimer() { - clearTimeout( timer ); - } - - function clearTapHandlers() { - clearTapTimer(); - - $this.unbind( "vclick", clickHandler ) - .unbind( "vmouseup", clearTapTimer ); - $document.unbind( "vmousecancel", clearTapHandlers ); - } - - function clickHandler( event ) { - clearTapHandlers(); - - // ONLY trigger a 'tap' event if the start target is - // the same as the stop target. - if ( !isTaphold && origTarget === event.target ) { - triggerCustomEvent( thisObject, "tap", event ); - } else if ( isTaphold ) { - event.preventDefault(); - } - } - - $this.bind( "vmouseup", clearTapTimer ) - .bind( "vclick", clickHandler ); - $document.bind( "vmousecancel", clearTapHandlers ); - - timer = setTimeout( function() { - if ( !$.event.special.tap.emitTapOnTaphold ) { - isTaphold = true; - } - triggerCustomEvent( thisObject, "taphold", $.Event( "taphold", { target: origTarget } ) ); - }, $.event.special.tap.tapholdThreshold ); - }); - }, - teardown: function() { - $( this ).unbind( "vmousedown" ).unbind( "vclick" ).unbind( "vmouseup" ); - $document.unbind( "vmousecancel" ); - } - }; - - // Also handles swipeleft, swiperight - $.event.special.swipe = { - - // More than this horizontal displacement, and we will suppress scrolling. - scrollSupressionThreshold: 30, - - // More time than this, and it isn't a swipe. - durationThreshold: 1000, - - // Swipe horizontal displacement must be more than this. - horizontalDistanceThreshold: 30, - - // Swipe vertical displacement must be less than this. - verticalDistanceThreshold: 30, - - getLocation: function ( event ) { - var winPageX = window.pageXOffset, - winPageY = window.pageYOffset, - x = event.clientX, - y = event.clientY; - - if ( event.pageY === 0 && Math.floor( y ) > Math.floor( event.pageY ) || - event.pageX === 0 && Math.floor( x ) > Math.floor( event.pageX ) ) { - - // iOS4 clientX/clientY have the value that should have been - // in pageX/pageY. While pageX/page/ have the value 0 - x = x - winPageX; - y = y - winPageY; - } else if ( y < ( event.pageY - winPageY) || x < ( event.pageX - winPageX ) ) { - - // Some Android browsers have totally bogus values for clientX/Y - // when scrolling/zooming a page. Detectable since clientX/clientY - // should never be smaller than pageX/pageY minus page scroll - x = event.pageX - winPageX; - y = event.pageY - winPageY; - } - - return { - x: x, - y: y - }; - }, - - start: function( event ) { - var data = event.originalEvent.touches ? - event.originalEvent.touches[ 0 ] : event, - location = $.event.special.swipe.getLocation( data ); - return { - time: ( new Date() ).getTime(), - coords: [ location.x, location.y ], - origin: $( event.target ) - }; - }, - - stop: function( event ) { - var data = event.originalEvent.touches ? - event.originalEvent.touches[ 0 ] : event, - location = $.event.special.swipe.getLocation( data ); - return { - time: ( new Date() ).getTime(), - coords: [ location.x, location.y ] - }; - }, - - handleSwipe: function( start, stop, thisObject, origTarget ) { - if ( stop.time - start.time < $.event.special.swipe.durationThreshold && - Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.horizontalDistanceThreshold && - Math.abs( start.coords[ 1 ] - stop.coords[ 1 ] ) < $.event.special.swipe.verticalDistanceThreshold ) { - var direction = start.coords[0] > stop.coords[ 0 ] ? "swipeleft" : "swiperight"; - - triggerCustomEvent( thisObject, "swipe", $.Event( "swipe", { target: origTarget, swipestart: start, swipestop: stop }), true ); - triggerCustomEvent( thisObject, direction,$.Event( direction, { target: origTarget, swipestart: start, swipestop: stop } ), true ); - return true; - } - return false; - - }, - - // This serves as a flag to ensure that at most one swipe event event is - // in work at any given time - eventInProgress: false, - - setup: function() { - var events, - thisObject = this, - $this = $( thisObject ), - context = {}; - - // Retrieve the events data for this element and add the swipe context - events = $.data( this, "mobile-events" ); - if ( !events ) { - events = { length: 0 }; - $.data( this, "mobile-events", events ); - } - events.length++; - events.swipe = context; - - context.start = function( event ) { - - // Bail if we're already working on a swipe event - if ( $.event.special.swipe.eventInProgress ) { - return; - } - $.event.special.swipe.eventInProgress = true; - - var stop, - start = $.event.special.swipe.start( event ), - origTarget = event.target, - emitted = false; - - context.move = function( event ) { - if ( !start ) { - return; - } - - stop = $.event.special.swipe.stop( event ); - if ( !emitted ) { - emitted = $.event.special.swipe.handleSwipe( start, stop, thisObject, origTarget ); - if ( emitted ) { - - // Reset the context to make way for the next swipe event - $.event.special.swipe.eventInProgress = false; - } - } - // prevent scrolling - if ( Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.scrollSupressionThreshold ) { - event.preventDefault(); - } - }; - - context.stop = function() { - emitted = true; - - // Reset the context to make way for the next swipe event - $.event.special.swipe.eventInProgress = false; - $document.off( touchMoveEvent, context.move ); - context.move = null; - }; - - $document.on( touchMoveEvent, context.move ) - .one( touchStopEvent, context.stop ); - }; - $this.on( touchStartEvent, context.start ); - }, - - teardown: function() { - var events, context; - - events = $.data( this, "mobile-events" ); - if ( events ) { - context = events.swipe; - delete events.swipe; - events.length--; - if ( events.length === 0 ) { - $.removeData( this, "mobile-events" ); - } - } - - if ( context ) { - if ( context.start ) { - $( this ).off( touchStartEvent, context.start ); - } - if ( context.move ) { - $document.off( touchMoveEvent, context.move ); - } - if ( context.stop ) { - $document.off( touchStopEvent, context.stop ); - } - } - } - }; - $.each({ - scrollstop: "scrollstart", - taphold: "tap", - swipeleft: "swipe.left", - swiperight: "swipe.right" - }, function( event, sourceEvent ) { - - $.event.special[ event ] = { - setup: function() { - $( this ).bind( sourceEvent, $.noop ); - }, - teardown: function() { - $( this ).unbind( sourceEvent ); - } - }; - }); - -})( jQuery, this ); + if ( eventCaptureSupported ) { + document.addEventListener( "click", function( e ) { + var cnt = clickBlockList.length, + target = e.target, + x, y, ele, i, o, touchID; + + if ( cnt ) { + x = e.clientX; + y = e.clientY; + threshold = $.vmouse.clickDistanceThreshold; + + // The idea here is to run through the clickBlockList to see if + // the current click event is in the proximity of one of our + // vclick events that had preventDefault() called on it. If we find + // one, then we block the click. + // + // Why do we have to rely on proximity? + // + // Because the target of the touch event that triggered the vclick + // can be different from the target of the click event synthesized + // by the browser. The target of a mouse/click event that is synthesized + // from a touch event seems to be implementation specific. For example, + // some browsers will fire mouse/click events for a link that is near + // a touch event, even though the target of the touchstart/touchend event + // says the user touched outside the link. Also, it seems that with most + // browsers, the target of the mouse/click event is not calculated until the + // time it is dispatched, so if you replace an element that you touched + // with another element, the target of the mouse/click will be the new + // element underneath that point. + // + // Aside from proximity, we also check to see if the target and any + // of its ancestors were the ones that blocked a click. This is necessary + // because of the strange mouse/click target calculation done in the + // Android 2.1 browser, where if you click on an element, and there is a + // mouse/click handler on one of its ancestors, the target will be the + // innermost child of the touched element, even if that child is no where + // near the point of touch. + + ele = target; + + while ( ele ) { + for ( i = 0; i < cnt; i++ ) { + o = clickBlockList[ i ]; + touchID = 0; + + if ( ( ele === target && Math.abs( o.x - x ) < threshold && Math.abs( o.y - y ) < threshold ) || + $.data( ele, touchTargetPropertyName ) === o.touchID ) { + // XXX: We may want to consider removing matches from the block list + // instead of waiting for the reset timer to fire. + e.preventDefault(); + e.stopPropagation(); + return; + } + } + ele = ele.parentNode; + } + } + }, true ); + } + } ); + + /*! + * jQuery Mobile Namespace @VERSION + * http://jquerymobile.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ + +//>>label: Namespace +//>>group: Core +//>>description: The mobile namespace on the jQuery object + + ( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( 'ns',[ "jquery" ], factory ); + } else { + + // Browser globals + factory( jQuery ); + } + } )( function( $ ) { + + $.mobile = { version: "@VERSION" }; + + return $.mobile; + } ); + + /*! + * jQuery Mobile Touch Support Test @VERSION + * http://jquerymobile.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ + +//>>label: Touch support test +//>>group: Core +//>>description: Touch feature test + + ( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( 'support/touch',[ + "jquery", + "../ns" ], factory ); + } else { + + // Browser globals + factory( jQuery ); + } + } )( function( $ ) { + + var support = { + touch: "ontouchend" in document + }; + + $.mobile.support = $.mobile.support || {}; + $.extend( $.support, support ); + $.extend( $.mobile.support, support ); + + return $.support; + } ); + + /*! + * jQuery Mobile Touch Events @VERSION + * http://jquerymobile.com + * + * Copyright jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license + */ + +//>>label: Touch +//>>group: Events +//>>description: Touch events including: touchstart, touchmove, touchend, tap, taphold, swipe, swipeleft, swiperight + + ( function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( 'events/touch',[ + "jquery", + "../vmouse", + "../support/touch" ], factory ); + } else { + + // Browser globals + factory( jQuery ); + } + } )( function( $ ) { + var $document = $( document ), + supportTouch = $.mobile.support.touch, + touchStartEvent = supportTouch ? "touchstart" : "mousedown", + touchStopEvent = supportTouch ? "touchend" : "mouseup", + touchMoveEvent = supportTouch ? "touchmove" : "mousemove"; + +// setup new event shortcuts + $.each( ( "touchstart touchmove touchend " + + "tap taphold " + + "swipe swipeleft swiperight" ).split( " " ), function( i, name ) { + + $.fn[ name ] = function( fn ) { + return fn ? this.bind( name, fn ) : this.trigger( name ); + }; + + // jQuery < 1.8 + if ( $.attrFn ) { + $.attrFn[ name ] = true; + } + } ); + + function triggerCustomEvent( obj, eventType, event, bubble ) { + var originalType = event.type; + event.type = eventType; + if ( bubble ) { + $.event.trigger( event, undefined, obj ); + } else { + $.event.dispatch.call( obj, event ); + } + event.type = originalType; + } + +// also handles taphold + $.event.special.tap = { + tapholdThreshold: 750, + emitTapOnTaphold: true, + setup: function() { + var thisObject = this, + $this = $( thisObject ), + isTaphold = false; + + $this.bind( "vmousedown", function( event ) { + isTaphold = false; + if ( event.which && event.which !== 1 ) { + return true; + } + + var origTarget = event.target, + timer, clickHandler; + + function clearTapTimer() { + if ( timer ) { + $this.bind( "vclick", clickHandler ); + clearTimeout( timer ); + } + } + + function clearTapHandlers() { + clearTapTimer(); + + $this.unbind( "vclick", clickHandler ) + .unbind( "vmouseup", clearTapTimer ); + $document.unbind( "vmousecancel", clearTapHandlers ); + } + + clickHandler = function( event ) { + clearTapHandlers(); + + // ONLY trigger a 'tap' event if the start target is + // the same as the stop target. + if ( !isTaphold && origTarget === event.target ) { + triggerCustomEvent( thisObject, "tap", event ); + } else if ( isTaphold ) { + event.preventDefault(); + } + }; + + $this.bind( "vmouseup", clearTapTimer ); + + $document.bind( "vmousecancel", clearTapHandlers ); + + timer = setTimeout( function() { + if ( !$.event.special.tap.emitTapOnTaphold ) { + isTaphold = true; + } + timer = 0; + triggerCustomEvent( thisObject, "taphold", $.Event( "taphold", { target: origTarget } ) ); + }, $.event.special.tap.tapholdThreshold ); + } ); + }, + teardown: function() { + $( this ).unbind( "vmousedown" ).unbind( "vclick" ).unbind( "vmouseup" ); + $document.unbind( "vmousecancel" ); + } + }; + +// Also handles swipeleft, swiperight + $.event.special.swipe = { + + // More than this horizontal displacement, and we will suppress scrolling. + scrollSupressionThreshold: 30, + + // More time than this, and it isn't a swipe. + durationThreshold: 1000, + + // Swipe horizontal displacement must be more than this. + horizontalDistanceThreshold: window.devicePixelRatio >= 2 ? 15 : 30, + + // Swipe vertical displacement must be less than this. + verticalDistanceThreshold: window.devicePixelRatio >= 2 ? 15 : 30, + + getLocation: function( event ) { + var winPageX = window.pageXOffset, + winPageY = window.pageYOffset, + x = event.clientX, + y = event.clientY; + + if ( event.pageY === 0 && Math.floor( y ) > Math.floor( event.pageY ) || + event.pageX === 0 && Math.floor( x ) > Math.floor( event.pageX ) ) { + + // iOS4 clientX/clientY have the value that should have been + // in pageX/pageY. While pageX/page/ have the value 0 + x = x - winPageX; + y = y - winPageY; + } else if ( y < ( event.pageY - winPageY ) || x < ( event.pageX - winPageX ) ) { + + // Some Android browsers have totally bogus values for clientX/Y + // when scrolling/zooming a page. Detectable since clientX/clientY + // should never be smaller than pageX/pageY minus page scroll + x = event.pageX - winPageX; + y = event.pageY - winPageY; + } + + return { + x: x, + y: y + }; + }, + + start: function( event ) { + var data = event.originalEvent.touches ? + event.originalEvent.touches[ 0 ] : event, + location = $.event.special.swipe.getLocation( data ); + return { + time: ( new Date() ).getTime(), + coords: [ location.x, location.y ], + origin: $( event.target ) + }; + }, + + stop: function( event ) { + var data = event.originalEvent.touches ? + event.originalEvent.touches[ 0 ] : event, + location = $.event.special.swipe.getLocation( data ); + return { + time: ( new Date() ).getTime(), + coords: [ location.x, location.y ] + }; + }, + + handleSwipe: function( start, stop, thisObject, origTarget ) { + if ( stop.time - start.time < $.event.special.swipe.durationThreshold && + Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.horizontalDistanceThreshold && + Math.abs( start.coords[ 1 ] - stop.coords[ 1 ] ) < $.event.special.swipe.verticalDistanceThreshold ) { + var direction = start.coords[ 0 ] > stop.coords[ 0 ] ? "swipeleft" : "swiperight"; + + triggerCustomEvent( thisObject, "swipe", $.Event( "swipe", { target: origTarget, swipestart: start, swipestop: stop } ), true ); + triggerCustomEvent( thisObject, direction, $.Event( direction, { target: origTarget, swipestart: start, swipestop: stop } ), true ); + return true; + } + return false; + + }, + + // This serves as a flag to ensure that at most one swipe event event is + // in work at any given time + eventInProgress: false, + + setup: function() { + var events, + thisObject = this, + $this = $( thisObject ), + context = {}; + + // Retrieve the events data for this element and add the swipe context + events = $.data( this, "mobile-events" ); + if ( !events ) { + events = { length: 0 }; + $.data( this, "mobile-events", events ); + } + events.length++; + events.swipe = context; + + context.start = function( event ) { + + // Bail if we're already working on a swipe event + if ( $.event.special.swipe.eventInProgress ) { + return; + } + $.event.special.swipe.eventInProgress = true; + + var stop, + start = $.event.special.swipe.start( event ), + origTarget = event.target, + emitted = false; + + context.move = function( event ) { + if ( !start || event.isDefaultPrevented() ) { + return; + } + + stop = $.event.special.swipe.stop( event ); + if ( !emitted ) { + emitted = $.event.special.swipe.handleSwipe( start, stop, thisObject, origTarget ); + if ( emitted ) { + + // Reset the context to make way for the next swipe event + $.event.special.swipe.eventInProgress = false; + } + } + // prevent scrolling + if ( Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ) > $.event.special.swipe.scrollSupressionThreshold ) { + event.preventDefault(); + } + }; + + context.stop = function() { + emitted = true; + + // Reset the context to make way for the next swipe event + $.event.special.swipe.eventInProgress = false; + $document.off( touchMoveEvent, context.move ); + context.move = null; + }; + + $document.on( touchMoveEvent, context.move ) + .one( touchStopEvent, context.stop ); + }; + $this.on( touchStartEvent, context.start ); + }, + + teardown: function() { + var events, context; + + events = $.data( this, "mobile-events" ); + if ( events ) { + context = events.swipe; + delete events.swipe; + events.length--; + if ( events.length === 0 ) { + $.removeData( this, "mobile-events" ); + } + } + + if ( context ) { + if ( context.start ) { + $( this ).off( touchStartEvent, context.start ); + } + if ( context.move ) { + $document.off( touchMoveEvent, context.move ); + } + if ( context.stop ) { + $document.off( touchStopEvent, context.stop ); + } + } + } + }; + $.each( { + taphold: "tap", + swipeleft: "swipe.left", + swiperight: "swipe.right" + }, function( event, sourceEvent ) { + + $.event.special[ event ] = { + setup: function() { + $( this ).bind( sourceEvent, $.noop ); + }, + teardown: function() { + $( this ).unbind( sourceEvent ); + } + }; + } ); + + return $.event.special; + } ); + })); From b21f2a6dd30d79cb0bd0e782caab202834b57655 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Thu, 15 Feb 2018 23:55:53 -0500 Subject: [PATCH 574/616] #13685: Fixed compatibility with jQuery 3.x replaced load() call with on('load') as of https://jquery.com/upgrade-guide/3.0/#breaking-change-load-unload-and-error-removed --- .../view/adminhtml/templates/product/edit/bundle/option.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml index 62f61a725097e..783d71beb1646 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml @@ -299,7 +299,7 @@ function togglePriceType() { jQuery('#bundle_product_container').bundleProduct(); jQuery('#product_bundle_container .collapse').collapse('hide'); -jQuery(window).load(function() { +jQuery(window).on('load', function() { togglePriceType(); Event.observe('price_type', 'change', togglePriceType); }); From 0db31757f1fc67f9dda00b85edd9e1bda329c023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 11:18:45 +0100 Subject: [PATCH 575/616] MAGETWO-72142 : Update ElasticSearch PHP client. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7f6ddd509770c..db9cf2ebd7fb1 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "magento/module-search": "100.2.*", "magento/module-store": "100.2.*", "magento/framework": "101.0.*", - "elasticsearch/elasticsearch": "~2.0" + "elasticsearch/elasticsearch": "~5.1" }, "suggest": { "magento/module-config": "101.0.*" From 5741e83adbf0268951ccbcbf01da56ff3e1509d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 11:44:20 +0100 Subject: [PATCH 576/616] MAGETWO-72142 : Fix indexing to use new ES 5.x string mapping (text and keyword). --- .../FieldMapper/ProductFieldMapper.php | 19 +++++++++++-------- Model/Adapter/FieldType.php | 5 +++-- Model/Client/Elasticsearch.php | 15 +++++++-------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 70646a1ee401e..96fdbf0a21ce2 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -88,7 +88,7 @@ public function getFieldName($attributeCode, $context = []) if (empty($context['type'])) { $fieldName = $attributeCode; } elseif ($context['type'] === FieldMapperInterface::TYPE_FILTER) { - if ($fieldType === 'string') { + if ($fieldType === FieldType::ES_DATA_TYPE_TEXT) { return $this->getFieldName( $attributeCode, array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY]) @@ -121,21 +121,24 @@ public function getAllAttributesTypes($context = []) $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode); $allAttributes[$attributeCode] = [ - 'type' => $this->fieldType->getFieldType($attribute) + 'type' => $this->fieldType->getFieldType($attribute), ]; if (!$attribute->getIsSearchable() && !$this->isAttributeUsedInAdvancedSearch($attribute) && !in_array($attributeCode, $alwaysIndexableAttributes, true) ) { - $allAttributes[$attributeCode] = array_merge( - $allAttributes[$attributeCode], - ['index' => 'no'] - ); + $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD; + } else if ($attributeCode == "category_ids") { + $allAttributes[$attributeCode] = [ + 'type' => FieldType::ES_DATA_TYPE_INT, + ]; } - if ($attribute->getFrontendInput() === 'select' || $attribute->getFrontendInput() === 'multiselect') { + if ($attribute->usesSource() || $attribute->getFrontendInput() === 'select' || $attribute->getFrontendInput() === 'multiselect') { + $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD; + $allAttributes[$attributeCode . '_value'] = [ - 'type' => FieldType::ES_DATA_TYPE_STRING, + 'type' => FieldType::ES_DATA_TYPE_TEXT, ]; } } diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 4315597a3cf58..7847606d889d3 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -17,7 +17,8 @@ class FieldType /**#@+ * Text flags for Elasticsearch field types */ - const ES_DATA_TYPE_STRING = 'string'; + const ES_DATA_TYPE_TEXT = 'text'; + const ES_DATA_TYPE_KEYWORD = 'keyword'; const ES_DATA_TYPE_FLOAT = 'float'; const ES_DATA_TYPE_INT = 'integer'; const ES_DATA_TYPE_DATE = 'date'; @@ -46,7 +47,7 @@ public function getFieldType($attribute) } elseif ($backendType === 'decimal') { $fieldType = self::ES_DATA_TYPE_FLOAT; } else { - $fieldType = self::ES_DATA_TYPE_STRING; + $fieldType = self::ES_DATA_TYPE_TEXT; } return $fieldType; diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index eeb210d9edbd5..6578dd45d625f 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -227,35 +227,34 @@ public function addFieldsMapping(array $fields, $index, $entityType) $entityType => [ '_all' => [ 'enabled' => true, - 'type' => 'string' + 'type' => 'text', ], 'properties' => [], 'dynamic_templates' => [ [ 'price_mapping' => [ 'match' => 'price_*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'float' + 'type' => 'float', ], ], ], [ 'string_mapping' => [ 'match' => '*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'string', - 'index' => 'no' + 'type' => 'keyword', ], ], ], [ 'position_mapping' => [ 'match' => 'position_*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'int' + 'type' => 'int', ], ], ], From 314ade9be627bfd1cec1c70c43a1c17636174489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 11:45:55 +0100 Subject: [PATCH 577/616] MAGETWO-72142 : Fix category_ids indexing. Now indexed as multivalued array. --- Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php | 2 +- Model/Adapter/DataMapper/ProductDataMapper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php index e2de4aec717a4..24f208b2a3d35 100644 --- a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php +++ b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php @@ -57,7 +57,7 @@ private function getProductCategoryData($productId, array $categoryIndexData) $categoryIds = array_column($indexData, 'id'); if (count($categoryIds)) { - $result = ['category_ids' => implode(' ', $categoryIds)]; + $result = ['category_ids' => $categoryIds]; foreach ($indexData as $data) { $result['position_category_' . $data['id']] = $data['position']; $result['name_category_' . $data['id']] = $data['name']; diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php index b91885b465c85..658e006424bfc 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -393,7 +393,7 @@ protected function getProductCategoryData($productId, array $categoryIndexData) if (array_key_exists($productId, $categoryIndexData)) { $indexData = $categoryIndexData[$productId]; foreach ($indexData as $categoryData) { - $categoryIds[] = $categoryData['id']; + $categoryIds[] = (int) $categoryData['id']; } if (count($categoryIds)) { $result = ['category_ids' => implode(' ', $categoryIds)]; From 76386362e09e9f59abd47ada68898493e24fd976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 11:47:01 +0100 Subject: [PATCH 578/616] MAGETWO-72142 : Fix search query building. Use minimum should match in query bool only if a should clause is present. --- SearchAdapter/Mapper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 48992e3829ba9..82833f9e1a741 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -72,7 +72,11 @@ public function buildQuery(RequestInterface $request) BoolQuery::QUERY_CONDITION_MUST ) ); - $searchQuery['body']['query']['bool']['minimum_should_match'] = 1; + + if (isset($searchQuery['body']['query']['bool']['should'])) { + $searchQuery['body']['query']['bool']['minimum_should_match'] = 1; + } + $searchQuery = $this->queryBuilder->initAggregations($request, $searchQuery); return $searchQuery; } From b53216e8530ccd1ae4099a10216ebbf81be9f8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 11:48:37 +0100 Subject: [PATCH 579/616] MAGETWO-72142 : Fix the way field are selected (use stored_fields instead of fields). --- SearchAdapter/Query/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index d22129d2a9531..4ace078817351 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -76,7 +76,7 @@ public function initQuery(RequestInterface $request) 'body' => [ 'from' => $request->getFrom(), 'size' => $request->getSize(), - 'fields' => ['_id', '_score'], + 'stored_fields' => ['_id', '_score'], 'query' => [], ], ]; From 036153ba8c209103ab8e749f0ddca7b8c9a4ec86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 12:08:46 +0100 Subject: [PATCH 580/616] MAGETWO-72142 : Fix tests. --- .../FieldMapper/ProductFieldMapperTest.php | 6 +++--- Test/Unit/Model/Adapter/FieldTypeTest.php | 6 +++--- Test/Unit/Model/Client/ElasticsearchTest.php | 19 +++++++++---------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index 6b2e5b9cb6202..f4221dbce5cac 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -251,19 +251,19 @@ public function attributeProvider() 'category_ids', 'select', ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false], - ['category_ids' => ['type' => 'integer'], 'category_ids_value' => ['type' => 'string']] + ['category_ids' => ['type' => 'keyword'], 'category_ids_value' => ['type' => 'text']] ], [ 'attr_code', 'text', ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false], - ['attr_code' => ['type' => 'integer', 'index' => 'no']] + ['attr_code' => ['type' => 'keyword']] ], [ 'attr_code', 'text', ['searchable' => '0', 'filterable' => '0', 'filterableInSearch' => '0', 'advSearch' => '0'], - ['attr_code' => ['type' => 'integer', 'index' => 'no']] + ['attr_code' => ['type' => 'keyword']] ], [ 'attr_code', diff --git a/Test/Unit/Model/Adapter/FieldTypeTest.php b/Test/Unit/Model/Adapter/FieldTypeTest.php index bccd111858af9..80b49c35b7677 100644 --- a/Test/Unit/Model/Adapter/FieldTypeTest.php +++ b/Test/Unit/Model/Adapter/FieldTypeTest.php @@ -92,13 +92,13 @@ public static function attributeTypesProvider() { return [ ['attr1', 'static', 'select', 'integer'], - ['attr1', 'static', 'text', 'string'], + ['attr1', 'static', 'text', 'text'], ['attr1', 'timestamp', 'select', 'date'], ['attr1', 'datetime', 'text', 'date'], ['attr1', 'int', 'select', 'integer'], ['attr1', 'decimal', 'text', 'float'], - ['attr1', 'varchar', 'select', 'string'], - ['attr1', 'array', 'multiselect', 'string'], + ['attr1', 'varchar', 'select', 'text'], + ['attr1', 'array', 'multiselect', 'text'], ['price', 'int', 'text', 'integer'], ['tier_price', 'int', 'text', 'integer'], ['tier_price', 'smallint', 'text', 'integer'], diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 0bf7773699201..319cbdcb7c5ff 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -350,7 +350,7 @@ public function testAddFieldsMapping() [ 'price_mapping' => [ 'match' => 'price_*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ 'type' => 'float' ], @@ -359,7 +359,7 @@ public function testAddFieldsMapping() [ 'string_mapping' => [ 'match' => '*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ 'type' => 'string', 'index' => 'no' @@ -369,7 +369,7 @@ public function testAddFieldsMapping() [ 'position_mapping' => [ 'match' => 'position_*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ 'type' => 'int' ], @@ -405,18 +405,18 @@ public function testAddFieldsMappingFailure() 'product' => [ '_all' => [ 'enabled' => true, - 'type' => 'string' + 'type' => 'text' ], 'properties' => [ 'name' => [ - 'type' => 'string', + 'type' => 'text', ], ], 'dynamic_templates' => [ [ 'price_mapping' => [ 'match' => 'price_*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ 'type' => 'float' ], @@ -425,17 +425,16 @@ public function testAddFieldsMappingFailure() [ 'string_mapping' => [ 'match' => '*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'string', - 'index' => 'no' + 'type' => 'keyword', ], ], ], [ 'position_mapping' => [ 'match' => 'position_*', - 'match_mapping' => 'string', + 'match_mapping_type' => 'string', 'mapping' => [ 'type' => 'int' ], From ec2d26ab12f7c17fa61e7d70172cdfe7d3e180f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Fri, 10 Nov 2017 15:34:12 +0100 Subject: [PATCH 581/616] MAGETWO-72142 : Avoid indexing of useless attributes. --- Model/Adapter/FieldMapper/ProductFieldMapper.php | 6 +++++- Model/Client/Elasticsearch.php | 3 ++- .../Adapter/FieldMapper/ProductFieldMapperTest.php | 4 ++-- Test/Unit/Model/Client/ElasticsearchTest.php | 13 +++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 96fdbf0a21ce2..c44b3d5842cc3 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -127,7 +127,11 @@ public function getAllAttributesTypes($context = []) if (!$attribute->getIsSearchable() && !$this->isAttributeUsedInAdvancedSearch($attribute) && !in_array($attributeCode, $alwaysIndexableAttributes, true) ) { - $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD; + if ($attribute->getIsFilterable() || $attribute->getIsFilterableInSearch()) { + $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD; + } else if ($allAttributes[$attributeCode]['type'] === FieldType::ES_DATA_TYPE_TEXT) { + $allAttributes[$attributeCode]['index'] = false; + } } else if ($attributeCode == "category_ids") { $allAttributes[$attributeCode] = [ 'type' => FieldType::ES_DATA_TYPE_INT, diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 6578dd45d625f..01d339333a60a 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -245,7 +245,8 @@ public function addFieldsMapping(array $fields, $index, $entityType) 'match' => '*', 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'keyword', + 'type' => 'text', + 'index' => 'no', ], ], ], diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index f4221dbce5cac..66ae7a0192ed8 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -257,13 +257,13 @@ public function attributeProvider() 'attr_code', 'text', ['searchable' => false, 'filterable' => false, 'filterableInSearch' => false, 'advSearch' => false], - ['attr_code' => ['type' => 'keyword']] + ['attr_code' => ['type' => 'integer']] ], [ 'attr_code', 'text', ['searchable' => '0', 'filterable' => '0', 'filterableInSearch' => '0', 'advSearch' => '0'], - ['attr_code' => ['type' => 'keyword']] + ['attr_code' => ['type' => 'integer']] ], [ 'attr_code', diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 319cbdcb7c5ff..81a73e7aca3e2 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -339,11 +339,11 @@ public function testAddFieldsMapping() 'product' => [ '_all' => [ 'enabled' => true, - 'type' => 'string' + 'type' => 'text' ], 'properties' => [ 'name' => [ - 'type' => 'string', + 'type' => 'text', ], ], 'dynamic_templates' => [ @@ -361,7 +361,7 @@ public function testAddFieldsMapping() 'match' => '*', 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'string', + 'type' => 'text', 'index' => 'no' ], ], @@ -382,7 +382,7 @@ public function testAddFieldsMapping() $this->model->addFieldsMapping( [ 'name' => [ - 'type' => 'string', + 'type' => 'text', ], ], 'indexName', @@ -427,7 +427,8 @@ public function testAddFieldsMappingFailure() 'match' => '*', 'match_mapping_type' => 'string', 'mapping' => [ - 'type' => 'keyword', + 'type' => 'text', + 'index' => 'no', ], ], ], @@ -448,7 +449,7 @@ public function testAddFieldsMappingFailure() $this->model->addFieldsMapping( [ 'name' => [ - 'type' => 'string', + 'type' => 'text', ], ], 'indexName', From 60da48109c77526731500ffad288fbfff15be048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Mon, 13 Nov 2017 09:37:14 +0100 Subject: [PATCH 582/616] MAGETWO-72142 : Ensure ES 2.x backward compatibility. --- .../FieldMapper/ProductFieldMapper.php | 2 +- Model/Client/Elasticsearch.php | 78 +++++++++++++++++-- Test/Unit/Model/Client/ElasticsearchTest.php | 6 +- 3 files changed, 79 insertions(+), 7 deletions(-) diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index c44b3d5842cc3..d847e04382484 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -130,7 +130,7 @@ public function getAllAttributesTypes($context = []) if ($attribute->getIsFilterable() || $attribute->getIsFilterableInSearch()) { $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD; } else if ($allAttributes[$attributeCode]['type'] === FieldType::ES_DATA_TYPE_TEXT) { - $allAttributes[$attributeCode]['index'] = false; + $allAttributes[$attributeCode]['index'] = 'no'; } } else if ($attributeCode == "category_ids") { $allAttributes[$attributeCode] = [ diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index 01d339333a60a..ab86f8886f5cf 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -30,6 +30,11 @@ class Elasticsearch implements ClientInterface */ protected $pingResult; + /** + * @var string + */ + protected $version; + /** * Initialize Elasticsearch Client * @@ -66,6 +71,7 @@ public function ping() if ($this->pingResult === null) { $this->pingResult = $this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]); } + return $this->pingResult; } @@ -225,10 +231,10 @@ public function addFieldsMapping(array $fields, $index, $entityType) 'type' => $entityType, 'body' => [ $entityType => [ - '_all' => [ + '_all' => $this->prepareFieldInfo([ 'enabled' => true, 'type' => 'text', - ], + ]), 'properties' => [], 'dynamic_templates' => [ [ @@ -244,10 +250,10 @@ public function addFieldsMapping(array $fields, $index, $entityType) 'string_mapping' => [ 'match' => '*', 'match_mapping_type' => 'string', - 'mapping' => [ + 'mapping' => $this->prepareFieldInfo([ 'type' => 'text', 'index' => 'no', - ], + ]), ], ], [ @@ -264,11 +270,36 @@ public function addFieldsMapping(array $fields, $index, $entityType) ], ]; foreach ($fields as $field => $fieldInfo) { - $params['body'][$entityType]['properties'][$field] = $fieldInfo; + $params['body'][$entityType]['properties'][$field] = $this->prepareFieldInfo($fieldInfo); } + $this->client->indices()->putMapping($params); } + /** + * Fix backward compatibility of field definition. + * Allow to run both 2.x and 5.x servers. + * + * @param array $query + * + * @return array + */ + private function prepareFieldInfo($fieldInfo) { + + if (strcmp($this->getVersion(), '5') < 0) { + if ($fieldInfo['type'] == 'keyword') { + $fieldInfo['type'] = 'string'; + $fieldInfo['index'] = isset($fieldInfo['index']) ? $fieldInfo['index'] : 'not_analyzed'; + } + + if ($fieldInfo['type'] == 'text') { + $fieldInfo['type'] = 'string'; + } + } + + return $fieldInfo; + } + /** * Delete mapping in Elasticsearch index * @@ -292,9 +323,31 @@ public function deleteMapping($index, $entityType) */ public function query($query) { + $query = $this->prepareSearchQuery($query); + return $this->client->search($query); } + /** + * Fix backward compatibility of the search queries. + * Allow to run both 2.x and 5.x servers. + * + * @param array $query + * + * @return array + */ + private function prepareSearchQuery($query) + { + if (strcmp($this->getVersion(), '5') < 0) { + if( isset($query['body']) && isset($query['body']['stored_fields'])) { + $query['body']['fields'] = $query['body']['stored_fields']; + unset($query['body']['stored_fields']); + } + } + + return $query; + } + /** * Execute suggest query * @@ -305,4 +358,19 @@ public function suggest($query) { return $this->client->suggest($query); } + + /** + * Retrieve ElasticSearch server current version. + * + * @return string + */ + private function getVersion() + { + if ($this->version === null) { + $info = $this->client->info(); + $this->version = $info['version']['number']; + } + + return $this->version; + } } diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Model/Client/ElasticsearchTest.php index 81a73e7aca3e2..a32b3513776eb 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Model/Client/ElasticsearchTest.php @@ -45,6 +45,7 @@ protected function setUp() 'search', 'scroll', 'suggest', + 'info', ]) ->disableOriginalConstructor() ->getMock(); @@ -59,7 +60,7 @@ protected function setUp() 'stats', 'updateAliases', 'existsAlias', - 'getAlias' + 'getAlias', ]) ->disableOriginalConstructor() ->getMock(); @@ -69,6 +70,9 @@ protected function setUp() $this->elasticsearchClientMock->expects($this->any()) ->method('ping') ->willReturn(true); + $this->elasticsearchClientMock->expects($this->any()) + ->method('info') + ->willReturn(['version' => ['number' => '5.0.0']]); $this->objectManager = new ObjectManagerHelper($this); $this->model = $this->objectManager->getObject( From 56dcce437137f8bd4f4b7f80af2027664e9af658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Mon, 13 Nov 2017 14:35:14 +0100 Subject: [PATCH 583/616] MAGETWO-72142 : Code cleaning. --- Model/Client/Elasticsearch.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php index ab86f8886f5cf..4fe54eeeb07d7 100644 --- a/Model/Client/Elasticsearch.php +++ b/Model/Client/Elasticsearch.php @@ -33,7 +33,7 @@ class Elasticsearch implements ClientInterface /** * @var string */ - protected $version; + private $serverVersion; /** * Initialize Elasticsearch Client @@ -286,7 +286,7 @@ public function addFieldsMapping(array $fields, $index, $entityType) */ private function prepareFieldInfo($fieldInfo) { - if (strcmp($this->getVersion(), '5') < 0) { + if (strcmp($this->getServerVersion(), '5') < 0) { if ($fieldInfo['type'] == 'keyword') { $fieldInfo['type'] = 'string'; $fieldInfo['index'] = isset($fieldInfo['index']) ? $fieldInfo['index'] : 'not_analyzed'; @@ -338,7 +338,7 @@ public function query($query) */ private function prepareSearchQuery($query) { - if (strcmp($this->getVersion(), '5') < 0) { + if (strcmp($this->getServerVersion(), '5') < 0) { if( isset($query['body']) && isset($query['body']['stored_fields'])) { $query['body']['fields'] = $query['body']['stored_fields']; unset($query['body']['stored_fields']); @@ -364,13 +364,13 @@ public function suggest($query) * * @return string */ - private function getVersion() + private function getServerVersion() { - if ($this->version === null) { + if ($this->serverVersion === null) { $info = $this->client->info(); - $this->version = $info['version']['number']; + $this->serverVersion = $info['version']['number']; } - return $this->version; + return $this->serverVersion; } } From dd6b94ed5e3b3bb8354305d2600e71d78d0aab6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20FOUCRET?= Date: Thu, 16 Nov 2017 11:07:23 +0100 Subject: [PATCH 584/616] MAGETWO-72142 : Update ES client requirement to allow 2.x client. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index db9cf2ebd7fb1..507d45d7a92e0 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "magento/module-search": "100.2.*", "magento/module-store": "100.2.*", "magento/framework": "101.0.*", - "elasticsearch/elasticsearch": "~5.1" + "elasticsearch/elasticsearch": "~2.0|~5.1" }, "suggest": { "magento/module-config": "101.0.*" From 7f3e33e5236655483da6a8a44c44675fc0572677 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 14 Dec 2017 11:16:44 -0600 Subject: [PATCH 585/616] PR-46: ES 5.x support. - Move ES5 specific classes to separate namespace --- .../Model}/Adapter/BatchDataMapper/CategoryFieldsProvider.php | 2 +- .../Model}/Adapter/DataMapper/ProductDataMapper.php | 2 +- .../Model}/Adapter/FieldMapper/ProductFieldMapper.php | 2 +- {Model => Elasticsearch5/Model}/Adapter/FieldType.php | 2 +- {Model => Elasticsearch5/Model}/Client/Elasticsearch.php | 2 +- {SearchAdapter => Elasticsearch5/SearchAdapter}/Mapper.php | 2 +- .../SearchAdapter}/Query/Builder.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename {Model => Elasticsearch5/Model}/Adapter/BatchDataMapper/CategoryFieldsProvider.php (95%) rename {Model => Elasticsearch5/Model}/Adapter/DataMapper/ProductDataMapper.php (99%) rename {Model => Elasticsearch5/Model}/Adapter/FieldMapper/ProductFieldMapper.php (98%) rename {Model => Elasticsearch5/Model}/Adapter/FieldType.php (95%) rename {Model => Elasticsearch5/Model}/Client/Elasticsearch.php (99%) rename {SearchAdapter => Elasticsearch5/SearchAdapter}/Mapper.php (99%) rename {SearchAdapter => Elasticsearch5/SearchAdapter}/Query/Builder.php (97%) diff --git a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php similarity index 95% rename from Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php rename to Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php index 24f208b2a3d35..009c07602fc2a 100644 --- a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php +++ b/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper; +namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper; use Magento\Elasticsearch\Model\ResourceModel\Index; use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface; diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php similarity index 99% rename from Model/Adapter/DataMapper/ProductDataMapper.php rename to Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php index 658e006424bfc..659df0f8447f9 100644 --- a/Model/Adapter/DataMapper/ProductDataMapper.php +++ b/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Adapter\DataMapper; +namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper; use Magento\Catalog\Model\ResourceModel\Eav\Attribute; use Magento\Elasticsearch\Model\Adapter\Container\Attribute as AttributeContainer; diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php similarity index 98% rename from Model/Adapter/FieldMapper/ProductFieldMapper.php rename to Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php index d847e04382484..20642d36436fc 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Adapter\FieldMapper; +namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper; use Magento\Catalog\Api\Data\ProductAttributeInterface; use Magento\Eav\Model\Config; diff --git a/Model/Adapter/FieldType.php b/Elasticsearch5/Model/Adapter/FieldType.php similarity index 95% rename from Model/Adapter/FieldType.php rename to Elasticsearch5/Model/Adapter/FieldType.php index 7847606d889d3..d11603295453d 100644 --- a/Model/Adapter/FieldType.php +++ b/Elasticsearch5/Model/Adapter/FieldType.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Adapter; +namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter; use Magento\Eav\Model\Entity\Attribute\AbstractAttribute; diff --git a/Model/Client/Elasticsearch.php b/Elasticsearch5/Model/Client/Elasticsearch.php similarity index 99% rename from Model/Client/Elasticsearch.php rename to Elasticsearch5/Model/Client/Elasticsearch.php index 4fe54eeeb07d7..5d25437f89f1c 100644 --- a/Model/Client/Elasticsearch.php +++ b/Elasticsearch5/Model/Client/Elasticsearch.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Model\Client; +namespace Magento\Elasticsearch\Elasticsearch5\Model\Client; use Magento\Framework\Exception\LocalizedException; use Magento\AdvancedSearch\Model\Client\ClientInterface; diff --git a/SearchAdapter/Mapper.php b/Elasticsearch5/SearchAdapter/Mapper.php similarity index 99% rename from SearchAdapter/Mapper.php rename to Elasticsearch5/SearchAdapter/Mapper.php index 82833f9e1a741..e14cb27d51fe5 100644 --- a/SearchAdapter/Mapper.php +++ b/Elasticsearch5/SearchAdapter/Mapper.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\SearchAdapter; +namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter; use Magento\Framework\Search\RequestInterface; use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface; diff --git a/SearchAdapter/Query/Builder.php b/Elasticsearch5/SearchAdapter/Query/Builder.php similarity index 97% rename from SearchAdapter/Query/Builder.php rename to Elasticsearch5/SearchAdapter/Query/Builder.php index 4ace078817351..db961d86962e9 100644 --- a/SearchAdapter/Query/Builder.php +++ b/Elasticsearch5/SearchAdapter/Query/Builder.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\SearchAdapter\Query; +namespace Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query; use Magento\Framework\Search\RequestInterface; use Magento\Elasticsearch\Model\Config; From edb3b8cb591853be074cf6d69195ced510a1a3ce Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 14 Dec 2017 11:59:50 -0600 Subject: [PATCH 586/616] PR-46: ES 5.x support. - Add ES2 classes --- .../CategoryFieldsProvider.php | 70 ++++ .../Adapter/DataMapper/ProductDataMapper.php | 52 +++ .../FieldMapper/ProductFieldMapper.php | 97 ++++++ Model/Adapter/FieldType.php | 54 +++ Model/Client/Elasticsearch.php | 308 ++++++++++++++++++ SearchAdapter/Mapper.php | 50 +++ SearchAdapter/Query/Builder.php | 42 +++ 7 files changed, 673 insertions(+) create mode 100644 Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php create mode 100644 Model/Adapter/DataMapper/ProductDataMapper.php create mode 100644 Model/Adapter/FieldMapper/ProductFieldMapper.php create mode 100644 Model/Adapter/FieldType.php create mode 100644 Model/Client/Elasticsearch.php create mode 100644 SearchAdapter/Mapper.php create mode 100644 SearchAdapter/Query/Builder.php diff --git a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php new file mode 100644 index 0000000000000..e2de4aec717a4 --- /dev/null +++ b/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php @@ -0,0 +1,70 @@ +resourceIndex = $resourceIndex; + } + + /** + * {@inheritdoc} + */ + public function getFields(array $productIds, $storeId) + { + $categoryData = $this->resourceIndex->getFullCategoryProductIndexData($storeId, $productIds); + + $fields = []; + foreach ($productIds as $productId) { + $fields[$productId] = $this->getProductCategoryData($productId, $categoryData); + } + + return $fields; + } + + /** + * Prepare category index data for product + * + * @param int $productId + * @param array $categoryIndexData + * @return array + */ + private function getProductCategoryData($productId, array $categoryIndexData) + { + $result = []; + + if (array_key_exists($productId, $categoryIndexData)) { + $indexData = $categoryIndexData[$productId]; + $categoryIds = array_column($indexData, 'id'); + + if (count($categoryIds)) { + $result = ['category_ids' => implode(' ', $categoryIds)]; + foreach ($indexData as $data) { + $result['position_category_' . $data['id']] = $data['position']; + $result['name_category_' . $data['id']] = $data['name']; + } + } + } + + return $result; + } +} diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/Model/Adapter/DataMapper/ProductDataMapper.php new file mode 100644 index 0000000000000..da37c8d7647d8 --- /dev/null +++ b/Model/Adapter/DataMapper/ProductDataMapper.php @@ -0,0 +1,52 @@ + implode(' ', $categoryIds)]; + foreach ($indexData as $data) { + $result['position_category_' . $data['id']] = $data['position']; + $result['name_category_' . $data['id']] = $data['name']; + } + } + } + return $result; + } +} diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php new file mode 100644 index 0000000000000..9487bcb56b863 --- /dev/null +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -0,0 +1,97 @@ +eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode); + if (!$attribute || in_array($attributeCode, ['id', 'sku', 'store_id', 'visibility'], true)) { + return $attributeCode; + } + if ($attributeCode === 'price') { + return $this->getPriceFieldName($context); + } + if ($attributeCode === 'position') { + return $this->getPositionFiledName($context); + } + $fieldType = $this->fieldType->getFieldType($attribute); + $frontendInput = $attribute->getFrontendInput(); + if (empty($context['type'])) { + $fieldName = $attributeCode; + } elseif ($context['type'] === FieldMapperInterface::TYPE_FILTER) { + if ($fieldType === 'string') { + return $this->getFieldName( + $attributeCode, + array_merge($context, ['type' => FieldMapperInterface::TYPE_QUERY]) + ); + } + $fieldName = $attributeCode; + } elseif ($context['type'] === FieldMapperInterface::TYPE_QUERY) { + $fieldName = $this->getQueryTypeFieldName($frontendInput, $fieldType, $attributeCode); + } else { + $fieldName = 'sort_' . $attributeCode; + } + + return $fieldName; + } + + /** + * {@inheritdoc} + */ + public function getAllAttributesTypes($context = []) + { + $attributeCodes = $this->eavConfig->getEntityAttributeCodes(ProductAttributeInterface::ENTITY_TYPE_CODE); + $allAttributes = []; + // List of attributes which are required to be indexable + $alwaysIndexableAttributes = [ + 'category_ids', + 'visibility', + ]; + + foreach ($attributeCodes as $attributeCode) { + $attribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode); + + $allAttributes[$attributeCode] = [ + 'type' => $this->fieldType->getFieldType($attribute) + ]; + + if (!$attribute->getIsSearchable() && !$this->isAttributeUsedInAdvancedSearch($attribute) + && !in_array($attributeCode, $alwaysIndexableAttributes, true) + ) { + $allAttributes[$attributeCode] = array_merge( + $allAttributes[$attributeCode], + ['index' => 'no'] + ); + } + + if ($attribute->getFrontendInput() === 'select' || $attribute->getFrontendInput() === 'multiselect') { + $allAttributes[$attributeCode . '_value'] = [ + 'type' => FieldType::ES_DATA_TYPE_STRING, + ]; + } + } + + return $allAttributes; + } +} diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php new file mode 100644 index 0000000000000..569f0e4a1595b --- /dev/null +++ b/Model/Adapter/FieldType.php @@ -0,0 +1,54 @@ +getBackendType(); + $frontendInput = $attribute->getFrontendInput(); + + if (in_array($backendType, ['timestamp', 'datetime'], true)) { + $fieldType = self::ES_DATA_TYPE_DATE; + } elseif ((in_array($backendType, ['int', 'smallint'], true) + || (in_array($frontendInput, ['select', 'boolean'], true) && $backendType !== 'varchar')) + && !$attribute->getIsUserDefined() + ) { + $fieldType = self::ES_DATA_TYPE_INT; + } elseif ($backendType === 'decimal') { + $fieldType = self::ES_DATA_TYPE_FLOAT; + } else { + $fieldType = self::ES_DATA_TYPE_STRING; + } + + return $fieldType; + } +} diff --git a/Model/Client/Elasticsearch.php b/Model/Client/Elasticsearch.php new file mode 100644 index 0000000000000..eeb210d9edbd5 --- /dev/null +++ b/Model/Client/Elasticsearch.php @@ -0,0 +1,308 @@ +buildConfig($options); + $elasticsearchClient = \Elasticsearch\ClientBuilder::fromConfig($config, true); + } + $this->client = $elasticsearchClient; + $this->clientOptions = $options; + } + + /** + * Ping the Elasticsearch client + * + * @return bool + */ + public function ping() + { + if ($this->pingResult === null) { + $this->pingResult = $this->client->ping(['client' => ['timeout' => $this->clientOptions['timeout']]]); + } + return $this->pingResult; + } + + /** + * Validate connection params + * + * @return bool + */ + public function testConnection() + { + return $this->ping(); + } + + /** + * @param array $options + * @return array + */ + private function buildConfig($options = []) + { + $host = preg_replace('/http[s]?:\/\//i', '', $options['hostname']); + $protocol = parse_url($options['hostname'], PHP_URL_SCHEME); + if (!$protocol) { + $protocol = 'http'; + } + if (!empty($options['port'])) { + $host .= ':' . $options['port']; + } + if (!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) { + $host = sprintf('%s://%s:%s@%s', $protocol, $options['username'], $options['password'], $host); + } + + $options['hosts'] = [$host]; + return $options; + } + + /** + * Performs bulk query over Elasticsearch index + * + * @param array $query + * @return void + */ + public function bulkQuery($query) + { + $this->client->bulk($query); + } + + /** + * Creates an Elasticsearch index. + * + * @param string $index + * @param array $settings + * @return void + */ + public function createIndex($index, $settings) + { + $this->client->indices()->create([ + 'index' => $index, + 'body' => $settings, + ]); + } + + /** + * Delete an Elasticsearch index. + * + * @param string $index + * @return void + */ + public function deleteIndex($index) + { + $this->client->indices()->delete(['index' => $index]); + } + + /** + * Check if index is empty. + * + * @param string $index + * @return bool + */ + public function isEmptyIndex($index) + { + $stats = $this->client->indices()->stats(['index' => $index, 'metric' => 'docs']); + if ($stats['indices'][$index]['primaries']['docs']['count'] == 0) { + return true; + } + return false; + } + + /** + * Updates alias. + * + * @param string $alias + * @param string $newIndex + * @param string $oldIndex + * @return void + */ + public function updateAlias($alias, $newIndex, $oldIndex = '') + { + $params['body'] = ['actions' => []]; + if ($oldIndex) { + $params['body']['actions'][] = ['remove' => ['alias' => $alias, 'index' => $oldIndex]]; + } + if ($newIndex) { + $params['body']['actions'][] = ['add' => ['alias' => $alias, 'index' => $newIndex]]; + } + + $this->client->indices()->updateAliases($params); + } + + /** + * Checks whether Elasticsearch index exists + * + * @param string $index + * @return bool + */ + public function indexExists($index) + { + return $this->client->indices()->exists(['index' => $index]); + } + + /** + * @param string $alias + * @param string $index + * + * @return bool + */ + public function existsAlias($alias, $index = '') + { + $params = ['name' => $alias]; + if ($index) { + $params['index'] = $index; + } + return $this->client->indices()->existsAlias($params); + } + + /** + * @param string $alias + * + * @return array + */ + public function getAlias($alias) + { + return $this->client->indices()->getAlias(['name' => $alias]); + } + + /** + * Add mapping to Elasticsearch index + * + * @param array $fields + * @param string $index + * @param string $entityType + * @return void + */ + public function addFieldsMapping(array $fields, $index, $entityType) + { + $params = [ + 'index' => $index, + 'type' => $entityType, + 'body' => [ + $entityType => [ + '_all' => [ + 'enabled' => true, + 'type' => 'string' + ], + 'properties' => [], + 'dynamic_templates' => [ + [ + 'price_mapping' => [ + 'match' => 'price_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'float' + ], + ], + ], + [ + 'string_mapping' => [ + 'match' => '*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'string', + 'index' => 'no' + ], + ], + ], + [ + 'position_mapping' => [ + 'match' => 'position_*', + 'match_mapping' => 'string', + 'mapping' => [ + 'type' => 'int' + ], + ], + ], + ], + ], + ], + ]; + foreach ($fields as $field => $fieldInfo) { + $params['body'][$entityType]['properties'][$field] = $fieldInfo; + } + $this->client->indices()->putMapping($params); + } + + /** + * Delete mapping in Elasticsearch index + * + * @param string $index + * @param string $entityType + * @return void + */ + public function deleteMapping($index, $entityType) + { + $this->client->indices()->deleteMapping([ + 'index' => $index, + 'type' => $entityType, + ]); + } + + /** + * Execute search by $query + * + * @param array $query + * @return array + */ + public function query($query) + { + return $this->client->search($query); + } + + /** + * Execute suggest query + * + * @param array $query + * @return array + */ + public function suggest($query) + { + return $this->client->suggest($query); + } +} diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php new file mode 100644 index 0000000000000..77b532b5bd101 --- /dev/null +++ b/SearchAdapter/Mapper.php @@ -0,0 +1,50 @@ +queryBuilder->initQuery($request); + $searchQuery['body']['query'] = array_merge( + $searchQuery['body']['query'], + $this->processQuery( + $request->getQuery(), + [], + BoolQuery::QUERY_CONDITION_MUST + ) + ); + + $searchQuery['body']['query']['bool']['minimum_should_match'] = 1; + + $searchQuery = $this->queryBuilder->initAggregations($request, $searchQuery); + return $searchQuery; + } +} diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php new file mode 100644 index 0000000000000..ed35abf4a97f7 --- /dev/null +++ b/SearchAdapter/Query/Builder.php @@ -0,0 +1,42 @@ +getDimensions()); + $storeId = $this->scopeResolver->getScope($dimension->getValue())->getId(); + $searchQuery = [ + 'index' => $this->searchIndexNameResolver->getIndexName($storeId, $request->getIndex()), + 'type' => $this->clientConfig->getEntityType(), + 'body' => [ + 'from' => $request->getFrom(), + 'size' => $request->getSize(), + 'fields' => ['_id', '_score'], + 'query' => [], + ], + ]; + return $searchQuery; + } +} From 5fe7b8d580d47d8de13df3dd0124ceac0a1d3598 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 15 Dec 2017 12:45:55 -0600 Subject: [PATCH 587/616] PR-46: ES 5.x support. - Add Proxies to make selection between ES2 and ES5 classes --- .../CategoryFieldsProviderProxy.php | 54 +++++++++++ .../DataMapper/ProductDataMapperProxy.php | 54 +++++++++++ .../FieldMapper/ProductFieldMapper.php | 2 +- .../FieldMapper/ProductFieldMapperProxy.php | 71 ++++++++++++++ Elasticsearch5/Model/Client/Elasticsearch.php | 2 +- Elasticsearch5/SearchAdapter/Adapter.php | 95 +++++++++++++++++++ Elasticsearch5/SearchAdapter/Mapper.php | 2 +- .../FieldMapper/ProductFieldMapper.php | 24 ++++- Model/Adapter/FieldType.php | 2 +- SearchAdapter/Mapper.php | 14 +++ etc/adminhtml/system.xml | 8 ++ etc/di.xml | 64 ++++++++++++- 12 files changed, 383 insertions(+), 9 deletions(-) create mode 100644 Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php create mode 100644 Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php create mode 100644 Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php create mode 100644 Elasticsearch5/SearchAdapter/Adapter.php diff --git a/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php b/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php new file mode 100644 index 0000000000000..58f7029cd16e1 --- /dev/null +++ b/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php @@ -0,0 +1,54 @@ +clientResolver = $clientResolver; + $this->categoryFieldsProviders = $categoryFieldsProviders; + } + + /** + * @return AdditionalFieldsProviderInterface + */ + private function getCategoryFieldsProvider() + { + return $this->categoryFieldsProviders[$this->clientResolver->getCurrentEngine()]; + } + + /** + * @inheritdoc + */ + public function getFields(array $productIds, $storeId) + { + return $this->getCategoryFieldsProvider()->getFields($productIds, $storeId); + } +} diff --git a/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php b/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php new file mode 100644 index 0000000000000..81c5b500d7b70 --- /dev/null +++ b/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php @@ -0,0 +1,54 @@ +clientResolver = $clientResolver; + $this->dataMappers = $dataMappers; + } + + /** + * @return DataMapperInterface + */ + private function getDataMapper() + { + return $this->dataMappers[$this->clientResolver->getCurrentEngine()]; + } + + /** + * @inheritdoc + */ + public function map($entityId, array $entityIndexData, $storeId, $context = []) + { + return $this->getDataMapper()->map($entityId, $entityIndexData, $storeId, $context); + } +} diff --git a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php index 20642d36436fc..db5a08529b227 100644 --- a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -8,7 +8,7 @@ use Magento\Catalog\Api\Data\ProductAttributeInterface; use Magento\Eav\Model\Config; use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; -use Magento\Elasticsearch\Model\Adapter\FieldType; +use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType; use Magento\Framework\Registry; use Magento\Store\Model\StoreManagerInterface as StoreManager; use \Magento\Customer\Model\Session as CustomerSession; diff --git a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php new file mode 100644 index 0000000000000..b912446acd63e --- /dev/null +++ b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php @@ -0,0 +1,71 @@ +clientResolver = $clientResolver; + $this->productFieldMappers = $productFieldMappers; + } + + /** + * @return FieldMapperInterface + */ + private function getProductFieldMapper() + { + return $this->productFieldMappers[$this->clientResolver->getCurrentEngine()]; + } + + /** + * Get field name + * + * @param string $attributeCode + * @param array $context + * @return string + * @since 100.1.0 + */ + public function getFieldName($attributeCode, $context = []) + { + return $this->getProductFieldMapper()->getFieldName($attributeCode, $context); + } + + /** + * Get all entity attribute types + * + * @param array $context + * @return array + * @since 100.1.0 + */ + public function getAllAttributesTypes($context = []) + { + return $this->getProductFieldMapper()->getAllAttributesTypes($context); + } +} diff --git a/Elasticsearch5/Model/Client/Elasticsearch.php b/Elasticsearch5/Model/Client/Elasticsearch.php index 5d25437f89f1c..f4bce6b98d71e 100644 --- a/Elasticsearch5/Model/Client/Elasticsearch.php +++ b/Elasticsearch5/Model/Client/Elasticsearch.php @@ -280,7 +280,7 @@ public function addFieldsMapping(array $fields, $index, $entityType) * Fix backward compatibility of field definition. * Allow to run both 2.x and 5.x servers. * - * @param array $query + * @param array $fieldInfo * * @return array */ diff --git a/Elasticsearch5/SearchAdapter/Adapter.php b/Elasticsearch5/SearchAdapter/Adapter.php new file mode 100644 index 0000000000000..c853f9d0a5ac2 --- /dev/null +++ b/Elasticsearch5/SearchAdapter/Adapter.php @@ -0,0 +1,95 @@ +connectionManager = $connectionManager; + $this->mapper = $mapper; + $this->responseFactory = $responseFactory; + $this->aggregationBuilder = $aggregationBuilder; + $this->queryContainerFactory = $queryContainerFactory + ?: ObjectManager::getInstance()->get(\Magento\Elasticsearch\SearchAdapter\QueryContainerFactory::class); + } + + /** + * @param RequestInterface $request + * @return QueryResponse + */ + public function query(RequestInterface $request) + { + $client = $this->connectionManager->getConnection(); + $aggregationBuilder = $this->aggregationBuilder; + + $query = $this->mapper->buildQuery($request); + $aggregationBuilder->setQuery($this->queryContainerFactory->create(['query' => $query])); + $rawResponse = $client->query($query); + + $rawDocuments = isset($rawResponse['hits']['hits']) ? $rawResponse['hits']['hits'] : []; + + $queryResponse = $this->responseFactory->create( + [ + 'documents' => $rawDocuments, + 'aggregations' => $aggregationBuilder->build($request, $rawResponse), + ] + ); + return $queryResponse; + } +} diff --git a/Elasticsearch5/SearchAdapter/Mapper.php b/Elasticsearch5/SearchAdapter/Mapper.php index e14cb27d51fe5..abd27abdac8a7 100644 --- a/Elasticsearch5/SearchAdapter/Mapper.php +++ b/Elasticsearch5/SearchAdapter/Mapper.php @@ -10,7 +10,7 @@ use Magento\Framework\Search\Request\Query\BoolExpression as BoolQuery; use Magento\Framework\Search\Request\Query\Filter as FilterQuery; use Magento\Framework\Search\Request\Query\Match as MatchQuery; -use Magento\Elasticsearch\SearchAdapter\Query\Builder as QueryBuilder; +use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as QueryBuilder; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index 9487bcb56b863..ba4bde3ab341b 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -11,14 +11,34 @@ use Magento\Framework\Registry; use Magento\Store\Model\StoreManagerInterface as StoreManager; use \Magento\Customer\Model\Session as CustomerSession; -use Magento\Elasticsearch\Elasticsearch5\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper - as ES5ProductFieldMapper; +use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper as ES5ProductFieldMapper; +use Magento\Elasticsearch\Model\Adapter\FieldType; /** * Class ProductFieldMapper */ class ProductFieldMapper extends ES5ProductFieldMapper implements FieldMapperInterface { + /** + * @param Config $eavConfig + * @param FieldType $fieldType + * @param CustomerSession $customerSession + * @param StoreManager $storeManager + * @param Registry $coreRegistry + */ + public function __construct( + Config $eavConfig, + FieldType $fieldType, + CustomerSession $customerSession, + StoreManager $storeManager, + Registry $coreRegistry + ) { + $this->eavConfig = $eavConfig; + $this->fieldType = $fieldType; + $this->customerSession = $customerSession; + $this->storeManager = $storeManager; + $this->coreRegistry = $coreRegistry; + } /** * {@inheritdoc} diff --git a/Model/Adapter/FieldType.php b/Model/Adapter/FieldType.php index 569f0e4a1595b..4315597a3cf58 100644 --- a/Model/Adapter/FieldType.php +++ b/Model/Adapter/FieldType.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Elasticsearch5\Model\Adapter; +namespace Magento\Elasticsearch\Model\Adapter; use Magento\Eav\Model\Entity\Attribute\AbstractAttribute; diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index 77b532b5bd101..c5c3d484962c3 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -22,6 +22,20 @@ */ class Mapper extends ES5Mapper { + /** + * @param QueryBuilder $queryBuilder + * @param MatchQueryBuilder $matchQueryBuilder + * @param FilterBuilder $filterBuilder + */ + public function __construct( + QueryBuilder $queryBuilder, + MatchQueryBuilder $matchQueryBuilder, + FilterBuilder $filterBuilder + ) { + $this->queryBuilder = $queryBuilder; + $this->matchQueryBuilder = $matchQueryBuilder; + $this->filterBuilder = $filterBuilder; + } /** * Build adapter dependent query diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index 011e353692381..eebd07bc032a5 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -13,18 +13,21 @@ elasticsearch + elasticsearch5 elasticsearch + elasticsearch5 elasticsearch + elasticsearch5 @@ -32,6 +35,7 @@ Magento\Config\Model\Config\Source\Yesno elasticsearch + elasticsearch5 @@ -39,6 +43,7 @@ elasticsearch 1 + elasticsearch5 @@ -46,12 +51,14 @@ elasticsearch 1 + elasticsearch5 elasticsearch + elasticsearch5 @@ -60,6 +67,7 @@ Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection elasticsearch + elasticsearch5 diff --git a/etc/di.xml b/etc/di.xml index 78de0d8153f27..fe2f3502b814e 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -10,7 +10,7 @@ - Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy @@ -18,7 +18,7 @@ - Magento\Elasticsearch\Model\Adapter\BatchDataMapper\CategoryFieldsProvider + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProviderProxy Magento\Elasticsearch\Model\Adapter\BatchDataMapper\PriceFieldsProvider @@ -42,6 +42,31 @@ Elasticsearch + Elasticsearch 5x + + + + + + + Magento\Elasticsearch\Model\Adapter\BatchDataMapper\CategoryFieldsProvider + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\BatchDataMapper\CategoryFieldsProvider + + + + + + + Magento\Elasticsearch\Model\Adapter\DataMapper\ProductDataMapper + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper + + + + + + + Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper + Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper @@ -49,9 +74,11 @@ \Magento\Elasticsearch\Model\Client\ElasticsearchFactory + \Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory \Magento\Elasticsearch\Model\Config + \Magento\Elasticsearch\Model\Config @@ -59,6 +86,7 @@ Magento\Elasticsearch\Model\Indexer\IndexerHandler + Magento\Elasticsearch\Model\Indexer\IndexerHandler @@ -66,6 +94,7 @@ Magento\Elasticsearch\Model\Indexer\IndexStructure + Magento\Elasticsearch\Model\Indexer\IndexStructure @@ -73,6 +102,7 @@ Magento\Elasticsearch\Model\ResourceModel\Engine + Magento\Elasticsearch\Model\ResourceModel\Engine @@ -80,6 +110,7 @@ Magento\Elasticsearch\SearchAdapter\Adapter + Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter @@ -95,14 +126,39 @@ - Magento\Elasticsearch\Model\Client\ElasticsearchFactory + Magento\Elasticsearch\Elasticsearch5\Model\Client\ClientFactoryProxy + Magento\Elasticsearch\Model\Config + + + + + Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory Magento\Elasticsearch\Model\Config + + + + Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch + + + + + + Magento\Elasticsearch\Model\Client\ElasticsearchFactory + Magento\Elasticsearch\Elasticsearch5\Model\Client\ElasticsearchFactory + + + + + + Magento\Elasticsearch\Elasticsearch5\SearchAdapter\ConnectionManager + Magento\Elasticsearch\SearchAdapter\Aggregation\Interval + Magento\Elasticsearch\SearchAdapter\Aggregation\Interval @@ -110,6 +166,7 @@ Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider + Magento\Elasticsearch\SearchAdapter\Dynamic\DataProvider @@ -161,6 +218,7 @@ Magento\Elasticsearch\Model\DataProvider\Suggestions + Magento\Elasticsearch\Model\DataProvider\Suggestions From b7409ea4a9c22638729dacaf798deb0689182bf4 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 15 Dec 2017 15:52:46 -0600 Subject: [PATCH 588/616] PR-46: ES 5.x support. - Move ES2 tests to ES5 --- .../Model/Client/ClientFactoryProxy.php | 54 +++++++++++++++++++ .../FieldMapper/ProductFieldMapperTest.php | 6 +-- .../Model/Adapter/FieldTypeTest.php | 4 +- .../Model/Client/ElasticsearchTest.php | 4 +- 4 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 Elasticsearch5/Model/Client/ClientFactoryProxy.php rename Test/Unit/{ => Elasticsearch5}/Model/Adapter/FieldMapper/ProductFieldMapperTest.php (97%) rename Test/Unit/{ => Elasticsearch5}/Model/Adapter/FieldTypeTest.php (95%) rename Test/Unit/{ => Elasticsearch5}/Model/Client/ElasticsearchTest.php (99%) diff --git a/Elasticsearch5/Model/Client/ClientFactoryProxy.php b/Elasticsearch5/Model/Client/ClientFactoryProxy.php new file mode 100644 index 0000000000000..1371e8eb1ccab --- /dev/null +++ b/Elasticsearch5/Model/Client/ClientFactoryProxy.php @@ -0,0 +1,54 @@ +clientResolver = $clientResolver; + $this->clientFactories = $clientFactories; + } + + /** + * @return ClientFactoryInterface + */ + private function getClientFactory() + { + return $this->clientFactories[$this->clientResolver->getCurrentEngine()]; + } + + /** + * @inheritdoc + */ + public function create(array $options = []) + { + return $this->getClientFactory()->create($options); + } +} diff --git a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php similarity index 97% rename from Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php rename to Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php index 66ae7a0192ed8..2128ee57681a8 100644 --- a/Test/Unit/Model/Adapter/FieldMapper/ProductFieldMapperTest.php +++ b/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php @@ -3,10 +3,10 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper; +namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter\FieldMapper; use Magento\Catalog\Api\Data\ProductAttributeInterface; -use Magento\Elasticsearch\Model\Adapter\FieldType; +use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; class ProductFieldMapperTest extends \PHPUnit\Framework\TestCase @@ -104,7 +104,7 @@ protected function setUp() ); $this->mapper = $objectManager->getObject( - \Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper::class, + \Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper::class, [ 'eavConfig' => $this->eavConfig, 'storeManager' => $this->storeManager, diff --git a/Test/Unit/Model/Adapter/FieldTypeTest.php b/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php similarity index 95% rename from Test/Unit/Model/Adapter/FieldTypeTest.php rename to Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php index 80b49c35b7677..63c993e27c9a9 100644 --- a/Test/Unit/Model/Adapter/FieldTypeTest.php +++ b/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Test\Unit\Model\Adapter; +namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Adapter; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use PHPUnit_Framework_MockObject_MockObject as MockObject; @@ -49,7 +49,7 @@ protected function setUp() ); $this->type = $objectManager->getObject( - \Magento\Elasticsearch\Model\Adapter\FieldType::class, + \Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType::class, [ 'eavConfig' => $this->eavConfig, ] diff --git a/Test/Unit/Model/Client/ElasticsearchTest.php b/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php similarity index 99% rename from Test/Unit/Model/Client/ElasticsearchTest.php rename to Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php index a32b3513776eb..415c8b61ac6ca 100644 --- a/Test/Unit/Model/Client/ElasticsearchTest.php +++ b/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php @@ -3,7 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Test\Unit\Model\Client; +namespace Magento\Elasticsearch\Test\Unit\Elasticsearch5\Model\Client; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; @@ -76,7 +76,7 @@ protected function setUp() $this->objectManager = new ObjectManagerHelper($this); $this->model = $this->objectManager->getObject( - \Magento\Elasticsearch\Model\Client\Elasticsearch::class, + \Magento\Elasticsearch\Elasticsearch5\Model\Client\Elasticsearch::class, [ 'options' => $this->getOptions(), 'elasticsearchClient' => $this->elasticsearchClientMock From 4fa48b29d245f2c07f9c664b11efdea13b2e35bb Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 4 Jan 2018 21:00:05 +0200 Subject: [PATCH 589/616] PR-46: ES 5.x support. - Make it possible to configure ElasticSearch5 connection separately --- .../Config/Elasticsearch5TestConnection.php | 30 +++++++++ .../DataMapper/ProductDataMapperProxy.php | 2 +- .../FieldMapper/ProductFieldMapper.php | 6 +- Elasticsearch5/Model/Client/Elasticsearch.php | 5 +- .../FieldMapper/ProductFieldMapper.php | 5 +- Model/Config.php | 23 ++++++- SearchAdapter/Mapper.php | 4 +- SearchAdapter/Query/Builder.php | 4 +- etc/adminhtml/system.xml | 61 ++++++++++++++++--- etc/config.xml | 6 ++ etc/di.xml | 16 ++++- 11 files changed, 141 insertions(+), 21 deletions(-) create mode 100644 Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php diff --git a/Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php b/Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php new file mode 100644 index 0000000000000..b0ec4ce2e3d07 --- /dev/null +++ b/Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php @@ -0,0 +1,30 @@ + 'catalog_search_engine', + 'hostname' => 'catalog_search_elasticsearch5_server_hostname', + 'port' => 'catalog_search_elasticsearch5_server_port', + 'index' => 'catalog_search_elasticsearch5_index_prefix', + 'enableAuth' => 'catalog_search_elasticsearch5_enable_auth', + 'username' => 'catalog_search_elasticsearch5_username', + 'password' => 'catalog_search_elasticsearch5_password', + 'timeout' => 'catalog_search_elasticsearch5_server_timeout', + ]; + return array_merge(parent::_getFieldMapping(), $fields); + } +} diff --git a/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php b/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php index 81c5b500d7b70..0fc6100979f21 100644 --- a/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php +++ b/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php @@ -49,6 +49,6 @@ private function getDataMapper() */ public function map($entityId, array $entityIndexData, $storeId, $context = []) { - return $this->getDataMapper()->map($entityId, $entityIndexData, $storeId, $context); + return $this->getDataMapper()->map($entityId, $entityIndexData, $storeId, $context); } } diff --git a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php index db5a08529b227..8590c9b58786e 100644 --- a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -106,6 +106,7 @@ public function getFieldName($attributeCode, $context = []) /** * {@inheritdoc} + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function getAllAttributesTypes($context = []) { @@ -138,7 +139,10 @@ public function getAllAttributesTypes($context = []) ]; } - if ($attribute->usesSource() || $attribute->getFrontendInput() === 'select' || $attribute->getFrontendInput() === 'multiselect') { + if ($attribute->usesSource() + || $attribute->getFrontendInput() === 'select' + || $attribute->getFrontendInput() === 'multiselect' + ) { $allAttributes[$attributeCode]['type'] = FieldType::ES_DATA_TYPE_KEYWORD; $allAttributes[$attributeCode . '_value'] = [ diff --git a/Elasticsearch5/Model/Client/Elasticsearch.php b/Elasticsearch5/Model/Client/Elasticsearch.php index f4bce6b98d71e..e260447173e76 100644 --- a/Elasticsearch5/Model/Client/Elasticsearch.php +++ b/Elasticsearch5/Model/Client/Elasticsearch.php @@ -284,7 +284,8 @@ public function addFieldsMapping(array $fields, $index, $entityType) * * @return array */ - private function prepareFieldInfo($fieldInfo) { + private function prepareFieldInfo($fieldInfo) + { if (strcmp($this->getServerVersion(), '5') < 0) { if ($fieldInfo['type'] == 'keyword') { @@ -339,7 +340,7 @@ public function query($query) private function prepareSearchQuery($query) { if (strcmp($this->getServerVersion(), '5') < 0) { - if( isset($query['body']) && isset($query['body']['stored_fields'])) { + if (isset($query['body']) && isset($query['body']['stored_fields'])) { $query['body']['fields'] = $query['body']['stored_fields']; unset($query['body']['stored_fields']); } diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/Model/Adapter/FieldMapper/ProductFieldMapper.php index ba4bde3ab341b..d0258286b6484 100644 --- a/Model/Adapter/FieldMapper/ProductFieldMapper.php +++ b/Model/Adapter/FieldMapper/ProductFieldMapper.php @@ -11,13 +11,14 @@ use Magento\Framework\Registry; use Magento\Store\Model\StoreManagerInterface as StoreManager; use \Magento\Customer\Model\Session as CustomerSession; -use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper as ES5ProductFieldMapper; +use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper + as Elasticsearch5ProductFieldMapper; use Magento\Elasticsearch\Model\Adapter\FieldType; /** * Class ProductFieldMapper */ -class ProductFieldMapper extends ES5ProductFieldMapper implements FieldMapperInterface +class ProductFieldMapper extends Elasticsearch5ProductFieldMapper implements FieldMapperInterface { /** * @param Config $eavConfig diff --git a/Model/Config.php b/Model/Config.php index c48aa14252759..93e715f928047 100644 --- a/Model/Config.php +++ b/Model/Config.php @@ -8,6 +8,8 @@ use Magento\Framework\App\Config\ScopeConfigInterface; use Magento\Store\Model\ScopeInterface; use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface; +use Magento\AdvancedSearch\Model\Client\ClientResolver; +use Magento\Framework\App\ObjectManager; /** * Elasticsearch config model @@ -42,15 +44,32 @@ class Config implements ClientOptionsInterface */ protected $scopeConfig; + /** + * @var string + */ + private $prefix; + + /** + * @var ClientResolver + */ + private $clientResolver; + /** * Constructor * * @param ScopeConfigInterface $scopeConfig + * @param ClientResolver $clientResolver + * @param string $prefix */ public function __construct( - ScopeConfigInterface $scopeConfig + ScopeConfigInterface $scopeConfig, + ClientResolver $clientResolver = null, + $prefix = null ) { $this->scopeConfig = $scopeConfig; + $this->clientResolver = $clientResolver ?: + ObjectManager::getInstance()->get(ClientResolver::class); + $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine(); } /** @@ -82,7 +101,7 @@ public function prepareClientOptions($options = []) */ public function getElasticsearchConfigData($field, $storeId = null) { - return $this->getSearchConfigData('elasticsearch_' . $field, $storeId); + return $this->getSearchConfigData($this->prefix . '_' . $field, $storeId); } /** diff --git a/SearchAdapter/Mapper.php b/SearchAdapter/Mapper.php index c5c3d484962c3..fd6ae3424b9da 100644 --- a/SearchAdapter/Mapper.php +++ b/SearchAdapter/Mapper.php @@ -13,14 +13,14 @@ use Magento\Elasticsearch\SearchAdapter\Query\Builder as QueryBuilder; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; use Magento\Elasticsearch\SearchAdapter\Filter\Builder as FilterBuilder; -use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Mapper as ES5Mapper; +use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Mapper as Elasticsearch5Mapper; /** * Mapper class * @api * @since 100.1.0 */ -class Mapper extends ES5Mapper +class Mapper extends Elasticsearch5Mapper { /** * @param QueryBuilder $queryBuilder diff --git a/SearchAdapter/Query/Builder.php b/SearchAdapter/Query/Builder.php index ed35abf4a97f7..cf75366b9b25e 100644 --- a/SearchAdapter/Query/Builder.php +++ b/SearchAdapter/Query/Builder.php @@ -7,13 +7,13 @@ use Magento\Framework\Search\RequestInterface; use Magento\Framework\App\ScopeResolverInterface; -use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as ES5Builder; +use Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Query\Builder as Elasticsearch5Builder; /** * @api * @since 100.1.0 */ -class Builder extends ES5Builder +class Builder extends Elasticsearch5Builder { /** diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index eebd07bc032a5..bde0d8dc5f835 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -9,25 +9,23 @@
+ elasticsearch - elasticsearch5 elasticsearch - elasticsearch5 elasticsearch - elasticsearch5 @@ -35,7 +33,6 @@ Magento\Config\Model\Config\Source\Yesno elasticsearch - elasticsearch5 @@ -43,7 +40,6 @@ elasticsearch 1 - elasticsearch5 @@ -51,14 +47,12 @@ elasticsearch 1 - elasticsearch5 elasticsearch - elasticsearch5 @@ -67,6 +61,59 @@ Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection elasticsearch + + + + + + + elasticsearch5 + + + + + + elasticsearch5 + + + + + + elasticsearch5 + + + + + Magento\Config\Model\Config\Source\Yesno + + elasticsearch5 + + + + + + 1 + elasticsearch5 + + + + + + 1 + elasticsearch5 + + + + + + elasticsearch5 + + + + diff --git a/etc/config.xml b/etc/config.xml index 68cf51b803e03..0e01aba5ed857 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -14,6 +14,12 @@ magento2 0 15 + + localhost + 9200 + magento2 + 0 + 15 diff --git a/etc/di.xml b/etc/di.xml index fe2f3502b814e..63f795b26f567 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -42,7 +42,7 @@ Elasticsearch - Elasticsearch 5x + Elasticsearch 5.0+ @@ -149,7 +149,7 @@ - + Magento\Elasticsearch\Elasticsearch5\SearchAdapter\ConnectionManager @@ -233,6 +233,10 @@ 1 1 1 + + 1 + 1 + 1 1 @@ -242,6 +246,14 @@ 1 1 1 + + 1 + 1 + 1 + 1 + 1 + 1 + 1 From 64b3ba05669e921be582eb7cfe80f9d06629bdb2 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 4 Jan 2018 21:19:34 +0200 Subject: [PATCH 590/616] PR-46: ES 5.x support. - naming fixes --- .../TestConnection.php} | 4 ++-- Elasticsearch5/SearchAdapter/Adapter.php | 5 ++--- etc/adminhtml/system.xml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) rename Block/Adminhtml/System/Config/{Elasticsearch5TestConnection.php => Elasticsearch5/TestConnection.php} (83%) diff --git a/Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php b/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php similarity index 83% rename from Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php rename to Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php index b0ec4ce2e3d07..fe7240cbce6db 100644 --- a/Block/Adminhtml/System/Config/Elasticsearch5TestConnection.php +++ b/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php @@ -3,12 +3,12 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Elasticsearch\Block\Adminhtml\System\Config; +namespace Magento\Elasticsearch\Block\Adminhtml\System\Config\Elasticsearch5; /** * Elasticsearch 5x test connection block * @codeCoverageIgnore */ -class Elasticsearch5TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection +class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection { /** * {@inheritdoc} diff --git a/Elasticsearch5/SearchAdapter/Adapter.php b/Elasticsearch5/SearchAdapter/Adapter.php index c853f9d0a5ac2..13d4f8a7296ce 100644 --- a/Elasticsearch5/SearchAdapter/Adapter.php +++ b/Elasticsearch5/SearchAdapter/Adapter.php @@ -59,14 +59,13 @@ public function __construct( Mapper $mapper, ResponseFactory $responseFactory, AggregationBuilder $aggregationBuilder, - \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory = null + \Magento\Elasticsearch\SearchAdapter\QueryContainerFactory $queryContainerFactory ) { $this->connectionManager = $connectionManager; $this->mapper = $mapper; $this->responseFactory = $responseFactory; $this->aggregationBuilder = $aggregationBuilder; - $this->queryContainerFactory = $queryContainerFactory - ?: ObjectManager::getInstance()->get(\Magento\Elasticsearch\SearchAdapter\QueryContainerFactory::class); + $this->queryContainerFactory = $queryContainerFactory; } /** diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml index bde0d8dc5f835..b9fddc46f78ec 100644 --- a/etc/adminhtml/system.xml +++ b/etc/adminhtml/system.xml @@ -112,7 +112,7 @@
From 7c768ad3099b5f54fcf99fc807737962383f20a1 Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Fri, 23 Feb 2018 11:44:13 +0200 Subject: [PATCH 594/616] MAGETWO-85842: Quick search does not support quoted phrases --- SearchAdapter/Query/Builder/Match.php | 19 +++-- .../SearchAdapter/Query/Builder/MatchTest.php | 78 ++++++++++++++++--- 2 files changed, 81 insertions(+), 16 deletions(-) diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 61766663ea2e4..19d756ceb2847 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -49,12 +49,14 @@ public function build(array $selectQuery, RequestQueryInterface $requestQuery, $ $requestQueryBoost = $requestQuery->getBoost() ?: 1; foreach ($queries as $query) { $queryBody = $query['body']; - foreach ($queryBody['match'] as $field => $matchQuery) { + $matchKey = isset($queryBody['match_phrase']) ? 'match_phrase' : 'match'; + foreach ($queryBody[$matchKey] as $field => $matchQuery) { $matchQuery['boost'] = $requestQueryBoost + $matchQuery['boost']; - $queryBody['match'][$field] = $matchQuery; + $queryBody[$matchKey][$field] = $matchQuery; } - $selectQuery['bool'][$query['condition']][]= $queryBody; + $selectQuery['bool'][$query['condition']][] = $queryBody; } + return $selectQuery; } @@ -94,6 +96,12 @@ protected function prepareQuery($queryValue, $conditionType) protected function buildQueries($matches, $queryValue) { $conditions = []; + + // Checking for quoted phrase \"phrase test\", trim escaped surrounding quotes if found + $count = 0; + $value = preg_replace('#^\\\\"(.*)\\\\"$#m', '$1', $queryValue['value'], -1, $count); + $condition = ($count) ? 'match_phrase' : 'match'; + foreach ($matches as $match) { $resolvedField = $this->fieldMapper->getFieldName( $match['field'], @@ -102,15 +110,16 @@ protected function buildQueries($matches, $queryValue) $conditions[] = [ 'condition' => $queryValue['condition'], 'body' => [ - 'match' => [ + $condition => [ $resolvedField => [ - 'query' => $queryValue['value'], + 'query' => $value, 'boost' => isset($match['boost']) ? $match['boost'] : 1, ], ], ], ]; } + return $conditions; } diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php index b1b4d9d27d551..8114feb09d35d 100644 --- a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php +++ b/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php @@ -5,14 +5,33 @@ */ namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\Builder; +use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use Magento\Elasticsearch\SearchAdapter\Query\Builder\Match as MatchQueryBuilder; use Magento\Framework\Search\Request\Query\Match as MatchRequestQuery; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; -use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface; use PHPUnit_Framework_MockObject_MockObject as MockObject; class MatchTest extends \PHPUnit\Framework\TestCase { + /** + * @var MatchQueryBuilder + */ + private $matchQueryBuilder; + + /** + * @inheritdoc + */ + protected function setUp() + { + $this->matchQueryBuilder = (new ObjectManager($this))->getObject( + MatchQueryBuilder::class, + [ + 'fieldMapper' => $this->getFieldMapper(), + 'preprocessorContainer' => [], + ] + ); + } + /** * Tests that method constructs a correct select query. * @see MatchQueryBuilder::build @@ -24,17 +43,8 @@ class MatchTest extends \PHPUnit\Framework\TestCase */ public function testBuild($rawQueryValue, $errorMessage) { - /** @var MatchQueryBuilder $matchQueryBuilder */ - $matchQueryBuilder = (new ObjectManager($this))->getObject( - MatchQueryBuilder::class, - [ - 'fieldMapper' => $this->getFieldMapper(), - 'preprocessorContainer' => [], - ] - ); - $this->assertSelectQuery( - $matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not'), + $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'not'), $errorMessage ); } @@ -55,6 +65,52 @@ public function queryValuesInvariantsProvider() ]; } + /** + * Tests that method constructs a correct "match" query depending on query value. + * + * @dataProvider matchProvider + * + * @param string $rawQueryValue + * @param string $queryValue + * @param string $match + */ + public function testBuildMatchQuery($rawQueryValue, $queryValue, $match) + { + $query = $this->matchQueryBuilder->build([], $this->getMatchRequestQuery($rawQueryValue), 'should'); + + $expectedSelectQuery = [ + 'bool' => [ + 'should' => [ + [ + $match => [ + 'some_field' => [ + 'query' => $queryValue, + 'boost' => 43, + ], + ], + ], + ], + ], + ]; + + $this->assertEquals( + $expectedSelectQuery, + $query, + sprintf('Wrong "match" query. Should be processed with "%s"', $match) + ); + } + + /** + * @return array + */ + public function matchProvider() + { + return [ + ['query_value', 'query_value', 'match'], + ['"query value"', 'query value', 'match_phrase'], + ]; + } + /** * @param array $selectQuery * @param string $errorMessage From 83fd9c2179bd4aca966d05c1ec006feacb50090a Mon Sep 17 00:00:00 2001 From: Andrii Meysar Date: Mon, 26 Feb 2018 11:09:03 +0200 Subject: [PATCH 595/616] MAGETWO-85842: Quick search does not support quoted phrases --- SearchAdapter/Query/Builder/Match.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SearchAdapter/Query/Builder/Match.php b/SearchAdapter/Query/Builder/Match.php index 19d756ceb2847..f1c3451482bab 100644 --- a/SearchAdapter/Query/Builder/Match.php +++ b/SearchAdapter/Query/Builder/Match.php @@ -93,7 +93,7 @@ protected function prepareQuery($queryValue, $conditionType) * @param array $queryValue * @return array */ - protected function buildQueries($matches, $queryValue) + protected function buildQueries(array $matches, array $queryValue) { $conditions = []; From a470ceea4cb021006e5a66c4b9a728c4d4d0e598 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 9 Mar 2018 17:43:18 -0600 Subject: [PATCH 596/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Adminhtml/System/Config/Elasticsearch5/TestConnection.php | 0 .../Block}/Adminhtml/System/Config/TestConnection.php | 0 .../Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php | 0 .../Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php | 0 .../Model/Adapter/DataMapper/ProductDataMapper.php | 0 .../Model/Adapter/DataMapper/ProductDataMapperProxy.php | 0 .../Model/Adapter/FieldMapper/ProductFieldMapper.php | 0 .../Model/Adapter/FieldMapper/ProductFieldMapperProxy.php | 0 .../Elasticsearch/Elasticsearch5}/Model/Adapter/FieldType.php | 0 .../Elasticsearch5}/Model/Client/ClientFactoryProxy.php | 0 .../Elasticsearch/Elasticsearch5}/Model/Client/Elasticsearch.php | 0 .../Elasticsearch/Elasticsearch5}/SearchAdapter/Adapter.php | 0 .../Elasticsearch/Elasticsearch5}/SearchAdapter/Mapper.php | 0 .../Elasticsearch/Elasticsearch5}/SearchAdapter/Query/Builder.php | 0 LICENSE_EE.txt => app/code/Magento/Elasticsearch/LICENSE_EE.txt | 0 .../Model}/Adapter/BatchDataMapper/CategoryFieldsProvider.php | 0 .../Model}/Adapter/BatchDataMapper/DataMapperFactory.php | 0 .../Model}/Adapter/BatchDataMapper/DataMapperResolver.php | 0 .../Model}/Adapter/BatchDataMapper/PriceFieldsProvider.php | 0 .../Model}/Adapter/BatchDataMapper/ProductDataMapper.php | 0 .../Elasticsearch/Model}/Adapter/BatchDataMapperInterface.php | 0 .../Magento/Elasticsearch/Model}/Adapter/Container/Attribute.php | 0 .../Model}/Adapter/DataMapper/DataMapperResolver.php | 0 .../Elasticsearch/Model}/Adapter/DataMapper/ProductDataMapper.php | 0 .../Magento/Elasticsearch/Model}/Adapter/DataMapperInterface.php | 0 .../Magento/Elasticsearch/Model}/Adapter/Document/Builder.php | 0 .../code/Magento/Elasticsearch/Model}/Adapter/Elasticsearch.php | 0 .../Model}/Adapter/FieldMapper/FieldMapperResolver.php | 0 .../Model}/Adapter/FieldMapper/ProductFieldMapper.php | 0 .../Magento/Elasticsearch/Model}/Adapter/FieldMapperInterface.php | 0 .../code/Magento/Elasticsearch/Model}/Adapter/FieldType.php | 0 .../code/Magento/Elasticsearch/Model}/Adapter/FieldType/Date.php | 0 .../code/Magento/Elasticsearch/Model}/Adapter/Index/Builder.php | 0 .../Elasticsearch/Model}/Adapter/Index/BuilderInterface.php | 0 .../Elasticsearch/Model}/Adapter/Index/Config/Converter.php | 0 .../Elasticsearch/Model}/Adapter/Index/Config/EsConfig.php | 0 .../Model}/Adapter/Index/Config/EsConfigInterface.php | 0 .../Elasticsearch/Model}/Adapter/Index/Config/SchemaLocator.php | 0 .../Elasticsearch/Model}/Adapter/Index/IndexNameResolver.php | 0 .../code/Magento/Elasticsearch/Model}/Client/Elasticsearch.php | 0 {Model => app/code/Magento/Elasticsearch/Model}/Config.php | 0 .../Magento/Elasticsearch/Model}/DataProvider/Suggestions.php | 0 .../code/Magento/Elasticsearch/Model}/Indexer/IndexStructure.php | 0 .../code/Magento/Elasticsearch/Model}/Indexer/IndexerHandler.php | 0 .../code/Magento/Elasticsearch/Model}/ResourceModel/Engine.php | 0 .../code/Magento/Elasticsearch/Model}/ResourceModel/Index.php | 0 README.md => app/code/Magento/Elasticsearch/README.md | 0 .../code/Magento/Elasticsearch/SearchAdapter}/Adapter.php | 0 .../Magento/Elasticsearch/SearchAdapter}/Aggregation/Builder.php | 0 .../SearchAdapter}/Aggregation/Builder/BucketBuilderInterface.php | 0 .../Elasticsearch/SearchAdapter}/Aggregation/Builder/Dynamic.php | 0 .../Elasticsearch/SearchAdapter}/Aggregation/Builder/Term.php | 0 .../SearchAdapter}/Aggregation/DataProviderFactory.php | 0 .../Magento/Elasticsearch/SearchAdapter}/Aggregation/Interval.php | 0 .../Magento/Elasticsearch/SearchAdapter}/AggregationFactory.php | 0 .../Magento/Elasticsearch/SearchAdapter}/ConnectionManager.php | 0 .../code/Magento/Elasticsearch/SearchAdapter}/DocumentFactory.php | 0 .../Magento/Elasticsearch/SearchAdapter}/Dynamic/DataProvider.php | 0 .../code/Magento/Elasticsearch/SearchAdapter}/Filter/Builder.php | 0 .../SearchAdapter}/Filter/Builder/FilterInterface.php | 0 .../Magento/Elasticsearch/SearchAdapter}/Filter/Builder/Range.php | 0 .../Magento/Elasticsearch/SearchAdapter}/Filter/Builder/Term.php | 0 .../Elasticsearch/SearchAdapter}/Filter/Builder/Wildcard.php | 0 .../Elasticsearch/SearchAdapter}/Filter/BuilderInterface.php | 0 .../code/Magento/Elasticsearch/SearchAdapter}/Mapper.php | 0 .../code/Magento/Elasticsearch/SearchAdapter}/Query/Builder.php | 0 .../Elasticsearch/SearchAdapter}/Query/Builder/Aggregation.php | 0 .../Magento/Elasticsearch/SearchAdapter}/Query/Builder/Match.php | 0 .../Elasticsearch/SearchAdapter}/Query/Builder/QueryInterface.php | 0 .../Elasticsearch/SearchAdapter}/Query/Preprocessor/Stopwords.php | 0 .../Magento/Elasticsearch/SearchAdapter}/QueryAwareInterface.php | 0 .../code/Magento/Elasticsearch/SearchAdapter}/QueryContainer.php | 0 .../code/Magento/Elasticsearch/SearchAdapter}/ResponseFactory.php | 0 .../Elasticsearch/SearchAdapter}/SearchIndexNameResolver.php | 0 .../Model/Adapter/FieldMapper/ProductFieldMapperTest.php | 0 .../Test}/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php | 0 .../Test}/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php | 0 .../Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php | 0 .../Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php | 0 .../Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php | 0 .../Test}/Unit/Model/Adapter/Container/AttributeTest.php | 0 .../Test}/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php | 0 .../Test}/Unit/Model/Adapter/Document/BuilderTest.php | 0 .../Elasticsearch/Test}/Unit/Model/Adapter/ElasticsearchTest.php | 0 .../Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php | 0 .../Elasticsearch/Test}/Unit/Model/Adapter/FieldType/DateTest.php | 0 .../Elasticsearch/Test}/Unit/Model/Adapter/Index/BuilderTest.php | 0 .../Test}/Unit/Model/Adapter/Index/Config/ConverterTest.php | 0 .../Test}/Unit/Model/Adapter/Index/Config/EsConfigTest.php | 0 .../Test}/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php | 0 .../Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml | 0 .../Test}/Unit/Model/Adapter/Index/IndexNameResolverTest.php | 0 .../code/Magento/Elasticsearch/Test}/Unit/Model/ConfigTest.php | 0 .../Test}/Unit/Model/DataProvider/SuggestionsTest.php | 0 .../Elasticsearch/Test}/Unit/Model/Indexer/IndexStructureTest.php | 0 .../Elasticsearch/Test}/Unit/Model/Indexer/IndexerHandlerTest.php | 0 .../Elasticsearch/Test}/Unit/Model/ResourceModel/EngineTest.php | 0 .../Elasticsearch/Test}/Unit/Model/ResourceModel/IndexTest.php | 0 .../Elasticsearch/Test}/Unit/SearchAdapter/AdapterTest.php | 0 .../Test}/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php | 0 .../Test}/Unit/SearchAdapter/Aggregation/Builder/TermTest.php | 0 .../Test}/Unit/SearchAdapter/Aggregation/BuilderTest.php | 0 .../Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php | 0 .../Test}/Unit/SearchAdapter/Aggregation/IntervalTest.php | 0 .../Test}/Unit/SearchAdapter/AggregationFactoryTest.php | 0 .../Test}/Unit/SearchAdapter/ConnectionManagerTest.php | 0 .../Test}/Unit/SearchAdapter/DocumentFactoryTest.php | 0 .../Test}/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 0 .../Test}/Unit/SearchAdapter/Filter/Builder/RangeTest.php | 0 .../Test}/Unit/SearchAdapter/Filter/Builder/TermTest.php | 0 .../Test}/Unit/SearchAdapter/Filter/Builder/WildcardTest.php | 0 .../Elasticsearch/Test}/Unit/SearchAdapter/Filter/BuilderTest.php | 0 .../Magento/Elasticsearch/Test}/Unit/SearchAdapter/MapperTest.php | 0 .../Test}/Unit/SearchAdapter/Query/Builder/AggregationTest.php | 0 .../Test}/Unit/SearchAdapter/Query/Builder/MatchTest.php | 0 .../Elasticsearch/Test}/Unit/SearchAdapter/Query/BuilderTest.php | 0 .../Test}/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php | 0 .../Test}/Unit/SearchAdapter/ResponseFactoryTest.php | 0 .../Test}/Unit/SearchAdapter/SearchIndexNameResolverTest.php | 0 composer.json => app/code/Magento/Elasticsearch/composer.json | 0 {etc => app/code/Magento/Elasticsearch/etc}/adminhtml/system.xml | 0 {etc => app/code/Magento/Elasticsearch/etc}/config.xml | 0 {etc => app/code/Magento/Elasticsearch/etc}/di.xml | 0 {etc => app/code/Magento/Elasticsearch/etc}/esconfig.xml | 0 {etc => app/code/Magento/Elasticsearch/etc}/esconfig.xsd | 0 {etc => app/code/Magento/Elasticsearch/etc}/module.xml | 0 {etc => app/code/Magento/Elasticsearch/etc}/search_engine.xml | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords.csv | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords_de_DE.csv | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords_en_US.csv | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords_es_ES.csv | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords_fr_FR.csv | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords_nl_NL.csv | 0 .../code/Magento/Elasticsearch/etc}/stopwords/stopwords_pt_BR.csv | 0 .../Magento/Elasticsearch/etc}/stopwords/stopwords_zh_Hans_CN.csv | 0 {i18n => app/code/Magento/Elasticsearch/i18n}/en_US.csv | 0 .../code/Magento/Elasticsearch/registration.php | 0 137 files changed, 0 insertions(+), 0 deletions(-) rename {Block => app/code/Magento/Elasticsearch/Block}/Adminhtml/System/Config/Elasticsearch5/TestConnection.php (100%) rename {Block => app/code/Magento/Elasticsearch/Block}/Adminhtml/System/Config/TestConnection.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/DataMapper/ProductDataMapper.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/DataMapper/ProductDataMapperProxy.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/FieldMapper/ProductFieldMapper.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Adapter/FieldType.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Client/ClientFactoryProxy.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/Model/Client/Elasticsearch.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/SearchAdapter/Adapter.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/SearchAdapter/Mapper.php (100%) rename {Elasticsearch5 => app/code/Magento/Elasticsearch/Elasticsearch5}/SearchAdapter/Query/Builder.php (100%) rename LICENSE_EE.txt => app/code/Magento/Elasticsearch/LICENSE_EE.txt (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/BatchDataMapper/CategoryFieldsProvider.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/BatchDataMapper/DataMapperFactory.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/BatchDataMapper/DataMapperResolver.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/BatchDataMapper/PriceFieldsProvider.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/BatchDataMapper/ProductDataMapper.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/BatchDataMapperInterface.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Container/Attribute.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/DataMapper/DataMapperResolver.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/DataMapper/ProductDataMapper.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/DataMapperInterface.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Document/Builder.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Elasticsearch.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/FieldMapper/FieldMapperResolver.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/FieldMapper/ProductFieldMapper.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/FieldMapperInterface.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/FieldType.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/FieldType/Date.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/Builder.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/BuilderInterface.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/Config/Converter.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/Config/EsConfig.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/Config/EsConfigInterface.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/Config/SchemaLocator.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Adapter/Index/IndexNameResolver.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Client/Elasticsearch.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Config.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/DataProvider/Suggestions.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Indexer/IndexStructure.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/Indexer/IndexerHandler.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/ResourceModel/Engine.php (100%) rename {Model => app/code/Magento/Elasticsearch/Model}/ResourceModel/Index.php (100%) rename README.md => app/code/Magento/Elasticsearch/README.md (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Adapter.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Aggregation/Builder.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Aggregation/Builder/BucketBuilderInterface.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Aggregation/Builder/Dynamic.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Aggregation/Builder/Term.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Aggregation/DataProviderFactory.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Aggregation/Interval.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/AggregationFactory.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/ConnectionManager.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/DocumentFactory.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Dynamic/DataProvider.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Filter/Builder.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Filter/Builder/FilterInterface.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Filter/Builder/Range.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Filter/Builder/Term.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Filter/Builder/Wildcard.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Filter/BuilderInterface.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Mapper.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Query/Builder.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Query/Builder/Aggregation.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Query/Builder/Match.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Query/Builder/QueryInterface.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/Query/Preprocessor/Stopwords.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/QueryAwareInterface.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/QueryContainer.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/ResponseFactory.php (100%) rename {SearchAdapter => app/code/Magento/Elasticsearch/SearchAdapter}/SearchIndexNameResolver.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Container/AttributeTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Document/BuilderTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/ElasticsearchTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/FieldType/DateTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Index/BuilderTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Index/Config/ConverterTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Index/Config/EsConfigTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Adapter/Index/IndexNameResolverTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/ConfigTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/DataProvider/SuggestionsTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Indexer/IndexStructureTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/Indexer/IndexerHandlerTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/ResourceModel/EngineTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/Model/ResourceModel/IndexTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/AdapterTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Aggregation/Builder/TermTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Aggregation/BuilderTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Aggregation/IntervalTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/AggregationFactoryTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/ConnectionManagerTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/DocumentFactoryTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Dynamic/DataProviderTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Filter/Builder/RangeTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Filter/Builder/TermTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Filter/Builder/WildcardTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Filter/BuilderTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/MapperTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Query/Builder/AggregationTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Query/Builder/MatchTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Query/BuilderTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/ResponseFactoryTest.php (100%) rename {Test => app/code/Magento/Elasticsearch/Test}/Unit/SearchAdapter/SearchIndexNameResolverTest.php (100%) rename composer.json => app/code/Magento/Elasticsearch/composer.json (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/adminhtml/system.xml (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/config.xml (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/di.xml (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/esconfig.xml (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/esconfig.xsd (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/module.xml (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/search_engine.xml (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_de_DE.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_en_US.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_es_ES.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_fr_FR.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_nl_NL.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_pt_BR.csv (100%) rename {etc => app/code/Magento/Elasticsearch/etc}/stopwords/stopwords_zh_Hans_CN.csv (100%) rename {i18n => app/code/Magento/Elasticsearch/i18n}/en_US.csv (100%) rename registration.php => app/code/Magento/Elasticsearch/registration.php (100%) diff --git a/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php similarity index 100% rename from Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php rename to app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php similarity index 100% rename from Block/Adminhtml/System/Config/TestConnection.php rename to app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/TestConnection.php diff --git a/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php similarity index 100% rename from Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php diff --git a/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php similarity index 100% rename from Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProviderProxy.php diff --git a/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php similarity index 100% rename from Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php diff --git a/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php similarity index 100% rename from Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapperProxy.php diff --git a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php similarity index 100% rename from Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php diff --git a/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php similarity index 100% rename from Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php diff --git a/Elasticsearch5/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php similarity index 100% rename from Elasticsearch5/Model/Adapter/FieldType.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php diff --git a/Elasticsearch5/Model/Client/ClientFactoryProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/ClientFactoryProxy.php similarity index 100% rename from Elasticsearch5/Model/Client/ClientFactoryProxy.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/ClientFactoryProxy.php diff --git a/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php similarity index 100% rename from Elasticsearch5/Model/Client/Elasticsearch.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php diff --git a/Elasticsearch5/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php similarity index 100% rename from Elasticsearch5/SearchAdapter/Adapter.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Adapter.php diff --git a/Elasticsearch5/SearchAdapter/Mapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php similarity index 100% rename from Elasticsearch5/SearchAdapter/Mapper.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php diff --git a/Elasticsearch5/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php similarity index 100% rename from Elasticsearch5/SearchAdapter/Query/Builder.php rename to app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php diff --git a/LICENSE_EE.txt b/app/code/Magento/Elasticsearch/LICENSE_EE.txt similarity index 100% rename from LICENSE_EE.txt rename to app/code/Magento/Elasticsearch/LICENSE_EE.txt diff --git a/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php similarity index 100% rename from Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php rename to app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php diff --git a/Model/Adapter/BatchDataMapper/DataMapperFactory.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperFactory.php similarity index 100% rename from Model/Adapter/BatchDataMapper/DataMapperFactory.php rename to app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperFactory.php diff --git a/Model/Adapter/BatchDataMapper/DataMapperResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperResolver.php similarity index 100% rename from Model/Adapter/BatchDataMapper/DataMapperResolver.php rename to app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/DataMapperResolver.php diff --git a/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php similarity index 100% rename from Model/Adapter/BatchDataMapper/PriceFieldsProvider.php rename to app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php diff --git a/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php similarity index 100% rename from Model/Adapter/BatchDataMapper/ProductDataMapper.php rename to app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php diff --git a/Model/Adapter/BatchDataMapperInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapperInterface.php similarity index 100% rename from Model/Adapter/BatchDataMapperInterface.php rename to app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapperInterface.php diff --git a/Model/Adapter/Container/Attribute.php b/app/code/Magento/Elasticsearch/Model/Adapter/Container/Attribute.php similarity index 100% rename from Model/Adapter/Container/Attribute.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Container/Attribute.php diff --git a/Model/Adapter/DataMapper/DataMapperResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/DataMapperResolver.php similarity index 100% rename from Model/Adapter/DataMapper/DataMapperResolver.php rename to app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/DataMapperResolver.php diff --git a/Model/Adapter/DataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php similarity index 100% rename from Model/Adapter/DataMapper/ProductDataMapper.php rename to app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php diff --git a/Model/Adapter/DataMapperInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/DataMapperInterface.php similarity index 100% rename from Model/Adapter/DataMapperInterface.php rename to app/code/Magento/Elasticsearch/Model/Adapter/DataMapperInterface.php diff --git a/Model/Adapter/Document/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Document/Builder.php similarity index 100% rename from Model/Adapter/Document/Builder.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Document/Builder.php diff --git a/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php similarity index 100% rename from Model/Adapter/Elasticsearch.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php diff --git a/Model/Adapter/FieldMapper/FieldMapperResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/FieldMapperResolver.php similarity index 100% rename from Model/Adapter/FieldMapper/FieldMapperResolver.php rename to app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/FieldMapperResolver.php diff --git a/Model/Adapter/FieldMapper/ProductFieldMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php similarity index 100% rename from Model/Adapter/FieldMapper/ProductFieldMapper.php rename to app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/ProductFieldMapper.php diff --git a/Model/Adapter/FieldMapperInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapperInterface.php similarity index 100% rename from Model/Adapter/FieldMapperInterface.php rename to app/code/Magento/Elasticsearch/Model/Adapter/FieldMapperInterface.php diff --git a/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php similarity index 100% rename from Model/Adapter/FieldType.php rename to app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php diff --git a/Model/Adapter/FieldType/Date.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType/Date.php similarity index 100% rename from Model/Adapter/FieldType/Date.php rename to app/code/Magento/Elasticsearch/Model/Adapter/FieldType/Date.php diff --git a/Model/Adapter/Index/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php similarity index 100% rename from Model/Adapter/Index/Builder.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php diff --git a/Model/Adapter/Index/BuilderInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/BuilderInterface.php similarity index 100% rename from Model/Adapter/Index/BuilderInterface.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/BuilderInterface.php diff --git a/Model/Adapter/Index/Config/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php similarity index 100% rename from Model/Adapter/Index/Config/Converter.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php diff --git a/Model/Adapter/Index/Config/EsConfig.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfig.php similarity index 100% rename from Model/Adapter/Index/Config/EsConfig.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfig.php diff --git a/Model/Adapter/Index/Config/EsConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php similarity index 100% rename from Model/Adapter/Index/Config/EsConfigInterface.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php diff --git a/Model/Adapter/Index/Config/SchemaLocator.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/SchemaLocator.php similarity index 100% rename from Model/Adapter/Index/Config/SchemaLocator.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/SchemaLocator.php diff --git a/Model/Adapter/Index/IndexNameResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php similarity index 100% rename from Model/Adapter/Index/IndexNameResolver.php rename to app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php diff --git a/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php similarity index 100% rename from Model/Client/Elasticsearch.php rename to app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php diff --git a/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php similarity index 100% rename from Model/Config.php rename to app/code/Magento/Elasticsearch/Model/Config.php diff --git a/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php similarity index 100% rename from Model/DataProvider/Suggestions.php rename to app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php diff --git a/Model/Indexer/IndexStructure.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexStructure.php similarity index 100% rename from Model/Indexer/IndexStructure.php rename to app/code/Magento/Elasticsearch/Model/Indexer/IndexStructure.php diff --git a/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php similarity index 100% rename from Model/Indexer/IndexerHandler.php rename to app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php diff --git a/Model/ResourceModel/Engine.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php similarity index 100% rename from Model/ResourceModel/Engine.php rename to app/code/Magento/Elasticsearch/Model/ResourceModel/Engine.php diff --git a/Model/ResourceModel/Index.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php similarity index 100% rename from Model/ResourceModel/Index.php rename to app/code/Magento/Elasticsearch/Model/ResourceModel/Index.php diff --git a/README.md b/app/code/Magento/Elasticsearch/README.md similarity index 100% rename from README.md rename to app/code/Magento/Elasticsearch/README.md diff --git a/SearchAdapter/Adapter.php b/app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php similarity index 100% rename from SearchAdapter/Adapter.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Adapter.php diff --git a/SearchAdapter/Aggregation/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder.php similarity index 100% rename from SearchAdapter/Aggregation/Builder.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder.php diff --git a/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php similarity index 100% rename from SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/BucketBuilderInterface.php diff --git a/SearchAdapter/Aggregation/Builder/Dynamic.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php similarity index 100% rename from SearchAdapter/Aggregation/Builder/Dynamic.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php diff --git a/SearchAdapter/Aggregation/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php similarity index 100% rename from SearchAdapter/Aggregation/Builder/Term.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Term.php diff --git a/SearchAdapter/Aggregation/DataProviderFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/DataProviderFactory.php similarity index 100% rename from SearchAdapter/Aggregation/DataProviderFactory.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/DataProviderFactory.php diff --git a/SearchAdapter/Aggregation/Interval.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Interval.php similarity index 100% rename from SearchAdapter/Aggregation/Interval.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Interval.php diff --git a/SearchAdapter/AggregationFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/AggregationFactory.php similarity index 100% rename from SearchAdapter/AggregationFactory.php rename to app/code/Magento/Elasticsearch/SearchAdapter/AggregationFactory.php diff --git a/SearchAdapter/ConnectionManager.php b/app/code/Magento/Elasticsearch/SearchAdapter/ConnectionManager.php similarity index 100% rename from SearchAdapter/ConnectionManager.php rename to app/code/Magento/Elasticsearch/SearchAdapter/ConnectionManager.php diff --git a/SearchAdapter/DocumentFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/DocumentFactory.php similarity index 100% rename from SearchAdapter/DocumentFactory.php rename to app/code/Magento/Elasticsearch/SearchAdapter/DocumentFactory.php diff --git a/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php similarity index 100% rename from SearchAdapter/Dynamic/DataProvider.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php diff --git a/SearchAdapter/Filter/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder.php similarity index 100% rename from SearchAdapter/Filter/Builder.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder.php diff --git a/SearchAdapter/Filter/Builder/FilterInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/FilterInterface.php similarity index 100% rename from SearchAdapter/Filter/Builder/FilterInterface.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/FilterInterface.php diff --git a/SearchAdapter/Filter/Builder/Range.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Range.php similarity index 100% rename from SearchAdapter/Filter/Builder/Range.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Range.php diff --git a/SearchAdapter/Filter/Builder/Term.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php similarity index 100% rename from SearchAdapter/Filter/Builder/Term.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Term.php diff --git a/SearchAdapter/Filter/Builder/Wildcard.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Wildcard.php similarity index 100% rename from SearchAdapter/Filter/Builder/Wildcard.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Wildcard.php diff --git a/SearchAdapter/Filter/BuilderInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Filter/BuilderInterface.php similarity index 100% rename from SearchAdapter/Filter/BuilderInterface.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Filter/BuilderInterface.php diff --git a/SearchAdapter/Mapper.php b/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php similarity index 100% rename from SearchAdapter/Mapper.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php diff --git a/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php similarity index 100% rename from SearchAdapter/Query/Builder.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder.php diff --git a/SearchAdapter/Query/Builder/Aggregation.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Aggregation.php similarity index 100% rename from SearchAdapter/Query/Builder/Aggregation.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Aggregation.php diff --git a/SearchAdapter/Query/Builder/Match.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php similarity index 100% rename from SearchAdapter/Query/Builder/Match.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Match.php diff --git a/SearchAdapter/Query/Builder/QueryInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/QueryInterface.php similarity index 100% rename from SearchAdapter/Query/Builder/QueryInterface.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/QueryInterface.php diff --git a/SearchAdapter/Query/Preprocessor/Stopwords.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Preprocessor/Stopwords.php similarity index 100% rename from SearchAdapter/Query/Preprocessor/Stopwords.php rename to app/code/Magento/Elasticsearch/SearchAdapter/Query/Preprocessor/Stopwords.php diff --git a/SearchAdapter/QueryAwareInterface.php b/app/code/Magento/Elasticsearch/SearchAdapter/QueryAwareInterface.php similarity index 100% rename from SearchAdapter/QueryAwareInterface.php rename to app/code/Magento/Elasticsearch/SearchAdapter/QueryAwareInterface.php diff --git a/SearchAdapter/QueryContainer.php b/app/code/Magento/Elasticsearch/SearchAdapter/QueryContainer.php similarity index 100% rename from SearchAdapter/QueryContainer.php rename to app/code/Magento/Elasticsearch/SearchAdapter/QueryContainer.php diff --git a/SearchAdapter/ResponseFactory.php b/app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php similarity index 100% rename from SearchAdapter/ResponseFactory.php rename to app/code/Magento/Elasticsearch/SearchAdapter/ResponseFactory.php diff --git a/SearchAdapter/SearchIndexNameResolver.php b/app/code/Magento/Elasticsearch/SearchAdapter/SearchIndexNameResolver.php similarity index 100% rename from SearchAdapter/SearchIndexNameResolver.php rename to app/code/Magento/Elasticsearch/SearchAdapter/SearchIndexNameResolver.php diff --git a/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php similarity index 100% rename from Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperTest.php diff --git a/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php similarity index 100% rename from Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Adapter/FieldTypeTest.php diff --git a/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php similarity index 100% rename from Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php diff --git a/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php similarity index 100% rename from Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php diff --git a/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php similarity index 100% rename from Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php diff --git a/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php similarity index 100% rename from Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php diff --git a/Test/Unit/Model/Adapter/Container/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Container/AttributeTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Container/AttributeTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Container/AttributeTest.php diff --git a/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php similarity index 100% rename from Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/DataMapper/ProductDataMapperTest.php diff --git a/Test/Unit/Model/Adapter/Document/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Document/BuilderTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Document/BuilderTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Document/BuilderTest.php diff --git a/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php similarity index 100% rename from Test/Unit/Model/Adapter/ElasticsearchTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php diff --git a/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php similarity index 100% rename from Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/FieldMapperResolverTest.php diff --git a/Test/Unit/Model/Adapter/FieldType/DateTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldType/DateTest.php similarity index 100% rename from Test/Unit/Model/Adapter/FieldType/DateTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldType/DateTest.php diff --git a/Test/Unit/Model/Adapter/Index/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/BuilderTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Index/BuilderTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/BuilderTest.php diff --git a/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Index/Config/ConverterTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/ConverterTest.php diff --git a/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php diff --git a/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/SchemaLocatorTest.php diff --git a/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml similarity index 100% rename from Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/_files/esconfig_test.xml diff --git a/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php similarity index 100% rename from Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/IndexNameResolverTest.php diff --git a/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php similarity index 100% rename from Test/Unit/Model/ConfigTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php diff --git a/Test/Unit/Model/DataProvider/SuggestionsTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/SuggestionsTest.php similarity index 100% rename from Test/Unit/Model/DataProvider/SuggestionsTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/SuggestionsTest.php diff --git a/Test/Unit/Model/Indexer/IndexStructureTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexStructureTest.php similarity index 100% rename from Test/Unit/Model/Indexer/IndexStructureTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexStructureTest.php diff --git a/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php similarity index 100% rename from Test/Unit/Model/Indexer/IndexerHandlerTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php diff --git a/Test/Unit/Model/ResourceModel/EngineTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/EngineTest.php similarity index 100% rename from Test/Unit/Model/ResourceModel/EngineTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/EngineTest.php diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php similarity index 100% rename from Test/Unit/Model/ResourceModel/IndexTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php diff --git a/Test/Unit/SearchAdapter/AdapterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AdapterTest.php similarity index 100% rename from Test/Unit/SearchAdapter/AdapterTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AdapterTest.php diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/DynamicTest.php diff --git a/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/Builder/TermTest.php diff --git a/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Aggregation/BuilderTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/BuilderTest.php diff --git a/Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/DataProviderFactoryTest.php diff --git a/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Aggregation/IntervalTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Aggregation/IntervalTest.php diff --git a/Test/Unit/SearchAdapter/AggregationFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AggregationFactoryTest.php similarity index 100% rename from Test/Unit/SearchAdapter/AggregationFactoryTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/AggregationFactoryTest.php diff --git a/Test/Unit/SearchAdapter/ConnectionManagerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ConnectionManagerTest.php similarity index 100% rename from Test/Unit/SearchAdapter/ConnectionManagerTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ConnectionManagerTest.php diff --git a/Test/Unit/SearchAdapter/DocumentFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php similarity index 100% rename from Test/Unit/SearchAdapter/DocumentFactoryTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php diff --git a/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php diff --git a/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/RangeTest.php diff --git a/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Filter/Builder/TermTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/TermTest.php diff --git a/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/Builder/WildcardTest.php diff --git a/Test/Unit/SearchAdapter/Filter/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/BuilderTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Filter/BuilderTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Filter/BuilderTest.php diff --git a/Test/Unit/SearchAdapter/MapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/MapperTest.php similarity index 100% rename from Test/Unit/SearchAdapter/MapperTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/MapperTest.php diff --git a/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/AggregationTest.php diff --git a/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Query/Builder/MatchTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Builder/MatchTest.php diff --git a/Test/Unit/SearchAdapter/Query/BuilderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/BuilderTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Query/BuilderTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/BuilderTest.php diff --git a/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php similarity index 100% rename from Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/Preprocessor/StopwordsTest.php diff --git a/Test/Unit/SearchAdapter/ResponseFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php similarity index 100% rename from Test/Unit/SearchAdapter/ResponseFactoryTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/ResponseFactoryTest.php diff --git a/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php similarity index 100% rename from Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php rename to app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/SearchIndexNameResolverTest.php diff --git a/composer.json b/app/code/Magento/Elasticsearch/composer.json similarity index 100% rename from composer.json rename to app/code/Magento/Elasticsearch/composer.json diff --git a/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch/etc/adminhtml/system.xml similarity index 100% rename from etc/adminhtml/system.xml rename to app/code/Magento/Elasticsearch/etc/adminhtml/system.xml diff --git a/etc/config.xml b/app/code/Magento/Elasticsearch/etc/config.xml similarity index 100% rename from etc/config.xml rename to app/code/Magento/Elasticsearch/etc/config.xml diff --git a/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml similarity index 100% rename from etc/di.xml rename to app/code/Magento/Elasticsearch/etc/di.xml diff --git a/etc/esconfig.xml b/app/code/Magento/Elasticsearch/etc/esconfig.xml similarity index 100% rename from etc/esconfig.xml rename to app/code/Magento/Elasticsearch/etc/esconfig.xml diff --git a/etc/esconfig.xsd b/app/code/Magento/Elasticsearch/etc/esconfig.xsd similarity index 100% rename from etc/esconfig.xsd rename to app/code/Magento/Elasticsearch/etc/esconfig.xsd diff --git a/etc/module.xml b/app/code/Magento/Elasticsearch/etc/module.xml similarity index 100% rename from etc/module.xml rename to app/code/Magento/Elasticsearch/etc/module.xml diff --git a/etc/search_engine.xml b/app/code/Magento/Elasticsearch/etc/search_engine.xml similarity index 100% rename from etc/search_engine.xml rename to app/code/Magento/Elasticsearch/etc/search_engine.xml diff --git a/etc/stopwords/stopwords.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords.csv similarity index 100% rename from etc/stopwords/stopwords.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords.csv diff --git a/etc/stopwords/stopwords_de_DE.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_de_DE.csv similarity index 100% rename from etc/stopwords/stopwords_de_DE.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_de_DE.csv diff --git a/etc/stopwords/stopwords_en_US.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_en_US.csv similarity index 100% rename from etc/stopwords/stopwords_en_US.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_en_US.csv diff --git a/etc/stopwords/stopwords_es_ES.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_es_ES.csv similarity index 100% rename from etc/stopwords/stopwords_es_ES.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_es_ES.csv diff --git a/etc/stopwords/stopwords_fr_FR.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_fr_FR.csv similarity index 100% rename from etc/stopwords/stopwords_fr_FR.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_fr_FR.csv diff --git a/etc/stopwords/stopwords_nl_NL.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_nl_NL.csv similarity index 100% rename from etc/stopwords/stopwords_nl_NL.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_nl_NL.csv diff --git a/etc/stopwords/stopwords_pt_BR.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_pt_BR.csv similarity index 100% rename from etc/stopwords/stopwords_pt_BR.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_pt_BR.csv diff --git a/etc/stopwords/stopwords_zh_Hans_CN.csv b/app/code/Magento/Elasticsearch/etc/stopwords/stopwords_zh_Hans_CN.csv similarity index 100% rename from etc/stopwords/stopwords_zh_Hans_CN.csv rename to app/code/Magento/Elasticsearch/etc/stopwords/stopwords_zh_Hans_CN.csv diff --git a/i18n/en_US.csv b/app/code/Magento/Elasticsearch/i18n/en_US.csv similarity index 100% rename from i18n/en_US.csv rename to app/code/Magento/Elasticsearch/i18n/en_US.csv diff --git a/registration.php b/app/code/Magento/Elasticsearch/registration.php similarity index 100% rename from registration.php rename to app/code/Magento/Elasticsearch/registration.php From 49983531eeecec714cdd6d9c53da970cbf8395a1 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 18:49:22 -0500 Subject: [PATCH 597/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt | 0 .../functional/Magento/FunctionalTest/Elasticsearch/README.md | 0 .../functional/Magento/FunctionalTest/Elasticsearch/composer.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename LICENSE_EE.txt => dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt (100%) rename README.md => dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md (100%) rename composer.json => dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json (100%) diff --git a/LICENSE_EE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt similarity index 100% rename from LICENSE_EE.txt rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt diff --git a/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md similarity index 100% rename from README.md rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/README.md diff --git a/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json similarity index 100% rename from composer.json rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/composer.json From 013fee37938f6d7be0dfd9cc979dbb6de7a3b28a Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 18:50:27 -0500 Subject: [PATCH 598/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Magento/Elasticsearch/Model}/Client/ElasticsearchTest.php | 0 .../Magento/Elasticsearch/Model}/Indexer/IndexHandlerTest.php | 0 .../Magento/Elasticsearch/Model}/Indexer/ReindexAllTest.php | 0 .../Magento/Elasticsearch/SearchAdapter}/AdapterTest.php | 0 .../Magento/Elasticsearch/_files}/configurable_products.php | 0 .../Elasticsearch/_files}/configurable_products_rollback.php | 0 .../testsuite/Magento/Elasticsearch/_files}/indexer.php | 0 .../testsuite/Magento/Elasticsearch/_files}/indexer_rollback.php | 0 .../Magento/Elasticsearch/_files}/multiselect_attribute.php | 0 .../Elasticsearch/_files}/multiselect_attribute_rollback.php | 0 .../testsuite/Magento/Elasticsearch/_files}/requests.xml | 0 .../testsuite/Magento/Elasticsearch/_files}/select_attribute.php | 0 .../Magento/Elasticsearch/_files}/select_attribute_rollback.php | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename {Model => dev/tests/integration/testsuite/Magento/Elasticsearch/Model}/Client/ElasticsearchTest.php (100%) rename {Model => dev/tests/integration/testsuite/Magento/Elasticsearch/Model}/Indexer/IndexHandlerTest.php (100%) rename {Model => dev/tests/integration/testsuite/Magento/Elasticsearch/Model}/Indexer/ReindexAllTest.php (100%) rename {SearchAdapter => dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter}/AdapterTest.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/configurable_products.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/configurable_products_rollback.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/indexer.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/indexer_rollback.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/multiselect_attribute.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/multiselect_attribute_rollback.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/requests.xml (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/select_attribute.php (100%) rename {_files => dev/tests/integration/testsuite/Magento/Elasticsearch/_files}/select_attribute_rollback.php (100%) diff --git a/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php similarity index 100% rename from Model/Client/ElasticsearchTest.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php diff --git a/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php similarity index 100% rename from Model/Indexer/IndexHandlerTest.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php diff --git a/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php similarity index 100% rename from Model/Indexer/ReindexAllTest.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php diff --git a/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php similarity index 100% rename from SearchAdapter/AdapterTest.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php diff --git a/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php similarity index 100% rename from _files/configurable_products.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products.php diff --git a/_files/configurable_products_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php similarity index 100% rename from _files/configurable_products_rollback.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/configurable_products_rollback.php diff --git a/_files/indexer.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php similarity index 100% rename from _files/indexer.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer.php diff --git a/_files/indexer_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php similarity index 100% rename from _files/indexer_rollback.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php diff --git a/_files/multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php similarity index 100% rename from _files/multiselect_attribute.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute.php diff --git a/_files/multiselect_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute_rollback.php similarity index 100% rename from _files/multiselect_attribute_rollback.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/multiselect_attribute_rollback.php diff --git a/_files/requests.xml b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml similarity index 100% rename from _files/requests.xml rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml diff --git a/_files/select_attribute.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute.php similarity index 100% rename from _files/select_attribute.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute.php diff --git a/_files/select_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute_rollback.php similarity index 100% rename from _files/select_attribute_rollback.php rename to dev/tests/integration/testsuite/Magento/Elasticsearch/_files/select_attribute_rollback.php From cc24768386764766dc0e97881ed37d3b380d9cb5 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 19:46:18 -0500 Subject: [PATCH 599/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../code/Magento/AdvancedSearch/Block}/Adminhtml/Search/Edit.php | 0 .../code/Magento/AdvancedSearch/Block}/Adminhtml/Search/Grid.php | 0 .../Block}/Adminhtml/System/Config/TestConnection.php | 0 .../code/Magento/AdvancedSearch/Block}/Recommendations.php | 0 {Block => app/code/Magento/AdvancedSearch/Block}/SearchData.php | 0 .../code/Magento/AdvancedSearch/Block}/SearchDataInterface.php | 0 {Block => app/code/Magento/AdvancedSearch/Block}/Suggestions.php | 0 .../Controller}/Adminhtml/Search/System/Config/TestConnection.php | 0 LICENSE_EE.txt => app/code/Magento/AdvancedSearch/LICENSE_EE.txt | 0 .../Model}/Adapter/DataMapper/AdditionalFieldsProvider.php | 0 .../Adapter/DataMapper/AdditionalFieldsProviderInterface.php | 0 .../AdvancedSearch/Model}/Adminhtml/Search/Grid/Options.php | 0 .../code/Magento/AdvancedSearch/Model}/Client/ClientFactory.php | 0 .../AdvancedSearch/Model}/Client/ClientFactoryInterface.php | 0 .../code/Magento/AdvancedSearch/Model}/Client/ClientInterface.php | 0 .../AdvancedSearch/Model}/Client/ClientOptionsInterface.php | 0 .../code/Magento/AdvancedSearch/Model}/Client/ClientResolver.php | 0 .../Magento/AdvancedSearch/Model}/DataProvider/Suggestions.php | 0 .../Model}/Indexer/Fulltext/Plugin/CustomerGroup.php | 0 .../AdvancedSearch/Model}/Recommendations/DataProvider.php | 0 .../Model}/Recommendations/SaveSearchQueryRelationsObserver.php | 0 .../code/Magento/AdvancedSearch/Model}/ResourceModel/Index.php | 0 .../AdvancedSearch/Model}/ResourceModel/Recommendations.php | 0 .../Model}/ResourceModel/Search/Grid/Collection.php | 0 .../code/Magento/AdvancedSearch/Model}/SuggestedQueries.php | 0 .../Magento/AdvancedSearch/Model}/SuggestedQueriesInterface.php | 0 README.md => app/code/Magento/AdvancedSearch/README.md | 0 .../Magento/AdvancedSearch/Test}/Unit/Block/SearchDataTest.php | 0 .../Adminhtml/Search/System/Config/TestConnectionTest.php | 0 .../AdvancedSearch/Test}/Unit/Model/Client/ClientResolverTest.php | 0 .../Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php | 0 .../AdvancedSearch/Test}/Unit/Model/ResourceModel/IndexTest.php | 0 .../AdvancedSearch/Test}/Unit/Model/SuggestedQueriesTest.php | 0 composer.json => app/code/Magento/AdvancedSearch/composer.json | 0 {etc => app/code/Magento/AdvancedSearch/etc}/adminhtml/events.xml | 0 {etc => app/code/Magento/AdvancedSearch/etc}/adminhtml/routes.xml | 0 {etc => app/code/Magento/AdvancedSearch/etc}/adminhtml/system.xml | 0 {etc => app/code/Magento/AdvancedSearch/etc}/config.xml | 0 {etc => app/code/Magento/AdvancedSearch/etc}/db_schema.xml | 0 .../code/Magento/AdvancedSearch/etc}/db_schema_whitelist.json | 0 {etc => app/code/Magento/AdvancedSearch/etc}/di.xml | 0 {etc => app/code/Magento/AdvancedSearch/etc}/module.xml | 0 {i18n => app/code/Magento/AdvancedSearch/i18n}/en_US.csv | 0 .../code/Magento/AdvancedSearch/registration.php | 0 .../view}/adminhtml/layout/catalog_search_block.xml | 0 .../AdvancedSearch/view}/adminhtml/layout/catalog_search_edit.xml | 0 .../view}/adminhtml/layout/catalog_search_relatedgrid.xml | 0 .../Magento/AdvancedSearch/view}/adminhtml/requirejs-config.js | 0 .../view}/adminhtml/templates/system/config/testconnection.phtml | 0 .../AdvancedSearch/view}/adminhtml/web/js/testconnection.js | 0 .../view}/frontend/layout/catalogsearch_result_index.xml | 0 .../AdvancedSearch/view}/frontend/templates/search_data.phtml | 0 52 files changed, 0 insertions(+), 0 deletions(-) rename {Block => app/code/Magento/AdvancedSearch/Block}/Adminhtml/Search/Edit.php (100%) rename {Block => app/code/Magento/AdvancedSearch/Block}/Adminhtml/Search/Grid.php (100%) rename {Block => app/code/Magento/AdvancedSearch/Block}/Adminhtml/System/Config/TestConnection.php (100%) rename {Block => app/code/Magento/AdvancedSearch/Block}/Recommendations.php (100%) rename {Block => app/code/Magento/AdvancedSearch/Block}/SearchData.php (100%) rename {Block => app/code/Magento/AdvancedSearch/Block}/SearchDataInterface.php (100%) rename {Block => app/code/Magento/AdvancedSearch/Block}/Suggestions.php (100%) rename {Controller => app/code/Magento/AdvancedSearch/Controller}/Adminhtml/Search/System/Config/TestConnection.php (100%) rename LICENSE_EE.txt => app/code/Magento/AdvancedSearch/LICENSE_EE.txt (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Adapter/DataMapper/AdditionalFieldsProvider.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Adapter/DataMapper/AdditionalFieldsProviderInterface.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Adminhtml/Search/Grid/Options.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Client/ClientFactory.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Client/ClientFactoryInterface.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Client/ClientInterface.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Client/ClientOptionsInterface.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Client/ClientResolver.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/DataProvider/Suggestions.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Indexer/Fulltext/Plugin/CustomerGroup.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Recommendations/DataProvider.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/Recommendations/SaveSearchQueryRelationsObserver.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/ResourceModel/Index.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/ResourceModel/Recommendations.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/ResourceModel/Search/Grid/Collection.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/SuggestedQueries.php (100%) rename {Model => app/code/Magento/AdvancedSearch/Model}/SuggestedQueriesInterface.php (100%) rename README.md => app/code/Magento/AdvancedSearch/README.md (100%) rename {Test => app/code/Magento/AdvancedSearch/Test}/Unit/Block/SearchDataTest.php (100%) rename {Test => app/code/Magento/AdvancedSearch/Test}/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php (100%) rename {Test => app/code/Magento/AdvancedSearch/Test}/Unit/Model/Client/ClientResolverTest.php (100%) rename {Test => app/code/Magento/AdvancedSearch/Test}/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php (100%) rename {Test => app/code/Magento/AdvancedSearch/Test}/Unit/Model/ResourceModel/IndexTest.php (100%) rename {Test => app/code/Magento/AdvancedSearch/Test}/Unit/Model/SuggestedQueriesTest.php (100%) rename composer.json => app/code/Magento/AdvancedSearch/composer.json (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/adminhtml/events.xml (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/adminhtml/routes.xml (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/adminhtml/system.xml (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/config.xml (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/db_schema.xml (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/db_schema_whitelist.json (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/di.xml (100%) rename {etc => app/code/Magento/AdvancedSearch/etc}/module.xml (100%) rename {i18n => app/code/Magento/AdvancedSearch/i18n}/en_US.csv (100%) rename registration.php => app/code/Magento/AdvancedSearch/registration.php (100%) rename {view => app/code/Magento/AdvancedSearch/view}/adminhtml/layout/catalog_search_block.xml (100%) rename {view => app/code/Magento/AdvancedSearch/view}/adminhtml/layout/catalog_search_edit.xml (100%) rename {view => app/code/Magento/AdvancedSearch/view}/adminhtml/layout/catalog_search_relatedgrid.xml (100%) rename {view => app/code/Magento/AdvancedSearch/view}/adminhtml/requirejs-config.js (100%) rename {view => app/code/Magento/AdvancedSearch/view}/adminhtml/templates/system/config/testconnection.phtml (100%) rename {view => app/code/Magento/AdvancedSearch/view}/adminhtml/web/js/testconnection.js (100%) rename {view => app/code/Magento/AdvancedSearch/view}/frontend/layout/catalogsearch_result_index.xml (100%) rename {view => app/code/Magento/AdvancedSearch/view}/frontend/templates/search_data.phtml (100%) diff --git a/Block/Adminhtml/Search/Edit.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php similarity index 100% rename from Block/Adminhtml/Search/Edit.php rename to app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php diff --git a/Block/Adminhtml/Search/Grid.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php similarity index 100% rename from Block/Adminhtml/Search/Grid.php rename to app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php diff --git a/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/System/Config/TestConnection.php similarity index 100% rename from Block/Adminhtml/System/Config/TestConnection.php rename to app/code/Magento/AdvancedSearch/Block/Adminhtml/System/Config/TestConnection.php diff --git a/Block/Recommendations.php b/app/code/Magento/AdvancedSearch/Block/Recommendations.php similarity index 100% rename from Block/Recommendations.php rename to app/code/Magento/AdvancedSearch/Block/Recommendations.php diff --git a/Block/SearchData.php b/app/code/Magento/AdvancedSearch/Block/SearchData.php similarity index 100% rename from Block/SearchData.php rename to app/code/Magento/AdvancedSearch/Block/SearchData.php diff --git a/Block/SearchDataInterface.php b/app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php similarity index 100% rename from Block/SearchDataInterface.php rename to app/code/Magento/AdvancedSearch/Block/SearchDataInterface.php diff --git a/Block/Suggestions.php b/app/code/Magento/AdvancedSearch/Block/Suggestions.php similarity index 100% rename from Block/Suggestions.php rename to app/code/Magento/AdvancedSearch/Block/Suggestions.php diff --git a/Controller/Adminhtml/Search/System/Config/TestConnection.php b/app/code/Magento/AdvancedSearch/Controller/Adminhtml/Search/System/Config/TestConnection.php similarity index 100% rename from Controller/Adminhtml/Search/System/Config/TestConnection.php rename to app/code/Magento/AdvancedSearch/Controller/Adminhtml/Search/System/Config/TestConnection.php diff --git a/LICENSE_EE.txt b/app/code/Magento/AdvancedSearch/LICENSE_EE.txt similarity index 100% rename from LICENSE_EE.txt rename to app/code/Magento/AdvancedSearch/LICENSE_EE.txt diff --git a/Model/Adapter/DataMapper/AdditionalFieldsProvider.php b/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProvider.php similarity index 100% rename from Model/Adapter/DataMapper/AdditionalFieldsProvider.php rename to app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProvider.php diff --git a/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php b/app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php similarity index 100% rename from Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php rename to app/code/Magento/AdvancedSearch/Model/Adapter/DataMapper/AdditionalFieldsProviderInterface.php diff --git a/Model/Adminhtml/Search/Grid/Options.php b/app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php similarity index 100% rename from Model/Adminhtml/Search/Grid/Options.php rename to app/code/Magento/AdvancedSearch/Model/Adminhtml/Search/Grid/Options.php diff --git a/Model/Client/ClientFactory.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php similarity index 100% rename from Model/Client/ClientFactory.php rename to app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php diff --git a/Model/Client/ClientFactoryInterface.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientFactoryInterface.php similarity index 100% rename from Model/Client/ClientFactoryInterface.php rename to app/code/Magento/AdvancedSearch/Model/Client/ClientFactoryInterface.php diff --git a/Model/Client/ClientInterface.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientInterface.php similarity index 100% rename from Model/Client/ClientInterface.php rename to app/code/Magento/AdvancedSearch/Model/Client/ClientInterface.php diff --git a/Model/Client/ClientOptionsInterface.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientOptionsInterface.php similarity index 100% rename from Model/Client/ClientOptionsInterface.php rename to app/code/Magento/AdvancedSearch/Model/Client/ClientOptionsInterface.php diff --git a/Model/Client/ClientResolver.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php similarity index 100% rename from Model/Client/ClientResolver.php rename to app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php diff --git a/Model/DataProvider/Suggestions.php b/app/code/Magento/AdvancedSearch/Model/DataProvider/Suggestions.php similarity index 100% rename from Model/DataProvider/Suggestions.php rename to app/code/Magento/AdvancedSearch/Model/DataProvider/Suggestions.php diff --git a/Model/Indexer/Fulltext/Plugin/CustomerGroup.php b/app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php similarity index 100% rename from Model/Indexer/Fulltext/Plugin/CustomerGroup.php rename to app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php diff --git a/Model/Recommendations/DataProvider.php b/app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php similarity index 100% rename from Model/Recommendations/DataProvider.php rename to app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php diff --git a/Model/Recommendations/SaveSearchQueryRelationsObserver.php b/app/code/Magento/AdvancedSearch/Model/Recommendations/SaveSearchQueryRelationsObserver.php similarity index 100% rename from Model/Recommendations/SaveSearchQueryRelationsObserver.php rename to app/code/Magento/AdvancedSearch/Model/Recommendations/SaveSearchQueryRelationsObserver.php diff --git a/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php similarity index 100% rename from Model/ResourceModel/Index.php rename to app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php diff --git a/Model/ResourceModel/Recommendations.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php similarity index 100% rename from Model/ResourceModel/Recommendations.php rename to app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php diff --git a/Model/ResourceModel/Search/Grid/Collection.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php similarity index 100% rename from Model/ResourceModel/Search/Grid/Collection.php rename to app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php diff --git a/Model/SuggestedQueries.php b/app/code/Magento/AdvancedSearch/Model/SuggestedQueries.php similarity index 100% rename from Model/SuggestedQueries.php rename to app/code/Magento/AdvancedSearch/Model/SuggestedQueries.php diff --git a/Model/SuggestedQueriesInterface.php b/app/code/Magento/AdvancedSearch/Model/SuggestedQueriesInterface.php similarity index 100% rename from Model/SuggestedQueriesInterface.php rename to app/code/Magento/AdvancedSearch/Model/SuggestedQueriesInterface.php diff --git a/README.md b/app/code/Magento/AdvancedSearch/README.md similarity index 100% rename from README.md rename to app/code/Magento/AdvancedSearch/README.md diff --git a/Test/Unit/Block/SearchDataTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Block/SearchDataTest.php similarity index 100% rename from Test/Unit/Block/SearchDataTest.php rename to app/code/Magento/AdvancedSearch/Test/Unit/Block/SearchDataTest.php diff --git a/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php similarity index 100% rename from Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php rename to app/code/Magento/AdvancedSearch/Test/Unit/Controller/Adminhtml/Search/System/Config/TestConnectionTest.php diff --git a/Test/Unit/Model/Client/ClientResolverTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php similarity index 100% rename from Test/Unit/Model/Client/ClientResolverTest.php rename to app/code/Magento/AdvancedSearch/Test/Unit/Model/Client/ClientResolverTest.php diff --git a/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php similarity index 100% rename from Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php rename to app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php diff --git a/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php similarity index 100% rename from Test/Unit/Model/ResourceModel/IndexTest.php rename to app/code/Magento/AdvancedSearch/Test/Unit/Model/ResourceModel/IndexTest.php diff --git a/Test/Unit/Model/SuggestedQueriesTest.php b/app/code/Magento/AdvancedSearch/Test/Unit/Model/SuggestedQueriesTest.php similarity index 100% rename from Test/Unit/Model/SuggestedQueriesTest.php rename to app/code/Magento/AdvancedSearch/Test/Unit/Model/SuggestedQueriesTest.php diff --git a/composer.json b/app/code/Magento/AdvancedSearch/composer.json similarity index 100% rename from composer.json rename to app/code/Magento/AdvancedSearch/composer.json diff --git a/etc/adminhtml/events.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/events.xml similarity index 100% rename from etc/adminhtml/events.xml rename to app/code/Magento/AdvancedSearch/etc/adminhtml/events.xml diff --git a/etc/adminhtml/routes.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/routes.xml similarity index 100% rename from etc/adminhtml/routes.xml rename to app/code/Magento/AdvancedSearch/etc/adminhtml/routes.xml diff --git a/etc/adminhtml/system.xml b/app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml similarity index 100% rename from etc/adminhtml/system.xml rename to app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml diff --git a/etc/config.xml b/app/code/Magento/AdvancedSearch/etc/config.xml similarity index 100% rename from etc/config.xml rename to app/code/Magento/AdvancedSearch/etc/config.xml diff --git a/etc/db_schema.xml b/app/code/Magento/AdvancedSearch/etc/db_schema.xml similarity index 100% rename from etc/db_schema.xml rename to app/code/Magento/AdvancedSearch/etc/db_schema.xml diff --git a/etc/db_schema_whitelist.json b/app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json similarity index 100% rename from etc/db_schema_whitelist.json rename to app/code/Magento/AdvancedSearch/etc/db_schema_whitelist.json diff --git a/etc/di.xml b/app/code/Magento/AdvancedSearch/etc/di.xml similarity index 100% rename from etc/di.xml rename to app/code/Magento/AdvancedSearch/etc/di.xml diff --git a/etc/module.xml b/app/code/Magento/AdvancedSearch/etc/module.xml similarity index 100% rename from etc/module.xml rename to app/code/Magento/AdvancedSearch/etc/module.xml diff --git a/i18n/en_US.csv b/app/code/Magento/AdvancedSearch/i18n/en_US.csv similarity index 100% rename from i18n/en_US.csv rename to app/code/Magento/AdvancedSearch/i18n/en_US.csv diff --git a/registration.php b/app/code/Magento/AdvancedSearch/registration.php similarity index 100% rename from registration.php rename to app/code/Magento/AdvancedSearch/registration.php diff --git a/view/adminhtml/layout/catalog_search_block.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml similarity index 100% rename from view/adminhtml/layout/catalog_search_block.xml rename to app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml diff --git a/view/adminhtml/layout/catalog_search_edit.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_edit.xml similarity index 100% rename from view/adminhtml/layout/catalog_search_edit.xml rename to app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_edit.xml diff --git a/view/adminhtml/layout/catalog_search_relatedgrid.xml b/app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_relatedgrid.xml similarity index 100% rename from view/adminhtml/layout/catalog_search_relatedgrid.xml rename to app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_relatedgrid.xml diff --git a/view/adminhtml/requirejs-config.js b/app/code/Magento/AdvancedSearch/view/adminhtml/requirejs-config.js similarity index 100% rename from view/adminhtml/requirejs-config.js rename to app/code/Magento/AdvancedSearch/view/adminhtml/requirejs-config.js diff --git a/view/adminhtml/templates/system/config/testconnection.phtml b/app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml similarity index 100% rename from view/adminhtml/templates/system/config/testconnection.phtml rename to app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml diff --git a/view/adminhtml/web/js/testconnection.js b/app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js similarity index 100% rename from view/adminhtml/web/js/testconnection.js rename to app/code/Magento/AdvancedSearch/view/adminhtml/web/js/testconnection.js diff --git a/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/AdvancedSearch/view/frontend/layout/catalogsearch_result_index.xml similarity index 100% rename from view/frontend/layout/catalogsearch_result_index.xml rename to app/code/Magento/AdvancedSearch/view/frontend/layout/catalogsearch_result_index.xml diff --git a/view/frontend/templates/search_data.phtml b/app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml similarity index 100% rename from view/frontend/templates/search_data.phtml rename to app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml From 2ab2a5158c78f5d3811ee66992056608b500d4f7 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 19:46:41 -0500 Subject: [PATCH 600/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt | 0 .../functional/Magento/FunctionalTest/AdvancedSearch/README.md | 0 .../Magento/FunctionalTest/AdvancedSearch/composer.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename LICENSE_EE.txt => dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt (100%) rename README.md => dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md (100%) rename composer.json => dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json (100%) diff --git a/LICENSE_EE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt similarity index 100% rename from LICENSE_EE.txt rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt diff --git a/README.md b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md similarity index 100% rename from README.md rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/README.md diff --git a/composer.json b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json similarity index 100% rename from composer.json rename to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/composer.json From ef5beb1c7b1007a8dfecf164beffbd8cdd106929 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 19:47:07 -0500 Subject: [PATCH 601/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../testsuite/Magento/AdvancedSearch/Block}/SuggestionsTest.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {Block => dev/tests/integration/testsuite/Magento/AdvancedSearch/Block}/SuggestionsTest.php (100%) diff --git a/Block/SuggestionsTest.php b/dev/tests/integration/testsuite/Magento/AdvancedSearch/Block/SuggestionsTest.php similarity index 100% rename from Block/SuggestionsTest.php rename to dev/tests/integration/testsuite/Magento/AdvancedSearch/Block/SuggestionsTest.php From 49ae58eacc1bbe3e0ca2b9a3e7f196a7114fb60c Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 20:10:35 -0500 Subject: [PATCH 602/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- composer.json | 2 + composer.lock | 433 +++++++++++++----- .../_files/dependency_test/tables_ce.php | 1 + .../whitelist/refactored_modules.php | 1 + .../Test/Legacy/_files/obsolete_classes.php | 10 + .../_files/whitelist/exempt_modules/ce.php | 1 + 6 files changed, 333 insertions(+), 115 deletions(-) diff --git a/composer.json b/composer.json index 212322ee2300c..947c082ee8e43 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@ "colinmollenhour/cache-backend-redis": "1.10.2", "colinmollenhour/credis": "1.6", "colinmollenhour/php-redis-session-abstract": "~1.3.8", + "elasticsearch/elasticsearch": "~2.0|~5.1", "composer/composer": "1.4.1", "magento/composer": "~1.2.0", "magento/magento-composer-installer": ">=0.1.11", @@ -136,6 +137,7 @@ "magento/module-downloadable-graph-ql": "100.0.0-dev", "magento/module-downloadable-import-export": "100.3.0-dev", "magento/module-eav": "100.3.0-dev", + "magento/module-elasticsearch": "100.3.0-dev", "magento/module-email": "100.3.0-dev", "magento/module-encryption-key": "100.3.0-dev", "magento/module-fedex": "100.3.0-dev", diff --git a/composer.lock b/composer.lock index d86ab3e509178..ad37912ba0d0d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "19f6c01c03032849ec8101511a02d174", + "hash": "448cc8490b2ba7ec9f1560d4f7f9ecc2", + "content-hash": "8fe7c97f3e0594e7324884b4e3baa1e5", "packages": [ { "name": "braintree/braintree_php", @@ -51,7 +52,7 @@ } ], "description": "Braintree PHP Client Library", - "time": "2017-02-16T19:59:04+00:00" + "time": "2017-02-16 19:59:04" }, { "name": "colinmollenhour/cache-backend-file", @@ -87,7 +88,7 @@ ], "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File", - "time": "2016-05-02T16:24:47+00:00" + "time": "2016-05-02 16:24:47" }, { "name": "colinmollenhour/cache-backend-redis", @@ -123,7 +124,7 @@ ], "description": "Zend_Cache backend using Redis with full support for tags.", "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis", - "time": "2017-03-25T04:54:24+00:00" + "time": "2017-03-25 04:54:24" }, { "name": "colinmollenhour/credis", @@ -162,7 +163,7 @@ ], "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.", "homepage": "https://github.com/colinmollenhour/credis", - "time": "2015-11-28T01:20:04+00:00" + "time": "2015-11-28 01:20:04" }, { "name": "colinmollenhour/php-redis-session-abstract", @@ -199,7 +200,7 @@ ], "description": "A Redis-based session handler with optimistic locking", "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract", - "time": "2018-01-08T14:53:13+00:00" + "time": "2018-01-08 14:53:13" }, { "name": "composer/ca-bundle", @@ -255,7 +256,7 @@ "ssl", "tls" ], - "time": "2017-11-29T09:37:33+00:00" + "time": "2017-11-29 09:37:33" }, { "name": "composer/composer", @@ -332,7 +333,7 @@ "dependency", "package" ], - "time": "2017-03-10T08:29:45+00:00" + "time": "2017-03-10 08:29:45" }, { "name": "composer/semver", @@ -394,7 +395,7 @@ "validation", "versioning" ], - "time": "2016-08-30T16:08:34+00:00" + "time": "2016-08-30 16:08:34" }, { "name": "composer/spdx-licenses", @@ -455,7 +456,7 @@ "spdx", "validator" ], - "time": "2018-01-31T13:17:27+00:00" + "time": "2018-01-31 13:17:27" }, { "name": "container-interop/container-interop", @@ -486,7 +487,163 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14T19:40:03+00:00" + "time": "2017-02-14 19:40:03" + }, + { + "name": "elasticsearch/elasticsearch", + "version": "v5.3.2", + "source": { + "type": "git", + "url": "https://github.com/elastic/elasticsearch-php.git", + "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/4b29a4121e790bbfe690d5ee77da348b62d48eb8", + "reference": "4b29a4121e790bbfe690d5ee77da348b62d48eb8", + "shasum": "" + }, + "require": { + "guzzlehttp/ringphp": "~1.0", + "php": "^5.6|^7.0", + "psr/log": "~1.0" + }, + "require-dev": { + "cpliakas/git-wrapper": "~1.0", + "doctrine/inflector": "^1.1", + "mockery/mockery": "0.9.4", + "phpunit/phpunit": "^4.7|^5.4", + "sami/sami": "~3.2", + "symfony/finder": "^2.8", + "symfony/yaml": "^2.8" + }, + "suggest": { + "ext-curl": "*", + "monolog/monolog": "Allows for client-level logging and tracing" + }, + "type": "library", + "autoload": { + "psr-4": { + "Elasticsearch\\": "src/Elasticsearch/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Zachary Tong" + } + ], + "description": "PHP Client for Elasticsearch", + "keywords": [ + "client", + "elasticsearch", + "search" + ], + "time": "2017-11-08 17:04:47" + }, + { + "name": "guzzlehttp/ringphp", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/RingPHP.git", + "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b", + "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b", + "shasum": "" + }, + "require": { + "guzzlehttp/streams": "~3.0", + "php": ">=5.4.0", + "react/promise": "~2.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "ext-curl": "Guzzle will use specific adapters if cURL is present" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Ring\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.", + "time": "2015-05-20 03:37:09" + }, + { + "name": "guzzlehttp/streams", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/streams.git", + "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5", + "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Stream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Provides a simple abstraction over streams of data", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "Guzzle", + "stream" + ], + "time": "2014-10-12 19:18:40" }, { "name": "justinrainbow/json-schema", @@ -552,7 +709,7 @@ "json", "schema" ], - "time": "2017-10-21T13:15:38+00:00" + "time": "2017-10-21 13:15:38" }, { "name": "magento/composer", @@ -588,7 +745,7 @@ "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "time": "2017-04-24T09:57:02+00:00" + "time": "2017-04-24 09:57:02" }, { "name": "magento/magento-composer-installer", @@ -667,7 +824,7 @@ "composer-installer", "magento" ], - "time": "2017-12-29T16:45:24+00:00" + "time": "2017-12-29 16:45:24" }, { "name": "magento/zendframework1", @@ -714,7 +871,7 @@ "ZF1", "framework" ], - "time": "2017-06-21T14:56:23+00:00" + "time": "2017-06-21 14:56:23" }, { "name": "monolog/monolog", @@ -792,7 +949,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2017-06-19 01:22:40" }, { "name": "oyejorge/less.php", @@ -854,7 +1011,7 @@ "php", "stylesheet" ], - "time": "2017-03-28T22:19:25+00:00" + "time": "2017-03-28 22:19:25" }, { "name": "paragonie/random_compat", @@ -902,7 +1059,7 @@ "pseudorandom", "random" ], - "time": "2017-09-27T21:40:39+00:00" + "time": "2017-09-27 21:40:39" }, { "name": "pelago/emogrifier", @@ -971,7 +1128,7 @@ "email", "pre-processing" ], - "time": "2018-01-05T23:30:21+00:00" + "time": "2018-01-05 23:30:21" }, { "name": "php-amqplib/php-amqplib", @@ -1025,7 +1182,7 @@ "queue", "rabbitmq" ], - "time": "2015-08-11T12:30:09+00:00" + "time": "2015-08-11 12:30:09" }, { "name": "phpseclib/phpseclib", @@ -1117,7 +1274,7 @@ "x.509", "x509" ], - "time": "2017-11-29T06:38:08+00:00" + "time": "2017-11-29 06:38:08" }, { "name": "psr/container", @@ -1166,7 +1323,7 @@ "container-interop", "psr" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2017-02-14 16:28:37" }, { "name": "psr/log", @@ -1213,7 +1370,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2016-10-10 12:19:37" }, { "name": "ramsey/uuid", @@ -1295,7 +1452,53 @@ "identifier", "uuid" ], - "time": "2017-03-26T20:37:53+00:00" + "time": "2017-03-26 20:37:53" + }, + { + "name": "react/promise", + "version": "v2.5.1", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "62785ae604c8d69725d693eb370e1d67e94c4053" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/62785ae604c8d69725d693eb370e1d67e94c4053", + "reference": "62785ae604c8d69725d693eb370e1d67e94c4053", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "React\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com" + } + ], + "description": "A lightweight implementation of CommonJS Promises/A for PHP", + "keywords": [ + "promise", + "promises" + ], + "time": "2017-03-25 12:08:31" }, { "name": "seld/cli-prompt", @@ -1343,7 +1546,7 @@ "input", "prompt" ], - "time": "2017-03-18T11:32:45+00:00" + "time": "2017-03-18 11:32:45" }, { "name": "seld/jsonlint", @@ -1392,7 +1595,7 @@ "parser", "validator" ], - "time": "2018-01-24T12:46:19+00:00" + "time": "2018-01-24 12:46:19" }, { "name": "seld/phar-utils", @@ -1436,7 +1639,7 @@ "keywords": [ "phra" ], - "time": "2015-10-13T18:44:15+00:00" + "time": "2015-10-13 18:44:15" }, { "name": "symfony/console", @@ -1497,7 +1700,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-01-29 08:54:45" }, { "name": "symfony/debug", @@ -1554,7 +1757,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-07-30T07:22:48+00:00" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/event-dispatcher", @@ -1614,7 +1817,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" + "time": "2018-01-03 07:36:31" }, { "name": "symfony/filesystem", @@ -1663,7 +1866,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/finder", @@ -1712,7 +1915,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "symfony/polyfill-mbstring", @@ -1771,7 +1974,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/process", @@ -1820,7 +2023,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-01-29T08:54:45+00:00" + "time": "2018-01-29 08:54:45" }, { "name": "tedivm/jshrink", @@ -1866,7 +2069,7 @@ "javascript", "minifier" ], - "time": "2015-07-04T07:35:09+00:00" + "time": "2015-07-04 07:35:09" }, { "name": "tubalmartin/cssmin", @@ -1919,7 +2122,7 @@ "minify", "yui" ], - "time": "2017-05-16T13:45:26+00:00" + "time": "2017-05-16 13:45:26" }, { "name": "webonyx/graphql-php", @@ -1966,7 +2169,7 @@ "api", "graphql" ], - "time": "2017-12-12T09:03:21+00:00" + "time": "2017-12-12 09:03:21" }, { "name": "zendframework/zend-captcha", @@ -2023,7 +2226,7 @@ "captcha", "zf2" ], - "time": "2017-02-23T08:09:44+00:00" + "time": "2017-02-23 08:09:44" }, { "name": "zendframework/zend-code", @@ -2076,7 +2279,7 @@ "code", "zf2" ], - "time": "2016-10-24T13:23:32+00:00" + "time": "2016-10-24 13:23:32" }, { "name": "zendframework/zend-config", @@ -2132,7 +2335,7 @@ "config", "zf2" ], - "time": "2016-02-04T23:01:10+00:00" + "time": "2016-02-04 23:01:10" }, { "name": "zendframework/zend-console", @@ -2185,7 +2388,7 @@ "console", "zf" ], - "time": "2018-01-25T19:08:04+00:00" + "time": "2018-01-25 19:08:04" }, { "name": "zendframework/zend-crypt", @@ -2235,7 +2438,7 @@ "crypt", "zf2" ], - "time": "2016-02-03T23:46:30+00:00" + "time": "2016-02-03 23:46:30" }, { "name": "zendframework/zend-db", @@ -2293,7 +2496,7 @@ "db", "zf" ], - "time": "2017-12-11T14:57:52+00:00" + "time": "2017-12-11 14:57:52" }, { "name": "zendframework/zend-di", @@ -2340,7 +2543,7 @@ "di", "zf2" ], - "time": "2016-04-25T20:58:11+00:00" + "time": "2016-04-25 20:58:11" }, { "name": "zendframework/zend-escaper", @@ -2384,7 +2587,7 @@ "escaper", "zf2" ], - "time": "2016-06-30T19:48:38+00:00" + "time": "2016-06-30 19:48:38" }, { "name": "zendframework/zend-eventmanager", @@ -2431,7 +2634,7 @@ "eventmanager", "zf2" ], - "time": "2017-12-12T17:48:56+00:00" + "time": "2017-12-12 17:48:56" }, { "name": "zendframework/zend-filter", @@ -2491,7 +2694,7 @@ "filter", "zf2" ], - "time": "2017-05-17T20:56:17+00:00" + "time": "2017-05-17 20:56:17" }, { "name": "zendframework/zend-form", @@ -2569,7 +2772,7 @@ "form", "zf" ], - "time": "2017-12-06T21:09:08+00:00" + "time": "2017-12-06 21:09:08" }, { "name": "zendframework/zend-http", @@ -2622,7 +2825,7 @@ "zend", "zf" ], - "time": "2017-10-13T12:06:24+00:00" + "time": "2017-10-13 12:06:24" }, { "name": "zendframework/zend-hydrator", @@ -2680,7 +2883,7 @@ "hydrator", "zf2" ], - "time": "2016-02-18T22:38:26+00:00" + "time": "2016-02-18 22:38:26" }, { "name": "zendframework/zend-i18n", @@ -2747,7 +2950,7 @@ "i18n", "zf2" ], - "time": "2017-05-17T17:00:12+00:00" + "time": "2017-05-17 17:00:12" }, { "name": "zendframework/zend-inputfilter", @@ -2800,7 +3003,7 @@ "inputfilter", "zf" ], - "time": "2018-01-22T19:41:18+00:00" + "time": "2018-01-22 19:41:18" }, { "name": "zendframework/zend-json", @@ -2855,7 +3058,7 @@ "json", "zf2" ], - "time": "2016-02-04T21:20:26+00:00" + "time": "2016-02-04 21:20:26" }, { "name": "zendframework/zend-loader", @@ -2899,7 +3102,7 @@ "loader", "zf2" ], - "time": "2015-06-03T14:05:47+00:00" + "time": "2015-06-03 14:05:47" }, { "name": "zendframework/zend-log", @@ -2970,7 +3173,7 @@ "logging", "zf2" ], - "time": "2017-05-17T16:03:26+00:00" + "time": "2017-05-17 16:03:26" }, { "name": "zendframework/zend-mail", @@ -3032,7 +3235,7 @@ "mail", "zf2" ], - "time": "2017-06-08T20:03:58+00:00" + "time": "2017-06-08 20:03:58" }, { "name": "zendframework/zend-math", @@ -3082,7 +3285,7 @@ "math", "zf2" ], - "time": "2016-04-07T16:29:53+00:00" + "time": "2016-04-07 16:29:53" }, { "name": "zendframework/zend-mime", @@ -3133,7 +3336,7 @@ "mime", "zf" ], - "time": "2017-11-28T15:02:22+00:00" + "time": "2017-11-28 15:02:22" }, { "name": "zendframework/zend-modulemanager", @@ -3193,7 +3396,7 @@ "modulemanager", "zf" ], - "time": "2017-12-02T06:11:18+00:00" + "time": "2017-12-02 06:11:18" }, { "name": "zendframework/zend-mvc", @@ -3280,7 +3483,7 @@ "mvc", "zf2" ], - "time": "2016-02-23T15:24:59+00:00" + "time": "2016-02-23 15:24:59" }, { "name": "zendframework/zend-serializer", @@ -3338,7 +3541,7 @@ "serializer", "zf2" ], - "time": "2017-11-20T22:21:04+00:00" + "time": "2017-11-20 22:21:04" }, { "name": "zendframework/zend-server", @@ -3384,7 +3587,7 @@ "server", "zf2" ], - "time": "2016-06-20T22:27:55+00:00" + "time": "2016-06-20 22:27:55" }, { "name": "zendframework/zend-servicemanager", @@ -3436,7 +3639,7 @@ "servicemanager", "zf2" ], - "time": "2017-12-05T16:27:36+00:00" + "time": "2017-12-05 16:27:36" }, { "name": "zendframework/zend-session", @@ -3506,7 +3709,7 @@ "session", "zf" ], - "time": "2018-01-31T17:38:47+00:00" + "time": "2018-01-31 17:38:47" }, { "name": "zendframework/zend-soap", @@ -3559,7 +3762,7 @@ "soap", "zf2" ], - "time": "2018-01-29T17:51:26+00:00" + "time": "2018-01-29 17:51:26" }, { "name": "zendframework/zend-stdlib", @@ -3618,7 +3821,7 @@ "stdlib", "zf2" ], - "time": "2016-04-12T21:17:31+00:00" + "time": "2016-04-12 21:17:31" }, { "name": "zendframework/zend-text", @@ -3665,7 +3868,7 @@ "text", "zf2" ], - "time": "2016-02-08T19:03:52+00:00" + "time": "2016-02-08 19:03:52" }, { "name": "zendframework/zend-uri", @@ -3712,7 +3915,7 @@ "uri", "zf2" ], - "time": "2016-02-17T22:38:51+00:00" + "time": "2016-02-17 22:38:51" }, { "name": "zendframework/zend-validator", @@ -3783,7 +3986,7 @@ "validator", "zf2" ], - "time": "2018-02-01T17:05:33+00:00" + "time": "2018-02-01 17:05:33" }, { "name": "zendframework/zend-view", @@ -3870,7 +4073,7 @@ "view", "zf2" ], - "time": "2018-01-17T22:21:50+00:00" + "time": "2018-01-17 22:21:50" } ], "packages-dev": [ @@ -3926,7 +4129,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2015-06-14 21:17:01" }, { "name": "friendsofphp/php-cs-fixer", @@ -3996,7 +4199,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2017-03-31T12:59:38+00:00" + "time": "2017-03-31 12:59:38" }, { "name": "ircmaxell/password-compat", @@ -4038,7 +4241,7 @@ "hashing", "password" ], - "time": "2014-11-20T16:49:30+00:00" + "time": "2014-11-20 16:49:30" }, { "name": "lusitanian/oauth", @@ -4105,7 +4308,7 @@ "oauth", "security" ], - "time": "2016-07-12T22:15:40+00:00" + "time": "2016-07-12 22:15:40" }, { "name": "myclabs/deep-copy", @@ -4150,7 +4353,7 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2017-10-19 19:58:43" }, { "name": "pdepend/pdepend", @@ -4190,7 +4393,7 @@ "BSD-3-Clause" ], "description": "Official version of pdepend to be handled with Composer", - "time": "2017-01-19T14:23:36+00:00" + "time": "2017-01-19 14:23:36" }, { "name": "phar-io/manifest", @@ -4245,7 +4448,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" + "time": "2017-03-05 18:14:27" }, { "name": "phar-io/version", @@ -4292,7 +4495,7 @@ } ], "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2017-03-05 17:38:23" }, { "name": "phpdocumentor/reflection-common", @@ -4346,7 +4549,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2017-09-11 18:02:19" }, { "name": "phpdocumentor/reflection-docblock", @@ -4397,7 +4600,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2017-11-30 07:14:17" }, { "name": "phpdocumentor/type-resolver", @@ -4444,7 +4647,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "time": "2017-07-14 14:27:02" }, { "name": "phpmd/phpmd", @@ -4510,7 +4713,7 @@ "phpmd", "pmd" ], - "time": "2017-01-20T14:41:10+00:00" + "time": "2017-01-20 14:41:10" }, { "name": "phpspec/prophecy", @@ -4573,7 +4776,7 @@ "spy", "stub" ], - "time": "2017-11-24T13:59:53+00:00" + "time": "2017-11-24 13:59:53" }, { "name": "phpunit/php-code-coverage", @@ -4636,7 +4839,7 @@ "testing", "xunit" ], - "time": "2017-12-06T09:29:45+00:00" + "time": "2017-12-06 09:29:45" }, { "name": "phpunit/php-file-iterator", @@ -4683,7 +4886,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2017-11-27 13:52:08" }, { "name": "phpunit/php-text-template", @@ -4724,7 +4927,7 @@ "keywords": [ "template" ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", @@ -4773,7 +4976,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2017-02-26 11:10:40" }, { "name": "phpunit/php-token-stream", @@ -4822,7 +5025,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27T05:48:46+00:00" + "time": "2017-11-27 05:48:46" }, { "name": "phpunit/phpunit", @@ -4906,7 +5109,7 @@ "testing", "xunit" ], - "time": "2017-08-03T13:59:28+00:00" + "time": "2017-08-03 13:59:28" }, { "name": "phpunit/phpunit-mock-objects", @@ -4965,7 +5168,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2017-08-03 14:08:16" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5010,7 +5213,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "time": "2017-03-04 06:30:41" }, { "name": "sebastian/comparator", @@ -5074,7 +5277,7 @@ "compare", "equality" ], - "time": "2017-03-03T06:26:08+00:00" + "time": "2017-03-03 06:26:08" }, { "name": "sebastian/diff", @@ -5126,7 +5329,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2017-05-22 07:24:03" }, { "name": "sebastian/environment", @@ -5176,7 +5379,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2017-07-01 08:51:00" }, { "name": "sebastian/exporter", @@ -5243,7 +5446,7 @@ "export", "exporter" ], - "time": "2017-04-03T13:19:02+00:00" + "time": "2017-04-03 13:19:02" }, { "name": "sebastian/finder-facade", @@ -5282,7 +5485,7 @@ ], "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.", "homepage": "https://github.com/sebastianbergmann/finder-facade", - "time": "2017-11-18T17:31:49+00:00" + "time": "2017-11-18 17:31:49" }, { "name": "sebastian/global-state", @@ -5333,7 +5536,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2017-04-27 15:39:26" }, { "name": "sebastian/object-enumerator", @@ -5380,7 +5583,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "time": "2017-08-03 12:35:26" }, { "name": "sebastian/object-reflector", @@ -5425,7 +5628,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "time": "2017-03-29 09:07:27" }, { "name": "sebastian/phpcpd", @@ -5476,7 +5679,7 @@ ], "description": "Copy/Paste Detector (CPD) for PHP code.", "homepage": "https://github.com/sebastianbergmann/phpcpd", - "time": "2016-04-17T19:32:49+00:00" + "time": "2016-04-17 19:32:49" }, { "name": "sebastian/recursion-context", @@ -5529,7 +5732,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" + "time": "2017-03-03 06:23:57" }, { "name": "sebastian/resource-operations", @@ -5571,7 +5774,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2015-07-28 20:34:47" }, { "name": "sebastian/version", @@ -5614,7 +5817,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "time": "2016-10-03 07:35:21" }, { "name": "squizlabs/php_codesniffer", @@ -5665,7 +5868,7 @@ "phpcs", "standards" ], - "time": "2017-06-14T01:23:49+00:00" + "time": "2017-06-14 01:23:49" }, { "name": "symfony/config", @@ -5727,7 +5930,7 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-01-21T19:05:02+00:00" + "time": "2018-01-21 19:05:02" }, { "name": "symfony/dependency-injection", @@ -5798,7 +6001,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-01-29T09:16:57+00:00" + "time": "2018-01-29 09:16:57" }, { "name": "symfony/polyfill-php54", @@ -5856,7 +6059,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php55", @@ -5912,7 +6115,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php70", @@ -5971,7 +6174,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/polyfill-php72", @@ -6026,7 +6229,7 @@ "portable", "shim" ], - "time": "2018-01-31T17:43:24+00:00" + "time": "2018-01-31 17:43:24" }, { "name": "symfony/polyfill-xml", @@ -6074,7 +6277,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-01-30 19:27:44" }, { "name": "symfony/stopwatch", @@ -6123,7 +6326,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2018-01-03 07:37:34" }, { "name": "theseer/fdomdocument", @@ -6163,7 +6366,7 @@ ], "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2017-06-30T11:53:12+00:00" + "time": "2017-06-30 11:53:12" }, { "name": "theseer/tokenizer", @@ -6203,7 +6406,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07T12:08:54+00:00" + "time": "2017-04-07 12:08:54" }, { "name": "webmozart/assert", @@ -6253,7 +6456,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-01-29 19:49:41" } ], "aliases": [], diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php index 50fe1e3232977..530f55504d009 100644 --- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php +++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php @@ -301,4 +301,5 @@ 'variable' => 'Magento\Variable', 'variable_value' => 'Magento\Variable', 'job_queue' => 'Magento\Queue', + 'catalogsearch_recommendations' => 'Magento\AdvancedSearch', ]; diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php index 390f0020a5b58..0608808d89f3f 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/connection/whitelist/refactored_modules.php @@ -10,6 +10,7 @@ return [ 'Magento_AdminNotification', 'Magento_AdvancedPricingImportExport', + 'Magento_AdvancedSearch', 'Magento_Authorization', 'Magento_Authorizenet', 'Magento_Backend', diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index dea45d5f7f860..8087dee74f8a4 100755 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -4220,4 +4220,14 @@ ['Magento\Framework\MessageQueue\Config\Reader', 'Magento\Framework\MessageQueue\Config\Reader\Xml'], ['Magento\Framework\MessageQueue\PublisherFactory'], ['Magento\Framework\MessageQueue\PublisherProxy'], + ['Magento\Search\Block\SearchData', 'Magento\AdvancedSearch\Block\SearchData'], + ['Magento\Search\Block\Recommendations', 'Magento\AdvancedSearch\Block\Recommendations'], + ['Magento\Search\Block\SearchDataInterface', 'Magento\AdvancedSearch\Block\SearchDataInterface'], + ['Magento\Search\Block\Suggestions', 'Magento\AdvancedSearch\Block\Suggestions'], + ['Magento\Search\Model\SearchDataProvider', 'Magento\AdvancedSearch\Model\SearchDataProvider'], + ['Magento\Search\Model\SearchDataProviderInterface', 'Magento\AdvancedSearch\Model\SearchDataProviderInterface'], + [ + 'Magento\Elasticsearch\Test\Unit\Model\SearchAdapter\ConnectionManagerTest', + 'Magento\Elasticsearch\Test\Unit\SearchAdapter\ConnectionManagerTest' + ], ]; diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php index 55104db48ba18..0d99320b15e7f 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php @@ -6,6 +6,7 @@ /* These are the modules that have not been refactored from @escapeNotVerified yet. */ return [ 'Magento_AdminNotification', + 'Magento_AdvancedSearch', 'Magento_Backend', 'Magento_Backup', 'Magento_Bundle', From d4d5ad15b7610fcfd86eb35ec7888b76bbe9928d Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 20:17:50 -0500 Subject: [PATCH 603/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Magento/Test/Php/_files/phpcpd/blacklist/common.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt index c831239bed42b..cf0ea458483e8 100644 --- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt +++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt @@ -200,3 +200,4 @@ IntegrationConfig.php *Test.php setup/performance-toolkit/aggregate-report Magento/MessageQueue/Setup +Magento/Elasticsearch/Elasticsearch5 From 39624bca2019b9ca37fe23d0cd0d11842481c93d Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 20:32:54 -0500 Subject: [PATCH 604/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- composer.json | 1 + composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 947c082ee8e43..8ede1fe1d204a 100644 --- a/composer.json +++ b/composer.json @@ -97,6 +97,7 @@ "magento/module-asynchronous-operations": "100.3.0-dev", "magento/module-authorization": "100.3.0-dev", "magento/module-authorizenet": "100.3.0-dev", + "magento/module-advanced-search": "100.3.0-dev", "magento/module-backend": "100.3.0-dev", "magento/module-backup": "100.3.0-dev", "magento/module-braintree": "100.3.0-dev", diff --git a/composer.lock b/composer.lock index ad37912ba0d0d..540645c32dbd1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "448cc8490b2ba7ec9f1560d4f7f9ecc2", - "content-hash": "8fe7c97f3e0594e7324884b4e3baa1e5", + "hash": "548d1c133e72f185367f630478f0a79f", + "content-hash": "626cf11f387b81b9dc0f36f297181fce", "packages": [ { "name": "braintree/braintree_php", From 73ece0604c5de53c3a8ceff1771e8544875d63f5 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 20:39:21 -0500 Subject: [PATCH 605/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Model/Indexer/ReindexAllTest.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php index 5122e3c1dfca1..a083949d846b5 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php @@ -96,22 +96,6 @@ public function testSearchSpecificProduct() self::assertEquals($specificProduct->getId(), $result[0]['_id']); } - /** - * Test search of grouped product after full reindex - * - * @magentoDataFixture Magento/GroupedProduct/_files/product_grouped_with_simple.php - * @magentoConfigFixture current_store catalog/search/engine elasticsearch - * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_grouped - */ - public function testSearchGroupedProduct() - { - $expectedProductName = 'Grouped Product Simple 11 Simple 22'; - $this->reindexAll(); - $result = $this->searchByName('Grouped Product'); - self::assertCount(1, $result); - self::assertEquals($expectedProductName, $result[0]['_source']['name']); - } - /** * @param string $text * @return array From 464698c36675cd40c51bb21232b6497bf3b25ccb Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Mon, 12 Mar 2018 20:54:15 -0500 Subject: [PATCH 606/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../_files/product_grouped_with_simple.php | 66 +++++++++++++++++++ .../product_grouped_with_simple_rollback.php | 34 ++++++++++ 2 files changed, 100 insertions(+) create mode 100644 dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php create mode 100644 dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php new file mode 100644 index 0000000000000..fc01daf2381bc --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple.php @@ -0,0 +1,66 @@ +get(ProductRepositoryInterface::class); + +$productLinkFactory = Bootstrap::getObjectManager() + ->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class); +$productIds = ['11', '22']; + +foreach ($productIds as $productId) { + /** @var $product Product */ + $product = Bootstrap::getObjectManager()->create(Product::class); + $product->setTypeId(Type::TYPE_SIMPLE) + ->setId($productId) + ->setWebsiteIds([1]) + ->setAttributeSetId(4) + ->setName('Simple ' . $productId) + ->setSku('simple_' . $productId) + ->setPrice(100) + ->setVisibility(Visibility::VISIBILITY_BOTH) + ->setStatus(Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]); + + $linkedProducts[] = $productRepository->save($product); +} + +/** @var $product Product */ +$product = Bootstrap::getObjectManager()->create(Product::class); + +$product->setTypeId(Grouped::TYPE_CODE) + ->setId(1) + ->setWebsiteIds([1]) + ->setAttributeSetId(4) + ->setName('Grouped Product') + ->setSku('grouped') + ->setVisibility(Visibility::VISIBILITY_BOTH) + ->setStatus(Status::STATUS_ENABLED) + ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]); + +foreach ($linkedProducts as $linkedProduct) { + /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */ + $productLink = $productLinkFactory->create(); + $productLink->setSku($product->getSku()) + ->setLinkType('associated') + ->setLinkedProductSku($linkedProduct->getSku()) + ->setLinkedProductType($linkedProduct->getTypeId()) + ->getExtensionAttributes() + ->setQty(1); + $newLinks[] = $productLink; +} + +$product->setProductLinks($newLinks); + +$productRepository->save($product); diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php new file mode 100644 index 0000000000000..bc2f04d7b19d0 --- /dev/null +++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php @@ -0,0 +1,34 @@ +get(\Magento\Framework\Registry::class); + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', true); + +/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */ +$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager() + ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class); + +$skuList = ['simple_11', 'simple_22', 'grouped']; +foreach ($skuList as $sku) { + try { + $product = $productRepository->get($sku, false, null, true); + + $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class); + $stockStatus->load($product->getEntityId(), 'product_id'); + $stockStatus->delete(); + + $productRepository->delete($product); + } catch (\Magento\Framework\Exception\NoSuchEntityException $e) { + //Product already removed + } +} + +$registry->unregister('isSecureArea'); +$registry->register('isSecureArea', false); From b2783b31731a02d7e0e147f222376a25e268d225 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Tue, 13 Mar 2018 14:04:34 -0500 Subject: [PATCH 607/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- app/code/Magento/AdvancedSearch/LICENSE.txt | 48 ++ .../Magento/AdvancedSearch/LICENSE_AFL.txt | 48 ++ .../Magento/AdvancedSearch/LICENSE_EE.txt | 437 ------------------ app/code/Magento/Elasticsearch/LICENSE.txt | 48 ++ .../Magento/Elasticsearch/LICENSE_AFL.txt | 48 ++ app/code/Magento/Elasticsearch/LICENSE_EE.txt | 437 ------------------ 6 files changed, 192 insertions(+), 874 deletions(-) create mode 100644 app/code/Magento/AdvancedSearch/LICENSE.txt create mode 100644 app/code/Magento/AdvancedSearch/LICENSE_AFL.txt delete mode 100644 app/code/Magento/AdvancedSearch/LICENSE_EE.txt create mode 100644 app/code/Magento/Elasticsearch/LICENSE.txt create mode 100644 app/code/Magento/Elasticsearch/LICENSE_AFL.txt delete mode 100644 app/code/Magento/Elasticsearch/LICENSE_EE.txt diff --git a/app/code/Magento/AdvancedSearch/LICENSE.txt b/app/code/Magento/AdvancedSearch/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/app/code/Magento/AdvancedSearch/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/AdvancedSearch/LICENSE_AFL.txt b/app/code/Magento/AdvancedSearch/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/app/code/Magento/AdvancedSearch/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/AdvancedSearch/LICENSE_EE.txt b/app/code/Magento/AdvancedSearch/LICENSE_EE.txt deleted file mode 100644 index 2bddf5feda6ba..0000000000000 --- a/app/code/Magento/AdvancedSearch/LICENSE_EE.txt +++ /dev/null @@ -1,437 +0,0 @@ -MAGENTO(tm) ENTERPRISE EDITION -END USER LICENSE AGREEMENT - -This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. -through its Magento division ("Magento"), and the Licensee executing the Magento Order Form -(defined below). The parties agree as follows: - -TERMS AND CONDITIONS - -1. License - 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with - other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, - non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of - installing and using it on a computer and solely for internal purposes, in accordance with the - Software's technical documentation and solely during the periods and on the maximum number - of Designated Servers specified in one or more applicable Magento or Magento-authorized - reseller ordering schedules (the "Magento Order Form") executed with Licensee. - - 1.2. In the event that Licensee's actual number of Servers of a particular Software license - exceeds the licensed number of Designated Servers on such license, Licensee shall promptly - provide Magento with written notice and pay Magento the fees required to license such - additional Server(s) in accordance with the commercial terms set out in the Magento Order - Form. - - 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the - maximum number of licensed Servers of the Software. Magento reserves the right to audit - Licensee's use of the Software during normal business hours and with reasonable notice and to - include means within the Software to limit Licensee's use of the Software to the licensed - number of Servers. - - 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated - technical documentation, for use by Licensee in accordance with this Agreement. Subject to - Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server - copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights - under this Agreement. - - 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a - temporary basis without charge any time a Designated Server is inoperative due to a - malfunction beyond the control of Licensee. Licensee may transfer the Software on a - permanent basis to a single replacement Server without charge. Licensee agrees to provide - Magento with written notice, including the Server type and operating system, of any such - transfer to a backup or replacement Server within five (5) days thereafter. - - 1.6. Licensee acknowledges that portions of the Software are also freely available to the public - under Magento's open source version of the Software, known as Magento Community Edition, - subject to certain conditions, with limited warranties and other limited assurances, and without - service or support. As an express condition for the license granted hereunder, Licensee agrees - that any use during the term of this Agreement of such open source versions of the Software, - whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed - use of the Software for purposes of the calculation of fees payable under the Agreement. - - 1.7. Magento also grants Licensee the right to modify and create derivative works of the - Software. Licensee may contribute the rights in any of those derivative works back to Magento. - Licensee may contact Magento for more information regarding contributions of derivative - works rights to Magento. Regardless of whether Licensee contributes such derivative works - rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of - the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and - royalty-free license to reproduce, create derivative works of, distribute, perform, and display - any derivative works of the Software developed by or for Licensee, and to use, make, have - made, sell, offer to sell, import, export, and otherwise exploit any product based on any such - derivative works. - -2. License Exclusions - 2.1 Except as expressly authorized herein, Licensee shall not: - a. use or deploy the Software on any Server in excess of the number of Designated Servers - specified in the applicable Magento Order Form; - - b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, - networking, batch processing or transfer of, the Software to any third party, or permit any - person or entity to have access to the Software by means of a time sharing, remote - computing services, networking, batch processing, service bureau or time sharing - arrangement; - - c. export the Software in violation of U.S. Department of Commerce export administration - regulations. - - 2.2. No license, right or interest in any Magento trademark, trade name or service mark is - granted hereunder. - -3. Fees and Payment Terms - Licensee agrees to the fees and payment terms that are described in each Magento Order Form - executed by Licensee. - -4. Title and Protection - 4.1. Magento (or its third party providers) retains title to all portions of the Software and other - Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable - proprietary information, and Licensee shall not disclose them to anyone other than those of its - employees or consultants under written nondisclosure obligations at least as restrictive as - those contained in this Agreement, having a need to know for purposes consistent with this - Agreement. Licensee shall be responsible for the compliance of such employees or consultants. - Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright - and proprietary information notices as were affixed to the original. The obligations set forth in - this Section shall survive termination of this Agreement. - - 4.2. Licensee acknowledges that the Software includes certain open source software which is - governed by the applicable license terms thereof. A list of such open source software, as - amended from time to time, including the links applicable to such open source software is - specified in the product software bundled within the Software, and the Software is subject to - the provisions of such license agreements, and in the event of any contradiction between the - provisions of this Agreement and the provisions of such applicable license agreement, the - provisions of the applicable open source license agreement shall prevail solely with respect to - such open source software products. - - 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the - "Government"), the Government agrees that such Product is "commercial computer software" - or "commercial computer software documentation" and that, absent a written agreement to - the contrary, the Government's rights with respect thereto are limited by the terms of this - Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. - -5. Patent and Copyright Indemnity - Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support - Services (as defined below), Magento shall indemnify and defend Licensee against any claims made - by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section - 5, means the Software as delivered by Magento, excluding the open source software programs - described in Section 4.2) as permitted in this Agreement directly infringes such third party's United - States patent or copyright, provided that Licensee complies with the requirements of this Section. - Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any - intellectual property rights, (b) provide Magento with all information and assistance requested of it - with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or - settle any and all such claims. - - In the event that a court holds that the Software, or if Magento believes a court may hold that the - Software, infringes the intellectual property rights of any third party, Magento may (but is not - obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue - using the Software, replace or modify the Software so that it becomes non-infringing while providing - substantially equivalent performance or, accept return of the Software, terminate this Agreement, - and refund Licensee an amount equal to the license fees paid to Magento multiplied by the - percentage of the term of the license for the Software that Licensee did not enjoy due to the early - termination by Magento. - - Magento shall have no liability or obligation under this Agreement to the extent the alleged - infringement is based on (i) a modification or derivative work of the Software developed by anyone - other than Magento; (ii), a combination of the Software with any product or service not provided by - Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) - use of the Software other than in accordance with this Agreement or the documentation; (iv) - indirect or willful infringement; or (v) any open source code, as described in Section 4.2. - - This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement - related to the Software. - -6. Default and Termination - 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its - obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) - Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in - Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party - fails to perform any other material obligation under this Agreement and such failure remains - uncured for more than thirty (30) days after receipt of written notice thereof. - - 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights - available to it under the law, may terminate this Agreement and all licenses granted hereunder - by written notice to the defaulting party. - - 6.3. Within thirty (30) days after termination of the Software license or this Agreement or - expiration of the license term as specified in the Magento Order Form, Licensee shall certify in - writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that - all copies or embodiments thereof in any form, including partial copies within modified - versions, have been destroyed. - -7. Warranty - 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days - commencing upon Magento's electronic delivery of the Software to Licensee that the Software, - as delivered, will in all material respects perform the functions described in the specifications - contained in the documentation provided with the Software. In the event that the Software - does not, in all material respects, perform the functions therein described, Magento or its - authorized reseller will undertake to correct any reported error in accordance with the Support - Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire - liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant - that the Software will meet Licensee's requirements, that the Software will operate in the - combinations which Licensee may select for use, that the operation of the Software will be - uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED - IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". - - 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY - WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. - MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR - TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, - ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR - PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR - AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING - TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. - -8. Limitation of Liability - 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS - OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE - USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; - LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; - OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES - (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A - CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR - UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING - OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER - TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, - FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. - - 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN - WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH - RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE - LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, - THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE - SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. - -9. Support Services Terms and Conditions - For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide - support services and Updates for the Software as described in Magento's standard Support Services - Terms and Conditions, which follow. Magento will have no obligation to provide support for any - modifications or derivative works of the Software developed by anyone other than Magento. - -10. Customer References - Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer - lists and other related marketing materials. The parties shall cooperate to undertake mutually- - agreed joint marketing activities. - -11. Notices - All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by - facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order - Form, or such other address as either party may indicate by at least ten (10) days prior written - notice to the other party. Notices to Magento shall be sent to the Contracts Administration - Department. - -12. Assignment - Licensee may not assign this Agreement without the prior written consent of Magento; provided - that such consent shall not be required for assignment to a purchaser of all or substantially all of the - assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and - conditions of this Agreement. Any prohibited assignment shall be null and void. - -13. Entire Agreement - Along with Magento's standard Support Services Terms and Conditions, which follow, and the - Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, - which supersedes all proposals or prior agreements, oral or written, including any online (click- - through) agreement which Licensee may have accepted in conjunction with the downloading of the - Software, and all other communications between the parties relating to the subject matter hereof. - No purchase order, other ordering document or any hand written or typewritten text which purports - to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the - terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both - parties, all such proposed variations or additions are objected to and shall have no force or effect. - -14. General - This Agreement is made in and shall be governed by the laws of the State of California, without - giving effect to any principles that provide for the application of the law of another jurisdiction. All - proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, - California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. - The United Nations Convention for the International Sale of Goods shall not apply. The section - headings herein are provided for convenience only and have no substantive effect on the - construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall - be liable for any failure to perform due to causes beyond its reasonable control. If any provision of - this Agreement is held to be unenforceable, this Agreement shall be construed without such - provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such - party's right to exercise such right or any other right in the future. This Agreement may be amended - only by a written document executed by a duly authorized representative of each of the parties. The - parties agree to receive electronic documents and accept electronic signatures (information - attached or logically associated with such document and clicked or otherwise adopted with an intent - to sign) including in counterparts which shall be valid substitutes for paper-based documents and - signatures, and the legal validity of a transaction will not be denied on the ground that it is not in - writing. - -15. Definitions - "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a - particular Software license. Such Server may be that of a third-party under nondisclosure obligations - that will host the Software for the benefit of Licensee. - - "Modifications" means any code developed by Licensee or any third party, including without - limitation, configuration, integrations, implementations, or localizations to the external layer of the - core, baseline Software product. The term "Modifications" excludes Updates. - - "Proprietary Material" means the Software, related documentation, and all parts, copies and - modifications thereof, and any other information, in whatever form, received by Licensee - hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is - or becomes a part of the public domain through no act or omission of Licensee; or (b) was in - Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from - Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or - (d) is independently developed by Licensee without reference to or use of Magento's Proprietary - Material. - - "Server" means each physical or virtual server from which a single instance of the Software is - accessed and used either for production purposes ("Production Server Instance") or for non- - production purposes, such as development, testing, training and other non-operational business - transactions ("Non-Production Server Instance"). For example, if one server contains two (2) - instances of the Software, i.e., one Production Server Instance and one Non-Production Server - Instance, then a Server license is required for each of such instances; development in-house and by - third-party consultants requires licenses for two Non-Production Server Instances. - - "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) - Enterprise Edition, provided solely in source code, including associated technical documentation, - and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise - specified herein, the term Software includes certain open source software programs described in - Section 4.2. "Software" does not include any Modifications. - - "Updates" means all published revisions and corrections to the printed documentation and - corrections and new releases of the Software which are generally made available to Magento's - supported customers at no additional cost or for media and handling charges only. Updates shall not - include any options or future products which Magento sells separately. - - -SUPPORT SERVICES TERMS AND CONDITIONS - -Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the -Agreement. - -1. "Support Services" consists of: - a. Advice regarding the downloading, installation and configuration of the Software (including - Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to - the Software), when used by Licensee on systems that meet the Software's "System - Requirements" specified on Magento's website at www.magentocommerce.com/system- - requirements. - - b. Facilities for bug tracking, escalation of problems for priority attention, and access to - community-supported FAQs and Forums relating to the Software. - - c. Assistance with troubleshooting to diagnose and fix errors in the Software. - - d. Access to Magento documentation relating to the Software, including authorization to make - copies of that documentation for internal use as specified in the Agreement. - -2. Exclusions from Support Services. - Magento shall have no obligation to support (i) versions of the - Software other than the then-current and immediately previous releases, which are operated on a - supported hardware/operating system platform specified in the release notes for the Software; (ii) - altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by - Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with - Magento's instructions. Magento is not responsible for hardware changes necessitated by changes - to the Software. Support Services does not include: - a. Assistance in the development or debugging of Licensee's system, including the operating - system and support tools. - - b. Information and assistance on technical issues related to the installation, administration, and - use of enabling technologies such as databases, computer networks, and communications. - - c. Assistance with the installation and configuration of hardware including, but not limited to - computers, hard disks, networks, and printers. - -3. Subcontractors. - Magento or its authorized resellers reserve the right to subcontract any or all of - the work to be performed under these Support Terms, and Magento retains responsibility for any - work so subcontracted. - -4. Licensee Responsibilities. - Licensee shall provide commercially reasonable cooperation and full - information to Magento or its authorized resellers with respect to the furnishing of Support Services - under this Agreement. - -5. Support Contacts. - Licensee shall designate one or more support contacts that are authorized to - submit Software problems. If Licensee has purchased the license from a Magento-authorized - reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license - directly from Magento, Licensee may contact Magento on the www.magentocommere.com website - or at its toll-free Support telephone number. - -6. Problem Priority. - Upon receipt of a properly submitted Software problem, as specified on - Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall - prioritize it in accordance with the guidelines below: - - a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely - impacts the Licensee's Production Server Instance, or because of which Licensee's Production - Server Instance is down or not functioning, or that results in a loss of production data and no - work around exists. P1 problems must be reported on Magento's toll-free support telephone - number in order to expedite resolution. Magento will use continuous efforts during its normal - hours of operation, with appropriate escalation to senior management, to provide a resolution - for any P1 problem as soon as is commercially reasonable. - - b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is - functioning but in a reduced capacity, or the Problem is causing significant impact to portions of - the Licensee's business operations and productivity, or the Software is exposed to potential loss - or interruption of service. Problems existing in a non-production environment that would - otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P2 - problem as soon as is commercially reasonable. - - c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- - critical loss of functionality, or that impairs some operations but allows Licensee's operations to - continue to function. Problems for which there is limited or no loss or functionality or impact to - Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P3 - problem in time for the next minor release of the Software. - - d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature - or documentation related, but the Software works without normal hours of operation to - provide a resolution for any P4 problem in time for the next major release of the Software. - - e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or - modification to add official support and documentation for unsupported or undocumented - feature, or features that do not exist in the Software. Magento will take ERs into consideration - in the product management process, but has no obligation to deliver enhancements based on - any ER. - -7. Response Times. - Magento or its authorized reseller shall exercise commercially reasonable efforts - to meet the response times specified below for Gold Support (unless Licensee has upgraded to - Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem - properly submitted by Licensee: - - Magento GOLD Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - North American Telephone Support Hours M-F 08:00 - 17:00 (PT) - European Telephone Support Hours M-F 08:30 - 17:30 (CET) - Telephone Response Time P1 Issues* 4 business hours - Response Time P2-P4 Issues* 24 business hours - *From initial contact - - - Magento PLATINUM Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - Telephone Support Hours 24 hours - Telephone Response Time P1 Issues* Up to 2 hours - Response Time P2-P4 Issues* 4 business hours - *From initial contact - - -8. Prohibited Use. - As a condition of Licensee's use of the Forums, Licensee will not use (and will - prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or - regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, - defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software - viruses or any other computer code, files or programs that may interrupt, destroy or limit the - functionality of any computer software or hardware or telecommunications equipment; (iv) to - infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any - third party; or (v) use the Forums for any purpose other than their intended use. - -9. Term and Termination. - Magento will provide Support Services and any Updates to Licensee - during the periods identified in the Magento Order Form, subject to Licensee's payment of the - applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee - materially breaches the Support Services provisions and does not cure such breach within thirty (30) - days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. - -10. General. - Magento shall not be liable for any failure or delay in performance under these Support - Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be - severed from these Support Terms. Licensee agrees that any information received pursuant to these - Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the - License Agreement. Licensee's obligation of payment of moneys due under these Support Terms - shall survive termination of these Support Terms or the License Agreement. These Support Terms - state the entire agreement regarding provision of Support Services to Licensee and may be amended - only by a written amendment set forth on a separate document executed by authorized - representatives of both parties. diff --git a/app/code/Magento/Elasticsearch/LICENSE.txt b/app/code/Magento/Elasticsearch/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/app/code/Magento/Elasticsearch/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/Elasticsearch/LICENSE_AFL.txt b/app/code/Magento/Elasticsearch/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/app/code/Magento/Elasticsearch/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/Elasticsearch/LICENSE_EE.txt b/app/code/Magento/Elasticsearch/LICENSE_EE.txt deleted file mode 100644 index 2bddf5feda6ba..0000000000000 --- a/app/code/Magento/Elasticsearch/LICENSE_EE.txt +++ /dev/null @@ -1,437 +0,0 @@ -MAGENTO(tm) ENTERPRISE EDITION -END USER LICENSE AGREEMENT - -This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. -through its Magento division ("Magento"), and the Licensee executing the Magento Order Form -(defined below). The parties agree as follows: - -TERMS AND CONDITIONS - -1. License - 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with - other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, - non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of - installing and using it on a computer and solely for internal purposes, in accordance with the - Software's technical documentation and solely during the periods and on the maximum number - of Designated Servers specified in one or more applicable Magento or Magento-authorized - reseller ordering schedules (the "Magento Order Form") executed with Licensee. - - 1.2. In the event that Licensee's actual number of Servers of a particular Software license - exceeds the licensed number of Designated Servers on such license, Licensee shall promptly - provide Magento with written notice and pay Magento the fees required to license such - additional Server(s) in accordance with the commercial terms set out in the Magento Order - Form. - - 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the - maximum number of licensed Servers of the Software. Magento reserves the right to audit - Licensee's use of the Software during normal business hours and with reasonable notice and to - include means within the Software to limit Licensee's use of the Software to the licensed - number of Servers. - - 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated - technical documentation, for use by Licensee in accordance with this Agreement. Subject to - Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server - copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights - under this Agreement. - - 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a - temporary basis without charge any time a Designated Server is inoperative due to a - malfunction beyond the control of Licensee. Licensee may transfer the Software on a - permanent basis to a single replacement Server without charge. Licensee agrees to provide - Magento with written notice, including the Server type and operating system, of any such - transfer to a backup or replacement Server within five (5) days thereafter. - - 1.6. Licensee acknowledges that portions of the Software are also freely available to the public - under Magento's open source version of the Software, known as Magento Community Edition, - subject to certain conditions, with limited warranties and other limited assurances, and without - service or support. As an express condition for the license granted hereunder, Licensee agrees - that any use during the term of this Agreement of such open source versions of the Software, - whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed - use of the Software for purposes of the calculation of fees payable under the Agreement. - - 1.7. Magento also grants Licensee the right to modify and create derivative works of the - Software. Licensee may contribute the rights in any of those derivative works back to Magento. - Licensee may contact Magento for more information regarding contributions of derivative - works rights to Magento. Regardless of whether Licensee contributes such derivative works - rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of - the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and - royalty-free license to reproduce, create derivative works of, distribute, perform, and display - any derivative works of the Software developed by or for Licensee, and to use, make, have - made, sell, offer to sell, import, export, and otherwise exploit any product based on any such - derivative works. - -2. License Exclusions - 2.1 Except as expressly authorized herein, Licensee shall not: - a. use or deploy the Software on any Server in excess of the number of Designated Servers - specified in the applicable Magento Order Form; - - b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, - networking, batch processing or transfer of, the Software to any third party, or permit any - person or entity to have access to the Software by means of a time sharing, remote - computing services, networking, batch processing, service bureau or time sharing - arrangement; - - c. export the Software in violation of U.S. Department of Commerce export administration - regulations. - - 2.2. No license, right or interest in any Magento trademark, trade name or service mark is - granted hereunder. - -3. Fees and Payment Terms - Licensee agrees to the fees and payment terms that are described in each Magento Order Form - executed by Licensee. - -4. Title and Protection - 4.1. Magento (or its third party providers) retains title to all portions of the Software and other - Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable - proprietary information, and Licensee shall not disclose them to anyone other than those of its - employees or consultants under written nondisclosure obligations at least as restrictive as - those contained in this Agreement, having a need to know for purposes consistent with this - Agreement. Licensee shall be responsible for the compliance of such employees or consultants. - Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright - and proprietary information notices as were affixed to the original. The obligations set forth in - this Section shall survive termination of this Agreement. - - 4.2. Licensee acknowledges that the Software includes certain open source software which is - governed by the applicable license terms thereof. A list of such open source software, as - amended from time to time, including the links applicable to such open source software is - specified in the product software bundled within the Software, and the Software is subject to - the provisions of such license agreements, and in the event of any contradiction between the - provisions of this Agreement and the provisions of such applicable license agreement, the - provisions of the applicable open source license agreement shall prevail solely with respect to - such open source software products. - - 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the - "Government"), the Government agrees that such Product is "commercial computer software" - or "commercial computer software documentation" and that, absent a written agreement to - the contrary, the Government's rights with respect thereto are limited by the terms of this - Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. - -5. Patent and Copyright Indemnity - Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support - Services (as defined below), Magento shall indemnify and defend Licensee against any claims made - by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section - 5, means the Software as delivered by Magento, excluding the open source software programs - described in Section 4.2) as permitted in this Agreement directly infringes such third party's United - States patent or copyright, provided that Licensee complies with the requirements of this Section. - Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any - intellectual property rights, (b) provide Magento with all information and assistance requested of it - with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or - settle any and all such claims. - - In the event that a court holds that the Software, or if Magento believes a court may hold that the - Software, infringes the intellectual property rights of any third party, Magento may (but is not - obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue - using the Software, replace or modify the Software so that it becomes non-infringing while providing - substantially equivalent performance or, accept return of the Software, terminate this Agreement, - and refund Licensee an amount equal to the license fees paid to Magento multiplied by the - percentage of the term of the license for the Software that Licensee did not enjoy due to the early - termination by Magento. - - Magento shall have no liability or obligation under this Agreement to the extent the alleged - infringement is based on (i) a modification or derivative work of the Software developed by anyone - other than Magento; (ii), a combination of the Software with any product or service not provided by - Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) - use of the Software other than in accordance with this Agreement or the documentation; (iv) - indirect or willful infringement; or (v) any open source code, as described in Section 4.2. - - This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement - related to the Software. - -6. Default and Termination - 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its - obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) - Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in - Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party - fails to perform any other material obligation under this Agreement and such failure remains - uncured for more than thirty (30) days after receipt of written notice thereof. - - 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights - available to it under the law, may terminate this Agreement and all licenses granted hereunder - by written notice to the defaulting party. - - 6.3. Within thirty (30) days after termination of the Software license or this Agreement or - expiration of the license term as specified in the Magento Order Form, Licensee shall certify in - writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that - all copies or embodiments thereof in any form, including partial copies within modified - versions, have been destroyed. - -7. Warranty - 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days - commencing upon Magento's electronic delivery of the Software to Licensee that the Software, - as delivered, will in all material respects perform the functions described in the specifications - contained in the documentation provided with the Software. In the event that the Software - does not, in all material respects, perform the functions therein described, Magento or its - authorized reseller will undertake to correct any reported error in accordance with the Support - Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire - liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant - that the Software will meet Licensee's requirements, that the Software will operate in the - combinations which Licensee may select for use, that the operation of the Software will be - uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED - IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". - - 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY - WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. - MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR - TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, - ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR - PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR - AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING - TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. - -8. Limitation of Liability - 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS - OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE - USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; - LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; - OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES - (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A - CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR - UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING - OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER - TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, - FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. - - 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN - WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH - RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE - LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, - THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE - SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. - -9. Support Services Terms and Conditions - For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide - support services and Updates for the Software as described in Magento's standard Support Services - Terms and Conditions, which follow. Magento will have no obligation to provide support for any - modifications or derivative works of the Software developed by anyone other than Magento. - -10. Customer References - Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer - lists and other related marketing materials. The parties shall cooperate to undertake mutually- - agreed joint marketing activities. - -11. Notices - All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by - facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order - Form, or such other address as either party may indicate by at least ten (10) days prior written - notice to the other party. Notices to Magento shall be sent to the Contracts Administration - Department. - -12. Assignment - Licensee may not assign this Agreement without the prior written consent of Magento; provided - that such consent shall not be required for assignment to a purchaser of all or substantially all of the - assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and - conditions of this Agreement. Any prohibited assignment shall be null and void. - -13. Entire Agreement - Along with Magento's standard Support Services Terms and Conditions, which follow, and the - Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, - which supersedes all proposals or prior agreements, oral or written, including any online (click- - through) agreement which Licensee may have accepted in conjunction with the downloading of the - Software, and all other communications between the parties relating to the subject matter hereof. - No purchase order, other ordering document or any hand written or typewritten text which purports - to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the - terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both - parties, all such proposed variations or additions are objected to and shall have no force or effect. - -14. General - This Agreement is made in and shall be governed by the laws of the State of California, without - giving effect to any principles that provide for the application of the law of another jurisdiction. All - proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, - California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. - The United Nations Convention for the International Sale of Goods shall not apply. The section - headings herein are provided for convenience only and have no substantive effect on the - construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall - be liable for any failure to perform due to causes beyond its reasonable control. If any provision of - this Agreement is held to be unenforceable, this Agreement shall be construed without such - provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such - party's right to exercise such right or any other right in the future. This Agreement may be amended - only by a written document executed by a duly authorized representative of each of the parties. The - parties agree to receive electronic documents and accept electronic signatures (information - attached or logically associated with such document and clicked or otherwise adopted with an intent - to sign) including in counterparts which shall be valid substitutes for paper-based documents and - signatures, and the legal validity of a transaction will not be denied on the ground that it is not in - writing. - -15. Definitions - "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a - particular Software license. Such Server may be that of a third-party under nondisclosure obligations - that will host the Software for the benefit of Licensee. - - "Modifications" means any code developed by Licensee or any third party, including without - limitation, configuration, integrations, implementations, or localizations to the external layer of the - core, baseline Software product. The term "Modifications" excludes Updates. - - "Proprietary Material" means the Software, related documentation, and all parts, copies and - modifications thereof, and any other information, in whatever form, received by Licensee - hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is - or becomes a part of the public domain through no act or omission of Licensee; or (b) was in - Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from - Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or - (d) is independently developed by Licensee without reference to or use of Magento's Proprietary - Material. - - "Server" means each physical or virtual server from which a single instance of the Software is - accessed and used either for production purposes ("Production Server Instance") or for non- - production purposes, such as development, testing, training and other non-operational business - transactions ("Non-Production Server Instance"). For example, if one server contains two (2) - instances of the Software, i.e., one Production Server Instance and one Non-Production Server - Instance, then a Server license is required for each of such instances; development in-house and by - third-party consultants requires licenses for two Non-Production Server Instances. - - "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) - Enterprise Edition, provided solely in source code, including associated technical documentation, - and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise - specified herein, the term Software includes certain open source software programs described in - Section 4.2. "Software" does not include any Modifications. - - "Updates" means all published revisions and corrections to the printed documentation and - corrections and new releases of the Software which are generally made available to Magento's - supported customers at no additional cost or for media and handling charges only. Updates shall not - include any options or future products which Magento sells separately. - - -SUPPORT SERVICES TERMS AND CONDITIONS - -Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the -Agreement. - -1. "Support Services" consists of: - a. Advice regarding the downloading, installation and configuration of the Software (including - Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to - the Software), when used by Licensee on systems that meet the Software's "System - Requirements" specified on Magento's website at www.magentocommerce.com/system- - requirements. - - b. Facilities for bug tracking, escalation of problems for priority attention, and access to - community-supported FAQs and Forums relating to the Software. - - c. Assistance with troubleshooting to diagnose and fix errors in the Software. - - d. Access to Magento documentation relating to the Software, including authorization to make - copies of that documentation for internal use as specified in the Agreement. - -2. Exclusions from Support Services. - Magento shall have no obligation to support (i) versions of the - Software other than the then-current and immediately previous releases, which are operated on a - supported hardware/operating system platform specified in the release notes for the Software; (ii) - altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by - Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with - Magento's instructions. Magento is not responsible for hardware changes necessitated by changes - to the Software. Support Services does not include: - a. Assistance in the development or debugging of Licensee's system, including the operating - system and support tools. - - b. Information and assistance on technical issues related to the installation, administration, and - use of enabling technologies such as databases, computer networks, and communications. - - c. Assistance with the installation and configuration of hardware including, but not limited to - computers, hard disks, networks, and printers. - -3. Subcontractors. - Magento or its authorized resellers reserve the right to subcontract any or all of - the work to be performed under these Support Terms, and Magento retains responsibility for any - work so subcontracted. - -4. Licensee Responsibilities. - Licensee shall provide commercially reasonable cooperation and full - information to Magento or its authorized resellers with respect to the furnishing of Support Services - under this Agreement. - -5. Support Contacts. - Licensee shall designate one or more support contacts that are authorized to - submit Software problems. If Licensee has purchased the license from a Magento-authorized - reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license - directly from Magento, Licensee may contact Magento on the www.magentocommere.com website - or at its toll-free Support telephone number. - -6. Problem Priority. - Upon receipt of a properly submitted Software problem, as specified on - Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall - prioritize it in accordance with the guidelines below: - - a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely - impacts the Licensee's Production Server Instance, or because of which Licensee's Production - Server Instance is down or not functioning, or that results in a loss of production data and no - work around exists. P1 problems must be reported on Magento's toll-free support telephone - number in order to expedite resolution. Magento will use continuous efforts during its normal - hours of operation, with appropriate escalation to senior management, to provide a resolution - for any P1 problem as soon as is commercially reasonable. - - b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is - functioning but in a reduced capacity, or the Problem is causing significant impact to portions of - the Licensee's business operations and productivity, or the Software is exposed to potential loss - or interruption of service. Problems existing in a non-production environment that would - otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P2 - problem as soon as is commercially reasonable. - - c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- - critical loss of functionality, or that impairs some operations but allows Licensee's operations to - continue to function. Problems for which there is limited or no loss or functionality or impact to - Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P3 - problem in time for the next minor release of the Software. - - d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature - or documentation related, but the Software works without normal hours of operation to - provide a resolution for any P4 problem in time for the next major release of the Software. - - e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or - modification to add official support and documentation for unsupported or undocumented - feature, or features that do not exist in the Software. Magento will take ERs into consideration - in the product management process, but has no obligation to deliver enhancements based on - any ER. - -7. Response Times. - Magento or its authorized reseller shall exercise commercially reasonable efforts - to meet the response times specified below for Gold Support (unless Licensee has upgraded to - Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem - properly submitted by Licensee: - - Magento GOLD Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - North American Telephone Support Hours M-F 08:00 - 17:00 (PT) - European Telephone Support Hours M-F 08:30 - 17:30 (CET) - Telephone Response Time P1 Issues* 4 business hours - Response Time P2-P4 Issues* 24 business hours - *From initial contact - - - Magento PLATINUM Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - Telephone Support Hours 24 hours - Telephone Response Time P1 Issues* Up to 2 hours - Response Time P2-P4 Issues* 4 business hours - *From initial contact - - -8. Prohibited Use. - As a condition of Licensee's use of the Forums, Licensee will not use (and will - prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or - regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, - defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software - viruses or any other computer code, files or programs that may interrupt, destroy or limit the - functionality of any computer software or hardware or telecommunications equipment; (iv) to - infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any - third party; or (v) use the Forums for any purpose other than their intended use. - -9. Term and Termination. - Magento will provide Support Services and any Updates to Licensee - during the periods identified in the Magento Order Form, subject to Licensee's payment of the - applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee - materially breaches the Support Services provisions and does not cure such breach within thirty (30) - days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. - -10. General. - Magento shall not be liable for any failure or delay in performance under these Support - Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be - severed from these Support Terms. Licensee agrees that any information received pursuant to these - Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the - License Agreement. Licensee's obligation of payment of moneys due under these Support Terms - shall survive termination of these Support Terms or the License Agreement. These Support Terms - state the entire agreement regarding provision of Support Services to Licensee and may be amended - only by a written amendment set forth on a separate document executed by authorized - representatives of both parties. From 44382f07cf74554585be148ecb4aac67031b1235 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Tue, 13 Mar 2018 14:29:32 -0500 Subject: [PATCH 608/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- app/code/Magento/Amqp/LICENSE.txt | 48 ++ app/code/Magento/Amqp/LICENSE_AFL.txt | 48 ++ app/code/Magento/MessageQueue/LICENSE.txt | 48 ++ app/code/Magento/MessageQueue/LICENSE_AFL.txt | 48 ++ app/code/Magento/MysqlMq/LICENSE.txt | 48 ++ app/code/Magento/MysqlMq/LICENSE_AFL.txt | 48 ++ .../FunctionalTest/AdvancedSearch/LICENSE.txt | 48 ++ .../AdvancedSearch/LICENSE_AFL.txt | 48 ++ .../AdvancedSearch/LICENSE_EE.txt | 437 ------------------ .../Magento/FunctionalTest/Amqp/LICENSE.txt | 48 ++ .../FunctionalTest/Amqp/LICENSE_AFL.txt | 48 ++ .../FunctionalTest/Elasticsearch/LICENSE.txt | 48 ++ .../Elasticsearch/LICENSE_AFL.txt | 48 ++ .../Elasticsearch/LICENSE_EE.txt | 437 ------------------ .../FunctionalTest/MessageQueue/LICENSE.txt | 48 ++ .../MessageQueue/LICENSE_AFL.txt | 48 ++ .../FunctionalTest/MysqlMq/LICENSE.txt | 48 ++ .../FunctionalTest/MysqlMq/LICENSE_AFL.txt | 48 ++ 18 files changed, 768 insertions(+), 874 deletions(-) create mode 100644 app/code/Magento/Amqp/LICENSE.txt create mode 100644 app/code/Magento/Amqp/LICENSE_AFL.txt create mode 100644 app/code/Magento/MessageQueue/LICENSE.txt create mode 100644 app/code/Magento/MessageQueue/LICENSE_AFL.txt create mode 100644 app/code/Magento/MysqlMq/LICENSE.txt create mode 100644 app/code/Magento/MysqlMq/LICENSE_AFL.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_AFL.txt delete mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE_AFL.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE.txt create mode 100644 dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE_AFL.txt diff --git a/app/code/Magento/Amqp/LICENSE.txt b/app/code/Magento/Amqp/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/app/code/Magento/Amqp/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/Amqp/LICENSE_AFL.txt b/app/code/Magento/Amqp/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/app/code/Magento/Amqp/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/MessageQueue/LICENSE.txt b/app/code/Magento/MessageQueue/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/app/code/Magento/MessageQueue/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/MessageQueue/LICENSE_AFL.txt b/app/code/Magento/MessageQueue/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/app/code/Magento/MessageQueue/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/app/code/Magento/MysqlMq/LICENSE.txt b/app/code/Magento/MysqlMq/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/app/code/Magento/MysqlMq/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/MysqlMq/LICENSE_AFL.txt b/app/code/Magento/MysqlMq/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/app/code/Magento/MysqlMq/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt deleted file mode 100644 index 2bddf5feda6ba..0000000000000 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/AdvancedSearch/LICENSE_EE.txt +++ /dev/null @@ -1,437 +0,0 @@ -MAGENTO(tm) ENTERPRISE EDITION -END USER LICENSE AGREEMENT - -This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. -through its Magento division ("Magento"), and the Licensee executing the Magento Order Form -(defined below). The parties agree as follows: - -TERMS AND CONDITIONS - -1. License - 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with - other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, - non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of - installing and using it on a computer and solely for internal purposes, in accordance with the - Software's technical documentation and solely during the periods and on the maximum number - of Designated Servers specified in one or more applicable Magento or Magento-authorized - reseller ordering schedules (the "Magento Order Form") executed with Licensee. - - 1.2. In the event that Licensee's actual number of Servers of a particular Software license - exceeds the licensed number of Designated Servers on such license, Licensee shall promptly - provide Magento with written notice and pay Magento the fees required to license such - additional Server(s) in accordance with the commercial terms set out in the Magento Order - Form. - - 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the - maximum number of licensed Servers of the Software. Magento reserves the right to audit - Licensee's use of the Software during normal business hours and with reasonable notice and to - include means within the Software to limit Licensee's use of the Software to the licensed - number of Servers. - - 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated - technical documentation, for use by Licensee in accordance with this Agreement. Subject to - Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server - copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights - under this Agreement. - - 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a - temporary basis without charge any time a Designated Server is inoperative due to a - malfunction beyond the control of Licensee. Licensee may transfer the Software on a - permanent basis to a single replacement Server without charge. Licensee agrees to provide - Magento with written notice, including the Server type and operating system, of any such - transfer to a backup or replacement Server within five (5) days thereafter. - - 1.6. Licensee acknowledges that portions of the Software are also freely available to the public - under Magento's open source version of the Software, known as Magento Community Edition, - subject to certain conditions, with limited warranties and other limited assurances, and without - service or support. As an express condition for the license granted hereunder, Licensee agrees - that any use during the term of this Agreement of such open source versions of the Software, - whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed - use of the Software for purposes of the calculation of fees payable under the Agreement. - - 1.7. Magento also grants Licensee the right to modify and create derivative works of the - Software. Licensee may contribute the rights in any of those derivative works back to Magento. - Licensee may contact Magento for more information regarding contributions of derivative - works rights to Magento. Regardless of whether Licensee contributes such derivative works - rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of - the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and - royalty-free license to reproduce, create derivative works of, distribute, perform, and display - any derivative works of the Software developed by or for Licensee, and to use, make, have - made, sell, offer to sell, import, export, and otherwise exploit any product based on any such - derivative works. - -2. License Exclusions - 2.1 Except as expressly authorized herein, Licensee shall not: - a. use or deploy the Software on any Server in excess of the number of Designated Servers - specified in the applicable Magento Order Form; - - b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, - networking, batch processing or transfer of, the Software to any third party, or permit any - person or entity to have access to the Software by means of a time sharing, remote - computing services, networking, batch processing, service bureau or time sharing - arrangement; - - c. export the Software in violation of U.S. Department of Commerce export administration - regulations. - - 2.2. No license, right or interest in any Magento trademark, trade name or service mark is - granted hereunder. - -3. Fees and Payment Terms - Licensee agrees to the fees and payment terms that are described in each Magento Order Form - executed by Licensee. - -4. Title and Protection - 4.1. Magento (or its third party providers) retains title to all portions of the Software and other - Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable - proprietary information, and Licensee shall not disclose them to anyone other than those of its - employees or consultants under written nondisclosure obligations at least as restrictive as - those contained in this Agreement, having a need to know for purposes consistent with this - Agreement. Licensee shall be responsible for the compliance of such employees or consultants. - Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright - and proprietary information notices as were affixed to the original. The obligations set forth in - this Section shall survive termination of this Agreement. - - 4.2. Licensee acknowledges that the Software includes certain open source software which is - governed by the applicable license terms thereof. A list of such open source software, as - amended from time to time, including the links applicable to such open source software is - specified in the product software bundled within the Software, and the Software is subject to - the provisions of such license agreements, and in the event of any contradiction between the - provisions of this Agreement and the provisions of such applicable license agreement, the - provisions of the applicable open source license agreement shall prevail solely with respect to - such open source software products. - - 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the - "Government"), the Government agrees that such Product is "commercial computer software" - or "commercial computer software documentation" and that, absent a written agreement to - the contrary, the Government's rights with respect thereto are limited by the terms of this - Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. - -5. Patent and Copyright Indemnity - Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support - Services (as defined below), Magento shall indemnify and defend Licensee against any claims made - by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section - 5, means the Software as delivered by Magento, excluding the open source software programs - described in Section 4.2) as permitted in this Agreement directly infringes such third party's United - States patent or copyright, provided that Licensee complies with the requirements of this Section. - Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any - intellectual property rights, (b) provide Magento with all information and assistance requested of it - with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or - settle any and all such claims. - - In the event that a court holds that the Software, or if Magento believes a court may hold that the - Software, infringes the intellectual property rights of any third party, Magento may (but is not - obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue - using the Software, replace or modify the Software so that it becomes non-infringing while providing - substantially equivalent performance or, accept return of the Software, terminate this Agreement, - and refund Licensee an amount equal to the license fees paid to Magento multiplied by the - percentage of the term of the license for the Software that Licensee did not enjoy due to the early - termination by Magento. - - Magento shall have no liability or obligation under this Agreement to the extent the alleged - infringement is based on (i) a modification or derivative work of the Software developed by anyone - other than Magento; (ii), a combination of the Software with any product or service not provided by - Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) - use of the Software other than in accordance with this Agreement or the documentation; (iv) - indirect or willful infringement; or (v) any open source code, as described in Section 4.2. - - This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement - related to the Software. - -6. Default and Termination - 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its - obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) - Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in - Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party - fails to perform any other material obligation under this Agreement and such failure remains - uncured for more than thirty (30) days after receipt of written notice thereof. - - 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights - available to it under the law, may terminate this Agreement and all licenses granted hereunder - by written notice to the defaulting party. - - 6.3. Within thirty (30) days after termination of the Software license or this Agreement or - expiration of the license term as specified in the Magento Order Form, Licensee shall certify in - writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that - all copies or embodiments thereof in any form, including partial copies within modified - versions, have been destroyed. - -7. Warranty - 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days - commencing upon Magento's electronic delivery of the Software to Licensee that the Software, - as delivered, will in all material respects perform the functions described in the specifications - contained in the documentation provided with the Software. In the event that the Software - does not, in all material respects, perform the functions therein described, Magento or its - authorized reseller will undertake to correct any reported error in accordance with the Support - Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire - liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant - that the Software will meet Licensee's requirements, that the Software will operate in the - combinations which Licensee may select for use, that the operation of the Software will be - uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED - IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". - - 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY - WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. - MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR - TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, - ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR - PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR - AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING - TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. - -8. Limitation of Liability - 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS - OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE - USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; - LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; - OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES - (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A - CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR - UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING - OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER - TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, - FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. - - 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN - WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH - RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE - LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, - THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE - SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. - -9. Support Services Terms and Conditions - For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide - support services and Updates for the Software as described in Magento's standard Support Services - Terms and Conditions, which follow. Magento will have no obligation to provide support for any - modifications or derivative works of the Software developed by anyone other than Magento. - -10. Customer References - Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer - lists and other related marketing materials. The parties shall cooperate to undertake mutually- - agreed joint marketing activities. - -11. Notices - All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by - facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order - Form, or such other address as either party may indicate by at least ten (10) days prior written - notice to the other party. Notices to Magento shall be sent to the Contracts Administration - Department. - -12. Assignment - Licensee may not assign this Agreement without the prior written consent of Magento; provided - that such consent shall not be required for assignment to a purchaser of all or substantially all of the - assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and - conditions of this Agreement. Any prohibited assignment shall be null and void. - -13. Entire Agreement - Along with Magento's standard Support Services Terms and Conditions, which follow, and the - Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, - which supersedes all proposals or prior agreements, oral or written, including any online (click- - through) agreement which Licensee may have accepted in conjunction with the downloading of the - Software, and all other communications between the parties relating to the subject matter hereof. - No purchase order, other ordering document or any hand written or typewritten text which purports - to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the - terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both - parties, all such proposed variations or additions are objected to and shall have no force or effect. - -14. General - This Agreement is made in and shall be governed by the laws of the State of California, without - giving effect to any principles that provide for the application of the law of another jurisdiction. All - proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, - California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. - The United Nations Convention for the International Sale of Goods shall not apply. The section - headings herein are provided for convenience only and have no substantive effect on the - construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall - be liable for any failure to perform due to causes beyond its reasonable control. If any provision of - this Agreement is held to be unenforceable, this Agreement shall be construed without such - provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such - party's right to exercise such right or any other right in the future. This Agreement may be amended - only by a written document executed by a duly authorized representative of each of the parties. The - parties agree to receive electronic documents and accept electronic signatures (information - attached or logically associated with such document and clicked or otherwise adopted with an intent - to sign) including in counterparts which shall be valid substitutes for paper-based documents and - signatures, and the legal validity of a transaction will not be denied on the ground that it is not in - writing. - -15. Definitions - "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a - particular Software license. Such Server may be that of a third-party under nondisclosure obligations - that will host the Software for the benefit of Licensee. - - "Modifications" means any code developed by Licensee or any third party, including without - limitation, configuration, integrations, implementations, or localizations to the external layer of the - core, baseline Software product. The term "Modifications" excludes Updates. - - "Proprietary Material" means the Software, related documentation, and all parts, copies and - modifications thereof, and any other information, in whatever form, received by Licensee - hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is - or becomes a part of the public domain through no act or omission of Licensee; or (b) was in - Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from - Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or - (d) is independently developed by Licensee without reference to or use of Magento's Proprietary - Material. - - "Server" means each physical or virtual server from which a single instance of the Software is - accessed and used either for production purposes ("Production Server Instance") or for non- - production purposes, such as development, testing, training and other non-operational business - transactions ("Non-Production Server Instance"). For example, if one server contains two (2) - instances of the Software, i.e., one Production Server Instance and one Non-Production Server - Instance, then a Server license is required for each of such instances; development in-house and by - third-party consultants requires licenses for two Non-Production Server Instances. - - "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) - Enterprise Edition, provided solely in source code, including associated technical documentation, - and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise - specified herein, the term Software includes certain open source software programs described in - Section 4.2. "Software" does not include any Modifications. - - "Updates" means all published revisions and corrections to the printed documentation and - corrections and new releases of the Software which are generally made available to Magento's - supported customers at no additional cost or for media and handling charges only. Updates shall not - include any options or future products which Magento sells separately. - - -SUPPORT SERVICES TERMS AND CONDITIONS - -Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the -Agreement. - -1. "Support Services" consists of: - a. Advice regarding the downloading, installation and configuration of the Software (including - Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to - the Software), when used by Licensee on systems that meet the Software's "System - Requirements" specified on Magento's website at www.magentocommerce.com/system- - requirements. - - b. Facilities for bug tracking, escalation of problems for priority attention, and access to - community-supported FAQs and Forums relating to the Software. - - c. Assistance with troubleshooting to diagnose and fix errors in the Software. - - d. Access to Magento documentation relating to the Software, including authorization to make - copies of that documentation for internal use as specified in the Agreement. - -2. Exclusions from Support Services. - Magento shall have no obligation to support (i) versions of the - Software other than the then-current and immediately previous releases, which are operated on a - supported hardware/operating system platform specified in the release notes for the Software; (ii) - altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by - Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with - Magento's instructions. Magento is not responsible for hardware changes necessitated by changes - to the Software. Support Services does not include: - a. Assistance in the development or debugging of Licensee's system, including the operating - system and support tools. - - b. Information and assistance on technical issues related to the installation, administration, and - use of enabling technologies such as databases, computer networks, and communications. - - c. Assistance with the installation and configuration of hardware including, but not limited to - computers, hard disks, networks, and printers. - -3. Subcontractors. - Magento or its authorized resellers reserve the right to subcontract any or all of - the work to be performed under these Support Terms, and Magento retains responsibility for any - work so subcontracted. - -4. Licensee Responsibilities. - Licensee shall provide commercially reasonable cooperation and full - information to Magento or its authorized resellers with respect to the furnishing of Support Services - under this Agreement. - -5. Support Contacts. - Licensee shall designate one or more support contacts that are authorized to - submit Software problems. If Licensee has purchased the license from a Magento-authorized - reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license - directly from Magento, Licensee may contact Magento on the www.magentocommere.com website - or at its toll-free Support telephone number. - -6. Problem Priority. - Upon receipt of a properly submitted Software problem, as specified on - Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall - prioritize it in accordance with the guidelines below: - - a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely - impacts the Licensee's Production Server Instance, or because of which Licensee's Production - Server Instance is down or not functioning, or that results in a loss of production data and no - work around exists. P1 problems must be reported on Magento's toll-free support telephone - number in order to expedite resolution. Magento will use continuous efforts during its normal - hours of operation, with appropriate escalation to senior management, to provide a resolution - for any P1 problem as soon as is commercially reasonable. - - b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is - functioning but in a reduced capacity, or the Problem is causing significant impact to portions of - the Licensee's business operations and productivity, or the Software is exposed to potential loss - or interruption of service. Problems existing in a non-production environment that would - otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P2 - problem as soon as is commercially reasonable. - - c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- - critical loss of functionality, or that impairs some operations but allows Licensee's operations to - continue to function. Problems for which there is limited or no loss or functionality or impact to - Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P3 - problem in time for the next minor release of the Software. - - d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature - or documentation related, but the Software works without normal hours of operation to - provide a resolution for any P4 problem in time for the next major release of the Software. - - e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or - modification to add official support and documentation for unsupported or undocumented - feature, or features that do not exist in the Software. Magento will take ERs into consideration - in the product management process, but has no obligation to deliver enhancements based on - any ER. - -7. Response Times. - Magento or its authorized reseller shall exercise commercially reasonable efforts - to meet the response times specified below for Gold Support (unless Licensee has upgraded to - Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem - properly submitted by Licensee: - - Magento GOLD Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - North American Telephone Support Hours M-F 08:00 - 17:00 (PT) - European Telephone Support Hours M-F 08:30 - 17:30 (CET) - Telephone Response Time P1 Issues* 4 business hours - Response Time P2-P4 Issues* 24 business hours - *From initial contact - - - Magento PLATINUM Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - Telephone Support Hours 24 hours - Telephone Response Time P1 Issues* Up to 2 hours - Response Time P2-P4 Issues* 4 business hours - *From initial contact - - -8. Prohibited Use. - As a condition of Licensee's use of the Forums, Licensee will not use (and will - prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or - regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, - defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software - viruses or any other computer code, files or programs that may interrupt, destroy or limit the - functionality of any computer software or hardware or telecommunications equipment; (iv) to - infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any - third party; or (v) use the Forums for any purpose other than their intended use. - -9. Term and Termination. - Magento will provide Support Services and any Updates to Licensee - during the periods identified in the Magento Order Form, subject to Licensee's payment of the - applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee - materially breaches the Support Services provisions and does not cure such breach within thirty (30) - days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. - -10. General. - Magento shall not be liable for any failure or delay in performance under these Support - Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be - severed from these Support Terms. Licensee agrees that any information received pursuant to these - Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the - License Agreement. Licensee's obligation of payment of moneys due under these Support Terms - shall survive termination of these Support Terms or the License Agreement. These Support Terms - state the entire agreement regarding provision of Support Services to Licensee and may be amended - only by a written amendment set forth on a separate document executed by authorized - representatives of both parties. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Amqp/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt deleted file mode 100644 index 2bddf5feda6ba..0000000000000 --- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Elasticsearch/LICENSE_EE.txt +++ /dev/null @@ -1,437 +0,0 @@ -MAGENTO(tm) ENTERPRISE EDITION -END USER LICENSE AGREEMENT - -This End User License Agreement ("Agreement") is entered into by and between X.commerce, Inc. -through its Magento division ("Magento"), and the Licensee executing the Magento Order Form -(defined below). The parties agree as follows: - -TERMS AND CONDITIONS - -1. License - 1.1. Subject to Licensee's payment of the applicable fees and to Licensee's compliance with - other terms and conditions of this Agreement, Magento grants Licensee a non-transferable, - non-assignable, non-sublicensable, worldwide license to copy the Software for the purpose of - installing and using it on a computer and solely for internal purposes, in accordance with the - Software's technical documentation and solely during the periods and on the maximum number - of Designated Servers specified in one or more applicable Magento or Magento-authorized - reseller ordering schedules (the "Magento Order Form") executed with Licensee. - - 1.2. In the event that Licensee's actual number of Servers of a particular Software license - exceeds the licensed number of Designated Servers on such license, Licensee shall promptly - provide Magento with written notice and pay Magento the fees required to license such - additional Server(s) in accordance with the commercial terms set out in the Magento Order - Form. - - 1.3. Licensee shall implement reasonable controls to ensure that it does not exceed the - maximum number of licensed Servers of the Software. Magento reserves the right to audit - Licensee's use of the Software during normal business hours and with reasonable notice and to - include means within the Software to limit Licensee's use of the Software to the licensed - number of Servers. - - 1.4. Magento shall provide to Licensee an initial copy of the Software, including the associated - technical documentation, for use by Licensee in accordance with this Agreement. Subject to - Sections 1.1-1.3 above, Licensee is authorized to make a reasonable number of non-Server - copies of the Software, e.g., onto a local pc, as it requires for purpose of exercising its rights - under this Agreement. - - 1.5. Licensee is authorized to use the Software on a single substitute or backup Server on a - temporary basis without charge any time a Designated Server is inoperative due to a - malfunction beyond the control of Licensee. Licensee may transfer the Software on a - permanent basis to a single replacement Server without charge. Licensee agrees to provide - Magento with written notice, including the Server type and operating system, of any such - transfer to a backup or replacement Server within five (5) days thereafter. - - 1.6. Licensee acknowledges that portions of the Software are also freely available to the public - under Magento's open source version of the Software, known as Magento Community Edition, - subject to certain conditions, with limited warranties and other limited assurances, and without - service or support. As an express condition for the license granted hereunder, Licensee agrees - that any use during the term of this Agreement of such open source versions of the Software, - whether in a Production Server Instance or a Non-Production Server Instance, shall be deemed - use of the Software for purposes of the calculation of fees payable under the Agreement. - - 1.7. Magento also grants Licensee the right to modify and create derivative works of the - Software. Licensee may contribute the rights in any of those derivative works back to Magento. - Licensee may contact Magento for more information regarding contributions of derivative - works rights to Magento. Regardless of whether Licensee contributes such derivative works - rights to Magento, Licensee hereby grants Magento a perpetual and irrevocable (irrespective of - the expiration or termination of this Agreement), nonexclusive, transferable, worldwide, and - royalty-free license to reproduce, create derivative works of, distribute, perform, and display - any derivative works of the Software developed by or for Licensee, and to use, make, have - made, sell, offer to sell, import, export, and otherwise exploit any product based on any such - derivative works. - -2. License Exclusions - 2.1 Except as expressly authorized herein, Licensee shall not: - a. use or deploy the Software on any Server in excess of the number of Designated Servers - specified in the applicable Magento Order Form; - - b. distribute, sublicense, disclose, market, rent, lease, or offer remote computing services, - networking, batch processing or transfer of, the Software to any third party, or permit any - person or entity to have access to the Software by means of a time sharing, remote - computing services, networking, batch processing, service bureau or time sharing - arrangement; - - c. export the Software in violation of U.S. Department of Commerce export administration - regulations. - - 2.2. No license, right or interest in any Magento trademark, trade name or service mark is - granted hereunder. - -3. Fees and Payment Terms - Licensee agrees to the fees and payment terms that are described in each Magento Order Form - executed by Licensee. - -4. Title and Protection - 4.1. Magento (or its third party providers) retains title to all portions of the Software and other - Proprietary Materials and any copies thereof. The Proprietary Materials contain valuable - proprietary information, and Licensee shall not disclose them to anyone other than those of its - employees or consultants under written nondisclosure obligations at least as restrictive as - those contained in this Agreement, having a need to know for purposes consistent with this - Agreement. Licensee shall be responsible for the compliance of such employees or consultants. - Licensee shall affix, to each full or partial copy of the Software made by Licensee, all copyright - and proprietary information notices as were affixed to the original. The obligations set forth in - this Section shall survive termination of this Agreement. - - 4.2. Licensee acknowledges that the Software includes certain open source software which is - governed by the applicable license terms thereof. A list of such open source software, as - amended from time to time, including the links applicable to such open source software is - specified in the product software bundled within the Software, and the Software is subject to - the provisions of such license agreements, and in the event of any contradiction between the - provisions of this Agreement and the provisions of such applicable license agreement, the - provisions of the applicable open source license agreement shall prevail solely with respect to - such open source software products. - - 4.3. If the Software is acquired by or on behalf of a unit or agency of the U.S. Government (the - "Government"), the Government agrees that such Product is "commercial computer software" - or "commercial computer software documentation" and that, absent a written agreement to - the contrary, the Government's rights with respect thereto are limited by the terms of this - Agreement, pursuant to applicable FAR and/or DFARS and successor regulations. - -5. Patent and Copyright Indemnity - Subject to the limitations in Section 8, for such time as Licensee is entitled to receive Support - Services (as defined below), Magento shall indemnify and defend Licensee against any claims made - by a third party that Licensee's reproduction of the Software (which, for the purposes of this Section - 5, means the Software as delivered by Magento, excluding the open source software programs - described in Section 4.2) as permitted in this Agreement directly infringes such third party's United - States patent or copyright, provided that Licensee complies with the requirements of this Section. - Licensee will (a) provide Magento prompt written notice of any claim that the Software infringes any - intellectual property rights, (b) provide Magento with all information and assistance requested of it - with respect to any such claim, and (c) offer Magento sole and complete authority to defend and/or - settle any and all such claims. - - In the event that a court holds that the Software, or if Magento believes a court may hold that the - Software, infringes the intellectual property rights of any third party, Magento may (but is not - obligated to), in its sole discretion, do any of the following: obtain for Licensee the right to continue - using the Software, replace or modify the Software so that it becomes non-infringing while providing - substantially equivalent performance or, accept return of the Software, terminate this Agreement, - and refund Licensee an amount equal to the license fees paid to Magento multiplied by the - percentage of the term of the license for the Software that Licensee did not enjoy due to the early - termination by Magento. - - Magento shall have no liability or obligation under this Agreement to the extent the alleged - infringement is based on (i) a modification or derivative work of the Software developed by anyone - other than Magento; (ii), a combination of the Software with any product or service not provided by - Magento; (ii) use of the Software with one or more Servers not listed in a Magento Order Form; (iii) - use of the Software other than in accordance with this Agreement or the documentation; (iv) - indirect or willful infringement; or (v) any open source code, as described in Section 4.2. - - This Section 5 states Magento's entire liability and Licensee's exclusive remedy for any infringement - related to the Software. - -6. Default and Termination - 6.1. An event of default shall be deemed to occur if: (i) Licensee fails to perform any of its - obligations under the Sections entitled "License Exclusions" or "Title and Protection"; (ii) - Licensee fails to pay amounts due pursuant to its agreement to the fees and payment terms in - Section 3 of this Agreement within seven (7) days of the relevant due date; or (iii) either party - fails to perform any other material obligation under this Agreement and such failure remains - uncured for more than thirty (30) days after receipt of written notice thereof. - - 6.2. If an event of default occurs, the non-defaulting party, in addition to any other rights - available to it under the law, may terminate this Agreement and all licenses granted hereunder - by written notice to the defaulting party. - - 6.3. Within thirty (30) days after termination of the Software license or this Agreement or - expiration of the license term as specified in the Magento Order Form, Licensee shall certify in - writing to Magento that Licensee has ceased use of any and all Proprietary Materials and that - all copies or embodiments thereof in any form, including partial copies within modified - versions, have been destroyed. - -7. Warranty - 7.1. Warranty for Software. Magento warrants for a single period of ninety (90) days - commencing upon Magento's electronic delivery of the Software to Licensee that the Software, - as delivered, will in all material respects perform the functions described in the specifications - contained in the documentation provided with the Software. In the event that the Software - does not, in all material respects, perform the functions therein described, Magento or its - authorized reseller will undertake to correct any reported error in accordance with the Support - Services Terms and Conditions set forth below in Section 9, which shall be Magento's entire - liability and Licensee's exclusive remedy for breach of this warranty. Magento does not warrant - that the Software will meet Licensee's requirements, that the Software will operate in the - combinations which Licensee may select for use, that the operation of the Software will be - uninterrupted or error-free, or that all error conditions will be corrected. EXCEPT AS PROVIDED - IN THIS SECTION ALL SOFTWARE PROVIDED HEREUNDER IS PROVIDED "AS IS". - - 7.2. DISCLAIMER. THE EXPRESS WARRANTIES SET FORTH IN THIS SECTION 7 ARE THE ONLY - WARRANTIES MADE BY MAGENTO WITH RESPECT TO THE SOFTWARE PROVIDED BY MAGENTO. - MAGENTO MAKES NO OTHER WARRANTIES, EXPRESS, IMPLIED OR ARISING BY CUSTOM OR - TRADE USAGE, AND, SPECIFICALLY, MAKES NO WARRANTY OF TITLE, NON-INFRINGEMENT, - ACCURACY, QUIET ENJOYMENT, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR - PURPOSE. MAGENTO'S EXPRESS WARRANTIES SHALL NOT BE ENLARGED, DIMINISHED OR - AFFECTED BY, AND NO OBLIGATION OR LIABILITY SHALL ARISE OUT OF, MAGENTO RENDERING - TECHNICAL OR OTHER ADVICE OR SERVICE IN CONNECTION WITH THE SOFTWARE. - -8. Limitation of Liability - 8.1. LIABILITY EXCLUSIONS. UNDER NO CIRCUMSTANCES WILL MAGENTO BE LIABLE FOR: LOSS - OF REVENUE; LOSS OF ACTUAL OR ANTICIPATED PROFITS; LOSS OF CONTRACTS; LOSS OF THE - USE OF MONEY; LOSS OF ANTICIPATED SAVINGS; LOSS OF BUSINESS; LOSS OF OPPORTUNITY; - LOSS OF GOODWILL; LOSS OF REPUTATION; LOSS OF, DAMAGE TO OR CORRUPTION OF DATA; - OR CONSEQUENTIAL OR INDIRECT LOSS OR SPECIAL, PUNITIVE, OR INCIDENTAL DAMAGES - (INCLUDING, FOR THE AVOIDANCE OF DOUBT, WHERE SUCH LOSS OR DAMAGE IS ALSO OF A - CATEGORY OF LOSS OR DAMAGE ALREADY LISTED), WHETHER FORESEEABLE OR - UNFORESEEABLE, BASED ON CLAIMS OF LICENSEE, MAGENTO OR ANY THIRD PARTY ARISING - OUT OF ANY BREACH OR FAILURE OF EXPRESS OR IMPLIED WARRANTY CONDITIONS OR OTHER - TERM, BREACH OF CONTRACT, MISREPRESENTATION, NEGLIGENCE, OTHER LIABILITY IN TORT, - FAILURE OF ANY REMEDY TO ACHIEVE ITS ESSENTIAL PURPOSE, OR OTHERWISE. - - 8.2. LIABILITY CAP. NOTWITHSTANDING THE FORM (E.G., CONTRACT, TORT, OR OTHERWISE) IN - WHICH ANY LEGAL OR EQUITABLE ACTION MAY BE BROUGHT, IN NO EVENT (INCLUDING WITH - RESPECT TO OBLIGATIONS ARISING UNDER SECTION 5) WILL MAGENTO OR ITS SUPPLIERS BE - LIABLE FOR DAMAGES, EXPENSES, COSTS, LIABILITIES, SUITS, CLAIMS, RESTITUTION OR LOSSES, - THAT EXCEED, IN THE AGGREGATE, THE AMOUNT OF FEES PAID BY LICENSEE FOR THE - SOFTWARE LICENSE IN THE FIRST TWELVE (12) MONTH PERIOD AFTER THE EFFECTIVE DATE. - -9. Support Services Terms and Conditions - For the periods specified in the Magento Order Form, Magento or its authorized reseller will provide - support services and Updates for the Software as described in Magento's standard Support Services - Terms and Conditions, which follow. Magento will have no obligation to provide support for any - modifications or derivative works of the Software developed by anyone other than Magento. - -10. Customer References - Licensee hereby grants Magento the right to display Licensee's logos as part of Magento's customer - lists and other related marketing materials. The parties shall cooperate to undertake mutually- - agreed joint marketing activities. - -11. Notices - All notices shall be in writing and sent by first class mail or overnight mail (or courier), transmitted by - facsimile (if confirmed by such mailing), or email, to the addresses indicated on the Magento Order - Form, or such other address as either party may indicate by at least ten (10) days prior written - notice to the other party. Notices to Magento shall be sent to the Contracts Administration - Department. - -12. Assignment - Licensee may not assign this Agreement without the prior written consent of Magento; provided - that such consent shall not be required for assignment to a purchaser of all or substantially all of the - assets or equity securities of Licensee who undertakes in writing to be bound by all the terms and - conditions of this Agreement. Any prohibited assignment shall be null and void. - -13. Entire Agreement - Along with Magento's standard Support Services Terms and Conditions, which follow, and the - Magento Order Form, this Agreement is the complete and exclusive agreement between the parties, - which supersedes all proposals or prior agreements, oral or written, including any online (click- - through) agreement which Licensee may have accepted in conjunction with the downloading of the - Software, and all other communications between the parties relating to the subject matter hereof. - No purchase order, other ordering document or any hand written or typewritten text which purports - to modify or supplement the printed text hereof or Magento Order Form shall add to or vary the - terms thereof and Magento hereby rejects same. Except as contained in a writing signed by both - parties, all such proposed variations or additions are objected to and shall have no force or effect. - -14. General - This Agreement is made in and shall be governed by the laws of the State of California, without - giving effect to any principles that provide for the application of the law of another jurisdiction. All - proceedings shall be conducted in English. Venue for all proceedings shall be Santa Clara County, - California, provided that Magento may seek injunctive relief in any court of competent jurisdiction. - The United Nations Convention for the International Sale of Goods shall not apply. The section - headings herein are provided for convenience only and have no substantive effect on the - construction of this Agreement. Except for Licensee's obligation to pay Magento, neither party shall - be liable for any failure to perform due to causes beyond its reasonable control. If any provision of - this Agreement is held to be unenforceable, this Agreement shall be construed without such - provision. The failure by a party to exercise any right hereunder shall not operate as a waiver of such - party's right to exercise such right or any other right in the future. This Agreement may be amended - only by a written document executed by a duly authorized representative of each of the parties. The - parties agree to receive electronic documents and accept electronic signatures (information - attached or logically associated with such document and clicked or otherwise adopted with an intent - to sign) including in counterparts which shall be valid substitutes for paper-based documents and - signatures, and the legal validity of a transaction will not be denied on the ground that it is not in - writing. - -15. Definitions - "Designated Server" shall mean the Server specified in a Magento Order Form with respect to a - particular Software license. Such Server may be that of a third-party under nondisclosure obligations - that will host the Software for the benefit of Licensee. - - "Modifications" means any code developed by Licensee or any third party, including without - limitation, configuration, integrations, implementations, or localizations to the external layer of the - core, baseline Software product. The term "Modifications" excludes Updates. - - "Proprietary Material" means the Software, related documentation, and all parts, copies and - modifications thereof, and any other information, in whatever form, received by Licensee - hereunder, provided, however, such information shall not be deemed Proprietary Material if it (a) is - or becomes a part of the public domain through no act or omission of Licensee; or (b) was in - Licensee's lawful possession prior to the disclosure and had not been obtained by Licensee from - Magento; or (c) is lawfully disclosed to Licensee by a third party without restriction on disclosure; or - (d) is independently developed by Licensee without reference to or use of Magento's Proprietary - Material. - - "Server" means each physical or virtual server from which a single instance of the Software is - accessed and used either for production purposes ("Production Server Instance") or for non- - production purposes, such as development, testing, training and other non-operational business - transactions ("Non-Production Server Instance"). For example, if one server contains two (2) - instances of the Software, i.e., one Production Server Instance and one Non-Production Server - Instance, then a Server license is required for each of such instances; development in-house and by - third-party consultants requires licenses for two Non-Production Server Instances. - - "Software" means Magento's proprietary e-commerce software solution known as the Magento(tm) - Enterprise Edition, provided solely in source code, including associated technical documentation, - and all Updates thereof furnished to Licensee as part of Support Services. Except as otherwise - specified herein, the term Software includes certain open source software programs described in - Section 4.2. "Software" does not include any Modifications. - - "Updates" means all published revisions and corrections to the printed documentation and - corrections and new releases of the Software which are generally made available to Magento's - supported customers at no additional cost or for media and handling charges only. Updates shall not - include any options or future products which Magento sells separately. - - -SUPPORT SERVICES TERMS AND CONDITIONS - -Unless otherwise defined herein, all capitalized terms will have the meanings set forth in the -Agreement. - -1. "Support Services" consists of: - a. Advice regarding the downloading, installation and configuration of the Software (including - Updates provided by Magento, but excluding for the avoidance of doubt any Modifications to - the Software), when used by Licensee on systems that meet the Software's "System - Requirements" specified on Magento's website at www.magentocommerce.com/system- - requirements. - - b. Facilities for bug tracking, escalation of problems for priority attention, and access to - community-supported FAQs and Forums relating to the Software. - - c. Assistance with troubleshooting to diagnose and fix errors in the Software. - - d. Access to Magento documentation relating to the Software, including authorization to make - copies of that documentation for internal use as specified in the Agreement. - -2. Exclusions from Support Services. - Magento shall have no obligation to support (i) versions of the - Software other than the then-current and immediately previous releases, which are operated on a - supported hardware/operating system platform specified in the release notes for the Software; (ii) - altered or modified Software; (iii) Software accessed on unlicensed Servers; (iv) problems caused by - Licensee's negligence, misuse, or hardware malfunction; or (v) use of the Software inconsistent with - Magento's instructions. Magento is not responsible for hardware changes necessitated by changes - to the Software. Support Services does not include: - a. Assistance in the development or debugging of Licensee's system, including the operating - system and support tools. - - b. Information and assistance on technical issues related to the installation, administration, and - use of enabling technologies such as databases, computer networks, and communications. - - c. Assistance with the installation and configuration of hardware including, but not limited to - computers, hard disks, networks, and printers. - -3. Subcontractors. - Magento or its authorized resellers reserve the right to subcontract any or all of - the work to be performed under these Support Terms, and Magento retains responsibility for any - work so subcontracted. - -4. Licensee Responsibilities. - Licensee shall provide commercially reasonable cooperation and full - information to Magento or its authorized resellers with respect to the furnishing of Support Services - under this Agreement. - -5. Support Contacts. - Licensee shall designate one or more support contacts that are authorized to - submit Software problems. If Licensee has purchased the license from a Magento-authorized - reseller, Licensee shall contact that party for assistance. If Licensee has purchased the license - directly from Magento, Licensee may contact Magento on the www.magentocommere.com website - or at its toll-free Support telephone number. - -6. Problem Priority. - Upon receipt of a properly submitted Software problem, as specified on - Magento's website at www.magentocommerce.com, Magento or its authorized reseller shall - prioritize it in accordance with the guidelines below: - - a. Priority 1 (P1) - A P1 is a catastrophic production problem within the Software that severely - impacts the Licensee's Production Server Instance, or because of which Licensee's Production - Server Instance is down or not functioning, or that results in a loss of production data and no - work around exists. P1 problems must be reported on Magento's toll-free support telephone - number in order to expedite resolution. Magento will use continuous efforts during its normal - hours of operation, with appropriate escalation to senior management, to provide a resolution - for any P1 problem as soon as is commercially reasonable. - - b. Priority 2 (P2) - A P2 is a problem within the Software where the Licensee's system is - functioning but in a reduced capacity, or the Problem is causing significant impact to portions of - the Licensee's business operations and productivity, or the Software is exposed to potential loss - or interruption of service. Problems existing in a non-production environment that would - otherwise qualify as a P1 if they were in a production system qualify as P2. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P2 - problem as soon as is commercially reasonable. - - c. Priority 3 (P3) - A P3 is a medium-to-low impact problem that involves partial and/or non- - critical loss of functionality, or that impairs some operations but allows Licensee's operations to - continue to function. Problems for which there is limited or no loss or functionality or impact to - Licensee's operation and for which there is an easy work-around qualify as P3. Magento will use - reasonable efforts during its normal hours of operation to provide a resolution for any P3 - problem in time for the next minor release of the Software. - - d. Priority 4 (P4) - A P4 is for a general usage question or issue that may be cosmetic in nature - or documentation related, but the Software works without normal hours of operation to - provide a resolution for any P4 problem in time for the next major release of the Software. - - e. Enhancement Request (ER) - An ER is a recommendation for future product enhancement or - modification to add official support and documentation for unsupported or undocumented - feature, or features that do not exist in the Software. Magento will take ERs into consideration - in the product management process, but has no obligation to deliver enhancements based on - any ER. - -7. Response Times. - Magento or its authorized reseller shall exercise commercially reasonable efforts - to meet the response times specified below for Gold Support (unless Licensee has upgraded to - Platinum Support, as provided in the Magento Order Form), following receipt of a Software problem - properly submitted by Licensee: - - Magento GOLD Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - North American Telephone Support Hours M-F 08:00 - 17:00 (PT) - European Telephone Support Hours M-F 08:30 - 17:30 (CET) - Telephone Response Time P1 Issues* 4 business hours - Response Time P2-P4 Issues* 24 business hours - *From initial contact - - - Magento PLATINUM Support Response Times - WEB Ticket Submission 24 x 7 x 365 - WEB Ticket Response Time* 24 business hours - Telephone Support Hours 24 hours - Telephone Response Time P1 Issues* Up to 2 hours - Response Time P2-P4 Issues* 4 business hours - *From initial contact - - -8. Prohibited Use. - As a condition of Licensee's use of the Forums, Licensee will not use (and will - prohibit its customers from using) the Forums (i) to violate any applicable law, statute, ordinance or - regulation; (ii) to disseminate content that is harmful, threatening, abusive, harassing, tortuous, - defamatory, vulgar, obscene, libelous, or otherwise objectionable; (iii) to disseminate any software - viruses or any other computer code, files or programs that may interrupt, destroy or limit the - functionality of any computer software or hardware or telecommunications equipment; (iv) to - infringe the intellectual property rights or proprietary rights, or rights of publicity or privacy, of any - third party; or (v) use the Forums for any purpose other than their intended use. - -9. Term and Termination. - Magento will provide Support Services and any Updates to Licensee - during the periods identified in the Magento Order Form, subject to Licensee's payment of the - applicable fees. In the event Licensee fails to pay such fees to Magento or in the event Licensee - materially breaches the Support Services provisions and does not cure such breach within thirty (30) - days of its receipt of Magento's notice of same, Magento may suspend or cancel Support Services. - -10. General. - Magento shall not be liable for any failure or delay in performance under these Support - Terms due to causes beyond its reasonable control. Any illegal or unenforceable provision shall be - severed from these Support Terms. Licensee agrees that any information received pursuant to these - Support Terms shall be deemed to be subject to the non-disclosure obligations set forth in the - License Agreement. Licensee's obligation of payment of moneys due under these Support Terms - shall survive termination of these Support Terms or the License Agreement. These Support Terms - state the entire agreement regarding provision of Support Services to Licensee and may be amended - only by a written amendment set forth on a separate document executed by authorized - representatives of both parties. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MessageQueue/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE.txt new file mode 100644 index 0000000000000..49525fd99da9c --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE.txt @@ -0,0 +1,48 @@ + +Open Software License ("OSL") v. 3.0 + +This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Open Software License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE_AFL.txt b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE_AFL.txt new file mode 100644 index 0000000000000..f39d641b18a19 --- /dev/null +++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MysqlMq/LICENSE_AFL.txt @@ -0,0 +1,48 @@ + +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + + 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + 1. to reproduce the Original Work in copies, either alone or as part of a collective work; + + 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + 4. to perform the Original Work publicly; and + + 5. to display the Original Work publicly. + + 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + + 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + + 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + + 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + + 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + + 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + + 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + + 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + + 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + + 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + + 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + + 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + + 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + + 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + + 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. From 3511245b2348e4b91e73ae5f8669293775a76d10 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Wed, 14 Mar 2018 13:51:35 -0500 Subject: [PATCH 609/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Elasticsearch5/Model/Client/Elasticsearch.php | 3 ++- .../Magento/Elasticsearch/Model/Adapter/Elasticsearch.php | 4 +++- .../Model/Adapter/Index/IndexNameResolver.php | 3 ++- .../Magento/Elasticsearch/Model/Client/Elasticsearch.php | 3 ++- app/code/Magento/Elasticsearch/etc/di.xml | 8 ++++++++ app/code/Magento/Elasticsearch/etc/module.xml | 2 +- .../Elasticsearch/Model/Client/ElasticsearchTest.php | 8 ++++---- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php index e260447173e76..c0ecaadaea504 100644 --- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php +++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Elasticsearch\Elasticsearch5\Model\Client; use Magento\Framework\Exception\LocalizedException; @@ -49,7 +50,7 @@ public function __construct( if (empty($options['hostname']) || ((!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) { throw new LocalizedException( - __('We were unable to perform the search because of a search engine misconfiguration.') + __('The search failed because of a search engine misconfiguration.') ); } diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php index bbe0d0a6cac7d..7fc45eed35650 100644 --- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php +++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php @@ -3,12 +3,14 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Elasticsearch\Model\Adapter; use Magento\Framework\App\ObjectManager; /** * Elasticsearch adapter + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class Elasticsearch { @@ -110,7 +112,7 @@ public function __construct( } catch (\Exception $e) { $this->logger->critical($e); throw new \Magento\Framework\Exception\LocalizedException( - __('We were unable to perform the search because of a search engine misconfiguration.') + __('The search failed because of a search engine misconfiguration.') ); } } diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php index c2edc616e8609..742af4247524e 100644 --- a/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php +++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/IndexNameResolver.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Elasticsearch\Model\Adapter\Index; use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient; @@ -67,7 +68,7 @@ public function __construct( } catch (\Exception $e) { $this->logger->critical($e); throw new LocalizedException( - __('We were unable to perform the search because of a search engine misconfiguration.') + __('The search failed because of a search engine misconfiguration.') ); } } diff --git a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php index eeb210d9edbd5..f428bbf961e3b 100644 --- a/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php +++ b/app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php @@ -3,6 +3,7 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Elasticsearch\Model\Client; use Magento\Framework\Exception\LocalizedException; @@ -44,7 +45,7 @@ public function __construct( if (empty($options['hostname']) || ((!empty($options['enableAuth']) && ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) { throw new LocalizedException( - __('We were unable to perform the search because of a search engine misconfiguration.') + __('The search failed because of a search engine misconfiguration.') ); } diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml index 63f795b26f567..b3ba240ae239c 100644 --- a/app/code/Magento/Elasticsearch/etc/di.xml +++ b/app/code/Magento/Elasticsearch/etc/di.xml @@ -114,6 +114,14 @@ + + + + elasticsearch + elasticsearch5 + + + _id diff --git a/app/code/Magento/Elasticsearch/etc/module.xml b/app/code/Magento/Elasticsearch/etc/module.xml index f9dc8f7020195..3a0f229713bc0 100644 --- a/app/code/Magento/Elasticsearch/etc/module.xml +++ b/app/code/Magento/Elasticsearch/etc/module.xml @@ -6,7 +6,7 @@ */ --> - + diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php index 4f8c10fd195ea..8e512861be49f 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php @@ -95,7 +95,7 @@ private function search($text) } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch5 * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search */ public function testSearchConfigurableProductBySimpleProductName() @@ -104,7 +104,7 @@ public function testSearchConfigurableProductBySimpleProductName() } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search */ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect() @@ -113,7 +113,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search */ public function testSearchConfigurableProductBySimpleProductAttributeSelect() @@ -122,7 +122,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeSelect() } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search */ public function testSearchConfigurableProductBySimpleProductAttributeShortDescription() From 9bb3f7cb218170c042f60ac6fc884c2c0dcc52f0 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Wed, 14 Mar 2018 16:16:42 -0500 Subject: [PATCH 610/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .../Model/Client/ElasticsearchTest.php | 2 +- .../Model/Indexer/IndexHandlerTest.php | 8 ++-- .../Model/Indexer/ReindexAllTest.php | 4 +- .../SearchAdapter/AdapterTest.php | 42 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php index 8e512861be49f..0731871b4bd40 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php @@ -95,7 +95,7 @@ private function search($text) } /** - * @magentoConfigFixture default/catalog/search/engine elasticsearch5 + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search */ public function testSearchConfigurableProductBySimpleProductName() diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php index 52f8c20795d32..4cdff533af737 100755 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php @@ -111,7 +111,7 @@ protected function setUp() /** * Test reindex process - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest */ public function testReindexAll() @@ -128,7 +128,7 @@ public function testReindexAll() } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest */ public function testReindexRowAfterEdit() @@ -156,7 +156,7 @@ public function testReindexRowAfterEdit() } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest */ public function testReindexRowAfterMassAction() @@ -196,7 +196,7 @@ public function testReindexRowAfterMassAction() } /** - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest * @magentoAppArea adminhtml */ diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php index a083949d846b5..d40ce9e8a0706 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php @@ -68,7 +68,7 @@ protected function setUp() /** * Test search of all products after full reindex * - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php */ @@ -82,7 +82,7 @@ public function testSearchAll() /** * Test search of specific product after full reindex * - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php */ diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php index 2bbee60f8c7bc..d3fba768e9ff4 100644 --- a/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php +++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php @@ -48,7 +48,7 @@ protected function createAdapter() /** * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testMatchQuery() @@ -58,7 +58,7 @@ public function testMatchQuery() /** * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testMatchOrderedQuery() @@ -70,7 +70,7 @@ public function testMatchOrderedQuery() /** * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testAggregationsQuery() @@ -80,7 +80,7 @@ public function testAggregationsQuery() /** * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testMatchQueryFilters() @@ -92,7 +92,7 @@ public function testMatchQueryFilters() * Range filter test with all fields filled * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testRangeFilterWithAllFields() @@ -104,7 +104,7 @@ public function testRangeFilterWithAllFields() * Range filter test with all fields filled * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testRangeFilterWithoutFromField() @@ -116,7 +116,7 @@ public function testRangeFilterWithoutFromField() * Range filter test with all fields filled * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testRangeFilterWithoutToField() @@ -128,7 +128,7 @@ public function testRangeFilterWithoutToField() * Term filter test * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testTermFilter() @@ -140,7 +140,7 @@ public function testTermFilter() * Term filter test * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testTermFilterArray() @@ -152,7 +152,7 @@ public function testTermFilterArray() * Term filter test * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testWildcardFilter() @@ -164,7 +164,7 @@ public function testWildcardFilter() * Request limits test * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testSearchLimit() @@ -176,7 +176,7 @@ public function testSearchLimit() * Bool filter test * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testBoolFilter() @@ -188,7 +188,7 @@ public function testBoolFilter() * Test bool filter with nested negative bool filter * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testBoolFilterWithNestedNegativeBoolFilter() @@ -200,7 +200,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter() * Test range inside nested negative bool filter * * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() @@ -213,7 +213,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter() * * @dataProvider elasticSearchAdvancedSearchDataProvider * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @param string $nameQuery * @param string $descriptionQuery @@ -259,7 +259,7 @@ public function elasticSearchAdvancedSearchDataProvider() /** * @magentoAppIsolation enabled * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testCustomFilterableAttribute() @@ -274,7 +274,7 @@ public function testCustomFilterableAttribute() * * @magentoAppIsolation enabled * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @dataProvider filterByAttributeValuesDataProvider * @param string $requestName @@ -294,7 +294,7 @@ public function testFilterByAttributeValues($requestName, $additionalData) * @param $rangeFilter * @param $expectedRecordsCount * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest * @magentoAppIsolation enabled * @dataProvider dateDataProvider @@ -309,7 +309,7 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount) /** * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testAdvancedSearchCompositeProductWithOutOfStockOption() @@ -321,7 +321,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption() /** * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testAdvancedSearchCompositeProductWithDisabledChild() @@ -335,7 +335,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild() /** * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php * @magentoAppIsolation enabled - * @magentoConfigFixture current_store catalog/search/engine elasticsearch + * @magentoConfigFixture default/catalog/search/engine elasticsearch * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest */ public function testSearchQueryBoost() From 198a42abe724042a4d6d0fdae718454e2a01d36f Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Thu, 15 Mar 2018 16:33:53 +0200 Subject: [PATCH 611/616] MAGETWO-89277: [Forwardport] Product Price indexer stuck during reindexing --- .../Product/Indexer/Price/Configurable.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php index a30ec81528dd3..a0180b811e444 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php @@ -8,10 +8,7 @@ namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price; use Magento\Catalog\Api\Data\ProductInterface; -use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus; -use Magento\Catalog\Model\Product\Attribute\Source\Status; use Magento\Store\Api\StoreResolverInterface; -use Magento\Store\Model\Store; /** * @SuppressWarnings(PHPMD.CouplingBetweenObjects) @@ -58,7 +55,7 @@ protected function reindex($entityIds = null) if ($this->hasEntity() || !empty($entityIds)) { $this->prepareFinalPriceDataForType($entityIds, $this->getTypeId()); $this->_applyCustomOption(); - $this->_applyConfigurableOption(); + $this->_applyConfigurableOption($entityIds); $this->_movePriceDataToIndexTable($entityIds); } return $this; @@ -110,10 +107,11 @@ protected function _prepareConfigurableOptionPriceTable() * Calculate minimal and maximal prices for configurable product options * and apply it to final price * + * @param array|null $entityIds * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\Configurable * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - protected function _applyConfigurableOption() + protected function _applyConfigurableOption($entityIds = null) { $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class); $connection = $this->getConnection(); @@ -133,12 +131,13 @@ protected function _applyConfigurableOption() ['le' => $this->getTable('catalog_product_entity')], 'le.' . $linkField . ' = l.parent_id', ['parent_id' => 'entity_id'] - )->join( - ['i' => $this->_getDefaultFinalPriceTable()], - 'le.entity_id = i.entity_id', - [] ); + if ($entityIds !== null) { + $subSelect->where('le.entity_id IN (?)', $entityIds); + } + + $select = $connection->select(); $select ->from(['sub' => new \Zend_Db_Expr('(' . (string)$subSelect . ')')], '') @@ -178,6 +177,7 @@ protected function _applyConfigurableOption() ' AND i.website_id = io.website_id', [] ); + // adds price of custom option, that was applied in DefaultPrice::_applyCustomOption $select->columns( [ 'min_price' => new \Zend_Db_Expr('i.min_price - i.orig_price + io.min_price'), From 61960464c50f161bd1c061f5590932cfaa7ed592 Mon Sep 17 00:00:00 2001 From: Michail Slabko Date: Thu, 15 Mar 2018 17:05:02 +0200 Subject: [PATCH 612/616] MAGETWO-89277: [Forwardport] Product Price indexer stuck during reindexing --- .../Model/ResourceModel/Product/Indexer/Price/Configurable.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php index a0180b811e444..326310cc3c802 100644 --- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php +++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php @@ -137,7 +137,6 @@ protected function _applyConfigurableOption($entityIds = null) $subSelect->where('le.entity_id IN (?)', $entityIds); } - $select = $connection->select(); $select ->from(['sub' => new \Zend_Db_Expr('(' . (string)$subSelect . ')')], '') From d6c726e3925ad922533d5356a95005f93bdfce54 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 16 Mar 2018 09:18:56 -0500 Subject: [PATCH 613/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- app/code/Magento/CatalogSearch/etc/module.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/CatalogSearch/etc/module.xml b/app/code/Magento/CatalogSearch/etc/module.xml index db530edbdd7ef..68253014ec150 100644 --- a/app/code/Magento/CatalogSearch/etc/module.xml +++ b/app/code/Magento/CatalogSearch/etc/module.xml @@ -10,6 +10,8 @@ + + From 25f4cdaaffd3cf695b2c2d73e1197b2d2be7a367 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 16 Mar 2018 11:55:32 -0500 Subject: [PATCH 614/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- composer.lock | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 540645c32dbd1..ccb545e1444ba 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "548d1c133e72f185367f630478f0a79f", - "content-hash": "626cf11f387b81b9dc0f36f297181fce", + "hash": "f35a2b37d86a6e72b4843feba3f4ec39", + "content-hash": "2eef07fbc4708e9ac9889c2d4fd6adc3", "packages": [ { "name": "braintree/braintree_php", @@ -2636,6 +2636,67 @@ ], "time": "2017-12-12 17:48:56" }, + { + "name": "zendframework/zend-feed", + "version": "2.9.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-feed.git", + "reference": "abe88686124d492e0a2a84656f15e5482bfbe030" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/abe88686124d492e0a2a84656f15e5482bfbe030", + "reference": "abe88686124d492e0a2a84656f15e5482bfbe030", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "zendframework/zend-escaper": "^2.5.2", + "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "psr/http-message": "^1.0.1", + "zendframework/zend-cache": "^2.7.2", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-db": "^2.8.2", + "zendframework/zend-http": "^2.7", + "zendframework/zend-servicemanager": "^2.7.8 || ^3.3", + "zendframework/zend-validator": "^2.10.1" + }, + "suggest": { + "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator", + "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests", + "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub", + "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations", + "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.9-dev", + "dev-develop": "2.10-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Feed\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides functionality for consuming RSS and Atom feeds", + "keywords": [ + "ZendFramework", + "feed", + "zf" + ], + "time": "2017-12-04 17:59:38" + }, { "name": "zendframework/zend-filter", "version": "2.7.2", From b9d33d26053dae5fdad6bfbd15b9c9a7cc0add28 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 16 Mar 2018 15:11:57 -0500 Subject: [PATCH 615/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5b1147c44135a..06654f33462a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ addons: - magento2.travis services: - rabbitmq + - elasticsearch language: php php: - 7.0 From 55764189185b7c8f2bffa32f37566a38cd2557c1 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Fri, 16 Mar 2018 16:14:23 -0500 Subject: [PATCH 616/616] Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06654f33462a5..8ebebda1c6adf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,9 @@ cache: - $HOME/.nvm - $HOME/node_modules - $HOME/yarn.lock -before_install: ./dev/travis/before_install.sh +before_install: + - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart + - ./dev/travis/before_install.sh install: composer install --no-interaction before_script: ./dev/travis/before_script.sh script: