Merge pull request #406 from cytopia/intranet-drush-versions

#401 Fix display of drush versions
cytopia · Nov 1, 2018 · 0188970 · 0188970
2 parents 14cd1f0 + 7769e34
commit 0188970
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/.devilbox/www/htdocs/_ajax_callback.php b/.devilbox/www/htdocs/_ajax_callback.php
@@ -48,9 +48,19 @@
 				$_GET['software'] => (($version = loadClass('Php')->getDrupalConsoleVersion()) !== false) ? $version : $no
 			));
 		}
-		else if ($_GET['software'] == 'drush') {
+		else if ($_GET['software'] == 'drush7') {
 			echo json_encode(array(
-				$_GET['software'] => (($version = loadClass('Php')->getDrushVersion()) !== false) ? $version : $no
+				$_GET['software'] => (($version = loadClass('Php')->getDrushVersion(7)) !== false) ? $version : $no
+			));
+		}
+		else if ($_GET['software'] == 'drush8') {
+			echo json_encode(array(
+				$_GET['software'] => (($version = loadClass('Php')->getDrushVersion(8)) !== false) ? $version : $no
+			));
+		}
+		else if ($_GET['software'] == 'drush9') {
+			echo json_encode(array(
+				$_GET['software'] => (($version = loadClass('Php')->getDrushVersion(9)) !== false) ? $version : $no
 			));
 		}
 		else if ($_GET['software'] == 'git') {

diff --git a/.devilbox/www/htdocs/index.php b/.devilbox/www/htdocs/index.php
@@ -391,8 +391,16 @@
 										<td id="app_drupalc"></td>
 									</tr>
 									<tr>
-										<th>drush</th>
-										<td id="app_drush"></td>
+										<th>drush7</th>
+										<td id="app_drush7"></td>
+									</tr>
+									<tr>
+										<th>drush8</th>
+										<td id="app_drush8"></td>
+									</tr>
+									<tr>
+										<th>drush9</th>
+										<td id="app_drush9"></td>
 									</tr>
 									<tr>
 										<th>git</th>
@@ -907,7 +915,9 @@ function updateVersions(app) {
 			}
 			updateVersions('composer');
 			updateVersions('drupalc');
-			updateVersions('drush');
+			updateVersions('drush7');
+			updateVersions('drush8');
+			updateVersions('drush9');
 			updateVersions('git');
 			updateVersions('laravel');
 			updateVersions('mds');

diff --git a/.devilbox/www/include/lib/container/Php.php b/.devilbox/www/include/lib/container/Php.php
@@ -45,9 +45,9 @@ public function getComposerVersion()
 		$output = loadClass('Helper')->exec('composer --version', $output);
 		return loadClass('Helper')->egrep('/[0-9.]+/', $output);
 	}
-	public function getDrushVersion()
+	public function getDrushVersion($version)
 	{
-		$output = loadClass('Helper')->exec('drush --version', $output);
+		$output = loadClass('Helper')->exec('drush'.$version.' --version', $output);
 		return loadClass('Helper')->egrep('/[0-9.]+/', $output);
 	}
 	public function getDrupalConsoleVersion()