Skip to content

Commit 97825ae

Browse files
author
Hayder Sharhan
committed
MAGETWO-46020: [Integration] 2 config files needed to create single integartion
- Updated Tests.
1 parent e27bbb3 commit 97825ae

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

app/code/Magento/Integration/Model/ConsolidatedConfig.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ public function getIntegrations()
5454
$this->integrations = unserialize($integrations);
5555
} else {
5656
$this->integrations = $this->configReader->read();
57-
$this->configCacheType->save(serialize($this->integrations),
58-
self::CACHE_ID, [TypeConsolidated::CACHE_TAG]
57+
$this->configCacheType->save(
58+
serialize($this->integrations),
59+
self::CACHE_ID,
60+
[TypeConsolidated::CACHE_TAG]
5961
);
6062
}
6163
}

app/code/Magento/Integration/Test/Unit/Model/Config/ConverterTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
use \Magento\Integration\Model\Config\Converter;
99

10-
1110
/**
1211
* Test for conversion of integration XML config into array representation.
1312
*/

app/code/Magento/User/Model/ResourceModel/User.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function hasAssigned2Role($user)
150150
$select->from($this->getTable('authorization_role'))
151151
->where('parent_id > :parent_id')
152152
->where('user_id = :user_id')
153-
->where('user_type = :user_type' );
153+
->where('user_type = :user_type');
154154

155155
$binds = ['parent_id' => 0, 'user_id' => $userId,
156156
'user_type' => UserContextInterface::USER_TYPE_ADMIN

dev/tests/integration/testsuite/Magento/Integration/Model/Config/Consolidated/ReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*
66
*/
7-
namespace Magento\Integration\Model\Consolidated\Config;
7+
namespace Magento\Integration\Model\Config\Consolidated;
88

99
use Magento\Integration\Model\Config\Consolidated\Reader as ConfigReader;
1010

0 commit comments

Comments
 (0)