Skip to content

Commit 67b14bb

Browse files
orykhorykh
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento-qmt/magento2ce into MTA-1594
2 parents 72751d3 + f820f1e commit 67b14bb

File tree

608 files changed

+11256
-7213
lines changed

Some content is hidden

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

608 files changed

+11256
-7213
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/Console/Command/AbstractCacheCommand.php

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Console\Command;
8+
9+
use Magento\Framework\App\Cache\Manager;
10+
use Symfony\Component\Console\Command\Command;
11+
use Symfony\Component\Console\Input\InputOption;
12+
13+
abstract class AbstractCacheCommand extends Command
14+
{
15+
/**
16+
* Input option bootsrap
17+
*/
18+
const INPUT_KEY_BOOTSTRAP = 'bootstrap';
19+
20+
/**
21+
* CacheManager
22+
*
23+
* @var Manager
24+
*/
25+
protected $cacheManager;
26+
27+
/**
28+
* Constructor
29+
*
30+
* @param Manager $cacheManager
31+
*/
32+
public function __construct(Manager $cacheManager)
33+
{
34+
$this->cacheManager = $cacheManager;
35+
parent::__construct();
36+
}
37+
38+
/**
39+
* {@inheritdoc}
40+
*/
41+
protected function configure()
42+
{
43+
$this->addOption(
44+
self::INPUT_KEY_BOOTSTRAP,
45+
null,
46+
InputOption::VALUE_REQUIRED,
47+
'add or override parameters of the bootstrap'
48+
);
49+
}
50+
}

‎app/code/Magento/Backend/Console/Command/AbstractCacheManageCommand.php

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Console\Command;
8+
9+
use Symfony\Component\Console\Input\InputArgument;
10+
use Symfony\Component\Console\Input\InputInterface;
11+
use Symfony\Component\Console\Input\InputOption;
12+
13+
abstract class AbstractCacheManageCommand extends AbstractCacheCommand
14+
{
15+
/**
16+
* Input argument types
17+
*/
18+
const INPUT_KEY_TYPES = 'types';
19+
20+
/**
21+
* Input key all
22+
*/
23+
const INPUT_KEY_ALL = 'all';
24+
25+
/**
26+
* {@inheritdoc}
27+
*/
28+
protected function configure()
29+
{
30+
$this->addArgument(
31+
self::INPUT_KEY_TYPES,
32+
InputArgument::IS_ARRAY,
33+
'List of cache types, space separated. If omitted, all caches will be affected'
34+
);
35+
$this->addOption(
36+
self::INPUT_KEY_ALL,
37+
null,
38+
InputOption::VALUE_NONE,
39+
'All cache types'
40+
);
41+
parent::configure();
42+
}
43+
44+
45+
/**
46+
* Get requested cache types
47+
*
48+
* @param InputInterface $input
49+
* @return array
50+
*/
51+
protected function getRequestedTypes(InputInterface $input)
52+
{
53+
$requestedTypes = [];
54+
if ($input->getArgument(self::INPUT_KEY_TYPES)) {
55+
$requestedTypes = $input->getArgument(self::INPUT_KEY_TYPES);
56+
$requestedTypes = array_filter(array_map('trim', $requestedTypes), 'strlen');
57+
}
58+
if (empty($requestedTypes)) {
59+
return [];
60+
} else {
61+
$availableTypes = $this->cacheManager->getAvailableTypes();
62+
$unsupportedTypes = array_diff($requestedTypes, $availableTypes);
63+
if ($unsupportedTypes) {
64+
throw new \InvalidArgumentException(
65+
"The following requested cache types are not supported: '" . join("', '", $unsupportedTypes)
66+
. "'." . PHP_EOL . 'Supported types: ' . join(", ", $availableTypes)
67+
);
68+
}
69+
return array_values(array_intersect($availableTypes, $requestedTypes));
70+
}
71+
}
72+
}

