20230402 Fix CI build breakage.

Related Issue(s) #158 #159 #162 #163
NathanGibbs3 · Apr 2, 2023 · 4daad54 · 4daad54
1 parent 069ca68
commit 4daad54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/tests/php/iauth_AuthorizedxTest.php b/tests/php/iauth_AuthorizedxTest.php
@@ -246,6 +246,7 @@ public function testAuthorizedURISetOK(){
 			if (
 				( $version[0] == 5 && $version[1] == 3 )
 				|| ( $version[0] == 7 && $version[1] == 2 )
+				|| ( $version[0] == 7 && $version[1] == 3 )
 			){ // Composer Installed PHPUnit
 				$tmp = 'vendor';
 			}else{ // System PHPUnit

diff --git a/tests/phpunit.sh b/tests/phpunit.sh
@@ -50,6 +50,9 @@ else
 	elif [ "$PHVM" == "7" ] && [ "$PHVm" == "2" ]; then # Issue #154
 		pi=Composer
 		px="$ph vendor/bin/$pu"
+	elif [ "$PHVM" == "7" ] && [ "$PHVm" == "3" ]; then # Issue #159
+		pi=Composer
+		px="$ph vendor/bin/$pu"
 	else
 		pi=System
 		px=$pu

diff --git a/tests/setupenv.sh b/tests/setupenv.sh
@@ -203,7 +203,7 @@ elif [ "$pvM" \> "5" ]; then # PHP 7x
 	fi
 elif [ "$pvM" \> "4" ]; then # PHP 5x
 	if [ "$pvm" \> "2" ]; then # PHP 5.3+
-		ADODBVer=5.20.8
+		ADODBVer=5.20.9
 	else
 		ADODBVer=5.01beta
 	fi
@@ -254,13 +254,16 @@ else # Branch Mode
 	echo -n "branch $GHBranch"
 	ADOFile=$GHBranch
 	ADODl=tarball
-	ADODBPATH=ADOdb-ADOdb-*
 fi
 echo " from: https://$ADOSrc"
 if [ "$1" == "" ] && [ "$TRAVIS" == "true" ]; then
+	echo "Creating Build ADOdb Directory: `pwd`/build/adodb"
 	mkdir -p build/adodb
 	wget -nv https://$ADOSrc/$ADODl/$ADOFile -O build/adodb.tgz
 	tar -C build/adodb -zxf build/adodb.tgz
+	if [ "$GHMode" == "branch" ]; then
+		ADODBPATH=`ls build/adodb`
+	fi
 	export ADODBPATH=$ADODBPATH
 	RFADODBPATH="build/adodb/$ADODBPATH"
 else