Fix the scoping of JSON files

The JSON files should be decode with `assoc` set to true. Otherwise encoding it again may change the schema as if `assoc` is set to false, both `[]` and `{}` will be decoded as an empty array so encoding it again may change an empty object into an empty array which may screw up a JSON schema validation.
humbug · May 19, 2018 · 17e3a33 · 17e3a33
1 parent 2e82c70
commit 17e3a33
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 32 deletions.
diff --git a/src/Autoload/Requirements.php b/src/Autoload/Requirements.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the humbug/php-scoper package.
+ *
+ * Copyright (c) 2017 Théo FIDRY <[email protected]>,
+ *                    Pádraic Brady <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Humbug\PhpScoper\Autoload;
+
+use Symfony\Requirements\RequirementCollection;
+
+/**
+ * Collect the list of requirements for running the project. Code in this file must be PHP 5.3+ compatible as is used
+ * to know if PHP-Scoper can be run or not.
+ */
+final class Requirements extends RequirementCollection
+{
+    public function __construct($composerJson)
+    {
+        $composerConfig = $this->readComposer($composerJson);
+
+        $this->addPhpVersionRequirement($composerConfig);
+        $this->addExtensionRequirements($composerConfig);
+    }
+
+    private function readComposer($composerJson)
+    {
+        $composer = json_decode(file_get_contents($composerJson), true);
+
+        return $composer['require'];
+    }
+
+    private function addPhpVersionRequirement(array $composerConfig)
+    {
+        $installedPhpVersion = phpversion();
+        $requiredPhpVersion = $composerConfig['php'];
+
+        $this->addRequirement(
+            version_compare(phpversion(), $requiredPhpVersion, '>='),
+            sprintf(
+                'PHP version must satisfy "%s" ("%s" installed)',
+                $requiredPhpVersion,
+                $installedPhpVersion
+            ),
+            ''
+        );
+    }
+
+    private function addExtensionRequirements(array $composerConfig)
+    {
+        foreach ($composerConfig as $package => $constraint) {
+            if (preg_match('/^ext-(?<extension>.+)$/', $package, $matches)) {
+                $this->addExtensionRequirement($matches['extension']);
+            }
+        }
+    }
+
+    /**
+     * @param string $extension Extension name, e.g. `iconv`.
+     */
+    private function addExtensionRequirement($extension)
+    {
+        $this->addRequirement(
+            extension_loaded($extension),
+            sprintf(
+                'The extension "%s" must be enabled.',
+                $extension
+            ),
+            ''
+        );
+    }
+}
diff --git a/src/Scoper/Composer/AutoloadPrefixer.php b/src/Scoper/Composer/AutoloadPrefixer.php
@@ -14,45 +14,48 @@
 
 namespace Humbug\PhpScoper\Scoper\Composer;
 
