Skip to content

Commit 31f6552

Browse files
author
Cari Spruiell
committed
Merge branch 'develop' of github.scm.corp.ebay.com:magento2/magento2ce into MAGETWO-32618-35024-merge
2 parents 47efb0c + e9378e4 commit 31f6552

File tree

280 files changed

+4196
-2997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+4196
-2997
lines changed

‎CHANGELOG.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
0.74.0-beta8
2+
=============
3+
* Performance Toolkit improvements
4+
* Added order generator
5+
* Added indexer mode switcher via profile config
6+
* UI Improvements
7+
* Added hide/show columns for CMS pages/blocks grid on backend
8+
* Updated the multi-select functionality & UI for CMS pages/blocks grid on backend
9+
* Added the new look & feel for Edit Order Page (view/edit order)
10+
* Framework Improvements
11+
* Updated API framework to support different integration object ACLs
12+
* Updated unit and integration tests config files to include tests from the Updater Application
13+
* Exceptions caught and logged before reaching Phrase::__toString() method
14+
* MTF Improvements
15+
* Replaced end-to-end One-page Checkout test with online shipment methods with scenario test
16+
* Replaced end-to-end Layered Navigation test with injectable test
17+
* Replaced end-to-end Shopping Cart price rule test with injectable test
18+
* Replaced end-to-end Switch Currency test with injectable test
19+
* Fixed the filling condition element
20+
* Updated a set of functional tests
21+
* Various
22+
* Eliminated functional logic in constructors
23+
* Updated public API definitions
24+
* Added information for Downloadable Products to Catalog Product Data Object
25+
* Added information for Catalog Inventory data to Catalog Product Data Object
26+
* Added information for Grouped Products to Catalog Product Data Object
27+
* Added information for Configurable Products to Catalog Product Data Object
28+
* Cleaned Tax API data interfaces
29+
* Removed OptionTypesListInterface and type field in OptionInterface
30+
* Fixed bugs
31+
* Fixed an issue with focus state appearing on click event in Admin Menu logo.
32+
* Fixed an issue where order was placed via Payflow link without providing credit card data
33+
* Fixed an issue where titles were displayed for backend navigation menu group when it only contained a single section
34+
* Fixed an issue where REST URL paths were not case-sensitive
35+
* Implement transparent redirect API
36+
* Fixed an issue in cron.php with checking for functions which are disabled in php.ini
37+
* Front-end development workflow settings scope changed to Global
38+
* Fixed an issue with widget title escape
39+
* Fixed the filename filtering
40+
* Fixed an issue with universal fatal error in the profiler option #2
41+
* Fixed an issue when shipping address in backend could not be changed when creating order
42+
* Fixed the performance issue with tax rules creation
43+
* The extended attributes became optional
44+
* Fixed an issue where final price did not recalculate when option was selected
45+
* Fixed an issue with price currency symbols
46+
* Fixed an issue when low_stock_date showed incorrect data
47+
* Fixed an issue with random integration test failure
48+
* GitHub issues
49+
* [#526] (https://github.com/magento/magento2/issues/526) -- Area Sessions: Magento 2 Should not Allow "area-less" Sessions During an Area Aware Request
50+
* [#1212] (https://github.com/magento/magento2/issues/1212) -- Magento 2 0.74.0-beta5 unable to open home page after successful installation
51+
* [#1213] (https://github.com/magento/magento2/issues/1213) -- Magento 2 0.74.0-beta6 unable to open home page right after successful installation
52+
* [#1157] (https://github.com/magento/magento2/issues/1157) -- Something went wrong with the subscription
53+
* [#1228] (https://github.com/magento/magento2/issues/1228) -- PDOException during attempt to export products: Unknown column 'entity_value.entity_type_id' in 'on clause’
54+
155
0.74.0-beta7
256
=============
357
* Framework improvements

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta7",
7-
"magento/module-backend": "0.74.0-beta7",
8-
"magento/module-media-storage": "0.74.0-beta7",
9-
"magento/framework": "0.74.0-beta7",
6+
"magento/module-store": "0.74.0-beta8",
7+
"magento/module-backend": "0.74.0-beta8",
8+
"magento/module-media-storage": "0.74.0-beta8",
9+
"magento/framework": "0.74.0-beta8",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta7",
14+
"version": "0.74.0-beta8",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta7",
7-
"magento/framework": "0.74.0-beta7",
6+
"magento/module-backend": "0.74.0-beta8",
7+
"magento/framework": "0.74.0-beta8",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta7",
11+
"version": "0.74.0-beta8",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta7",
7-
"magento/module-directory": "0.74.0-beta7",
8-
"magento/module-developer": "0.74.0-beta7",
9-
"magento/module-eav": "0.74.0-beta7",
10-
"magento/module-cron": "0.74.0-beta7",
11-
"magento/module-theme": "0.74.0-beta7",
12-
"magento/module-reports": "0.74.0-beta7",
13-
"magento/module-sales": "0.74.0-beta7",
14-
"magento/module-quote": "0.74.0-beta7",
15-
"magento/module-catalog": "0.74.0-beta7",
16-
"magento/module-user": "0.74.0-beta7",
17-
"magento/module-backup": "0.74.0-beta7",
18-
"magento/module-customer": "0.74.0-beta7",
19-
"magento/module-translation": "0.74.0-beta7",
20-
"magento/module-require-js": "0.74.0-beta7",
21-
"magento/module-config": "0.74.0-beta7",
22-
"magento/framework": "0.74.0-beta7",
6+
"magento/module-store": "0.74.0-beta8",
7+
"magento/module-directory": "0.74.0-beta8",
8+
"magento/module-developer": "0.74.0-beta8",
9+
"magento/module-eav": "0.74.0-beta8",
10+
"magento/module-cron": "0.74.0-beta8",
11+
"magento/module-theme": "0.74.0-beta8",
12+
"magento/module-reports": "0.74.0-beta8",
13+
"magento/module-sales": "0.74.0-beta8",
14+
"magento/module-quote": "0.74.0-beta8",
15+
"magento/module-catalog": "0.74.0-beta8",
16+
"magento/module-user": "0.74.0-beta8",
17+
"magento/module-backup": "0.74.0-beta8",
18+
"magento/module-customer": "0.74.0-beta8",
19+
"magento/module-translation": "0.74.0-beta8",
20+
"magento/module-require-js": "0.74.0-beta8",
21+
"magento/module-config": "0.74.0-beta8",
22+
"magento/framework": "0.74.0-beta8",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta7",
26+
"version": "0.74.0-beta8",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta7",
7-
"magento/module-backend": "0.74.0-beta7",
8-
"magento/module-cron": "0.74.0-beta7",
9-
"magento/framework": "0.74.0-beta7",
6+
"magento/module-store": "0.74.0-beta8",
7+
"magento/module-backend": "0.74.0-beta8",
8+
"magento/module-cron": "0.74.0-beta8",
9+
"magento/framework": "0.74.0-beta8",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta7",
13+
"version": "0.74.0-beta8",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta7",
7-
"magento/module-catalog": "0.74.0-beta7",
8-
"magento/module-tax": "0.74.0-beta7",
9-
"magento/module-backend": "0.74.0-beta7",
10-
"magento/module-sales": "0.74.0-beta7",
11-
"magento/module-checkout": "0.74.0-beta7",
12-
"magento/module-catalog-inventory": "0.74.0-beta7",
13-
"magento/module-customer": "0.74.0-beta7",
14-
"magento/module-catalog-rule": "0.74.0-beta7",
15-
"magento/module-eav": "0.74.0-beta7",
16-
"magento/module-config": "0.74.0-beta7",
17-
"magento/module-gift-message": "0.74.0-beta7",
18-
"magento/framework": "0.74.0-beta7",
19-
"magento/module-quote": "0.74.0-beta7",
20-
"magento/module-media-storage": "0.74.0-beta7",
6+
"magento/module-store": "0.74.0-beta8",
7+
"magento/module-catalog": "0.74.0-beta8",
8+
"magento/module-tax": "0.74.0-beta8",
9+
"magento/module-backend": "0.74.0-beta8",
10+
"magento/module-sales": "0.74.0-beta8",
11+
"magento/module-checkout": "0.74.0-beta8",
12+
"magento/module-catalog-inventory": "0.74.0-beta8",
13+
"magento/module-customer": "0.74.0-beta8",
14+
"magento/module-catalog-rule": "0.74.0-beta8",
15+
"magento/module-eav": "0.74.0-beta8",
16+
"magento/module-config": "0.74.0-beta8",
17+
"magento/module-gift-message": "0.74.0-beta8",
18+
"magento/framework": "0.74.0-beta8",
19+
"magento/module-quote": "0.74.0-beta8",
20+
"magento/module-media-storage": "0.74.0-beta8",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta7"
24+
"magento/module-webapi": "0.74.0-beta8"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta7",
27+
"version": "0.74.0-beta8",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/CacheInvalidate/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-page-cache": "0.74.0-beta7",
7-
"magento/framework": "0.74.0-beta7",
6+
"magento/module-page-cache": "0.74.0-beta8",
7+
"magento/framework": "0.74.0-beta8",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta7",
11+
"version": "0.74.0-beta8",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta7",
7-
"magento/module-customer": "0.74.0-beta7",
8-
"magento/module-checkout": "0.74.0-beta7",
9-
"magento/module-backend": "0.74.0-beta7",
10-
"magento/framework": "0.74.0-beta7",
6+
"magento/module-store": "0.74.0-beta8",
7+
"magento/module-customer": "0.74.0-beta8",
8+
"magento/module-checkout": "0.74.0-beta8",
9+
"magento/module-backend": "0.74.0-beta8",
10+
"magento/framework": "0.74.0-beta8",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta7",
14+
"version": "0.74.0-beta8",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Catalog/Model/Observer.php

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,27 +149,10 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode, $block
149149
if (!$category->getIsActive()) {
150150
continue;
151151
}
152-
153-
$nodeId = 'category-node-' . $category->getId();
154-
155152
$block->addIdentity(\Magento\Catalog\Model\Category::CACHE_TAG . '_' . $category->getId());
156153

157154
$tree = $parentCategoryNode->getTree();
158-
159-
$isActiveCategory = false;
160-
/** @var \Magento\Catalog\Model\Category $currentCategory */
161-
$currentCategory = $this->_registry->registry('current_category');
162-
if ($currentCategory && $currentCategory->getId() == $category->getId()) {
163-
$isActiveCategory = true;
164-
}
165-
166-
$categoryData = [
167-
'name' => $category->getName(),
168-
'id' => $nodeId,
169-
'url' => $this->_catalogCategory->getCategoryUrl($category),
170-
'has_active' => $this->hasActive($category),
171-
'is_active' => $isActiveCategory
172-
];
155+
$categoryData = $this->getMenuCategoryData($category);
173156
$categoryNode = new \Magento\Framework\Data\Tree\Node($categoryData, 'id', $tree, $parentCategoryNode);
174157
$parentCategoryNode->addChild($categoryNode);
175158

@@ -183,6 +166,34 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode, $block
183166
}
184167
}
185168

169+
/**
170+
* Get category data to be added to the Menu
171+
*
172+
* @param \Magento\Framework\Data\Tree\Node $category
173+
* @return array
174+
*/
175+
public function getMenuCategoryData($category)
176+
{
177+
$nodeId = 'category-node-' . $category->getId();
178+
179+
$isActiveCategory = false;
180+
/** @var \Magento\Catalog\Model\Category $currentCategory */
181+
$currentCategory = $this->_registry->registry('current_category');
182+
if ($currentCategory && $currentCategory->getId() == $category->getId()) {
183+
$isActiveCategory = true;
184+
}
185+
186+
$categoryData = [
187+
'name' => $category->getName(),
188+
'id' => $nodeId,
189+
'url' => $this->_catalogCategory->getCategoryUrl($category),
190+
'has_active' => $this->hasActive($category),
191+
'is_active' => $isActiveCategory,
192+
];
193+
194+
return $categoryData;
195+
}
196+
186197
/**
187198
* Checks whether category belongs to active category's path
188199
*

‎app/code/Magento/Catalog/Setup/UpgradeSchema.php

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,32 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
3131
'FK_CAT_PRD_ENTT_ENTT_TYPE_ID_EAV_ENTT_TYPE_ENTT_TYPE_ID'
3232
);
3333

34-
//Drop entity_type_id column for catalog product entities
35-
$connection->dropColumn($installer->getTable('catalog_product_entity'), 'entity_type_id');
36-
$connection->dropColumn($installer->getTable('catalog_product_entity_datetime'), 'entity_type_id');
37-
$connection->dropColumn($installer->getTable('catalog_product_entity_decimal'), 'entity_type_id');
38-
$connection->dropColumn($installer->getTable('catalog_product_entity_gallery'), 'entity_type_id');
39-
$connection->dropColumn($installer->getTable('catalog_product_entity_int'), 'entity_type_id');
40-
$connection->dropColumn($installer->getTable('catalog_product_entity_text'), 'entity_type_id');
41-
$connection->dropColumn($installer->getTable('catalog_product_entity_varchar'), 'entity_type_id');
42-
43-
//Drop entity_type_id column for catalog category entities
44-
$connection->dropColumn($installer->getTable('catalog_category_entity'), 'entity_type_id');
45-
$connection->dropColumn($installer->getTable('catalog_category_entity_datetime'), 'entity_type_id');
46-
$connection->dropColumn($installer->getTable('catalog_category_entity_decimal'), 'entity_type_id');
47-
$connection->dropColumn($installer->getTable('catalog_category_entity_int'), 'entity_type_id');
48-
$connection->dropColumn($installer->getTable('catalog_category_entity_text'), 'entity_type_id');
49-
$connection->dropColumn($installer->getTable('catalog_category_entity_varchar'), 'entity_type_id');
34+
$dropTablesColumn = [
35+
'catalog_product_entity',
36+
'catalog_product_entity_datetime',
37+
'catalog_product_entity_decimal',
38+
'catalog_product_entity_gallery',
39+
'catalog_product_entity_int',
40+
'catalog_product_entity_text',
41+
'catalog_product_entity_varchar',
42+
'catalog_category_entity',
43+
'catalog_category_entity_datetime',
44+
'catalog_category_entity_decimal',
45+
'catalog_category_entity_int',
46+
'catalog_category_entity_text',
47+
'catalog_category_entity_varchar'
48+
];
49+
foreach ($dropTablesColumn as $table) {
50+
$connection->dropIndex(
51+
$installer->getTable($table),
52+
$installer->getIdxName(
53+
$table,
54+
'entity_type_id',
55+
\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
56+
)
57+
);
58+
$connection->dropColumn($installer->getTable($table), 'entity_type_id');
59+
}
5060

5161
$installer->endSetup();
5262
}

0 commit comments

Comments
 (0)