updated for new Types supported for Drupal

Author: edysmp

README.md

@@ -48,7 +48,7 @@ is not needed to install packages with these frameworks:
 | Croogo       | `croogo-plugin`<br>`croogo-theme`
 | DokuWiki     | `dokuwiki-plugin`<br>`dokuwiki-template`
 | Dolibarr     | `dolibarr-module`
-| Drupal       | <b>`drupal-core`<br>`drupal-module`<br>`drupal-theme`</b><br>`drupal-library`<br>`drupal-profile`<br>`drupal-drush`
+| Drupal       | **`drupal-core`<br>`drupal-module`<br>`drupal-theme`**<br>`drupal-library`<br>`drupal-profile`<br>`drupal-theme-engine`<br>`drupal-drush`<br>`drupal-custom-module`<br>`drupal-custom-theme`<br>`drupal-custom-profile`<br>`drupal-custom-theme-engine`
 | Elgg         | `elgg-plugin`
 | FuelPHP v1.x | `fuel-module`<br>`fuel-package`<br/>`fuel-theme`
 | FuelPHP v2.x | `fuelphp-component`

src/Composer/Installers/DrupalInstaller.php

@@ -3,14 +3,17 @@
 
 class DrupalInstaller extends BaseInstaller
 {
-    protected $locations = array(
-        'core'      => 'core/',
-        'module'    => 'modules/{$name}/',
-        'theme'     => 'themes/{$name}/',
-        'library'   => 'libraries/{$name}/',
-        'profile'   => 'profiles/{$name}/',
-        'drush'     => 'drush/{$name}/',
-	    'custom-theme' => 'themes/custom/{$name}/',
-	    'custom-module' => 'modules/custom/{$name}',
-    );
+	protected $locations = array(
+		'core'                => 'core/',
+		'drush'               => 'drush/{$name}/',
+		'module'              => 'modules/contrib/{$name}/',
+		'custom-module'       => 'modules/custom/{$name}',
+		'library'             => 'libraries/{$name}/',
+		'theme'               => 'themes/contrib/{$name}/',
+		'custom-theme'        => 'themes/custom/{$name}/',
+		'profile'             => 'profiles/contrib/{$name}/',
+		'custom-profile'      => 'profiles/custom/{$name}/',
+		'theme-engine'        => 'themes/engines/contrib/{$name}/',
+		'custom-theme-engine' => 'themes/engines/custom/{$name}/',
+	);
 }

tests/Composer/Installers/Test/InstallerTest.php

@@ -223,10 +223,15 @@ public function dataForTestInstallPath()
             array('dokuwiki-plugin', 'lib/plugins/someplugin/', 'author/someplugin'),
             array('dokuwiki-template', 'lib/tpl/sometemplate/', 'author/sometemplate'),
             array('dolibarr-module', 'htdocs/custom/my_module/', 'shama/my_module'),
-            array('drupal-module', 'modules/my_module/', 'shama/my_module'),
-            array('drupal-theme', 'themes/my_module/', 'shama/my_module'),
-            array('drupal-profile', 'profiles/my_module/', 'shama/my_module'),
             array('drupal-drush', 'drush/my_module/', 'shama/my_module'),
+            array('drupal-module', 'modules/contrib/my_module/', 'shama/my_module'),
+            array('drupal-custom-module', 'modules/custom/my_module/', 'shama/my_module'),
+            array('drupal-theme', 'themes/contrib/my_module/', 'shama/my_module'),
+            array('drupal-custom-theme', 'themes/custom/my_module/', 'shama/my_module'),
+            array('drupal-profile', 'profiles/contrib/my_module/', 'shama/my_module'),
+            array('drupal-custom-profile', 'profiles/custom/my_module/', 'shama/my_module'),
+            array('drupal-theme-engine', 'themes/engines/contrib/my_module/', 'shama/my_module'),
+            array('drupal-custom-theme-engine', 'themes/engines/custom/my_module/', 'shama/my_module'),
             array('elgg-plugin', 'mod/sample_plugin/', 'test/sample_plugin'),
             array('fuel-module', 'fuel/app/modules/module/', 'fuel/module'),
             array('fuel-package', 'fuel/packages/orm/', 'fuel/orm'),