From 66acee7feb51d4b30e8983c703bf07ce1d06883e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 12 Sep 2015 23:04:37 +0100 Subject: [PATCH] Add config.platform to the list of locked properties --- composer.lock | 1 + src/Composer/Package/Locker.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 288b61e4e..0c6108927 100644 --- a/composer.lock +++ b/composer.lock @@ -5,6 +5,7 @@ "This file is @generated automatically" ], "hash": "3024e89a7e808b8dece156112459a7ea", + "content-hash": "01608741fe66bb9528d7c77c0a422965", "packages": [ { "name": "composer/spdx-licenses", diff --git a/src/Composer/Package/Locker.php b/src/Composer/Package/Locker.php index 34f547c5e..6ef0fe979 100644 --- a/src/Composer/Package/Locker.php +++ b/src/Composer/Package/Locker.php @@ -397,6 +397,8 @@ class Locker $content = json_decode($composerFileContents, true); $relevantKeys = array( + 'name', + 'version', 'require', 'require-dev', 'conflict', @@ -406,8 +408,6 @@ class Locker 'prefer-stable', 'repositories', 'extra', - 'version', - 'name', ); $relevantContent = array(); @@ -415,6 +415,9 @@ class Locker foreach (array_intersect($relevantKeys, array_keys($content)) as $key) { $relevantContent[$key] = $content[$key]; } + if (isset($content['config']['platform'])) { + $relevantContent['config']['platform'] = $content['config']['platform']; + } ksort($relevantContent); return md5(json_encode($relevantContent));