Compile InstalledVersions.php if present (#484)

.travis.yml

@@ -27,7 +27,7 @@ matrix:
     - php: '7.4'
       env: COVERAGE='true'
     - php: '7.4'
-      env: COMPOSER_VERSION='snapshot'
+      env: COMPOSER_VERSION='2'
   allow_failures:
     - php: nightly
   fast_finish: true

Makefile

@@ -85,7 +85,7 @@ tm:	$(TU_BOX_DEPS) $(INFECTION)
 
 .PHONY: e2e
 e2e:			 ## Runs all the end-to-end tests
-e2e: e2e_php_settings_checker e2e_scoper_alias e2e_scoper_whitelist e2e_check_requirements e2e_symfony
+e2e: e2e_php_settings_checker e2e_scoper_alias e2e_scoper_whitelist e2e_check_requirements e2e_symfony e2e_composer_installed_versions
 
 .PHONY: e2e_scoper_alias
 e2e_scoper_alias: 	 ## Runs the end-to-end tests to check that the PHP-Scoper config API regarding the prefix alias is working
@@ -273,6 +273,15 @@ e2e_symfony: fixtures/build/dir012/vendor box
 
 	diff fixtures/build/dir012/expected-output fixtures/build/dir012/actual-output
 
+.PHONY: e2e_composer_installed_versions
+e2e_composer_installed_versions:		 ## Packages an app using Composer\InstalledVersions
+e2e_composer_installed_versions: fixtures/build/dir013/vendor box
+	./box compile --working-dir fixtures/build/dir013
+
+	php fixtures/build/dir013/bin/run.phar > fixtures/build/dir013/actual-output
+
+	diff fixtures/build/dir013/expected-output fixtures/build/dir013/actual-output
+
 .PHONY: blackfire
 blackfire:		 ## Profiles the compile step
 blackfire: box
@@ -355,6 +364,10 @@ fixtures/build/dir012/vendor:
 	composer install --working-dir fixtures/build/dir012
 	touch $@
 
+fixtures/build/dir013/vendor:
+	composer install --working-dir fixtures/build/dir013
+	touch $@
+
 .PHONY: fixtures/default_stub.php
 fixtures/default_stub.php:
 	bin/generate_default_stub

fixtures/build/dir013/.gitignore

@@ -0,0 +1,3 @@
+vendor/
+bin/run.phar
+actual-output

fixtures/build/dir013/bin/run

@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php declare(strict_types = 1);
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+set_error_handler(function($errno, $errstr, $errfile, $errline, $errcontext) {
+	// error was suppressed with the @-operator
+	if (0 === error_reporting()) {
+		return false;
+	}
+
+	throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
+});
+
+// force autoloader
+class_exists(\Composer\InstalledVersions::class);
+
+echo "OK\n";

fixtures/build/dir013/box.json

@@ -0,0 +1,4 @@
+{
+	"main": "bin/run",
+	"force-autodiscovery": true
+}

fixtures/build/dir013/composer.json

@@ -0,0 +1,5 @@
+{
+    "bin": [
+        "bin/run"
+    ]
+}

fixtures/build/dir013/expected-output

@@ -0,0 +1 @@
+OK

src/Configuration/Configuration.php

@@ -319,7 +319,7 @@ public static function create(?string $file, stdClass $raw): self
         );
 
         /**
-         * @var string[]
+         * @var string[] $excludedPaths
          * @var Closure  $blacklistFilter
          */
         [$excludedPaths, $blacklistFilter] = self::retrieveBlacklistFilter(
@@ -1398,6 +1398,13 @@ private static function retrieveAllDirectoriesToInclude(
                 $filesToAppend[] = $installedJsonFiles;
             }
 
+            // The InstalledVersions.php file is necessary since Composer v2 adds it to the autoloader class map
+            $installedVersionsPhp = self::normalizePath($vendorDir.'/composer/InstalledVersions.php', $basePath);
+
+            if (file_exists($installedVersionsPhp)) {
+                $filesToAppend[] = $installedVersionsPhp;
+            }
+
             $vendorPackages = toArray(values(map(
                 $toString,
                 Finder::create()

tests/Console/Command/CompileTest.php

@@ -122,8 +122,8 @@ public function test_it_can_build_a_PHAR_file(): void
 
         $numberOfFiles = 45;
         if (self::$runComposer2) {
-            // From Composer 2 there is one more class: Composer\InstalledVersions
-            ++$numberOfFiles;
+            // From Composer 2 there are more files
+            $numberOfFiles += 2;
         }
 
         dump_file(
@@ -277,6 +277,7 @@ public function test_it_can_build_a_PHAR_file(): void
             '/.box/vendor/autoload.php',
             '/.box/vendor/composer/',
             '/.box/vendor/composer/ClassLoader.php',
+            '/.box/vendor/composer/InstalledVersions.php',
             '/.box/vendor/composer/LICENSE',
             '/.box/vendor/composer/autoload_classmap.php',
             '/.box/vendor/composer/autoload_namespaces.php',
@@ -322,7 +323,8 @@ public function test_it_can_build_a_PHAR_file(): void
 
         if (!self::$runComposer2) {
             $expectedFiles = array_values(array_filter($expectedFiles, static function ($file): bool {
-                return '/.box/vendor/composer/platform_check.php' !== $file;
+                return '/.box/vendor/composer/platform_check.php' !== $file
+                && '/.box/vendor/composer/InstalledVersions.php' !== $file;
             }));
         }
 
@@ -396,8 +398,8 @@ public function test_it_can_build_a_PHAR_without_any_configuration(): void
 
         $numberOfFiles = 49;
         if (self::$runComposer2) {
-            // From Composer 2 there is one more class: Composer\InstalledVersions
-            ++$numberOfFiles;
+            // From Composer 2 there are more files
+            $numberOfFiles += 2;
         }
 
         $expected = <<<OUTPUT
@@ -514,6 +516,7 @@ public function test_it_can_build_a_PHAR_without_any_configuration(): void
             '/.box/vendor/autoload.php',
             '/.box/vendor/composer/',
             '/.box/vendor/composer/ClassLoader.php',
+            '/.box/vendor/composer/InstalledVersions.php',
             '/.box/vendor/composer/LICENSE',
             '/.box/vendor/composer/autoload_classmap.php',
             '/.box/vendor/composer/autoload_namespaces.php',
@@ -562,7 +565,8 @@ public function test_it_can_build_a_PHAR_without_any_configuration(): void
 
         if (!self::$runComposer2) {
             $expectedFiles = array_values(array_filter($expectedFiles, static function ($file): bool {
-                return '/.box/vendor/composer/platform_check.php' !== $file;
+                return '/.box/vendor/composer/platform_check.php' !== $file
+                && '/.box/vendor/composer/InstalledVersions.php' !== $file;
             }));
         }
 
@@ -829,9 +833,9 @@ public function test_it_can_build_a_PHAR_file_in_verbose_mode(): void
         $numberOfClasses = 0;
         $numberOfFiles = 45;
         if (self::$runComposer2) {
-            // From Composer 2 there is one more class: Composer\InstalledVersions
+            // From Composer 2 there are more files
             ++$numberOfClasses;
-            ++$numberOfFiles;
+            $numberOfFiles += 2;
         }
 
         dump_file(
@@ -951,9 +955,9 @@ public function test_it_can_build_a_PHAR_file_in_very_verbose_mode(): void
         $numberOfClasses = 0;
         $numberOfFiles = 45;
         if (self::$runComposer2) {
-            // From Composer 2 there is one more class: Composer\InstalledVersions
+            // From Composer 2 there are more files
             ++$numberOfClasses;
-            ++$numberOfFiles;
+            $numberOfFiles += 2;
         }
 
         dump_file(
@@ -2911,8 +2915,8 @@ public function test_it_can_generate_a_PHAR_with_docker(): void
 
         $numberOfFiles = 41;
         if (self::$runComposer2) {
-            // From Composer 2 there is one more class: Composer\InstalledVersions
-            ++$numberOfFiles;
+            // From Composer 2 there are more files
+            $numberOfFiles += 2;
         }
 
         $expected = <<<OUTPUT

tests/RequirementChecker/RequirementsDumperTest.php

@@ -74,6 +74,7 @@ public function test_it_dumps_the_requirement_checker_files(
         ];
 
         if (file_exists(__DIR__.'/../../.requirement-checker/vendor/composer/platform_check.php')) {
+            $expectedFiles[] = 'vendor/composer/InstalledVersions.php';
             $expectedFiles[] = 'vendor/composer/platform_check.php';
         }