Skip to content

Commit

Permalink
test: add PHP path back to command, as well as debug message
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Dec 31, 2021
1 parent 3c51967 commit f680dac
Show file tree
Hide file tree
Showing 20 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion bin/composer_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/expect/composer_install_01.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_02.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_03.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_04.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_05.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_06.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_07.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_08.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_09.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_10.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_11.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_12.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_13.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_14.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_15.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_16.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_17.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_18.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/expect/composer_install_19.exp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f680dac

Please sign in to comment.