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

Issue #3084326 by hussainweb, greg.1.anderson: Install .editorconfig and .gitattributes at the project root

merge-requests/55/head
Lee Rowlands 2019-09-30 16:24:21 +10:00
parent d8ec05c39f
commit c7a1b0204b
No known key found for this signature in database
GPG Key ID: 2B829A3DF9204DC4
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer/Plugin/Scaffold/ScaffoldOptions.php
View File

@ -34,6 +34,7 @@ class ScaffoldOptions {
// Define any default locations.
$this->options['locations'] += [
'project-root' => '.',
'web-root' => '.',
];
}

4
core/composer.json
View File

@ -189,11 +189,11 @@
"extra": {
"composer-scaffold": {
"file-mapping": {
"[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",
"[project-root]/.gitattributes": "assets/scaffold/files/gitattributes",
"[web-root]/.csslintrc": "assets/scaffold/files/csslintrc",
"[web-root]/.editorconfig": "assets/scaffold/files/editorconfig",
"[web-root]/.eslintignore": "assets/scaffold/files/eslintignore",
"[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json",
"[web-root]/.gitattributes": "assets/scaffold/files/gitattributes",
"[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php",
"[web-root]/.htaccess": "assets/scaffold/files/htaccess",
"[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore",

12
core/tests/Drupal/Tests/ComposerIntegrationTest.php
View File

@ -177,11 +177,11 @@ class ComposerIntegrationTest extends UnitTestCase {
*/
public function providerTestExpectedScaffoldFiles() {
return [
['.editorconfig', 'assets/scaffold/files/editorconfig', '[project-root]'],
['.gitattributes', 'assets/scaffold/files/gitattributes', '[project-root]'],
['.csslintrc', 'assets/scaffold/files/csslintrc'],
['.editorconfig', 'assets/scaffold/files/editorconfig'],
['.eslintignore', 'assets/scaffold/files/eslintignore'],
['.eslintrc.json', 'assets/scaffold/files/eslintrc.json'],
['.gitattributes', 'assets/scaffold/files/gitattributes'],
['.ht.router.php', 'assets/scaffold/files/ht.router.php'],
['.htaccess', 'assets/scaffold/files/htaccess'],
['example.gitignore', 'assets/scaffold/files/example.gitignore'],
@ -221,17 +221,19 @@ class ComposerIntegrationTest extends UnitTestCase {
* Path to scaffold file destination location
* @param string $sourceRelPath
* Path to scaffold file source location
* @param string $expectedDestination
* Named location to the destination path of the scaffold file
*
* @dataProvider providerTestExpectedScaffoldFiles
*/
public function testExpectedScaffoldFiles($destRelPath, $sourceRelPath) {
public function testExpectedScaffoldFiles($destRelPath, $sourceRelPath, $expectedDestination = '[web-root]') {
// Grab the 'file-mapping' section of the core composer.json file.
$json = json_decode(file_get_contents($this->root . '/core/composer.json'));
$scaffold_file_mapping = (array) $json->extra->{'composer-scaffold'}->{'file-mapping'};
// Assert that the 'file-mapping' section has the expected entry.
$this->assertArrayHasKey("[web-root]/$destRelPath", $scaffold_file_mapping);
$this->assertEquals($sourceRelPath, $scaffold_file_mapping["[web-root]/$destRelPath"]);
$this->assertArrayHasKey("$expectedDestination/$destRelPath", $scaffold_file_mapping);
$this->assertEquals($sourceRelPath, $scaffold_file_mapping["$expectedDestination/$destRelPath"]);
// Assert that the source file exists.
$this->assertFileExists($this->root . '/core/' . $sourceRelPath);