Merge branch '17-php-versions'

Author: Greg Bowler

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+# These are supported funding model platforms
+github: [g105b]

Dockerfile

@@ -1,10 +1,20 @@
-FROM composer:1.10
+FROM ghcr.io/php-actions/php-build:v1
 
 LABEL version="1.0.0"
 LABEL repository="https://github.com/php-actions/phpunit"
 LABEL homepage="https://github.com/php-actions/phpunit"
 LABEL maintainer="Greg Bowler <[email protected]>"
 
-RUN composer global require --no-progress phpunit/phpunit 9.*
+RUN curl https://phar.phpunit.de/phpunit-9.4.2.phar > phpunit-9.phar
+RUN curl https://phar.phpunit.de/phpunit-8.5.8.phar > phpunit-8.phar
+RUN curl https://phar.phpunit.de/phpunit-7.5.9.phar > phpunit-7.phar
+RUN curl https://phar.phpunit.de/phpunit-6.5.9.phar > phpunit-6.phar
+RUN chmod +x *.phar
+RUN ln -s $(pwd)/phpunit-9.phar /usr/local/bin/phpunit-9
+RUN ln -s $(pwd)/phpunit-8.phar /usr/local/bin/phpunit-8
+RUN ln -s $(pwd)/phpunit-7.phar /usr/local/bin/phpunit-7
+RUN ln -s $(pwd)/phpunit-6.phar /usr/local/bin/phpunit-6
+RUN ln -s /usr/local/bin/phpunit-9 /usr/local/bin/phpunit
+COPY switch-phpunit-version /usr/local/bin/.
 COPY entrypoint /usr/local/bin/entrypoint
 ENTRYPOINT ["/usr/local/bin/entrypoint"]

README.md

