From 29757ac896130df7ec197308aaf547149787a1b7 Mon Sep 17 00:00:00 2001 From: hw Date: Mon, 23 Oct 2017 13:28:51 +0530 Subject: [PATCH 1/3] Add support for drupal-composer-helper plugin --- src/DrupalFinder.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/DrupalFinder.php b/src/DrupalFinder.php index 98bb0c9..4a1b5fb 100644 --- a/src/DrupalFinder.php +++ b/src/DrupalFinder.php @@ -120,6 +120,12 @@ protected function isValidRoot($path) } } } + elseif (isset($json['extra']['drupal-composer-helper']) && is_array($json['extra']['drupal-composer-helper'])) { + $web_prefix = isset($json['extra']['drupal-composer-helper']['web-prefix']) ? $json['extra']['drupal-composer-helper']['web-prefix'] : 'web'; + $this->composerRoot = $path; + $this->drupalRoot = $path . '/' . $web_prefix; + $this->vendorDir = $path . '/vendor'; + } } } if ($this->composerRoot && file_exists($this->composerRoot . '/composer.json')) { From 6cf9e3236882c6ce80a2ebeacc7b71e7d325df60 Mon Sep 17 00:00:00 2001 From: hw Date: Mon, 23 Oct 2017 13:37:06 +0530 Subject: [PATCH 2/3] Fix style issue --- src/DrupalFinder.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DrupalFinder.php b/src/DrupalFinder.php index 4a1b5fb..a8476eb 100644 --- a/src/DrupalFinder.php +++ b/src/DrupalFinder.php @@ -119,8 +119,7 @@ protected function isValidRoot($path) $this->vendorDir = $this->composerRoot . '/vendor'; } } - } - elseif (isset($json['extra']['drupal-composer-helper']) && is_array($json['extra']['drupal-composer-helper'])) { + } elseif (isset($json['extra']['drupal-composer-helper']) && is_array($json['extra']['drupal-composer-helper'])) { $web_prefix = isset($json['extra']['drupal-composer-helper']['web-prefix']) ? $json['extra']['drupal-composer-helper']['web-prefix'] : 'web'; $this->composerRoot = $path; $this->drupalRoot = $path . '/' . $web_prefix; From 183d78408edea43756dff489776f08ac3779dfc8 Mon Sep 17 00:00:00 2001 From: hw Date: Wed, 14 Aug 2019 21:36:51 +0530 Subject: [PATCH 3/3] Change the setting name. --- src/DrupalFinder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DrupalFinder.php b/src/DrupalFinder.php index a8476eb..683440f 100644 --- a/src/DrupalFinder.php +++ b/src/DrupalFinder.php @@ -119,8 +119,8 @@ protected function isValidRoot($path) $this->vendorDir = $this->composerRoot . '/vendor'; } } - } elseif (isset($json['extra']['drupal-composer-helper']) && is_array($json['extra']['drupal-composer-helper'])) { - $web_prefix = isset($json['extra']['drupal-composer-helper']['web-prefix']) ? $json['extra']['drupal-composer-helper']['web-prefix'] : 'web'; + } elseif (!empty($json['extra']['drupal-web-dir'])) { + $web_prefix = $json['extra']['drupal-web-dir']; $this->composerRoot = $path; $this->drupalRoot = $path . '/' . $web_prefix; $this->vendorDir = $path . '/vendor';