public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Allow recursively call composerRequire (#10312) 

Fixes: #10311
Related: #10065
pull/10283/head^2
Helmut Hummel 2021-11-25 20:50:26 +01:00 committed by GitHub
parent f7525ddf52
commit 0b9e1da4fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -1106,9 +1106,9 @@ METHOD_FOOTER;
function composerRequire$suffix(\$fileIdentifier, \$file)
{
if (empty(\$GLOBALS['__composer_autoload_files'][\$fileIdentifier])) {
require \$file;
\$GLOBALS['__composer_autoload_files'][\$fileIdentifier] = true;
require \$file;
}
}
@ -1416,8 +1416,8 @@ INITIALIZER;
function composerRequire($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}

4
tests/Composer/Test/Autoload/Fixtures/autoload_real_files_by_dependency.php
View File

@ -71,8 +71,8 @@ class ComposerAutoloaderInitFilesAutoloadOrder
function composerRequireFilesAutoloadOrder($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}

4
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions.php
View File

@ -71,8 +71,8 @@ class ComposerAutoloaderInitFilesAutoload
function composerRequireFilesAutoload($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}

4
tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_include_paths.php
View File

@ -75,8 +75,8 @@ class ComposerAutoloaderInitFilesAutoload
function composerRequireFilesAutoload($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}

4
tests/Composer/Test/Autoload/Fixtures/autoload_real_target_dir.php
View File

@ -91,8 +91,8 @@ class ComposerAutoloaderInitTargetDir
function composerRequireTargetDir($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}

4
tests/Composer/Test/Fixtures/functional/installed-versions2/vendor/composer/autoload_real.php vendored
View File

@ -68,8 +68,8 @@ class ComposerAutoloaderInit46489d6835a727203ffccd612295440e
function composerRequire46489d6835a727203ffccd612295440e($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
require $file;
}
}