@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: php-actions/composer@v1 # or alternative dependency management
-    - uses: php-actions/phpunit@v9
+    - uses: php-actions/phpunit@v1
     # ... then your own project steps ...
 ```
 
@@ -42,6 +42,8 @@ The following configuration options are available:
 + `junit` Path to junit output file (default: `test/phpunit/_junit/junit.xml`)
 + `memory` The memory limit to run your tests with (default: `512M`)
 + `bootstrap` The path to the bootstrap file (default: `vendor/autoload.php`)
++ `php_version` The version of PHP to use e.g. `7.4` (default: latest)
++ `phpunit_version` The version of PHPUnit to use e.g. `9` or `9.4.2` (default: latest)
 
 The syntax for passing in a custom input is the following:
 
@@ -54,7 +56,7 @@ jobs:
     ...
 
     - name: PHPUnit tests
-      uses: php-actions/phpunit@v9
+      uses: php-actions/phpunit@v1
       with:
         configuration: custom/path/to/phpunit.xml
         memory_limit: 256M
@@ -65,16 +67,13 @@ If you require other configurations of phpunit, please request them in the [Gith
 Versions
 --------
 
-The Github Actions version numbers are in sync with the PHPUnit version. This allows you to specify which version of PHPUnit your project should run by using the @ syntax.
+Previously, the Github Actions release version numbers were in sync with the PHPUnit version, but this imposed too many limitations. For the next 12 months, v7, v8 and v9 branches will still point to their existing commits, but we have reverted to v1-based Actions releases, allowing PHPUnit version number to be specified from your configuration, using the `phpunit_version` input variable.
 
-Current versions supported by this Action:
+Any PHPUnit version available from https://phar.phpunit.de/ are supported.
 
-+ 9.*
-+ 8.*
+Please note the version number specified within your Action configuration must match your composer.json major version number. For example, if your composer.json requires `phpunit/phpunit 8.5.8`, you must use `phpunit_version: 8.5.8`, as major versions of PHPUnit are incompatible with each other.  
 
-Please note **the version number of the Github Action must match your composer.json major version number**. For example, if your composer.json requires `phpunit/phpunit 8.5.8`, you must use `php-actions/phpunit@v8`, as major versions of PHPUnit are incompatible with each other.  
-
-If you require a specific version that is not listed here, please request them in the [Github issue tracker](https://github.com/php-actions/phpunit/issues)
+If you require a specific version that is not compatible with Github Actions for some reason, please make a request in the [Github issue tracker](https://github.com/php-actions/phpunit/issues).
 
 If you found this repository helpful, please consider [sponsoring the developer][sponsor].
 

action.yml

@@ -2,6 +2,16 @@ name: PHPUnit (php-actions)
 description: Run your PHPUnit tests in your Github Actions.
 
 inputs:
+  php_version:
+    description: What version of PHP to use
+    default: latest
+    required: false
+
+  phpunit_version:
+    description: What version of PHPUnit to use
+    default: latest
+    required: false
+
   configuration:
     description: Configuration file location
     required: false
@@ -67,6 +77,8 @@ runs:
   using: 'docker'
   image: 'Dockerfile'
   env:
+    action_php_version: ${{ inputs.php_version }}
+    action_phpunit_version: ${{ inputs.phpunit_version }}
     action_configuration: ${{ inputs.configuration }}
     action_log_junit: ${{ inputs.log_junit }}
     action_testdox_html: ${{ inputs.testdox_html }}

entrypoint

@@ -2,77 +2,89 @@
 set -e
 PATH=/tmp/vendor/bin:$PATH
 
+if [ -n "$action_php_version" ]
+then
+	echo "Using PHP version: $action_php_version"
+	switch-php-version $action_php_version
+fi
+
+if [ -n "$action_phpunit_version" ]
+then
+	echo "Using PHPUnit version: $action_phpunit_version"
+	switch-phpunit-version $action_phpunit_version
+fi
+
 command_string="phpunit"
 
 if [ -n "$action_configuration" ]
 then
-				command_string="$command_string --configuration '$action_configuration'"
+	command_string="$command_string --configuration '$action_configuration'"
 fi
 
 if [ -n "$action_log_junit" ]
 then
-				command_string="$command_string --log-junit '$action_log_junit'"
+	command_string="$command_string --log-junit '$action_log_junit'"
 fi
 
 if [ -n "$action_testdox_html" ]
 then
-				command_string="$command_string --testdox-html '$action_testdox_html'"
+	command_string="$command_string --testdox-html '$action_testdox_html'"
 fi
 
 if [ -n "$action_testdox_text" ]
 then
-				command_string="$command_string --testdox-text '$action_testdox_text'"
+	command_string="$command_string --testdox-text '$action_testdox_text'"
 fi
 
 if [ -n "$action_testdox_xml" ]
 then
-				command_string="$command_string --testdox-xml '$action_testdox_xml'"
+	command_string="$command_string --testdox-xml '$action_testdox_xml'"
 fi
 
 if [ -n "$action_bootstrap" ]
 then
-				command_string="$command_string --bootstrap '$action_bootstrap'"
+	command_string="$command_string --bootstrap '$action_bootstrap'"
 fi
 
 if [ -n "$action_filter" ]
 then
-				command_string="$command_string --filter '$action_filter'"
+	command_string="$command_string --filter '$action_filter'"
 fi
 
 if [ -n "$action_testsuite" ]
 then
-				command_string="$command_string --testsuite '$action_testsuite'"
+	command_string="$command_string --testsuite '$action_testsuite'"
 fi
 
 if [ -n "$action_group" ]
 then
-				command_string="$command_string --group '$action_group'"
+	command_string="$command_string --group '$action_group'"
 fi
 
 if [ -n "$action_exclude_group" ]
 then
-				command_string="$command_string --exclude-group '$action_exclude_group'"
+	command_string="$command_string --exclude-group '$action_exclude_group'"
 fi
 
 if [ -n "$action_test_suffix" ]
 then
-				command_string="$command_string --test-suffix '$action_test_suffix'"
+	command_string="$command_string --test-suffix '$action_test_suffix'"
 fi
 
 if [ -n "$action_whitelist" ]
 then
-				command_string="$command_string --whitelist '$action_whitelist'"
+	command_string="$command_string --whitelist '$action_whitelist'"
 fi
 
 if [ -n "$action_memory_limit" ]
 then
-				command_string="$command_string -d memory_limit=$action_memory_limit"
+	command_string="$command_string -d memory_limit=$action_memory_limit"
 fi
 
 if [ -n "$action_args" ]
 then
-				command_string="$command_string $action_args"
+	command_string="$command_string $action_args"
 fi
 
 echo "Command: $command_string"
-eval "$command_string"
+eval "$command_string"

switch-phpunit-version

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = "latest" ]
+then
+	version=9
+else
+	version=$1
+fi
+
+phpunit_bin="/usr/local/bin/phpunit-$version"
+
+if test -f $phpunit_bin
+then
+	rm -f /usr/local/bin/phpunit
+	ln -s "$phpunit_bin" "/usr/local/bin/phpunit"
+	echo "Successfully linked $phpunit_bin"
+else
+	echo "Error linking $phpunit_bin: version doesn't exit"
+	exit 1
+fi