Skip to content

Commit c3f1514

Browse files
Pull request drupal-composer#58: Use includes-dev instead of dev.
1 parent f8730b2 commit c3f1514

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ of your root `composer.json`.
3838
"includes": [
3939
"sites/default/example.settings.my.php"
4040
],
41-
"dev": [
41+
"includes-dev": [
4242
"my_settings_file_for_development.php"
4343
],
4444
"initial": {
@@ -72,7 +72,7 @@ update.php
7272
web.config
7373
```
7474

75-
Default dev are provided by the plugin:
75+
Default includes dev are provided by the plugin:
7676
```
7777
.csslintrc
7878
.editorconfig
@@ -94,7 +94,7 @@ The `initial` hash lists files that should be copied over only if they do not
9494
exist in the destination. The key specifies the path to the source file, and
9595
the value indicates the path to the destination file.
9696

97-
The `dev` hash lists files that should be copied over only if they do not
97+
The `includes-dev` hash lists files that should be copied over only if they do not
9898
exist in the destination and if the dev packages are installed.
9999

100100
## Limitation

src/Handler.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function downloadScaffold($dev = FALSE) {
110110
$includes = $this->getIncludes();
111111
// Check dev files if necessary.
112112
if ($dev) {
113-
$includes = array_merge($includes, $this->getDev());
113+
$includes = array_merge($includes, $this->getIncludesDev());
114114
}
115115
$files = array_diff($includes, $this->getExcludes());
116116

@@ -272,8 +272,8 @@ protected function getIncludes() {
272272
*
273273
* @return array
274274
*/
275-
protected function getDev() {
276-
return $this->getNamedOptionList('dev', 'getDevDefault');
275+
protected function getIncludesDev() {
276+
return $this->getNamedOptionList('includes-dev', 'getIncludesDevDefault');
277277
}
278278

279279
/**
@@ -314,8 +314,8 @@ protected function getOptions() {
314314
'omit-defaults' => FALSE,
315315
'excludes' => [],
316316
'includes' => [],
317+
'includes-dev' => [],
317318
'initial' => [],
318-
'dev' => [],
319319
'source' => 'http://cgit.drupalcode.org/drupal/plain/{path}?h={version}',
320320
// Github: https://raw.githubusercontent.com/drupal/drupal/{version}/{path}
321321
];
@@ -356,7 +356,7 @@ protected function getIncludesDefault() {
356356
/**
357357
* Holds default dev files list.
358358
*/
359-
protected function getDevDefault() {
359+
protected function getIncludesDevDefault() {
360360
$version = $this->getDrupalCoreVersion($this->getDrupalCorePackage());
361361
list($major, $minor) = explode('.', $version, 3);
362362
$version = "$major.$minor";

0 commit comments

Comments
 (0)