Skip to content

Commit b170df3

Browse files
mazhalaimazhalai
committed
MAGETWO-34528: Contribution of Sprint 24 Work to Mainline
- fixing incorrect merge - fixing static tests
1 parent 23ddbdb commit b170df3

File tree

6 files changed

+60
-34
lines changed

6 files changed

+60
-34
lines changed

‎app/code/Magento/GoogleOptimizer/Helper/Data.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
namespace Magento\GoogleOptimizer\Helper;
1212

13+
use \Magento\Store\Model\ScopeInterface;
14+
1315
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1416
{
1517
/**
@@ -47,7 +49,7 @@ public function __construct(
4749
*/
4850
public function isGoogleExperimentEnabled($store = null)
4951
{
50-
return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
52+
return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE, $store);
5153
}
5254

5355
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6+
"magento/module-store": "0.42.0-beta9",
67
"magento/module-google-analytics": "0.42.0-beta9",
78
"magento/module-catalog": "0.42.0-beta9",
89
"magento/module-cms": "0.42.0-beta9",

‎app/code/Magento/Store/etc/di.xml

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9-
<preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
10-
<preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
11-
<preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
9+
<preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
10+
<preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
11+
<preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
12+
<type name="Magento\Framework\Module\Updater\SetupFactory">
13+
<arguments>
14+
<argument name="resourceTypes" xsi:type="array">
15+
<item name="store_setup" xsi:type="string">Magento\Framework\Module\DataSetup</item>
16+
</argument>
17+
</arguments>
18+
</type>
1219
<type name="Magento\Framework\App\Config\ScopePool">
1320
<arguments>
1421
<argument name="readerPool" xsi:type="object">Magento\Store\Model\Config\Reader\ReaderPool\Proxy</argument>
15-
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
22+
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
1623
</arguments>
1724
</type>
1825
<type name="Magento\Store\Model\Config\Reader\Website">
@@ -23,17 +30,17 @@
2330
<type name="Magento\Store\Model\Config\Reader\Store">
2431
<arguments>
2532
<argument name="scopePool" xsi:type="object">Magento\Framework\App\Config\ScopePool\Proxy</argument>
26-
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
33+
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
2734
</arguments>
2835
</type>
2936
<type name="Magento\Store\Model\Resolver\Store">
3037
<arguments>
31-
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
38+
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
3239
</arguments>
3340
</type>
3441
<type name="Magento\Store\Model\Resolver\Website">
3542
<arguments>
36-
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
43+
<argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
3744
</arguments>
3845
</type>
3946
<type name="Magento\Store\Model\Config\Reader\ReaderPool">
@@ -49,17 +56,17 @@
4956
</type>
5057
<preference for="Magento\Framework\App\Config\Scope\ReaderPoolInterface" type="Magento\Store\Model\Config\Reader\ReaderPool"/>
5158
<preference for="Magento\Framework\App\ScopeResolverInterface" type="Magento\Store\Model\Resolver\Store" />
52-
<preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
59+
<preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Store\Model\PathConfig" />
5360
<type name="Magento\Framework\App\Action\Action">
5461
<plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
55-
<plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>
56-
</type>
57-
<type name="Magento\Framework\Url\SecurityInfo">
58-
<plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
59-
</type>
60-
<type name="Magento\Framework\Url\RouteParamsResolver">
61-
<plugin name="storeUrlRouteParamsResolver" type="Magento\Store\Url\Plugin\RouteParamsResolver"/>
62-
</type>
62+
<plugin name="designLoader" type="Magento\Framework\App\Action\Plugin\Design" sortOrder="30"/>
63+
</type>
64+
<type name="Magento\Framework\Url\SecurityInfo">
65+
<plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
66+
</type>
67+
<type name="Magento\Framework\Url\RouteParamsResolver">
68+
<plugin name="storeUrlRouteParamsResolver" type="Magento\Store\Url\Plugin\RouteParamsResolver"/>
69+
</type>
6370
<type name="Magento\Store\Model\Resource\Website\Collection">
6471
<arguments>
6572
<argument name="fetchStrategy" xsi:type="object">Magento\Store\Model\Resource\Website\Collection\FetchStrategy</argument>
@@ -130,17 +137,17 @@
130137
</type>
131138
<type name="Magento\Framework\Module\Output\Config">
132139
<arguments>
133-
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
140+
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
134141
</arguments>
135142
</type>
136143
<type name="Magento\Framework\Session\Config">
137144
<arguments>
138-
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
145+
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
139146
</arguments>
140147
</type>
141148
<type name="Magento\Framework\Session\SidResolver">
142149
<arguments>
143-
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
150+
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
144151
</arguments>
145152
</type>
146153
<type name="Magento\Framework\View\Layout\Element\Layout">

