Merge pull request #166 from stronk7/better_code_coverage

Use pcov => xdebug => phpdbg for phpunit code coverage

Author: stronk7

.github/workflows/test.yml

@@ -15,7 +15,9 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: 7.3
-        coverage: none
+        # We want to verify that xdebug works for coverage. Once we only support
+        # Moodle 3.10/PHPUnit 8 and up, we can switch our tests to pcov too.
+        coverage: xdebug
 
     - name: Initialise
       run: make init
@@ -65,7 +67,9 @@ jobs:
       with:
         php-version: ${{ matrix.php }}
         extensions: pgsql, zip, gd, xmlrpc, soap
-        coverage: none
+        # We want to verify that xdebug works for coverage. Once we only support
+        # Moodle 3.10/PHPUnit 8 and up, we can switch our tests to pcov too.
+        coverage: xdebug
 
     - name: Initialise moodle-plugin-ci
       run: |

.travis.dist.yml

@@ -28,7 +28,10 @@ env:
 before_install:
   - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
   - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  # Don't disable xdebug if you want to get it used for code coverage.
   - phpenv config-rm xdebug.ini
+  # Alternative (for Moodle 3.10 and up) is to use pcov. It can be installed using:
+  # - pecl install pcov
   - cd ../..
   - composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"

.travis.yml

@@ -25,7 +25,9 @@ env:
     - MOODLE_BRANCH=master
 
 before_install:
-  - phpenv config-rm xdebug.ini
+  # We want to verify that xdebug works for coverage. Once we only support
+  # Moodle 3.10/PHPUnit 8 and up, we can switch our tests to pcov too.
+  # - phpenv config-rm xdebug.ini
   - make init
   # Mimic how a Moodle plugin would be run.
   - cp -R tests/Fixture/moodle-local_ci ../moodle-local_ci
@@ -55,7 +57,7 @@ script:
   - moodle-plugin-ci mustache
   - moodle-plugin-ci grunt || [ "$MOODLE_BRANCH" == 'MOODLE_38_STABLE' ]
   - moodle-plugin-ci phpdoc
-  - moodle-plugin-ci phpunit --coverage-text --fail-on-warning
+  - moodle-plugin-ci phpunit --verbose --coverage-text --fail-on-warning
   - moodle-plugin-ci behat --profile default
   - moodle-plugin-ci behat --profile chrome
 

Makefile

@@ -19,8 +19,7 @@ test-phpunit: check-init
 validate: check-init psalm check-docs
 	$(FIXER) fix --dry-run --stop-on-violation
 	$(COMPOSER) validate
-	phpdbg --version
-	phpdbg -d memory_limit=-1 -qrr $(PHPUNIT) --coverage-text
+	XDEBUG_MODE=coverage $(PHPUNIT) --verbose --coverage-text
 
 .PHONY:build
 build: build/moodle-plugin-ci.phar

docs/CHANGELOG.md

