Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / vendor / drupal-composer / drupal-scaffold / src / Handler.php

diff --git a/vendor/drupal-composer/drupal-scaffold/src/Handler.php b/vendor/drupal-composer/drupal-scaffold/src/Handler.php
index b6ca659cd0794912c5ed181d325487aebaae94d4..71307322be9be7724761670a6d12ddcb14fa2e12 100644 (file)
--- a/vendor/drupal-composer/drupal-scaffold/src/Handler.php
+++ b/vendor/drupal-composer/drupal-scaffold/src/Handler.php
@@ -13,6 +13,7 @@ use Composer\DependencyResolver\Operation\UpdateOperation;
 use Composer\EventDispatcher\EventDispatcher;
 use Composer\IO\IOInterface;
 use Composer\Package\PackageInterface;
+use Composer\Semver\Semver;
 use Composer\Util\Filesystem;
 use Composer\Util\RemoteFilesystem;
 use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
@@ -327,7 +328,6 @@ EOF;
       '.csslintrc',
       '.editorconfig',
       '.eslintignore',
-      '.eslintrc.json',
       '.gitattributes',
       '.htaccess',
       'index.php',
@@ -342,13 +342,14 @@ EOF;
     ];
 
     // Version specific variations.
-    switch ($version) {
-      case '8.0':
-      case '8.1':
-      case '8.2':
-        $common[] = '.eslintrc';
-        $common = array_diff($common, ['.eslintrc.json']);
-        break;
+    if (Semver::satisfies($version, '<8.3')) {
+      $common[] = '.eslintrc';
+    }
+    if (Semver::satisfies($version, '>=8.3')) {
+      $common[] = '.eslintrc.json';
+    }
+    if (Semver::satisfies($version, '>=8.5')) {
+      $common[] = '.ht.router.php';
     }
 
     sort($common);