Skip to content

Commit 4693927

Browse files
committed
Merge remote-tracking branch 'origin/2.0' into MDVA-373
2 parents 81632ff + 9d8b7a6 commit 4693927

File tree

6 files changed

+50
-28
lines changed

6 files changed

+50
-28
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2.0.7
2+
=============
3+
* GitHub requests:
4+
* [#2984](https://github.com/magento/magento2/issues/2984) -- Payment config settings not decrypted when used?
5+
16
2.0.6
27
=============
38
* Functional fixes:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2ce",
33
"description": "Magento 2 (Community Edition)",
44
"type": "project",
5-
"version": "2.0.6",
5+
"version": "2.0.7",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
@@ -187,7 +187,7 @@
187187
"magento/language-nl_nl": "100.0.5",
188188
"magento/language-pt_br": "100.0.5",
189189
"magento/language-zh_hans_cn": "100.0.5",
190-
"magento/framework": "100.0.8",
190+
"magento/framework": "100.0.9",
191191
"trentrichardson/jquery-timepicker-addon": "1.4.3",
192192
"colinmollenhour/cache-backend-redis": "1.8",
193193
"components/jquery": "1.11.0",

composer.lock

Lines changed: 24 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/App/Config/Data.php

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class Data implements DataInterface
2929
*/
3030
public function __construct(MetadataProcessor $processor, array $data)
3131
{
32-
$this->_data = $processor->process($data);
32+
/** Clone the array to work around a kink in php7 that modifies the argument by reference */
33+
$this->_data = $processor->process($this->_arrayClone($data));
3334
$this->_source = $data;
3435
}
3536

@@ -77,4 +78,19 @@ public function setValue($path, $value)
7778
}
7879
$currentElement[$lastKey] = $value;
7980
}
81+
82+
/**
83+
* Copy array by value
84+
*
85+
* @param array $data
86+
* @return array
87+
*/
88+
private function _arrayClone(array $data)
89+
{
90+
$clone = [];
91+
foreach ($data as $key => $value) {
92+
$clone[$key]= $value;
93+
}
94+
return $clone;
95+
}
8096
}

lib/internal/Magento/Framework/AppInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interface AppInterface
1717
/**
1818
* Magento version
1919
*/
20-
const VERSION = '2.0.6';
20+
const VERSION = '2.0.7';
2121

2222
/**
2323
* Launch application

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/framework",
33
"description": "N/A",
44
"type": "magento2-library",
5-
"version": "100.0.8",
5+
"version": "100.0.9",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

0 commit comments

Comments
 (0)