-use function array_key_exists;
+use stdClass;
 
 /**
  * @private
  */
 final class AutoloadPrefixer
 {
     /**
-     * @param array  $contents Decoded JSON
-     * @param string $prefix
+     * @param stdClass $contents Decoded JSON
+     * @param string   $prefix
      *
      * @return array Prefixed decoded JSON
      */
-    public static function prefixPackageAutoloads(array $contents, string $prefix): array
+    public static function prefixPackageAutoloads(stdClass $contents, string $prefix): stdClass
     {
-        if (isset($contents['autoload'])) {
-            $contents['autoload'] = self::prefixAutoloads($contents['autoload'], $prefix);
+        if (isset($contents->autoload)) {
+            $contents->autoload = self::prefixAutoloads($contents->autoload, $prefix);
         }
 
-        if (isset($contents['autoload-dev'])) {
-            $contents['autoload-dev'] = self::prefixAutoloads($contents['autoload-dev'], $prefix);
+        if (isset($contents->{'autoload-dev'})) {
+            $contents->{'autoload-dev'} = self::prefixAutoloads($contents->{'autoload-dev'}, $prefix);
         }
 
         return $contents;
     }
 
-    private static function prefixAutoloads(array $autoload, string $prefix): array
+    private static function prefixAutoloads(stdClass $autoload, string $prefix): stdClass
     {
-        if (false === array_key_exists('psr-4', $autoload) && false === array_key_exists('psr-0', $autoload)) {
+        if (false === isset($autoload->{'psr-4'}) && false === isset($autoload->{'psr-0'})) {
             return $autoload;
         }
 
-        if (isset($autoload['psr-0'])) {
-            $autoload['psr-4'] = self::mergePSR0And4($autoload['psr-0'], $autoload['psr-4'] ?? []);
+        if (isset($autoload->{'psr-0'})) {
+            $autoload->{'psr-4'} = self::mergePSR0And4(
+                (array) $autoload->{'psr-0'},
+                (array) ($autoload->{'psr-4'} ?? new stdClass())
+            );
         }
-        unset($autoload['psr-0']);
+        unset($autoload->{'psr-0'});
 
-        if (isset($autoload['psr-4'])) {
-            $autoload['psr-4'] = self::prefixAutoload($autoload['psr-4'], $prefix);
+        if (isset($autoload->{'psr-4'})) {
+            $autoload->{'psr-4'} = self::prefixAutoload((array) $autoload->{'psr-4'}, $prefix);
         }
 
         return $autoload;

diff --git a/src/Scoper/Composer/InstalledPackagesScoper.php b/src/Scoper/Composer/InstalledPackagesScoper.php
@@ -38,9 +38,9 @@ public function scope(string $filePath, string $contents, string $prefix, array
             return $this->decoratedScoper->scope($filePath, $contents, $prefix, $patchers, $whitelist);
         }
 
-        $decodedJson = json_decode($contents, true);
+        $decodedJson = json_decode($contents);
 
-        $decodedJson = $this->prefixLockPackages($decodedJson, $prefix);
+        $decodedJson = $this->prefixLockPackages((array) $decodedJson, $prefix);
 
         return json_encode(
             $decodedJson,

diff --git a/src/Scoper/Composer/JsonFileScoper.php b/src/Scoper/Composer/JsonFileScoper.php
@@ -36,7 +36,7 @@ public function scope(string $filePath, string $contents, string $prefix, array
             return $this->decoratedScoper->scope($filePath, $contents, $prefix, $patchers, $whitelist);
         }
 
-        $decodedJson = json_decode($contents, true);
+        $decodedJson = json_decode($contents);
 
         $decodedJson = AutoloadPrefixer::prefixPackageAutoloads($decodedJson, $prefix);
 

diff --git a/tests/Scoper/Composer/InstalledPackagesScoperTest.php b/tests/Scoper/Composer/InstalledPackagesScoperTest.php
@@ -134,11 +134,8 @@ public function provideInstalledPackagesFiles()
             }
         ],
         "description": "Thin assertion library for input validation in business models.",
-        "keywords": [
-            "assert",
-            "assertion",
-            "validation"
-        ]
+        "keywords": [],
+        "platform": {}
     }
 ]
 
@@ -197,11 +194,8 @@ public function provideInstalledPackagesFiles()
             }
         ],
         "description": "Thin assertion library for input validation in business models.",
-        "keywords": [
-            "assert",
-            "assertion",
-            "validation"
-        ]
+        "keywords": [],
+        "platform": {}
     }
 ]
 JSON

diff --git a/tests/Scoper/Composer/JsonFileScoperTest.php b/tests/Scoper/Composer/JsonFileScoperTest.php
@@ -90,7 +90,8 @@ public function provideComposerFiles()
         },
         "files": [
             "src/functions.php"
-        ]
+        ],
+        "classmap": []
     },
     "autoload-dev": {
         "psr-4": {
@@ -99,7 +100,8 @@ public function provideComposerFiles()
         "files": [
             "tests/functions.php"
         ]
-    }
+    },
+    "config": {}
 }
 
 JSON
@@ -115,7 +117,8 @@ public function provideComposerFiles()
         },
         "files": [
             "src\/functions.php"
-        ]
+        ],
+        "classmap": []
     },
     "autoload-dev": {
         "psr-4": {
@@ -124,7 +127,8 @@ public function provideComposerFiles()
         "files": [
             "tests\/functions.php"
         ]
-    }
+    },
+    "config": {}
 }
 JSON
         ];