Merge pull request #170 from palantirnet/lite

Pull out settings.php templating

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 4.0-alpha1
+
+The goal of this release is to remove some of the templating functionality that makes `planaitrnet/the-build` and `palantirnet/drupal-skeleton` harder to use and maintain.
+
+* Removed gitignore template
+* Removed settings.php templating
+* Changed how host-specific settings files are managed
+
+`palantirnet/drupal-skeleton` now contains the `settings.php` scaffolding for Drupal.
+
+The plan is to remove more templating/wrapping before releasing 4.0.
+
 ## 3.0.3 - November 25, 2020
 
 ### Fixed

README.md

@@ -21,7 +21,6 @@ $> vendor/bin/the-build-installer
 This will trigger an interactive prompt to configure your basic build properties, adding the following templated files and directories:
 
 * `.circleci/`
-* `.gitignore`
 * `.the-build/`
 * `behat.yml`
 * `build.xml`

defaults.yml

@@ -14,13 +14,14 @@
 build:
   # The destination host, either 'acquia', 'pantheon', 'platformsh', or 'other'. This is
   # currently only used when setting up the settings.php file for a Drupal site.
-  host: other
+  host: acquia
 
 # Drupal configuration used by targets/drupal.xml
 drupal:
   # Relative path to the Drupal web root. This is co-dependent with the composer installer
   # configuration in your `composer.json`. Use caution when changing this value.
-  root: web
+  # **This is a required value but must be set in a project's own build.yml file**
+  #root: web
 
   # Comma-separated list of directories that should be present for Drupal development.
   create_dirs: "${drupal.root}/modules/custom,${drupal.root}/themes/custom,${drupal.root}/profiles/custom,config/config_split/development,config/config_split/staging,config/config_split/production"
@@ -52,8 +53,9 @@ drupal:
       dir: default
 
       # REQUIRED: Your site's URI; the default should be the URI of your local
-      # development environment.
-      uri: "https://${projectname}.local"
+      # development environment. This must be present in your
+      # .the-build/build.yml file.
+#      uri: "https://${projectname}.ddev.site"
 
       # Customizing the following values is OPTIONAL. If these values are not
       # explicitly configured, they will be set in the-build.xml based on the
@@ -109,9 +111,9 @@ drupal:
       database:
         # This value is required, but a default is set in the-build.xml.
         # database: drupal
-        username: root
-        password: root
-        host: 127.0.0.1
+        username: db
+        password: db
+        host: db
 
       # Configuration used by the default 'build' target.
       build:
@@ -240,7 +242,7 @@ phpcs:
   # use the extensions option (below). This option should not be used with Coder >= 8.3.7, which only
   # checks php, inc, css, and js by default.
   ignore: "*.md"
-  
+
   # Comma-separated list of extensions to check in the PHP_CodeSniffer review.
   extensions: "php,module,inc,install,test,profile,theme,css,info,txt,yml,js"
 

defaults/install/build.xml

@@ -43,21 +43,6 @@
         <mkdir dir="${drupal.root}/${drupal.site.settings.file_private_path}" />
         <chmod file="${drupal.root}/${drupal.site.settings.file_private_path}" mode="640" />
 
-        <!-- Copy the settings.build.php and services.build.php templates into place. -->
-        <copy todir="${build.dir}" overwrite="true" mode="544">
-            <!-- Copy the template files -->
-            <filelist dir="${build.dir}" files="${drupal.site.build.settings_template},${drupal.site.build.services_template}" />
-            <!-- Map templates to their destinations -->
-            <mapper type="firstmatch">
-                <mapper type="glob" from="${drupal.site.build.settings_template}" to="${drupal.site.build.settings_dest}" />
-                <mapper type="glob" from="${drupal.site.build.services_template}" to="${drupal.site.build.services_dest}" />
-            </mapper>
-            <!-- Substitute property values -->
-            <filterchain>
-                <expandproperties />
-            </filterchain>
-        </copy>
-
         <!-- Include styleguide resources in the theme. This approach will symlink
              resources in development environments, and copy them for artifact builds. -->
         <!-- <includeresource source="styleguide/source/assets/css" dest="${drupal.root}/themes/custom/example_theme/css" /> -->
@@ -175,7 +160,7 @@
 
     <!-- Default target: list -->
     <target name="list" hidden="true">
-        <exec command="phing -q -f ${phing.file} -l" passthru="true"/>
+        <exec command="${phing.home}/bin/phing -q -f ${phing.file} -l" passthru="true"/>
         <echo>Find more documentation for palantirnet/the-build on GitHub:
 
             https://github.com/palantirnet/the-build#using-the-build</echo>

defaults/install/pantheon.yml

@@ -1,5 +1,5 @@
 # Pantheon configuration file
 api_version: 1
 web_docroot: true
-php_version: 7.2
+php_version: 7.4
 drush_version: 8

defaults/install/the-build/build.yml

@@ -5,6 +5,8 @@
 # found in the-build's repository.
 # @see https://github.com/palantirnet/the-build/blob/release-2.0/defaults.yml
 
+projectname: ${projectname}
+
 # These properties are used when building the settings.php and settings.yml for your
 # Drupal site, and by some of the targets in the default build.xml file.
 # @see .the-build/drupal/services.build.yml