Skip to content

Commit ec624c9

Browse files
Pull request #58: Use includes-dev instead of dev.
1 parent da930b9 commit ec624c9

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
@@ -93,7 +93,7 @@ The `initial` hash lists files that should be copied over only if they do not
9393
exist in the destination. The key specifies the path to the source file, and
9494
the value indicates the path to the destination file.
9595

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

9999
## Limitation

src/Handler.php

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

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

278278
/**
@@ -313,8 +313,8 @@ protected function getOptions() {
313313
'omit-defaults' => FALSE,
314314
'excludes' => [],
315315
'includes' => [],
316+
'includes-dev' => [],
316317
'initial' => [],
317-
'dev' => [],
318318
'source' => 'http://cgit.drupalcode.org/drupal/plain/{path}?h={version}',
319319
// Github: https://raw.githubusercontent.com/drupal/drupal/{version}/{path}
320320
];
@@ -355,7 +355,7 @@ protected function getIncludesDefault() {
355355
/**
356356
* Holds default dev files list.
357357
*/
358-
protected function getDevDefault() {
358+
protected function getIncludesDevDefault() {
359359
$version = $this->getDrupalCoreVersion($this->getDrupalCorePackage());
360360
list($major, $minor) = explode('.', $version, 3);
361361
$version = "$major.$minor";

0 commit comments

Comments
 (0)