Merge remote-tracking branch 'origin/master'

Author: Greg Bowler

README.md

@@ -60,6 +60,8 @@ Any arbitrary arguments can be passed to composer by using the `args` input, how
 + `quiet` - Whether to suppress all messages - yes / no (default no)
 + `args` - Optional arguments to pass - no constraints (default _empty_)
 + `only_args` - Only run the desired command with this args. Ignoring all other provided arguments(default _empty_)
++ `php_version` - Choose which version of PHP you want to use (7.1, 7.2, 7.3, 7.4 or 8.0)
++ `composer_version` - Choose which version of Composer you want to use (1 or 2)
 
 There are also SSH input available: `ssh_key`, `ssh_key_pub` and `ssh_domain` that are used for depending on private repositories. See below for more information on usage.
 

action.yml

@@ -72,6 +72,8 @@ runs:
   using: 'docker'
   image: 'Dockerfile'
   env:
+    action_php_version: ${{ inputs.php_version }}
+    action_composer_version: ${{ inputs.composer_version }}
     action_command: ${{ inputs.command }}
     action_only_args: ${{ inputs.only_args }}
     action_interaction: ${{ inputs.interaction }}