Update phive phars with correct version and update scripts to use both

new "-c" switch for all checking scripts to swtich to the composer version from the phive installed version NOTE: phpstan plugins only work in the composer version. Default is the phive version
2026-01-06 18:15:50 +09:00
parent c5fed66237
commit b8c0aff975
4 changed files with 58 additions and 11 deletions
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^10.3.5" installed="10.5.60" location="./tools/phpunit" copy="false"/>
-  <phar name="phpcbf" version="^3.7.2" installed="3.13.5" location="./tools/phpcbf" copy="false"/>
-  <phar name="phpcs" version="^3.10.3" installed="3.13.5" location="./tools/phpcs" copy="false"/>
+  <phar name="phpunit" version="~9.6" installed="9.6.31" location="./tools/phpunit" copy="false"/>
+  <phar name="phpcbf" version="4" installed="4.0.1" location="./tools/phpcbf" copy="false"/>
+  <phar name="phpcs" version="4" installed="4.0.1" location="./tools/phpcs" copy="false"/>
  <phar name="phpstan" version="^2.0" installed="2.1.33" location="./tools/phpstan" copy="false"/>
  <phar name="phan" version="^5.4.3" installed="5.5.2" location="./tools/phan" copy="false"/>
-  <phar name="psalm" version="^5.15.0" installed="5.26.1" location="./tools/psalm" copy="false"/>
+  <phar name="psalm" version="^5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
  <phar name="phpdox" version="^0.12.0" installed="0.12.0" location="./tools/phpdox" copy="false"/>
  <phar name="phpdocumentor" version="^3.4.2" installed="3.9.1" location="./tools/phpDocumentor" copy="false"/>
  <phar name="php-cs-fixer" version="^3.34.1" installed="3.92.4" location="./tools/php-cs-fixer" copy="false"/>
--- a/4dev/checking/phan.sh
+++ b/4dev/checking/phan.sh
@@ -16,6 +16,7 @@ Available options:

 -h, --help        Print this help and exit
 -p, --php VERSION Chose PHP version in the form of "N.N", if not found will exit
+-c, --composer    Use composer version and not the default phives bundle
 EOF
 	exit
 }
@@ -33,12 +34,17 @@ if [ -z "${DEFAULT_PHP_VERSION}" ]; then
 fi;
 php_version="";
 no_php_version=0;
+use_composer=0;
 while [ -n "${1-}" ]; do
 	case "${1}" in
 		-p | --php)
 			php_version="${2-}";
 			shift
 			;;
+		-c | --composer)
+			use_composer=1;
+			shift
+			;;
 		-h | --help)
 			usage
 			;;
@@ -55,6 +61,11 @@ if [ -z "${php_version}" ]; then
 fi;
 php_bin="${PHP_BIN_PATH}${php_version}";
 echo "Use PHP Version: ${php_version}";
+if [ "${use_composer}" -eq 1 ]; then
+	echo "Use composer installed phan";
+else
+	echo "Use phan installed via phives";
+fi;

 if [ ! -f "${php_bin}" ]; then
 	echo "Set php ${php_bin} does not exist";
@@ -66,7 +77,13 @@ cd "$BASE_PATH" || exit;
 export PHAN_DISABLE_XDEBUG_WARN=1;
 PHAN_CALL=(
 	"${php_bin}"
-	"${BASE_PATH}tools/phan"
+);
+if [ "${use_composer}" -eq 1 ]; then
+	PHAN_CALL+=("${BASE_PATH}vendor/bin/phan");
+else
+	PHAN_CALL+=("${BASE_PATH}tools/phan");
+fi;
+PHAN_CALL+=(
 	"--progress-bar"
 	"-C"
 	"--analyze-twice"
--- a/4dev/checking/phpstan.sh
+++ b/4dev/checking/phpstan.sh
@@ -16,6 +16,7 @@ Available options:

 -h, --help        Print this help and exit
 -p, --php VERSION Chose PHP version in the form of "N.N", if not found will exit
+-c, --composer    Use composer version and not the default phives bundle
 EOF
 	exit
 }
@@ -33,12 +34,17 @@ if [ -z "${DEFAULT_PHP_VERSION}" ]; then
 fi;
 php_version="";
 no_php_version=0;
