Fix InstalledVersions installed (#712)

Closes #678
humbug · Nov 6, 2022 · 1b01869 · 1b01869
1 parent 759f6d6
commit 1b01869
Show file tree

Hide file tree

Showing 8 changed files with 133 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -155,7 +155,7 @@ blackfire: vendor
 
 .PHONY: e2e
 e2e:	 ## Runs end-to-end tests
-e2e: e2e_004 e2e_005 e2e_011 e2e_013 e2e_014 e2e_015 e2e_016 e2e_017 e2e_018 e2e_019 e2e_020 e2e_022 e2e_023 e2e_024 e2e_025 e2e_026 e2e_027 e2e_028 e2e_029 e2e_030 e2e_031 e2e_032 e2e_033
+e2e: e2e_004 e2e_005 e2e_011 e2e_013 e2e_014 e2e_015 e2e_016 e2e_017 e2e_018 e2e_019 e2e_020 e2e_022 e2e_023 e2e_024 e2e_025 e2e_026 e2e_027 e2e_028 e2e_029 e2e_030 e2e_031 e2e_032 e2e_033 e2e_034
 
 .PHONY: e2e_004
 e2e_004: ## Runs end-to-end tests for the fixture set 004 — Minimalistic codebase
@@ -495,6 +495,25 @@ e2e_033: $(PHP_SCOPER_PHAR_BIN)
 	diff fixtures/set033-user-global-function/expected-output build/set033-user-global-function/output
 
 
+
+.PHONY: e2e_034
+e2e_034: ## Runs end-to-end tests for the fixture set 034 — Leverage Composer InstalledVersions
+e2e_034: $(PHP_SCOPER_PHAR_BIN)
+	$(PHP_SCOPER_PHAR) add-prefix \
+		--working-dir=fixtures/set034-installed-versions \
+		--output-dir=../../build/set034-installed-versions \
+		--force \
+		--no-interaction \
+		--stop-on-failure
+
+	php fixtures/set034-installed-versions/index.php > fixtures/set034-installed-versions/expected-output
+
+	composer --working-dir=build/set034-installed-versions dump-autoload --no-dev
+	php build/set034-installed-versions/index.php > build/set034-installed-versions/output
+
+	diff fixtures/set034-installed-versions/expected-output build/set034-installed-versions/output
+
+
 #
 # Rules from files
 #---------------------------------------------------------------------------

diff --git a/fixtures/set034-installed-versions/composer.json b/fixtures/set034-installed-versions/composer.json
@@ -0,0 +1,6 @@
+{
+    "bin": "index.php",
+    "require": {
+        "nikic/iter": "^2.0"
+    }
+}
diff --git a/fixtures/set034-installed-versions/composer.lock b/fixtures/set034-installed-versions/composer.lock
diff --git a/fixtures/set034-installed-versions/expected-output b/fixtures/set034-installed-versions/expected-output
@@ -0,0 +1 @@
+ok.
diff --git a/fixtures/set034-installed-versions/index.php b/fixtures/set034-installed-versions/index.php
@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace Acme;
+
+use Composer\InstalledVersions;
+use function file_exists;
+use const PHP_EOL;
+
+require file_exists(__DIR__.'/vendor/scoper-autoload.php')
+    ? __DIR__.'/vendor/scoper-autoload.php'
+    : __DIR__.'/vendor/autoload.php';
+
+if (InstalledVersions::isInstalled('nikic/iter')) {
+    echo "ok.".PHP_EOL;
+}
diff --git a/fixtures/set034-installed-versions/scoper.inc.php b/fixtures/set034-installed-versions/scoper.inc.php
@@ -0,0 +1,12 @@
+<?php
+
+use Isolated\Symfony\Component\Finder\Finder;
+
+return [
+    'finders' => [
+        (new Finder())
+            ->files()
+            ->in(__DIR__),
+    ],
+    'exclude-functions' => ['trigger_deprecation'],
+];
diff --git a/src/Autoload/ScoperAutoloadGenerator.php b/src/Autoload/ScoperAutoloadGenerator.php
@@ -79,6 +79,7 @@ public function dump(): string
 
                 namespace {
                     \$loader = require_once __DIR__.'/autoload.php';
+                    require_once __DIR__.'/composer/InstalledVersions.php';
                 }
 
                 {$statements}
@@ -95,6 +96,7 @@ public function dump(): string
                 // scoper-autoload.php @generated by PhpScoper
 
                 \$loader = require_once __DIR__.'/autoload.php';
+                require_once __DIR__.'/composer/InstalledVersions.php';
 
                 {$statements}
 

diff --git a/tests/Autoload/ScoperAutoloadGeneratorTest.php b/tests/Autoload/ScoperAutoloadGeneratorTest.php
@@ -45,6 +45,7 @@ public static function provideRegistry(): iterable
                 // scoper-autoload.php @generated by PhpScoper
 
                 $loader = require_once __DIR__.'/autoload.php';
+                require_once __DIR__.'/composer/InstalledVersions.php';
 
                 return $loader;
 
@@ -65,6 +66,7 @@ public static function provideRegistry(): iterable
                 // scoper-autoload.php @generated by PhpScoper
 
                 $loader = require_once __DIR__.'/autoload.php';
+                require_once __DIR__.'/composer/InstalledVersions.php';
 
                 // Exposed functions. For more information see:
                 // https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#exposing-functions
@@ -100,6 +102,7 @@ function bar() {
 
                 namespace {
                     $loader = require_once __DIR__.'/autoload.php';
+                    require_once __DIR__.'/composer/InstalledVersions.php';
                 }
 
                 // Exposed functions. For more information see:
@@ -146,6 +149,7 @@ function baz() {
                 // scoper-autoload.php @generated by PhpScoper
 
                 $loader = require_once __DIR__.'/autoload.php';
+                require_once __DIR__.'/composer/InstalledVersions.php';
 
                 // Exposed classes. For more information see:
                 // https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#exposing-classes
@@ -172,6 +176,7 @@ function baz() {
                 // scoper-autoload.php @generated by PhpScoper
 
                 $loader = require_once __DIR__.'/autoload.php';
+                require_once __DIR__.'/composer/InstalledVersions.php';
 
                 // Exposed classes. For more information see:
                 // https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#exposing-classes
@@ -207,6 +212,7 @@ function baz() {
 
                 namespace {
                     $loader = require_once __DIR__.'/autoload.php';
+                    require_once __DIR__.'/composer/InstalledVersions.php';
                 }
 
                 // Exposed classes. For more information see:
@@ -276,6 +282,7 @@ function baz() {
                 // scoper-autoload.php @generated by PhpScoper
 
                 $loader = require_once __DIR__.'/autoload.php';
+                require_once __DIR__.'/composer/InstalledVersions.php';
 
                 // Exposed functions. For more information see:
                 // https://github.com/humbug/php-scoper/blob/master/docs/configuration.md#exposing-functions
@@ -306,6 +313,7 @@ function __autoload($className) {
 
                 namespace {
                     $loader = require_once __DIR__.'/autoload.php';
+                    require_once __DIR__.'/composer/InstalledVersions.php';
                 }
 
                 // Exposed functions. For more information see: