Skip to content

Commit fd1d0ed

Browse files
committed
Fixes composer/drupal-project/issues/27
1 parent 247614a commit fd1d0ed

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ res/flood_sem
22
res/master
33
res/omega
44
res/registry_rebuild
5+
res/config_devel
56
vendor

scripts/fixtures.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ git clone http://git.drupal.org/project/flood_sem res/flood_sem
33
git clone http://git.drupal.org/project/omega res/omega
44
git clone http://git.drupal.org/project/master res/master
55
git clone http://git.drupal.org/project/registry_rebuild res/registry_rebuild
6+
git clone http://git.drupal.org/project/config_devel res/config_devel

src/Project.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,11 @@ function($path) {
108108
: current(array_keys($composerMap));
109109
if ('drupal' === $this->name) {
110110
$composerMap[$top]['type'] = 'drupal-core';
111-
} elseif ($releaseInfo = $this->getReleaseInfo($this->core)) {
111+
}
112+
if (empty($composerMap[$top]['type']) && $this->core == 8) {
113+
$composerMap[$top]['type'] = 'drupal-' . $info->drupalInfo()['type'];
114+
}
115+
if (empty($composerMap[$top]['type']) && $releaseInfo = $this->getReleaseInfo($this->core)) {
112116
$composerMap[$top]['type'] = $releaseInfo->getProjectType();
113117
if ($composerMap[$top]['type'] === 'drupal-module'
114118
&& !$this->hasModule && !$this->isTheme && $this->hasDrush

test/RepositoryTest.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,12 @@ public function testLoadVersions()
4949
'dev-7.x-1.x' => array(
5050
'type' => 'drupal-module'
5151
)
52-
)
52+
),
53+
'config_devel' => array(
54+
'dev-8.x-1.x' => array(
55+
'type' => 'drupal-module'
56+
),
57+
),
5358
);
5459

5560
$config = new Config();

0 commit comments

Comments
 (0)