Update to latest upstream

.editorconfig

@@ -15,6 +15,3 @@ insert_final_newline = true
 
 [composer.{json,lock}]
 indent_size = 4
-
-[.platform.app.yaml]
-indent_size = 4

README.md

@@ -6,7 +6,7 @@
 </a>
 </p>
 
-This template builds Drupal 8 using the [Drupal Composer project](https://github.com/drupal-composer/drupal-project) for better flexibility. It also includes configuration to use Redis for caching, although that must be enabled post-install in `.platform.app.yaml`.
+This template builds Drupal 8 using the "Drupal Recommended" Composer project. It also includes configuration to use Redis for caching, although that must be enabled post-install in `.platform.app.yaml`.
 
 Drupal is a flexible and extensible PHP-based CMS framework.
 
@@ -24,11 +24,11 @@ Drupal is a flexible and extensible PHP-based CMS framework.
 
 ## Customizations
 
-The following changes have been made relative to Drupal 8 as it is downloaded from Drupal.org. If using this project as a reference for your own existing project, replicate the changes below to your project.
+The following changes have been made relative to Drupal 8 "Recommended" project as it is downloaded from Drupal.org or Packagist. If using this project as a reference for your own existing project, replicate the changes below to your project.
 
-* It uses the Drupal Composer project, which allow the site to be managed entirely with Composer. That also causes the `vendor` and `config` directories to be placed outside of the web root for added security. See the [Drupal documentation](https://www.drupal.org/node/2404989) for tips on how best to leverage Composer with Drupal 8.
 * The `.platform.app.yaml`, `.platform/services.yaml`, and `.platform/routes.yaml` files have been added. These provide Platform.sh-specific configuration and are present in all projects on Platform.sh. You may customize them as you see fit.
 * An additional Composer library, [`platformsh/config-reader`](https://github.com/platformsh/config-reader-php), has been added. It provides convenience wrappers for accessing the Platform.sh environment variables.
+* Drush and Drupal Console have been pre-included in `composer.json`. You are free to remove one or both if you do not wish to use them. (Note that the default cron and deploy hooks make use of Drush commands, however.) The Drupal Redis module also comes pre-installed but not enabled by default.
 * The `settings.platformsh.php` file contains Platform.sh-specific code to map environment variables into Drupal configuration. You can add to it as needed. See the documentation for more examples of common snippets to include here. It uses the Config Reader library.
 * The `settings.php` file has been heavily customized to only define those values needed for both Platform.sh and local development. It calls out to `settings.platformsh.php` if available. You can add additional values as documented in `default.settings.php` as desired. It is also setup such that when you install Drupal on Platform.sh the installer will not ask for database credentials as they will already be defined.
 

composer.json

@@ -1,37 +1,30 @@
 {
- "name": "drupal-composer/drupal-project",
- "description": "Project template for Drupal 8 projects with composer",
+ "name": "drupal/recommended-project",
+ "description": "Project template for Drupal 8 projects with a relocated document root",
  "type": "project",
  "license": "GPL-2.0-or-later",
- "authors": [
- {
- "name": "",
- "role": ""
- }
- ],
+ "homepage": "https://www.drupal.org/project/drupal",
+ "support": {
+ "docs": "https://www.drupal.org/docs/user_guide/en/index.html",
+ "chat": "https://www.drupal.org/node/314178"
+ },
  "repositories": [
  {
  "type": "composer",
  "url": "https://packages.drupal.org/8"
  }
  ],
  "require": {
- "php": ">=7.0.8",
  "composer/installers": "^1.2",
- "cweagans/composer-patches": "^1.6.5",
- "drupal-composer/drupal-scaffold": "^2.5",
- "drupal/console": "^1.0.2",
- "drupal/core": "^8.7.0",
+ "drupal/console": "^1.9",
+ "drupal/core-composer-scaffold": "^8.8",
+ "drupal/core-project-message": "^8.8",
+ "drupal/core-recommended": "^8.8",
  "drupal/redis": "^1.2",
- "drush/drush": "^9.0.0",
- "platformsh/config-reader": "^2.3",
- "vlucas/phpdotenv": "^2.4",
- "webflo/drupal-finder": "^1.0.0",
- "webmozart/path-util": "^2.3",
- "zaporylie/composer-drupal-optimizations": "^1.0"
+ "drush/drush": "^10.1",
+ "platformsh/config-reader": "^2.3"
  },
  "require-dev": {
- "webflo/drupal-core-require-dev": "^8.7.0"
  },
  "conflict": {
  "drupal/drupal": "*"
@@ -41,44 +34,40 @@
  "config": {
  "sort-packages": true
  },
- "autoload": {
- "classmap": [
- "scripts/composer/ScriptHandler.php"
- ],
- "files": ["load.environment.php"]
- },
- "scripts": {
- "pre-install-cmd": [
- "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
- ],
- "pre-update-cmd": [
- "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
- ],
- "post-install-cmd": [
- "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
- ],
- "post-update-cmd": [
- "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
- ]
- },
  "extra": {
- "composer-exit-on-patch-failure": true,
- "patchLevel": {
- "drupal/core": "-p2"
+ "drupal-scaffold": {
+ "locations": {
+ "web-root": "web/"
+ }
  },
  "installer-paths": {
  "web/core": ["type:drupal-core"],
  "web/libraries/{$name}": ["type:drupal-library"],
  "web/modules/contrib/{$name}": ["type:drupal-module"],
  "web/profiles/contrib/{$name}": ["type:drupal-profile"],
  "web/themes/contrib/{$name}": ["type:drupal-theme"],
- "drush/Commands/contrib/{$name}": ["type:drupal-drush"]
+ "drush/Commands/contrib/{$name}": ["type:drupal-drush"],
+ "web/modules/custom/{$name}": ["type:drupal-custom-module"],
+ "web/themes/custom/{$name}": ["type:drupal-custom-theme"]
  },
- "drupal-scaffold": {
- "initial": {
- ".editorconfig": "../.editorconfig",
- ".gitattributes": "../.gitattributes"
- }
+ "drupal-core-project-message": {
+ "include-keys": ["homepage", "support"],
+ "post-create-project-cmd-message": [
+ "<bg=blue;fg=white> </>",
+ "<bg=blue;fg=white> Congratulations, you’ve installed the Drupal codebase </>",
+ "<bg=blue;fg=white> from the drupal/recommended-project template! </>",
+ "<bg=blue;fg=white> </>",
+ "",
+ "<bg=yellow;fg=black>Next steps</>:",
+
+ " * Install the site: https://www.drupal.org/docs/8/install",
+ " * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html",
+ " * Get support: https://www.drupal.org/support",
+ " * Get involved with the Drupal community:",
+ " https://www.drupal.org/getting-involved",
+ " * Remove the plugin that prints this message:",
+ " composer remove drupal/core-project-message"
+ ]
  }
  }
 }