@@ -9,10 +9,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 The format of this change log follows the advice given at [Keep a CHANGELOG](http://keepachangelog.com).
 
 ## [Unreleased]
+### Added
+- PHPUnit code coverage will now automatically fallback between `pcov` => `xdebug` => `phpdbg`, using the "best" one available in the system. Still, if needed to, any of them can be forced, given all their requirements are fulfilled, using the following new options of the 'phpunit' command: `--coverage-pcov`, `--coverage-xdebug` or `--coverage-phpdbg`.
+- ACTION SUGGESTED: Ensure that the `pcov` or `xdebug` extensions are installed in your environment to get 'moodle-plugin-ci' using them automatically.
 
 ## [3.2.6] - 2022-05-10
-### Changed
-- It is possible to specify more test execution options to the 'phpunit' command, such as "--fail-on-warning"
+### Added
+- It is possible to specify more test execution options to the 'phpunit' command, such as `--fail-on-incomplete`, `--fail-on-risky` and `--fail-on-skipped` and `--fail-on-warning`. For more information, see [PHPUnit documentation](https://phpunit.readthedocs.io).
 
 ### Fixed
 - Locally bundled [moodle-local_codechecker](https://github.com/moodlehq/moodle-local_codechecker) now works ok with recent (Moodle 3.11 and up) branches. A recent change in those versions was causing [some problems](https://tracker.moodle.org/browse/MDL-74704).

docs/CodeCoverage.md

@@ -6,6 +6,8 @@ title: Generating code coverage
 Currently, code coverage is only generated for builds that are running on PHP7 or later.  Code coverage generation
 is significantly faster and easier to produce in PHP7.
 
+Code coverage will now automatically fallback between `pcov` => `xdebug` => `phpdbg`, using the "best" one available in the system. Still, if needed to, any of them can be forced, given all their requirements are fulfilled, using the following new options of the 'phpunit' command: `--coverage-pcov`, `--coverage-xdebug` or `--coverage-phpdbg`.
+
 The way you generate code coverage is to use one of the coverage options on the `phpunit` command.  The currently
 available options are `--coverage-text` and `--coverage-clover`.  The easiest way to start generating code coverage
 is to use the text option as that gets printed in the Travis CI logs.  Example:

docs/GHAFileExplained.md

@@ -54,7 +54,8 @@ jobs:
     # another branch, total number of builds will become 12.
     # If you need to use PHP 7.0 and run phpunit coverage test, make sure you are
     # using ubuntu-16.04 virtual environment in this case to have phpdbg or
-    # this version in the system.
+    # this version in the system. See the "Setup PHP" step below for more details
+    # about PHPUnit code coverage.
     strategy:
       fail-fast: false
       matrix:
@@ -94,6 +95,7 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: ${{ matrix.extensions }}
           ini-values: max_input_vars=5000
+          # none to use phpdbg fallback. Specify pcov (Moodle 3.10 and up) or xdebug to use them instead.
           coverage: none
 
       # Install this project into a directory called "ci", updating PATH and

gha.dist.yml

@@ -46,6 +46,7 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: ${{ matrix.extensions }}
           ini-values: max_input_vars=5000
+          # none to use phpdbg fallback. Specify pcov (Moodle 3.10 and up) or xdebug to use them instead.
           coverage: none
 
       - name: Initialise moodle-plugin-ci

src/Command/PHPUnitCommand.php

@@ -31,6 +31,9 @@ protected function configure()
             ->setDescription('Run PHPUnit on a plugin')
             ->addOption('coverage-text', null, InputOption::VALUE_NONE, 'Generate and print code coverage report in text format')
             ->addOption('coverage-clover', null, InputOption::VALUE_NONE, 'Generate code coverage report in Clover XML format')
+            ->addOption('coverage-pcov', null, InputOption::VALUE_NONE, 'Use the pcov extension to calculate code coverage')
+            ->addOption('coverage-xdebug', null, InputOption::VALUE_NONE, 'Use the xdebug extension to calculate code coverage')
+            ->addOption('coverage-phpdbg', null, InputOption::VALUE_NONE, 'Use the phpdbg binary to calculate code coverage')
             ->addOption('fail-on-incomplete', null, InputOption::VALUE_NONE, 'Treat incomplete tests as failures')
             ->addOption('fail-on-risky', null, InputOption::VALUE_NONE, 'Treat risky tests as failures')
             ->addOption('fail-on-skipped', null, InputOption::VALUE_NONE, 'Treat skipped tests as failures')
@@ -52,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $colors  = $output->isDecorated() ? '--colors="always"' : '';
-        $binary  = $this->resolveBinary($input);
+        $binary  = $this->resolveBinary($input, $output);
         $options = $this->resolveOptions($input);
         $process = $this->execute->passThrough(
             sprintf('%s%s/vendor/bin/phpunit %s %s', $binary, $this->moodle->directory, $colors, $options),
@@ -78,6 +81,9 @@ private function resolveOptions(InputInterface $input)
         if ($this->supportsCoverage() && $input->getOption('coverage-clover')) {
             $options[] = sprintf('--coverage-clover %s/coverage.xml', getcwd());
         }
+        if ($input->getOption('verbose')) {
+            $options[] = '--verbose';
+        }
         foreach (['fail-on-warning', 'fail-on-risky', 'fail-on-skipped', 'fail-on-warning'] as $option) {
             if ($input->getOption($option)) {
                 $options[] = '--'.$option;
@@ -95,11 +101,12 @@ private function resolveOptions(InputInterface $input)
     /**
      * Use phpdbg if we are generating code coverage.
      *
-     * @param InputInterface $input
+     * @param InputInterface  $input
+     * @param OutputInterface $output
      *
      * @return string
      */
-    private function resolveBinary(InputInterface $input)
+    private function resolveBinary(InputInterface $input, OutputInterface $output)
     {
         if (!$this->supportsCoverage()) {
             return '';
@@ -108,7 +115,19 @@ private function resolveBinary(InputInterface $input)
             return '';
         }
 
-        return 'phpdbg -d memory_limit=-1 -qrr ';
+        // Depending on the coverage driver, selected return different values.
+        switch ($this->resolveCoverageDriver($input, $output)) {
+            case 'pcov':
+                return 'php -dxdebug.mode=off -dpcov.enabled=1 -dpcov.directory=. '; // Enable pcov, disable xdebug, just in case.
+            case 'xdebug':
+                return 'php -dpcov.enabled=0 -dxdebug.mode=coverage '; // Enable xdebug, disable pcov, just in case.
+            case 'phpdbg':
+                return 'phpdbg -d memory_limit=-1 -qrr ';
+        }
+        // No suitable coverage driver found, disabling all candidates.
+        $output->writeln('<error>No suitable driver found, disabling code coverage.</error>');
+
+        return 'php -dpcov.enabled=0 -dxdebug.mode=off ';
     }
 
     /**
@@ -120,4 +139,57 @@ private function supportsCoverage()
     {
         return version_compare(PHP_VERSION, '7.0.0', '>=');
     }
+
+    /**
+     * Given the current environment and options return the code coverage driver to use.
+     *
+     * @param InputInterface  $input
+     * @param OutputInterface $output
+     *
+     * @return string one of pcov, xdebug, phpdbg
+     */
+    private function resolveCoverageDriver(InputInterface $input, OutputInterface $output)
+    {
+        // Let's see if any of the coverage drivers has been forced via command line options.
+        if ($input->getOption('coverage-pcov')) {
+            // Before accepting it, perform some checks and report.
+            if (!extension_loaded('pcov')) {
+                $output->writeln('<error>PHP pcov extension not available.</error>');
+
+                return '';
+            }
+            if ($this->moodle->getBranch() < 310) {
+                $output->writeln('<error>PHP pcov coverage only can be used with Moodle 3.10 and up.</error>');
+
+                return '';
+            }
+
+            return 'pcov';
+        } elseif ($input->getOption('coverage-xdebug')) {
+            // Before accepting it, perform some checks and report.
+            if (!extension_loaded('xdebug')) {
+                $output->writeln('<error>PHP xdebug extension not available.</error>');
+
+                return '';
+            }
+
+            return 'xdebug';
+        } elseif ($input->getOption('coverage-phpdbg')) {
+            return 'phpdbg';
+        }
+
+        // Arrived here, let's find the best (pcov => xdebug => phpdbg) available driver.
+
+        if (extension_loaded('pcov') && $this->moodle->getBranch() >= 310) {
+            // If pcov is available and we are using Moodle 3.10 (PHPUnit 8.5) and up, let's use it.
+            return 'pcov';
+        }
+
+        if (extension_loaded('xdebug')) {
+            // If xdebug is available, let's use it.
+            return 'xdebug';
+        }
+
+        return 'phpdbg'; // Fallback to phpdbg (bundled with php 7.0 and up) if none of the above are available.
+    }
 }