diff --git a/bin/composer_install.sh b/bin/composer_install.sh index 41e84f5..191b706 100755 --- a/bin/composer_install.sh +++ b/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 diff --git a/tests/expect/composer_install_01.exp b/tests/expect/composer_install_01.exp index f95b1f3..cebb2d8 100755 --- a/tests/expect/composer_install_01.exp +++ b/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 diff --git a/tests/expect/composer_install_02.exp b/tests/expect/composer_install_02.exp index d5e8e77..9fc8bd9 100755 --- a/tests/expect/composer_install_02.exp +++ b/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 diff --git a/tests/expect/composer_install_03.exp b/tests/expect/composer_install_03.exp index 82b4c58..91c5469 100755 --- a/tests/expect/composer_install_03.exp +++ b/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 diff --git a/tests/expect/composer_install_04.exp b/tests/expect/composer_install_04.exp index 9d0fef4..af9fa20 100755 --- a/tests/expect/composer_install_04.exp +++ b/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 diff --git a/tests/expect/composer_install_05.exp b/tests/expect/composer_install_05.exp index 26b9f64..b2732dc 100755 --- a/tests/expect/composer_install_05.exp +++ b/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 diff --git a/tests/expect/composer_install_06.exp b/tests/expect/composer_install_06.exp index 18486f3..c9e45ed 100755 --- a/tests/expect/composer_install_06.exp +++ b/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 diff --git a/tests/expect/composer_install_07.exp b/tests/expect/composer_install_07.exp index 3b2747d..ca2b5b6 100755 --- a/tests/expect/composer_install_07.exp +++ b/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 diff --git a/tests/expect/composer_install_08.exp b/tests/expect/composer_install_08.exp index fad6e1a..2678767 100755 --- a/tests/expect/composer_install_08.exp +++ b/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 diff --git a/tests/expect/composer_install_09.exp b/tests/expect/composer_install_09.exp index e7dfdec..4d030f7 100755 --- a/tests/expect/composer_install_09.exp +++ b/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 diff --git a/tests/expect/composer_install_10.exp b/tests/expect/composer_install_10.exp index ab236fa..20324af 100755 --- a/tests/expect/composer_install_10.exp +++ b/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 diff --git a/tests/expect/composer_install_11.exp b/tests/expect/composer_install_11.exp index 07e699b..5db0e60 100755 --- a/tests/expect/composer_install_11.exp +++ b/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 diff --git a/tests/expect/composer_install_12.exp b/tests/expect/composer_install_12.exp index d083ca6..35763ec 100755 --- a/tests/expect/composer_install_12.exp +++ b/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 diff --git a/tests/expect/composer_install_13.exp b/tests/expect/composer_install_13.exp index 6e21b27..a6f84c4 100755 --- a/tests/expect/composer_install_13.exp +++ b/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 diff --git a/tests/expect/composer_install_14.exp b/tests/expect/composer_install_14.exp index 32a2ce1..9fa7d07 100755 --- a/tests/expect/composer_install_14.exp +++ b/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 diff --git a/tests/expect/composer_install_15.exp b/tests/expect/composer_install_15.exp index dab1d81..af1c715 100755 --- a/tests/expect/composer_install_15.exp +++ b/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 diff --git a/tests/expect/composer_install_16.exp b/tests/expect/composer_install_16.exp index 7143a06..f2bb343 100755 --- a/tests/expect/composer_install_16.exp +++ b/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 diff --git a/tests/expect/composer_install_17.exp b/tests/expect/composer_install_17.exp index 18ff7fc..93cf0bf 100755 --- a/tests/expect/composer_install_17.exp +++ b/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 diff --git a/tests/expect/composer_install_18.exp b/tests/expect/composer_install_18.exp index b862436..77a0440 100755 --- a/tests/expect/composer_install_18.exp +++ b/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 diff --git a/tests/expect/composer_install_19.exp b/tests/expect/composer_install_19.exp index ca326de..398c24e 100755 --- a/tests/expect/composer_install_19.exp +++ b/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"