added ability to specify non default custom project order

janschumann · Mar 18, 2015 · b62f435 · b62f435
1 parent 43e6697
commit b62f435
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/Drupal/ModuleComposer/Bundle/ModuleComposerBundle/DependencyInjection/Configuration.php b/src/Drupal/ModuleComposer/Bundle/ModuleComposerBundle/DependencyInjection/Configuration.php
@@ -20,6 +20,7 @@ public function getConfigTreeBuilder() {
     $rootNode
       ->fixXmlConfig('drushExtension')
       ->children()
+        ->scalarNode('order')->defaultValue('')->end()
         ->arrayNode('variable')
           ->prototype('array')
             ->children()

diff --git a/...oduleComposer/Bundle/ModuleComposerBundle/DependencyInjection/ModuleComposerExtension.php b/...oduleComposer/Bundle/ModuleComposerBundle/DependencyInjection/ModuleComposerExtension.php
@@ -50,6 +50,11 @@ public function load(array $configs, ContainerBuilder $container)
         $this->buildProject($container, $typeName, $projectName, $project);
       }
     }
+
+    if (isset($config['order']) && !empty($config['order'])) {
+      $order = explode(',', str_replace(' ', '', $config['order']));
+      $container->getDefinition('mc.composer')->addMethodCall('setOrder', array($order));
+    }
   }
 
   private function buildProject(ContainerBuilder $container, $type, $projectName, $project) {

diff --git a/...oduleComposer/Bundle/ModuleComposerBundle/Resources/config/schema/module-composer-1.0.xsd b/...oduleComposer/Bundle/ModuleComposerBundle/Resources/config/schema/module-composer-1.0.xsd
@@ -15,6 +15,7 @@
             <xsd:element name="customProjects" type="customProjects" minOccurs="0" maxOccurs="unbounded"/>
             <xsd:element name="variable" type="variable" minOccurs="0" maxOccurs="unbounded"/>
         </xsd:sequence>
+        <xsd:attribute name="order" default="composer,dev,custom" use="optional" />
     </xsd:complexType>
 
 

diff --git a/src/Drupal/ModuleComposer/Composer.php b/src/Drupal/ModuleComposer/Composer.php
@@ -90,7 +90,7 @@ private function getProjectsBySubType($projects) {
    * @param array $order
    */
   public function setOrder(array $order) {
-    $this->order = $order;
+    $this->customProjectsTypeOrder = $order;
   }
 
   /**