test: add PHP path back to command, as well as debug message

bin/composer_install.sh

@@ -28,6 +28,6 @@ if [ -n "${working_directory}" ]; then
     composer_options+=("--working-dir" "${working_directory}")
 fi
 
-full_command="${composer_path} ${composer_command} ${composer_options[*]}"
+full_command="${php_path} ${composer_path} ${composer_command} ${composer_options[*]}"
 echo "::debug::Using the following Composer command: '${full_command}'"
 $full_command

tests/expect/composer_install_01.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "" "" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi'"
 expect "Installing dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_02.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "lowest" "" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable'"
 expect "Updating dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_03.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "highest" "" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi'"
 expect "Updating dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_04.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "locked" "" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi'"
 expect "Installing dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_05.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "" "--ignore-platform-reqs --optimize-autoloader" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader'"
 expect "Installing dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_06.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "lowest" "--ignore-platform-reqs --optimize-autoloader" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable --ignore-platform-reqs --optimize-autoloader'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable --ignore-platform-reqs --optimize-autoloader'"
 expect "Updating dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_07.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "highest" "--ignore-platform-reqs --optimize-autoloader" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader'"
 expect "Updating dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_08.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "locked" "--ignore-platform-reqs --optimize-autoloader" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader'"
 expect "Installing dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_09.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "" "" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi --working-dir ../fixtures/with-lock-file'"
 expect "Installing dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_10.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "lowest" "" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable --working-dir ../fixtures/with-lock-file'"
 expect "Updating dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_11.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "highest" "" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --working-dir ../fixtures/with-lock-file'"
 expect "Updating dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_12.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "locked" "" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi --working-dir ../fixtures/with-lock-file'"
 expect "Installing dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_13.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "" "--ignore-platform-reqs --optimize-autoloader" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
 expect "Installing dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_14.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "lowest" "--ignore-platform-reqs --optimize-autoloader" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --prefer-lowest --prefer-stable --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
 expect "Updating dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_15.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "highest" "--ignore-platform-reqs --optimize-autoloader" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
 expect "Updating dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_16.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "locked" "--ignore-platform-reqs --optimize-autoloader" "../fixtures/with-lock-file" "" "" "../fixtures/with-lock-file/composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi --ignore-platform-reqs --optimize-autoloader --working-dir ../fixtures/with-lock-file'"
 expect "Installing dependencies"
 expect "Generating optimized autoload files"
 expect eof

tests/expect/composer_install_17.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "foobar" "" "" "" "" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer install --no-interaction --no-progress --ansi'"
+expect "::debug::Using the following Composer command: '*/php */composer install --no-interaction --no-progress --ansi'"
 expect "Installing dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_18.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "" "" "" "" "../fixtures/composer.phar" "composer.lock"
 match_max 100000
 
-expect "::debug::Using the following Composer command: '../fixtures/composer.phar install --no-interaction --no-progress --ansi'"
+expect "::debug::Using the following Composer command: '*/php ../fixtures/composer.phar install --no-interaction --no-progress --ansi'"
 expect "Installing dependencies"
 expect "Generating autoload files"
 expect eof

tests/expect/composer_install_19.exp

@@ -4,7 +4,7 @@ set timeout 3
 spawn ../../bin/composer_install.sh "" "" "../fixtures/no-lock-file" "" "" ""
 match_max 100000
 
-expect "::debug::Using the following Composer command: '*/composer update --no-interaction --no-progress --ansi --working-dir ../fixtures/no-lock-file'"
+expect "::debug::Using the following Composer command: '*/php */composer update --no-interaction --no-progress --ansi --working-dir ../fixtures/no-lock-file'"
 expect "Updating dependencies"
 expect "Writing lock file"
 expect "Generating autoload files"