MAGETWO-69539: PHP "soap" extension is not declared in composer.json but can be used by Magento modules

- Fixed conflict composer.lock

Author: isavchuk-magento

composer.json

@@ -68,6 +68,7 @@
         "ext-openssl": "*",
         "ext-zip": "*",
         "ext-pdo_mysql": "*",
+        "ext-soap": "*",
         "sjparkinson/static-review": "~4.1",
         "ramsey/uuid": "3.6.1"
     },

composer.lock

@@ -10,15 +10,121 @@
  */
 class ComposerLockTest extends \PHPUnit_Framework_TestCase
 {
-    public function testUpToDate()
+    /**
+     * @return string
+     */
+    public function testLockFileExists()
     {
-        $hash = hash_file('md5', BP . '/composer.json');
         $lockFilePath = BP . '/composer.lock';
-        if (!file_exists($lockFilePath)) {
-            $this->markTestSkipped('composer.lock file doesn\'t exist');
+        $this->assertLockFileExists($lockFilePath);
+        return $lockFilePath;
+    }
+
+    /**
+     * @depends testLockFileExists
+     * @param string $lockFilePath
+     * @return string
+     */
+    public function testLockFileReadable($lockFilePath)
+    {
+        $this->assertLockFileReadable($lockFilePath);
+        return $lockFilePath;
+    }
+
+    /**
+     * @depends testLockFileReadable
+     * @param string $lockFilePath
+     * @return string
+     */
+    public function testLockFileContainsJson($lockFilePath)
+    {
+        $lockFileContent = file_get_contents($lockFilePath);
+        $this->assertLockFileContainsValidJson($lockFileContent);
+        return $lockFileContent;
+    }
+
+    /**
+     * @depends testLockFileContainsJson
+     * @param string $lockFileContent
+     */
+    public function testUpToDate($lockFileContent)
+    {
+        $lockData = json_decode($lockFileContent, true);
+        $composerFilePath = BP . '/composer.json';
+        $this->assertLockDataRelevantToComposerFile($lockData, $composerFilePath);
+    }
+
+    /**
+     * @param string $lockFilePath
+     */
+    private function assertLockFileExists($lockFilePath)
+    {
+        $this->assertFileExists($lockFilePath, 'composer.lock file does not exist');
+    }
+
+    /**
+     * @param string $lockFilePath
+     */
+    private function assertLockFileReadable($lockFilePath)
+    {
+        if (!is_readable($lockFilePath)) {
+            $this->fail('composer.lock file is not readable');
         }
-        $jsonData = file_get_contents($lockFilePath);
-        $json = json_decode($jsonData);
-        $this->assertSame($hash, $json->hash, 'composer.lock file is not up to date');
+    }
+
+    /**
+     * @param string $lockFileContent
+     */
+    private function assertLockFileContainsValidJson($lockFileContent)
+    {
+        $this->assertJson($lockFileContent, 'composer.lock file does not contains valid json');
+    }
+
+    /**
+     * @param array $lockData
+     * @param string $composerFilePath
+     */
+    private function assertLockDataRelevantToComposerFile(array $lockData, $composerFilePath)
+    {
+        if (isset($lockData['content-hash'])) {
+            $this->assertLockDataRelevantToMeaningfulComposerConfig($lockData, $composerFilePath);
+        } else if (isset($lockData['hash'])) {
+            $this->assertLockDataRelevantToFullComposerConfig($lockData, $composerFilePath);
+        } else {
+            $this->fail('composer.lock does not linked to composer.json data');
+        }
+    }
+
+    /**
+     * @param array $lockData
+     * @param string $composerFilePath
+     */
+    private function assertLockDataRelevantToMeaningfulComposerConfig(array $lockData, $composerFilePath)
+    {
+        $contentHashCalculator = 'Composer\Package\Locker::getContentHash';
+        if (!is_callable($contentHashCalculator)) {
+            $this->markTestSkipped('Unable to check composer.lock file by content hash');
+        }
+
+        $composerContentHash = call_user_func($contentHashCalculator, file_get_contents($composerFilePath));
+        $this->assertSame(
+            $composerContentHash,
+            $lockData['content-hash'],
+            'composer.lock file is not up to date (composer.json file was modified)'
+        );
+    }
+
+    /**
+     * @param array $lockData
+     * @param string $composerFilePath
+     */
+    private function assertLockDataRelevantToFullComposerConfig(array $lockData, $composerFilePath)
+    {
+        $composerFileHash = hash_file('md5', $composerFilePath);
+        $this->assertSame(
+            $composerFileHash,
+            $lockData['hash'],
+            'composer.lock file is not up to date (composer.json file was modified)'
+        );
     }
 }