Fixing toggle-modules targets.

Author: grasmash

phing/tasks/ci.xml

@@ -38,12 +38,13 @@
     <phingcall target="setup:update">
       <property name="drush.alias" value="${drush.aliases.ci}"/>
     </phingcall>
+    <phingcall target="ci:toggle-modules"/>
   </target>
 
-  <target name="ci:toggle-modules" description="Enables modules.ci.enable projects and uninstalls modules.ci.uninstall projects.">
+  <target name="ci:toggle-modules" description="Enables modules.ci.enable projects and uninstalls modules.ci.uninstall projects." hidden="true">
     <phingcall target="setup:toggle-modules">
-      <param name="enable" value="${modules.ci.enable}"/>
-      <param name="uninstall" value="${modules.ci.uninstall}"/>
+      <param name="enable_property" value="modules.ci.enable"/>
+      <param name="uninstall_property" value="modules.ci.uninstall"/>
     </phingcall>
   </target>
 </project>

phing/tasks/deploy.xml

@@ -168,8 +168,8 @@
 
   <target name="deploy:toggle-modules" description="Enables modules.deploy.enable projects and uninstalls modules.deploy.uninstall projects.">
     <phingcall target="setup:toggle-modules">
-      <param name="enable" value="${modules.deploy.enable}"/>
-      <param name="uninstall" value="${modules.deploy.uninstall}"/>
+      <param name="enable_property" value="modules.deploy.enable"/>
+      <param name="uninstall_property" value="modules.deploy.uninstall"/>
     </phingcall>
   </target>
 </project>

phing/tasks/local-sync.xml

@@ -32,15 +32,16 @@
 
   <target name="local:toggle-modules" description="Enables modules.local.enable projects and uninstalls modules.local.uninstall projects.">
     <phingcall target="setup:toggle-modules">
-      <param name="enable" value="${modules.local.enable}"/>
-      <param name="uninstall" value="${modules.local.uninstall}"/>
+      <param name="enable_property" value="modules.local.enable"/>
+      <param name="uninstall_property" value="modules.local.uninstall"/>
     </phingcall>
   </target>
 
-  <target name="local:update" description="Update current database to reflect the state of the Drupal file system; uses local drush alias." depends="local:toggle-modules">
+  <target name="local:update" description="Update current database to reflect the state of the Drupal file system; uses local drush alias.">
     <phingcall target="setup:update">
       <property name="drush.alias" value="${drush.aliases.local}"/>
     </phingcall>
+    <phingcall target="local:toggle-modules"/>
   </target>
 
 </project>

phing/tasks/setup.xml

@@ -265,13 +265,23 @@
   </target>
 
   <target name="setup:toggle-modules" description="Enables and uninstalls specified modules.">
-    <drush command="pm-enable" assume="yes">
-      <param>${enable}</param>
-      <option>skip</option>
-    </drush>
-    <drush command="pm-uninstall" assume="yes">
-      <param>${uninstall}</param>
-    </drush>
+    <if>
+      <isset property="${enable_property}"/>
+      <then>
+        <drush command="pm-enable" assume="yes">
+          <param>${${enable_property}}</param>
+          <option name="skip"></option>
+        </drush>
+      </then>
+    </if>
+    <if>
+      <isset property="${uninstall_property}"/>
+      <then>
+        <drush command="pm-uninstall" assume="yes">
+          <param>${${uninstall_property}}</param>
+        </drush>
+      </then>
+    </if>
   </target>
 
 </project>

template/composer.json

@@ -8,6 +8,7 @@
         }
     ],
     "require": {
+
         "cweagans/composer-patches":                  "dev-master#5456199acdcc16b243814aa45259f4c56272a634 as 1.5.0",
         "drupal/acquia_connector":                    "^8.1.5",
         "drupal/acsf":                                "^8.1.32",