Skip to content

Commit 7a3fd99

Browse files
author
Alex Bomko
committed
Merge remote branch 'mainline/develop' into MAGETWO-43826
2 parents 63bf147 + 515bb06 commit 7a3fd99

File tree

13 files changed

+210
-136
lines changed

13 files changed

+210
-136
lines changed

‎dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ class MysqlTest extends \PHPUnit_Framework_TestCase
2222
*/
2323
protected $_connection = null;
2424

25+
public function setUp()
26+
{
27+
set_error_handler(null);
28+
}
29+
30+
public function tearDown()
31+
{
32+
restore_error_handler();
33+
}
34+
2535
/**
2636
* Test lost connection re-initializing
2737
*

‎dev/tests/integration/testsuite/Magento/Setup/Controller/ComponentGridTest.php‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ class ComponentGridTest extends \PHPUnit_Framework_TestCase
7070
*/
7171
private $lastSyncData = [];
7272

73-
public function __construct()
73+
public function setUp()
7474
{
7575
$this->lastSyncData = [
7676
"lastSyncDate" => "2015/08/10 21:05:34",
7777
"packages" => [
78-
'magento/sample-module1' => [
79-
'name' => 'magento/sample-module1',
78+
'magento/sample-module-one' => [
79+
'name' => 'magento/sample-module-one',
8080
'type' => 'magento2-module',
8181
'version' => '1.0.0'
8282
]
@@ -85,13 +85,20 @@ public function __construct()
8585
'countOfUpdate' => 1
8686
];
8787
$this->componentData = [
88-
'magento/sample-module1' => [
89-
'name' => 'magento/sample-module1',
88+
'magento/sample-module-one' => [
89+
'name' => 'magento/sample-module-one',
9090
'type' => 'magento2-module',
9191
'version' => '1.0.0'
9292
]
9393
];
94-
94+
$allComponentData = [
95+
'magento/sample-module-two' => [
96+
'name' => 'magento/sample-module-two',
97+
'type' => 'magento2-module',
98+
'version' => '1.0.0'
99+
]
100+
];
101+
$allComponentData = array_merge($allComponentData, $this->componentData);
95102
$this->composerInformationMock = $this->getMock(
96103
'Magento\Framework\Composer\ComposerInformation',
97104
[],
@@ -101,36 +108,26 @@ public function __construct()
101108
);
102109
$objectManagerProvider = $this->getMock('Magento\Setup\Model\ObjectManagerProvider', [], [], '', false);
103110
$objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
111+
$objectManagerProvider->expects($this->once())
112+
->method('get')
113+
->willReturn($objectManager);
114+
$this->packageInfoFactoryMock = $this
115+
->getMock('Magento\Framework\Module\PackageInfoFactory', [], [], '', false);
104116
$this->enabledModuleListMock = $this->getMock('Magento\Framework\Module\ModuleList', [], [], '', false);
117+
$this->enabledModuleListMock->expects($this->any())->method('has')->willReturn(true);
105118
$this->fullModuleListMock = $this->getMock('Magento\Framework\Module\FullModuleList', [], [], '', false);
106-
$this->packageInfoFactoryMock = $this->getMock(
107-
'Magento\Framework\Module\PackageInfoFactory',
108-
[],
109-
[],
110-
'',
111-
false
112-
);
119+
$this->fullModuleListMock->expects($this->any())->method('getNames')->willReturn($allComponentData);
120+
$objectManager->expects($this->exactly(3))
121+
->method('get')
122+
->willReturnMap([
123+
['Magento\Framework\Module\PackageInfoFactory', $this->packageInfoFactoryMock],
124+
['Magento\Framework\Module\FullModuleList', $this->fullModuleListMock],
125+
['Magento\Framework\Module\ModuleList', $this->enabledModuleListMock]
126+
]);
113127
$this->packageInfo = $this->getMock('Magento\Framework\Module\PackageInfo', [], [], '', false);
114128
$this->updatePackagesCacheMock = $this->getMock('Magento\Setup\Model\UpdatePackagesCache', [], [], '', false);
115-
116-
$objectManagerProvider->expects($this->any())->method('get')->willReturn($objectManager);
117-
118-
$objectManager->expects($this->at(0))->method('get')->willReturn($this->enabledModuleListMock);
119-
120-
$objectManager->expects($this->at(1))->method('get')->willReturn($this->fullModuleListMock);
121-
122-
$objectManager->expects($this->at(2))->method('get')->willReturn($this->packageInfoFactoryMock);
123-
129+
$this->connectManagerMock = $this->getMock('Magento\Setup\Model\ConnectManager', [], [], '', false);
124130
$this->packageInfoFactoryMock->expects($this->once())->method('create')->willReturn($this->packageInfo);
125-
126-
$this->connectManagerMock = $this->getMock(
127-
'Magento\Setup\Model\ConnectManager',
128-
[],
129-
[],
130-
'',
131-
false
132-
);
133-
134131
$this->controller = new ComponentGrid(
135132
$this->composerInformationMock,
136133
$objectManagerProvider,
@@ -154,12 +151,12 @@ public function testComponentsAction()
154151
$this->packageInfo->expects($this->once())
155152
->method('getModuleName')
156153
->willReturn('Sample_Module');
157-
$this->packageInfo->expects($this->once())
154+
$this->packageInfo->expects($this->exactly(2))
158155
->method('getPackageName')
159-
->willReturn('magento/sample-module1');
160-
$this->packageInfo->expects($this->once())
156+
->willReturn($this->componentData['magento/sample-module-one']['name']);
157+
$this->packageInfo->expects($this->exactly(2))
161158
->method('getVersion')
162-
->willReturn('1.0.0');
159+
->willReturn($this->componentData['magento/sample-module-one']['version']);
163160
$this->enabledModuleListMock->expects($this->once())
164161
->method('has')
165162
->willReturn(true);
@@ -178,7 +175,7 @@ public function testComponentsAction()
178175
$this->assertArrayHasKey('success', $variables);
179176
$this->assertTrue($variables['success']);
180177
$expected = [[
181-
'name' => 'magento/sample-module1',
178+
'name' => 'magento/sample-module-one',
182179
'type' => 'magento2-module',
183180
'version' => '1.0.0',
184181
'update' => false,

‎setup/pub/magento/setup/readiness-check.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ angular.module('readiness-check', [])
291291
item.fail();
292292
});
293293
}
294-
return $http.get(item.url, {timeout: 3000})
294+
// setting 1 minute timeout to prevent system from timing out
295+
return $http.get(item.url, {timeout: 60000})
295296
.success(function(data) { item.process(data) })
296297
.error(function(data, status) {
297298
item.fail();

‎setup/src/Magento/Setup/Console/Command/UpgradeCommand.php‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,22 @@
55
*/
66
namespace Magento\Setup\Console\Command;
77

8+
use Magento\Framework\Setup\ConsoleLogger;
9+
use Magento\Setup\Model\InstallerFactory;
810
use Symfony\Component\Console\Input\InputInterface;
11+
use Symfony\Component\Console\Input\InputOption;
912
use Symfony\Component\Console\Output\OutputInterface;
10-
use Magento\Setup\Model\InstallerFactory;
11-
use Magento\Framework\Setup\ConsoleLogger;
1213

1314
/**
1415
* Command for updating installed application after the code base has changed
1516
*/
1617
class UpgradeCommand extends AbstractSetupCommand
1718
{
19+
/**
20+
* Option to skip deletion of var/generation directory
21+
*/
22+
const INPUT_KEY_KEEP_GENERATED = 'keep-generated';
23+
1824
/**
1925
* Installer service factory
2026
*
@@ -38,10 +44,19 @@ public function __construct(InstallerFactory $installerFactory)
3844
*/
3945
protected function configure()
4046
{
47+
$options = [
48+
new InputOption(
49+
self::INPUT_KEY_KEEP_GENERATED,
50+
null,
51+
InputOption::VALUE_NONE,
52+
'Prevents generated code from being deleted. ' . PHP_EOL .
53+
'We discourage using this option except when deploying to production. ' . PHP_EOL .
54+
'Consult your system integrator or administrator for more information.'
55+
)
56+
];
4157
$this->setName('setup:upgrade')
42-
->setDescription(
43-
'Upgrades the Magento application, DB data, and schema'
44-
);
58+
->setDescription('Upgrades the Magento application, DB data, and schema')
59+
->setDefinition($options);
4560
parent::configure();
4661
}
4762

@@ -50,10 +65,13 @@ protected function configure()
5065
*/
5166
protected function execute(InputInterface $input, OutputInterface $output)
5267
{
68+
$keepGenerated = $input->getOption(self::INPUT_KEY_KEEP_GENERATED);
5369
$installer = $this->installerFactory->create(new ConsoleLogger($output));
54-
$installer->updateModulesSequence();
70+
$installer->updateModulesSequence($keepGenerated);
5571
$installer->installSchema();
5672
$installer->installDataFixtures();
57-
$output->writeln('<info>Please re-run Magento compile command</info>');
73+
if (!$keepGenerated) {
74+
$output->writeln('<info>Please re-run Magento compile command</info>');
75+
}
5876
}
5977
}

‎setup/src/Magento/Setup/Controller/ComponentGrid.php‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,10 @@
66

77
namespace Magento\Setup\Controller;
88

9-
use Magento\Framework\Composer\ComposerInformation;
10-
use Magento\Framework\Module\FullModuleList;
11-
use Magento\Framework\Module\ModuleList;
12-
use Magento\Framework\Module\PackageInfo;
13-
use Magento\Setup\Model\ObjectManagerProvider;
14-
use Zend\Mvc\Controller\AbstractActionController;
15-
use Zend\View\Model\JsonModel;
16-
use Zend\View\Model\ViewModel;
17-
use Magento\Setup\Model\ConnectManager;
18-
use Magento\Setup\Model\UpdatePackagesCache;
19-
209
/**
2110
* Controller for component grid tasks
2211
*/
23-
class ComponentGrid extends AbstractActionController
12+
class ComponentGrid extends \Zend\Mvc\Controller\AbstractActionController
2413
{
2514
/**
2615
* @var \Magento\Framework\Composer\ComposerInformation
@@ -35,7 +24,7 @@ class ComponentGrid extends AbstractActionController
3524
private $packageInfo;
3625

3726
/**
38-
* @var ConnectManager
27+
* @var \Magento\Setup\Model\ConnectManager
3928
*/
4029
private $connectManager;
4130

@@ -57,43 +46,42 @@ class ComponentGrid extends AbstractActionController
5746
private $updatePackagesCache;
5847

5948
/**
60-
* @param ComposerInformation $composerInformation
61-
* @param ObjectManagerProvider $objectManagerProvider
62-
* @param ConnectManager $connectManager
63-
* @param UpdatePackagesCache $updatePackagesCache
49+
* @param \Magento\Framework\Composer\ComposerInformation $composerInformation
50+
* @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
51+
* @param \Magento\Setup\Model\ConnectManager $connectManager
52+
* @param \Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache
6453
*/
6554
public function __construct(
66-
ComposerInformation $composerInformation,
67-
ObjectManagerProvider $objectManagerProvider,
68-
UpdatePackagesCache $updatePackagesCache,
69-
ConnectManager $connectManager
55+
\Magento\Framework\Composer\ComposerInformation $composerInformation,
56+
\Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
57+
\Magento\Setup\Model\UpdatePackagesCache $updatePackagesCache,
58+
\Magento\Setup\Model\ConnectManager $connectManager
7059
) {
7160
$this->composerInformation = $composerInformation;
7261
$objectManager = $objectManagerProvider->get();
7362
$this->enabledModuleList = $objectManager->get('Magento\Framework\Module\ModuleList');
7463
$this->fullModuleList = $objectManager->get('Magento\Framework\Module\FullModuleList');
75-
$this->packageInfo = $objectManagerProvider->get()
76-
->get('Magento\Framework\Module\PackageInfoFactory')->create();
64+
$this->packageInfo = $objectManager->get('Magento\Framework\Module\PackageInfoFactory')->create();
7765
$this->connectManager = $connectManager;
7866
$this->updatePackagesCache = $updatePackagesCache;
7967
}
8068

8169
/**
8270
* Index page action
8371
*
84-
* @return ViewModel
72+
* @return \Zend\View\Model\ViewModel
8573
*/
8674
public function indexAction()
8775
{
88-
$view = new ViewModel();
76+
$view = new \Zend\View\Model\ViewModel();
8977
$view->setTerminal(true);
9078
return $view;
9179
}
9280

9381
/**
9482
* Get Components info action
9583
*
96-
* @return JsonModel
84+
* @return \Zend\View\Model\JsonModel
9785
* @throws \RuntimeException
9886
* @SuppressWarnings(PHPMD.NPathComplexity)
9987
*/
@@ -108,7 +96,7 @@ public function componentsAction()
10896
$components[$component['name']]['uninstall'] = false;
10997
$components[$component['name']]['moduleName'] = $this->packageInfo->getModuleName($component['name']);
11098
if ($this->composerInformation->isPackageInComposerJson($component['name'])
111-
&& ($component['type'] !== ComposerInformation::METAPACKAGE_PACKAGE_TYPE)) {
99+
&& ($component['type'] !== \Magento\Framework\Composer\ComposerInformation::METAPACKAGE_PACKAGE_TYPE)) {
112100
$components[$component['name']]['uninstall'] = true;
113101
if (isset($lastSyncData['packages'][$component['name']]['latestVersion'])
114102
&& version_compare(
@@ -119,7 +107,7 @@ public function componentsAction()
119107
$components[$component['name']]['update'] = true;
120108
}
121109
}
122-
if ($component['type'] === ComposerInformation::MODULE_PACKAGE_TYPE) {
110+
if ($component['type'] === \Magento\Framework\Composer\ComposerInformation::MODULE_PACKAGE_TYPE) {
123111
$components[$component['name']]['enable'] =
124112
$this->enabledModuleList->has($components[$component['name']]['moduleName']);
125113
$components[$component['name']]['disable'] = !$components[$component['name']]['enable'];
@@ -137,7 +125,7 @@ public function componentsAction()
137125
isset($packagesForInstall['packages']) ? count($packagesForInstall['packages']) : 0;
138126
$lastSyncData['countOfUpdate'] = isset($lastSyncData['packages']) ? count($lastSyncData['packages']) : 0;
139127

140-
return new JsonModel(
128+
return new \Zend\View\Model\JsonModel(
141129
[
142130
'success' => true,
143131
'components' => array_values($components),
@@ -150,7 +138,7 @@ public function componentsAction()
150138
/**
151139
* Sync action
152140
*
153-
* @return JsonModel
141+
* @return \Zend\View\Model\JsonModel
154142
*/
155143
public function syncAction()
156144
{
@@ -165,7 +153,7 @@ public function syncAction()
165153
$lastSyncData['countOfUpdate'] = isset($lastSyncData['packages']) ? count($lastSyncData['packages']) : 0;
166154

167155

168-
return new JsonModel(
156+
return new \Zend\View\Model\JsonModel(
169157
[
170158
'success' => true,
171159
'lastSyncData' => $lastSyncData
@@ -185,7 +173,7 @@ private function getAllModules()
185173
foreach ($allModules as $module) {
186174
$moduleName = $this->packageInfo->getPackageName($module);
187175
$modules[$moduleName]['name'] = $moduleName;
188-
$modules[$moduleName]['type'] = ComposerInformation::MODULE_PACKAGE_TYPE;
176+
$modules[$moduleName]['type'] = \Magento\Framework\Composer\ComposerInformation::MODULE_PACKAGE_TYPE;
189177
$modules[$moduleName]['version'] = $this->packageInfo->getVersion($module);
190178
}
191179
return $modules;

‎setup/src/Magento/Setup/Controller/CustomizeYourStore.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
*/
66
namespace Magento\Setup\Controller;
77

8-
use Magento\Framework\App\Filesystem\DirectoryList;
98
use Magento\Framework\Filesystem;
10-
use Magento\Framework\Module\ModuleList;
9+
use Magento\Framework\Module\FullModuleList;
1110
use Magento\Framework\Setup\Lists;
1211
use Magento\Setup\Model\ObjectManagerProvider;
1312
use Zend\Mvc\Controller\AbstractActionController;
@@ -17,7 +16,7 @@
1716
class CustomizeYourStore extends AbstractActionController
1817
{
1918
/**
20-
* @var ModuleList
19+
* @var FullModuleList
2120
*/
2221
protected $moduleList;
2322

@@ -32,11 +31,11 @@ class CustomizeYourStore extends AbstractActionController
3231
protected $objectManagerProvider;
3332

3433
/**
35-
* @param ModuleList $moduleList
34+
* @param FullModuleList $moduleList
3635
* @param Lists $list
3736
* @param ObjectManagerProvider $objectManagerProvider
3837
*/
39-
public function __construct(ModuleList $moduleList, Lists $list, ObjectManagerProvider $objectManagerProvider)
38+
public function __construct(FullModuleList $moduleList, Lists $list, ObjectManagerProvider $objectManagerProvider)
4039
{
4140
$this->moduleList = $moduleList;
4241
$this->list = $list;

0 commit comments

Comments
 (0)