Update ci/cd scripts

Author: samlitowitz

scripts/build-and-verify-cli-images.sh

@@ -34,7 +34,7 @@ for i in ./build/*/; do
 	echo "${text_bold}* Building ${image} ${text_normal}"
 
 	# Builds image and check for return code
-	if [ "$(docker build --pull -t "${image}" "./build/${version}")" -eq 0 ]; then
+	if ! docker build --pull -t "${image}" "./build/${version}"; then
 		echo "${text_bold}${text_red}* ERROR when building ${image} ${text_normal}"
 		exit 1
 	fi
@@ -46,7 +46,5 @@ for i in ./build/*/; do
 	  --workdir /app \
 	  --entrypoint php \
 	  "${image}" test-xdebug-install.php
-
-	exit 0
 done
 

scripts/git-has-changes.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
-if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
+if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
   exit 1
 fi

scripts/test-xdebug-install.php

@@ -1,21 +1,20 @@
 <?php
 
-function testPhpinfo() {
-    ob_start();
-    phpinfo();
-    $phpinfo = ob_get_flush();
+function checkExtensionLoaded() {
+    if (!extension_loaded('xdebug')) {
+        exit(1);
+    }
 }
 
-function testVardump() {
-
-}
-
-function testXdebugIsDebuggerActive() {
-    // xdebug_is_debugger_active
-    // https://xdebug.org/docs/all_functions#xdebug_is_debugger_active
+function checkXdebugIsDebuggerActive() {
+    if (!function_exists('xdebug_is_debugger_active')) {
+        exit(1);
+    }
+    $result = xdebug_is_debugger_active();
+    if (!is_bool($result)) {
+        exit(1);
+    }
 }
 
-
-
-
-// https://stackoverflow.com/questions/14046501/check-if-xdebug-is-working
+checkExtensionLoaded();
+checkXdebugIsDebuggerActive();