Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3075621 by greg.1.anderson: Scaffold plugin sometimes fails to write autoload.php

merge-requests/55/head
Lee Rowlands 2019-08-19 14:27:23 +10:00
parent 590ca4a69c
commit 0039c527cb
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Drupal/Component/Scaffold/GenerateAutoloadReferenceFile.php
View File

@ -62,11 +62,12 @@ final class GenerateAutoloadReferenceFile {
*/
public static function autoloadFileCommitted(IOInterface $io, $package_name, $web_root) {
$autoload_path = static::autoloadPath($package_name, $web_root);
$location = dirname($autoload_path->fullPath());
if (!file_exists($location)) {
$autoload_file = $autoload_path->fullPath();
$location = dirname($autoload_file);
if (!file_exists($autoload_file)) {
return FALSE;
}
return Git::checkTracked($io, $location, $location);
return Git::checkTracked($io, $autoload_file, $location);
}
/**

4
core/tests/Drupal/Tests/Component/Scaffold/Functional/ManageGitIgnoreTest.php
View File

@ -104,10 +104,12 @@ class ManageGitIgnoreTest extends TestCase {
// Note that the drupal-composer-drupal-project fixture does not
// have any configuration settings related to .gitignore management.
$sut = $this->createSutWithGit('drupal-composer-drupal-project');
$this->assertFileNotExists($sut . '/docroot/autoload.php');
$this->assertFileNotExists($sut . '/docroot/index.php');
$this->assertFileNotExists($sut . '/docroot/sites/.gitignore');
// Run the scaffold command.
$this->fixtures->runScaffold($sut);
$this->assertFileExists($sut . '/docroot/autoload.php');
$this->assertFileExists($sut . '/docroot/index.php');
$expected = <<<EOT
build
@ -147,9 +149,11 @@ EOT;
// Note that the drupal-drupal fixture has a configuration setting
// `"gitignore": false,` which disables .gitignore file handling.
$sut = $this->createSutWithGit('drupal-drupal');
$this->assertFileNotExists($sut . '/docroot/autoload.php');
$this->assertFileNotExists($sut . '/docroot/index.php');
// Run the scaffold command.
$this->fixtures->runScaffold($sut);
$this->assertFileExists($sut . '/autoload.php');
$this->assertFileExists($sut . '/index.php');
$this->assertFileNotExists($sut . '/.gitignore');
$this->assertFileNotExists($sut . '/docroot/sites/default/.gitignore');