public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Add config.platform to the list of locked properties

pull/3960/merge
Jordi Boggiano 2015-09-12 23:04:37 +01:00
parent 74e56fd5c6
commit 66acee7feb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.lock generated
View File

@ -5,6 +5,7 @@
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "3024e89a7e808b8dece156112459a7ea", "hash": "3024e89a7e808b8dece156112459a7ea",
"content-hash": "01608741fe66bb9528d7c77c0a422965",
"packages": [ "packages": [
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",

7
src/Composer/Package/Locker.php
View File

@ -397,6 +397,8 @@ class Locker
$content = json_decode($composerFileContents, true); $content = json_decode($composerFileContents, true);
$relevantKeys = array( $relevantKeys = array(
'name',
'version',
'require', 'require',
'require-dev', 'require-dev',
'conflict', 'conflict',
@ -406,8 +408,6 @@ class Locker
'prefer-stable', 'prefer-stable',
'repositories', 'repositories',
'extra', 'extra',
'version',
'name',
); );
$relevantContent = array(); $relevantContent = array();
@ -415,6 +415,9 @@ class Locker
foreach (array_intersect($relevantKeys, array_keys($content)) as $key) { foreach (array_intersect($relevantKeys, array_keys($content)) as $key) {
$relevantContent[$key] = $content[$key]; $relevantContent[$key] = $content[$key];
} }
if (isset($content['config']['platform'])) {
$relevantContent['config']['platform'] = $content['config']['platform'];
}
ksort($relevantContent); ksort($relevantContent);
return md5(json_encode($relevantContent)); return md5(json_encode($relevantContent));