20230329 Fix CI build breakage. 6

         Related Issue(s) #155 #158 #159 #162

composer.json

@@ -41,7 +41,7 @@
 		"pear/mail": ">=1.4.1"
 	},
 	"require-dev": {
-		"phpunit/phpunit": ">=5.7.28",
+		"phpunit/phpunit": ">=5.7.28 || ">=4.8.19",
 		"php-coveralls/php-coveralls": "^2.1 || ^1.1",
 		"phpunit/phpcov": "^4.0 || ^3.0 || ^2.0"
 	}

tests/composer.sh

@@ -26,19 +26,11 @@ echo -n "PHP Composer install "
 if [ "$Composer" = "1" ]; then
 	if [ "$TRAVIS" == "true" ]; then # Only install on travis
 		echo "started."
-#		echo "Download"
 		curl -s http://getcomposer.org/installer | $ph
-#		$ph -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-#		echo "Setup"
-#		$ph composer-setup.php --disable-tls --2
 	else
 		echo "supported. Would install on CI."
 	fi
 	px="$ph $pu.phar"
-#	if [ "$PHVM" == "5" ] && [ "$PHVm" == "3" ]; then # Issue #155
-#		$px config --global disable-tls true
-#		$px config --global secure-http false
-#	fi
 elif [ "$Composer" = "2" ]; then
 	echo "not necessary, using system."
 	px=$pu

tests/setupenv.sh

@@ -142,16 +142,11 @@ if [ "$Composer" \< "1" ]; then # Can we install it?
 			export COMPOSER_MEMORY_LIMIT=2G
 			if [ "$pvM" == "5" ] && [ "$pvm" == "3" ]; then
 				# Update CA Bundle on PHP 5.3x Issue #155
-				# On travis-ci the certificates in the preinstalled
+				# On travis-ci the certificates in the installed
 				# ca-certificates package have expired.
 				dc="wget -nv --no-check-certificate http://curl.se/ca/cacert.pem"
 				dl=/usr/local/share/ca-certificates
-				sudo $dc -O $dl/cabundle.crt
-				# Add Ubuntu Trusty repo.
-#				sudo add-apt-repository -y deb http://us.archive.ubuntu.com/ubuntu/ trusty
-#				sudo apt-get -q update
-#				sudo apt-get install apt-transport-https ca-certificates -y
-#				sudo apt-get install ca-certificates -y
+				sudo $dc -O $dl/new-ca-bundle.crt
 				sudo update-ca-certificates -f # Update system ca-certs
 			fi
 			if [ "$SafeMode" == "1" ]; then # Safe mode, Install composer.
@@ -188,13 +183,13 @@ ADODl=archive
 ADOFilePfx=v
 ADOFileSfx=.tar.gz
 if [ "$pvM" \> "7" ]; then # PHP 8x
-	ADODBVer=5.20.20
+	ADODBVer=5.20.21
 	if [ "$1" == "" ] && [ "$TRAVIS" == "true" ]; then
 		ADODBPATH="ADOdb-$ADODBVer"
 	fi
 elif [ "$pvM" \> "5" ]; then # PHP 7x
 	if [ "$pvm" \> "2" ]; then # PHP 7.3+
-		ADODBVer=5.20.18
+		ADODBVer=5.20.19
 	elif [ "$pvm" \> "1" ]; then # PHP 7.2+
 		ADODBVer=5.20.13
 	else
@@ -205,7 +200,7 @@ elif [ "$pvM" \> "5" ]; then # PHP 7x
 	fi
 elif [ "$pvM" \> "4" ]; then # PHP 5x
 	if [ "$pvm" \> "2" ]; then # PHP 5.3+
-		ADODBVer=5.17
+		ADODBVer=5.18
 	else
 		ADODBVer=5.01beta
 	fi