‎dev/tests/static/testsuite/Magento/Test/Legacy/InstallUpgradeTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ function ($file) {
4747
basename($file),
4848
'Recurring scripts are obsolete. Please create class Recurring in module\'s Setup folder'
4949
);
50-
$this->fail('Invalid directory. Please convert data/sql scripts to a class within module\'s Setup'
51-
. ' folder');
50+
$this->fail(
51+
'Invalid directory. Please convert data/sql scripts to a class within module\'s Setup folder'
52+
);
5253
},
5354
$this->convertArray(Files::init()->getFiles(
54-
[BP . '/app/code/*/*/sql', BP . '/app/code/*/*/data'],
55-
'*.php'
55+
[BP . '/app/code/*/*/sql', BP . '/app/code/*/*/data'],
56+
'*.php'
5657
)
5758
)
5859
);

‎setup/src/Magento/Setup/Model/Installer.php

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
*
3939
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
4040
* @SuppressWarnings(PHPMD.TooManyFields)
41+
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
4142
*/
4243
class Installer
4344
{
@@ -595,7 +596,10 @@ private function setupModuleRegistry(SchemaSetupInterface $setup)
595596
*/
596597
public function installSchema()
597598
{
598-
$setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\Setup', ['resource' => $this->resource]);
599+
$setup = $this->objectManagerProvider->get()->create(
600+
'Magento\Setup\Module\Setup',
601+
['resource' => $this->resource]
602+
);
599603
$this->setupModuleRegistry($setup);
600604
$this->log->log('Schema creation/updates:');
601605
$this->handleDBSchemaData($setup, 'schema');
@@ -622,6 +626,9 @@ public function installDataFixtures()
622626
* @param string $type
623627
* @return void
624628
* @throws \Exception
629+
*
630+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
631+
* @SuppressWarnings(PHPMD.NPathComplexity)
625632
*/
626633
private function handleDBSchemaData($setup, $type)
627634
{
@@ -724,8 +731,10 @@ public function installUserConfig($data)
724731
*/
725732
private function installOrderIncrementPrefix($orderIncrementPrefix)
726733
{
727-
$setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\Setup',
728-
['resource' => $this->resource]);
734+
$setup = $this->objectManagerProvider->get()->create(
735+
'Magento\Setup\Module\Setup',
736+
['resource' => $this->resource]
737+
);
729738
$dbConnection = $setup->getConnection();
730739

731740
// get entity_type_id for order
@@ -768,8 +777,10 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
768777
public function installAdminUser($data)
769778
{
770779
$this->assertDeploymentConfigExists();
771-
$setup = $this->objectManagerProvider->get()->create('Magento\Setup\Module\Setup',
772-
['resource' => $this->resource]);
780+
$setup = $this->objectManagerProvider->get()->create(
781+
'Magento\Setup\Module\Setup',
782+
['resource' => $this->resource]
783+
);
773784
$adminAccount = $this->adminAccountFactory->create($setup, (array)$data);
774785
$adminAccount->save();
775786
}
@@ -1005,6 +1016,8 @@ private function installSampleData($request)
10051016
* @param string $type
10061017
* @return InstallSchemaInterface | UpgradeSchemaInterface | InstallDataInterface | UpgradeDataInterface | null
10071018
* @throws \Magento\Setup\Exception
1019+
*
1020+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
10081021
*/
10091022
private function getSchemaDataHandler($moduleName, $type)
10101023
{

‎setup/src/Magento/Setup/Model/InstallerFactory.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ class InstallerFactory
2727
* Constructor
2828
*
2929
* @param ServiceLocatorInterface $serviceLocator
30+
* @param ResourceFactory $resourceFactory
3031
*/
31-
public function __construct(
32-
ServiceLocatorInterface $serviceLocator,
33-
ResourceFactory $resourceFactory
34-
)
35-
{
32+
public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFactory $resourceFactory) {
3633
$this->serviceLocator = $serviceLocator;
3734
$this->resourceFactory = $resourceFactory;
3835
}
@@ -64,6 +61,11 @@ public function create(LoggerInterface $log)
6461
);
6562
}
6663

64+
/**
65+
* creates Resource Factory
66+
*
67+
* @return Resource
68+
*/
6769
private function getResource()
6870
{
6971
$deploymentConfig = new \Magento\Framework\App\DeploymentConfig(

0 commit comments

Comments
 (0)