+use_composer=0;
 while [ -n "${1-}" ]; do
 	case "${1}" in
 		-p | --php)
 			php_version="${2-}";
 			shift
 			;;
+		-c | --composer)
+			use_composer=1;
+			shift
+			;;
 		-h | --help)
 			usage
 			;;
@@ -55,6 +61,11 @@ if [ -z "${php_version}" ]; then
 fi;
 php_bin="${PHP_BIN_PATH}${php_version}";
 echo "Use PHP Version: ${php_version}";
+if [ "${use_composer}" -eq 1 ]; then
+	echo "Use composer installed phan";
+else
+	echo "Use phan installed via phives";
+fi;

 if [ ! -f "${php_bin}" ]; then
 	echo "Set php ${php_bin} does not exist";
@@ -65,8 +76,12 @@ BASE_PATH=$(pwd)"/";
 cd "$BASE_PATH" || exit;
 PHPSTAN_CALL=(
 	"${php_bin}"
-	"${BASE_PATH}tools/phpstan"
 );
+if [ "${use_composer}" -eq 1 ]; then
+	PHPSTAN_CALL+=("${BASE_PATH}vendor/bin/phpstan");
+else
+	PHPSTAN_CALL+=("${BASE_PATH}tools/phpstan");
+fi;
 "${PHPSTAN_CALL[@]}";
 if [ "${no_php_version}" -eq 0 ]; then
 	echo "*** CALLED WITH PHP ${php_bin} ***";
--- a/4dev/checking/phpunit.sh
+++ b/4dev/checking/phpunit.sh
@@ -15,8 +15,9 @@ If -p is not set, the default intalled PHP is used.
 Available options:

 -h, --help        Print this help and exit
-t, --testdox     Enable testdox output for phpunit
+-t, --testdox     Enable testdox output for PHPunit
 -v, --verbose     Enable verbose output for PHPunit
+-c, --composer    Use composer version and not the default phives bundle
 -p, --php VERSION Chose PHP version in the form of "N.N", if not found will exit
 EOF
 	exit
@@ -45,6 +46,7 @@ opt_testdox="";
 opt_verbose="";
 php_version="";
 no_php_version=0;
+use_composer=0;
 while [ -n "${1-}" ]; do
 	case "${1}" in
 		-t | --testdox)
@@ -53,6 +55,10 @@ while [ -n "${1-}" ]; do
 		-v | --verbose)
 			opt_verbose="--verbose";
 			;;
+		-c | --composer)
+			use_composer=1;
+			shift
+			;;
 		-p | --php)
 			php_version="${2-}";
 			shift
@@ -74,6 +80,11 @@ if [ -z "${php_version}" ]; then
 fi;
 php_bin="${PHP_BIN_PATH}${php_version}";
 echo "Use PHP Version: ${php_version}";
+if [ "${use_composer}" -eq 1 ]; then
+	echo "Use composer installed phan";
+else
+	echo "Use phan installed via phives";
+fi;

 if [ ! -f "${php_bin}" ]; then
 	echo "Set php ${php_bin} does not exist";
@@ -83,14 +94,18 @@ fi;
 # Note 4dev/tests/bootstrap.php has to be set as bootstrap file in phpunit.xml
 PHPUNIT_CALL=(
 	"${php_bin}"
-	"${BASE_PATH}vendor/bin/phpunit"
+);
+if [ "${use_composer}" -eq 1 ]; then
+	PHPUNIT_CALL+=("${BASE_PATH}vendor/bin/phpunit");
+else
+	PHPUNIT_CALL+=("${BASE_PATH}tools/phpunit");
+fi;
+PHPUNIT_CALL+=(
 	"${opt_testdox}"
 	"${opt_verbose}"
 	"-c" "${PHPUNIT_CONFIG}"
 	"${BASE_PATH}4dev/tests/"
-)
-# phpunit_call="${php_bin}${BASE_PATH}vendor/bin/phpunit ${opt_testdox} ${opt_verbose} -c ${PHPUNIT_CONFIG} ${BASE_PATH}4dev/tests/";
-# ${phpunit_call};
+);
 "${PHPUNIT_CALL[@]}" || exit;

 echo -e "\nPHPUnit Config: ${PHPUNIT_CONFIG}";