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

dirname(__FILE__) no longer needed

pull/10428/head
Michael Voříšek 2020-11-07 00:08:03 +01:00 committed by Jordi Boggiano
parent 7e50f37b87
commit 4fdc8b8ee1
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
31 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,6 @@ class AutoloadGenerator
$filesystem->ensureDirectoryExists($targetDir);
$vendorPathCode = $filesystem->findShortestPathCode(realpath($targetDir), $vendorPath, true);
$vendorPathCode52 = str_replace('__DIR__', 'dirname(__FILE__)', $vendorPathCode);
$vendorPathToTargetDirCode = $filesystem->findShortestPathCode($vendorPath, realpath($targetDir), true);
$appBaseDirCode = $filesystem->findShortestPathCode($vendorPath, $basePath, true);
@ -219,7 +218,7 @@ class AutoloadGenerator
// autoload_namespaces.php @generated by Composer
\$vendorDir = $vendorPathCode52;
\$vendorDir = $vendorPathCode;
\$baseDir = $appBaseDirCode;
return array(
@ -231,7 +230,7 @@ EOF;
// autoload_psr4.php @generated by Composer
\$vendorDir = $vendorPathCode52;
\$vendorDir = $vendorPathCode;
\$baseDir = $appBaseDirCode;
return array(
@ -279,7 +278,7 @@ EOF;
// autoload_classmap.php @generated by Composer
\$vendorDir = $vendorPathCode52;
\$vendorDir = $vendorPathCode;
\$baseDir = $appBaseDirCode;
return array(
@ -390,13 +389,13 @@ EOF;
$filesystem->filePutContentsIfModified($targetDir.'/autoload_psr4.php', $psr4File);
$filesystem->filePutContentsIfModified($targetDir.'/autoload_classmap.php', $classmapFile);
$includePathFilePath = $targetDir.'/include_paths.php';
if ($includePathFileContents = $this->getIncludePathsFile($packageMap, $filesystem, $basePath, $vendorPath, $vendorPathCode52, $appBaseDirCode)) {
if ($includePathFileContents = $this->getIncludePathsFile($packageMap, $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode)) {
$filesystem->filePutContentsIfModified($includePathFilePath, $includePathFileContents);
} elseif (file_exists($includePathFilePath)) {
unlink($includePathFilePath);
}
$includeFilesFilePath = $targetDir.'/autoload_files.php';
if ($includeFilesFileContents = $this->getIncludeFilesFile($autoloads['files'], $filesystem, $basePath, $vendorPath, $vendorPathCode52, $appBaseDirCode)) {
if ($includeFilesFileContents = $this->getIncludeFilesFile($autoloads['files'], $filesystem, $basePath, $vendorPath, $vendorPathCode, $appBaseDirCode)) {
$filesystem->filePutContentsIfModified($includeFilesFilePath, $includeFilesFileContents);
} elseif (file_exists($includeFilesFilePath)) {
unlink($includeFilesFilePath);

30
tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
View File

@ -641,7 +641,7 @@ class AutoloadGeneratorTest extends TestCase
// autoload_classmap.php @generated by Composer
\$vendorDir = dirname(dirname(__FILE__));
\$vendorDir = dirname(__DIR__);
\$baseDir = dirname(\$vendorDir);
return array(
@ -1113,7 +1113,7 @@ EOF;
// autoload_namespaces.php @generated by Composer
\$vendorDir = dirname(dirname(__FILE__));
\$vendorDir = dirname(__DIR__);
\$baseDir = dirname(\$vendorDir);
return array(
@ -1130,7 +1130,7 @@ EOF;
// autoload_psr4.php @generated by Composer
\$vendorDir = dirname(dirname(__FILE__));
\$vendorDir = dirname(__DIR__);
\$baseDir = dirname(\$vendorDir);
return array(
@ -1143,7 +1143,7 @@ EOF;
// autoload_classmap.php @generated by Composer
\$vendorDir = dirname(dirname(__FILE__));
\$vendorDir = dirname(__DIR__);
\$baseDir = dirname(\$vendorDir);
return array(
@ -1382,7 +1382,7 @@ EOF;
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir).'/working-dir';
return array(
@ -1397,7 +1397,7 @@ EOF;
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir).'/working-dir';
return array(
@ -1412,7 +1412,7 @@ EOF;
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir).'/working-dir';
return array(
@ -1471,7 +1471,7 @@ EOF;
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir).'/working-dir';
return array(
@ -1485,7 +1485,7 @@ EOF;
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir).'/working-dir';
return array(
@ -1499,7 +1499,7 @@ EOF;
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir).'/working-dir';
return array(
@ -1540,7 +1540,7 @@ EOF;
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
@ -1554,7 +1554,7 @@ EOF;
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
@ -1568,7 +1568,7 @@ EOF;
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
@ -1603,7 +1603,7 @@ EOF;
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
@ -1617,7 +1617,7 @@ EOF;
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap2.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname(dirname($vendorDir));
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap3.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = $vendorDir;
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap4.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap5.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap6.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap7.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap8.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_classmap9.php
View File

@ -2,7 +2,7 @@
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_files.php
View File

@ -2,7 +2,7 @@
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_files2.php
View File

@ -2,7 +2,7 @@
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_files_files_by_dependency.php
View File

@ -2,7 +2,7 @@
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_files_functions.php
View File

@ -2,7 +2,7 @@
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_files_functions_with_removed_extra.php
View File

@ -2,7 +2,7 @@
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_files_target_dir.php
View File

@ -2,7 +2,7 @@
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main2.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname(dirname($vendorDir));
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main3.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = $vendorDir;
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main4.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_main5.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_phar.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_phar_psr4.php
View File

@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_psr4.php
View File

@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_psr4_2.php
View File

@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname(dirname($vendorDir));
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_psr4_3.php
View File

@ -2,7 +2,7 @@
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = $vendorDir;
return array(

2
tests/Composer/Test/Autoload/Fixtures/autoload_vendors.php
View File

@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/include_paths.php
View File

@ -2,7 +2,7 @@
// include_paths.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/include_paths_functions.php
View File

@ -2,7 +2,7 @@
// include_paths.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(

2
tests/Composer/Test/Autoload/Fixtures/include_paths_functions_with_removed_extra.php
View File

@ -2,7 +2,7 @@
// include_paths.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(