‎app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Console\Command;
8+
9+
use Symfony\Component\Console\Input\InputInterface;
10+
use Symfony\Component\Console\Output\OutputInterface;
11+
12+
abstract class AbstractCacheSetCommand extends AbstractCacheManageCommand
13+
{
14+
/**
15+
* Is enable cache or not
16+
*
17+
* @return bool
18+
*/
19+
abstract protected function isEnable();
20+
21+
/**
22+
* {@inheritdoc}
23+
*/
24+
protected function execute(InputInterface $input, OutputInterface $output)
25+
{
26+
$isEnable = $this->isEnable();
27+
if ($input->getOption(self::INPUT_KEY_ALL)) {
28+
$types = $this->cacheManager->getAvailableTypes();
29+
} else {
30+
$types = $this->getRequestedTypes($input);
31+
}
32+
$changedTypes = $this->cacheManager->setEnabled($types, $isEnable);
33+
if ($changedTypes) {
34+
$output->writeln('Changed cache status:');
35+
foreach ($changedTypes as $type) {
36+
$output->writeln(sprintf('%30s: %d -> %d', $type, !$isEnable, $isEnable));
37+
}
38+
} else {
39+
$output->writeln('There is nothing to change in cache status');
40+
}
41+
if (!empty($changedTypes) && $isEnable) {
42+
$this->cacheManager->clean($changedTypes);
43+
$output->writeln('Cleaned cache types:');
44+
$output->writeln(join(PHP_EOL, $changedTypes));
45+
}
46+
}
47+
}

‎app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Console\Command;
8+
9+
use Symfony\Component\Console\Input\InputInterface;
10+
use Symfony\Component\Console\Output\OutputInterface;
11+
12+
abstract class AbstractCacheTypeManageCommand extends AbstractCacheManageCommand
13+
{
14+
/**
15+
* Perform a cache management action on cache types
16+
*
17+
* @param array $cacheTypes
18+
* @return void
19+
*/
20+
abstract protected function performAction(array $cacheTypes);
21+
22+
/**
23+
* Get display message
24+
*
25+
* @return string
26+
*/
27+
abstract protected function getDisplayMessage();
28+
29+
/**
30+
* Perform cache management action
31+
*
32+
* @param InputInterface $input
33+
* @param OutputInterface $output
34+
* @return void
35+
*/
36+
protected function execute(InputInterface $input, OutputInterface $output)
37+
{
38+
if ($input->getOption(self::INPUT_KEY_ALL)) {
39+
$types = $this->cacheManager->getAvailableTypes();
40+
} else {
41+
$types = $this->getRequestedTypes($input);
42+
}
43+
$this->performAction($types);
44+
$output->writeln($this->getDisplayMessage());
45+
$output->writeln(join(PHP_EOL, $types));
46+
}
47+
}

‎app/code/Magento/Backend/Console/Command/CacheCleanCommand.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Console\Command;
8+
9+
/**
10+
* Command for cleaning cache
11+
*/
12+
class CacheCleanCommand extends AbstractCacheTypeManageCommand
13+
{
14+
/**
15+
* {@inheritdoc}
16+
*/
17+
protected function configure()
18+
{
19+
$this->setName('cache:clean');
20+
$this->setDescription('Cleans cache type(s)');
21+
parent::configure();
22+
}
23+
24+
/**
25+
* Cleans cache types
26+
*
27+
* @param array $cacheTypes
28+
* @return void
29+
*/
30+
protected function performAction(array $cacheTypes)
31+
{
32+
$this->cacheManager->clean($cacheTypes);
33+
}
34+
35+
/**
36+
* {@inheritdoc}
37+
*/
38+
protected function getDisplayMessage()
39+
{
40+
return 'Cleaned cache types:';
41+
}
42+
}

‎app/code/Magento/Backend/Console/Command/CacheDisableCommand.php

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Console\Command;
8+
9+
/**
10+
* Command for disabling cache
11+
*/
12+
class CacheDisableCommand extends AbstractCacheSetCommand
13+
{
14+
/**
15+
* {@inheritdoc}
16+
*/
17+
protected function configure()
18+
{
19+
$this->setName('cache:disable');
20+
$this->setDescription('Disables cache type(s)');
21+
parent::configure();
22+
}
23+
24+
/**
25+
* Is Disable cache
26+
*
27+
* @return bool
28+
*/
29+
protected function isEnable()
30+
{
31+
return false;
32+
}
33+
}

0 commit comments

Comments
 (0)