Fix Composer autoloading (#59)

Add the missing parts to ensure the scoped code that still be autoloaded via Composer.

Closes #46

Author: theofidry

Makefile

@@ -3,7 +3,7 @@ PHPUNIT=vendor/bin/phpunit
 PHPSCOPER=bin/php-scoper.phar
 
 .DEFAULT_GOAL := help
-.PHONY: build test tu tc e2e
+.PHONY: build test tu tc e2e tb
 
 
 help:
@@ -58,6 +58,12 @@ e2e: scoper
 	php build/set004/bin/greet.phar > build/output
 	diff fixtures/set004/expected-output build/output
 
+	php -d zend.enable_gc=0 $(PHPSCOPER) add-prefix fixtures/set005 -o build/set005 -f
+	composer -d=build/set005 dump-autoload
+	php -d zend.enable_gc=0 $(BOX) build -c build/set005/box.json.dist
+	php build/set005/bin/greet.phar > build/output
+	diff fixtures/set005/expected-output build/output
+
 tb:				  ## Run Blackfire profiling
 tb: vendor
 	rm -rf build

fixtures/set005/bin/greet.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+require_once __DIR__.'/../vendor/autoload.php';
+
+use Assert\Assertion;
+use Set005\Greeter;
+
+Assertion::true(true);
+echo (new Greeter())->greet().PHP_EOL;

fixtures/set005/box.json.dist

@@ -0,0 +1,15 @@
+{
+    "output": "build/set005/bin/greet.phar",
+    "main": "bin/greet.php",
+    "base-path": "build/set005",
+    "directories": [
+        "src",
+        "vendor"
+    ],
+    "compression": "GZ",
+    "compactors": [
+        "Herrera\\Box\\Compactor\\Json",
+        "Herrera\\Box\\Compactor\\Php"
+    ],
+    "stub": true
+}

fixtures/set005/composer.json

@@ -0,0 +1,13 @@
+{
+    "bin": [
+        "bin/greet"
+    ],
+    "autoload": {
+        "psr-4": {
+            "Set005\\": "src/"
+        }
+    },
+    "require": {
+        "beberlei/assert": "^2.7"
+    }
+}

fixtures/set005/composer.lock

@@ -0,0 +1 @@
+Hello world!

fixtures/set005/expected-output

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Set005;
+
+class Greeter
+{
+    public function greet(): string
+    {
+        return 'Hello world!';
+    }
+}

fixtures/set005/src/Greeter.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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\Scoper\Composer;
+
+/**
+ * @internal
+ */
+final class AutoloadPrefixer
+{
+    /**
+     * @param array  $content Decoded JSON
+     * @param string $prefix
+     *
+     * @return array Prefixed decoded JSON
+     */
+    public static function prefixPackageAutoloads(array $content, string $prefix): array
+    {
+        if (isset($content['autoload'])) {
+            $content['autoload'] = self::prefixAutoloads($content['autoload'], $prefix);
+        }
+
+        if (isset($content['autoload-dev'])) {
+            $content['autoload-dev'] = self::prefixAutoloads($content['autoload-dev'], $prefix);
+        }
+
+        return $content;
+    }
+
+    private static function prefixAutoloads(array $autoload, string $prefix): array
+    {
+        if (isset($autoload['psr-4'])) {
+            $autoload['psr-4'] = self::prefixAutoload($autoload['psr-4'], $prefix);
+        }
+
+        return $autoload;
+    }
+
+    private static function prefixAutoload(array $autoload, string $prefix): array
+    {
+        $loader = [];
+
+        foreach ($autoload as $namespace => $paths) {
+            $loader[sprintf('%s\\%s', $prefix, $namespace)] = $paths;
+        }
+
+        return $loader;
+    }
+}

src/Scoper/Composer/AutoloadPrefixer.php

@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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\Scoper\Composer;
+
+use Humbug\PhpScoper\Scoper;
+use LogicException;
+
+final class InstalledPackagesScoper implements Scoper
+{
+    /**
+     * @var string
+     */
+    private static $filePattern;
+
+    private $decoratedScoper;
+
+    public function __construct(Scoper $decoratedScoper)
+    {
+        if (null === self::$filePattern) {
+            self::$filePattern = str_replace(
+                '/',
+                DIRECTORY_SEPARATOR,
+                '~composer/installed\.json~'
+            );
+        }
+
+        $this->decoratedScoper = $decoratedScoper;
+    }
+
+    /**
+     * Scopes PHP and JSON files related to Composer.
+     *
+     * {@inheritdoc}
+     */
+    public function scope(string $filePath, string $prefix): string
+    {
+        if (null === self::$filePattern) {
+            throw new LogicException('Cannot be used without being initialised first.');
+        }
+
+        if (1 !== preg_match(self::$filePattern, $filePath)) {
+            return $this->decoratedScoper->scope($filePath, $prefix);
+        }
+
+        $decodedJson = json_decode(
+            file_get_contents($filePath),
+            true
+        );
+
+        $decodedJson = $this->prefixLockPackages($decodedJson, $prefix);
+
+        return json_encode(
+            $decodedJson,
+            JSON_PRETTY_PRINT
+        );
+    }
+
+    private function prefixLockPackages(array $packages, string $prefix): array
+    {
+        foreach ($packages as $index => $package) {
+            $packages[$index] = AutoloadPrefixer::prefixPackageAutoloads($package, $prefix);
+        }
+
+        return $packages;
+    }
+}

src/Scoper/Composer/InstalledPackagesScoper.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * 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\Scoper\Composer;
+
+use Humbug\PhpScoper\Scoper;
+
+final class JsonFileScoper implements Scoper
+{
+    private $decoratedScoper;
+
+    public function __construct(Scoper $decoratedScoper)
+    {
+        $this->decoratedScoper = $decoratedScoper;
+    }
+
+    /**
+     * Scopes PHP and JSON files related to Composer.
+     *
+     * {@inheritdoc}
+     */
+    public function scope(string $filePath, string $prefix): string
+    {
+        if (1 !== preg_match('/composer\.json$/', $filePath)) {
+            return $this->decoratedScoper->scope($filePath, $prefix);
+        }
+
+        $decodedJson = json_decode(
+            file_get_contents($filePath),
+            true
+        );
+
+        $decodedJson = AutoloadPrefixer::prefixPackageAutoloads($decodedJson, $prefix);
+
+        return json_encode(
+            $decodedJson,
+            JSON_PRETTY_PRINT
+        );
+    }
+}