Support Drupal 8.3.x (#49)

Author: claudiu-cristea

README.md

@@ -61,7 +61,8 @@ Default includes are provided by the plugin:
 .csslintrc
 .editorconfig
 .eslintignore
-.eslintrc
+.eslintrc (Drupal <= 8.2.x)
+.eslintrc.json (Drupal >= 8.3.x)
 .gitattributes
 .htaccess
 index.php

src/Handler.php

@@ -109,10 +109,7 @@ public function downloadScaffold() {
     $dispatcher = new EventDispatcher($this->composer, $this->io);
     $dispatcher->dispatch(self::PRE_DRUPAL_SCAFFOLD_CMD);
 
-    $version = $drupalCorePackage->getPrettyVersion();
-    if ($drupalCorePackage->getStability() == 'dev' && substr($version, -4) == '-dev') {
-      $version = substr($version, 0, -4);
-    }
+    $version = $this->getDrupalCoreVersion($drupalCorePackage);
 
     $remoteFs = new RemoteFilesystem($this->io);
 
@@ -200,6 +197,22 @@ public function getDrupalCorePackage() {
     return $this->drupalCorePackage;
   }
 
+  /**
+   * Returns the Drupal core version for the given package.
+   *
+   * @param \Composer\Package\PackageInterface $drupalCorePackage
+   *
+   * @return string
+   */
+  protected function getDrupalCoreVersion(PackageInterface $drupalCorePackage) {
+    $version = $drupalCorePackage->getPrettyVersion();
+    if ($drupalCorePackage->getStability() == 'dev' && substr($version, -4) == '-dev') {
+      $version = substr($version, 0, -4);
+      return $version;
+    }
+    return $version;
+  }
+
   /**
    * Retrieve the path to the web root.
    *
@@ -301,11 +314,20 @@ protected function getExcludesDefault() {
    * Holds default settings files list.
    */
   protected function getIncludesDefault() {
-    return [
+    $version = $this->getDrupalCoreVersion($this->getDrupalCorePackage());
+    list($major, $minor) = explode('.', $version, 3);
+    $version = "$major.$minor";
+
+    /**
+     * Files from 8.3.x
+     *
+     * @see http://cgit.drupalcode.org/drupal/tree/?h=8.3.x
+     */
+    $common = [
       '.csslintrc',
       '.editorconfig',
       '.eslintignore',
-      '.eslintrc',
+      '.eslintrc.json',
       '.gitattributes',
       '.htaccess',
       'index.php',
@@ -318,6 +340,19 @@ protected function getIncludesDefault() {
       'update.php',
       'web.config'
     ];
+
+    // Version specific variations.
+    switch ($version) {
+      case '8.0':
+      case '8.1':
+      case '8.2':
+        $common[] = '.eslintrc';
+        $common = array_diff($common, ['.eslintrc.json']);
+        break;
+    }
+
+    sort($common);
+    return $common;
   }
 
   /**

tests/FetcherTest.php

@@ -7,6 +7,7 @@
 
 namespace DrupalComposer\DrupalScaffold\Tests;
 
+use Composer\Downloader\TransportException;
 use Composer\IO\NullIO;
 use Composer\Util\Filesystem;
 use Composer\Util\RemoteFilesystem;
@@ -68,6 +69,28 @@ public function testFetch() {
     $this->assertFileExists($this->tmpDir . '/sites/default/default.settings.php');
   }
 
+  /**
+   * Tests version specific files.
+   */
+  public function testFetchVersionSpecific() {
+    $fetcher = new FileFetcher(new RemoteFilesystem(new NullIO()), 'http://cgit.drupalcode.org/drupal/plain/{path}?h={version}', ['.eslintrc', '.eslintrc.json']);
+
+    $this->setExpectedException(TransportException::class);
+    $fetcher->fetch('8.2.x', $this->tmpDir);
+
+    $this->assertFileExists($this->tmpDir . '/.eslintrc');
+    $this->assertFileNotExists($this->tmpDir . '/.eslintrc.json');
+
+    // Remove downloaded files to retest with 8.3.x.
+    @unlink($this->tmpDir . '/.eslintrc');
+
+    $this->setExpectedException(TransportException::class);
+    $fetcher->fetch('8.3.x', $this->tmpDir);
+
+    $this->assertFileExists($this->tmpDir . '/.eslintrc.json');
+    $this->assertFileNotExists($this->tmpDir . '/.eslintrc');
+  }
+
   public function testInitialFetch() {
     $fetcher = new InitialFileFetcher(new RemoteFilesystem(new NullIO()), 'http://cgit.drupalcode.org/drupal/plain/{path}?h={version}', ['sites/default/default.settings.php' => 'sites/default/settings.php']);
     $fetcher->fetch('8.1.1', $this->tmpDir);