diff --git a/README.md b/README.md index 823cd39..e147396 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ of your root `composer.json`. "includes": [ "sites/default/example.settings.my.php" ], - "dev": [ + "includes-dev": [ "my_settings_file_for_development.php" ], "initial": { @@ -72,7 +72,7 @@ update.php web.config ``` -Default dev are provided by the plugin: +Default includes dev are provided by the plugin: ``` .csslintrc .editorconfig @@ -94,7 +94,7 @@ The `initial` hash lists files that should be copied over only if they do not exist in the destination. The key specifies the path to the source file, and the value indicates the path to the destination file. -The `dev` hash lists files that should be copied over only if they do not +The `includes-dev` hash lists files that should be copied over only if they do not exist in the destination and if the dev packages are installed. ## Limitation diff --git a/src/Handler.php b/src/Handler.php index 1089d58..988f325 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -133,7 +133,7 @@ public function downloadScaffold($dev = FALSE) { $includes = $this->getIncludes(); // Check dev files if necessary. if ($dev) { - $includes = array_merge($includes, $this->getDev()); + $includes = array_merge($includes, $this->getIncludesDev()); } $files = array_diff($includes, $this->getExcludes()); @@ -296,8 +296,8 @@ protected function getIncludes() { * * @return array */ - protected function getDev() { - return $this->getNamedOptionList('dev', 'getDevDefault'); + protected function getIncludesDev() { + return $this->getNamedOptionList('includes-dev', 'getIncludesDevDefault'); } /** @@ -338,9 +338,9 @@ protected function getOptions() { 'omit-defaults' => FALSE, 'excludes' => [], 'includes' => [], + 'includes-dev' => [], 'initial' => [], 'source' => 'https://cgit.drupalcode.org/drupal/plain/{path}?h={version}', - 'dev' => [], // Github: https://raw.githubusercontent.com/drupal/drupal/{version}/{path} ]; return $options; @@ -380,7 +380,7 @@ protected function getIncludesDefault() { /** * Holds default dev files list. */ - protected function getDevDefault() { + protected function getIncludesDevDefault() { $version = $this->getDrupalCoreVersion($this->getDrupalCorePackage()); list($major, $minor) = explode('.', $version, 3); $version = "$major.$minor";