diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 7f9e8af24..37e5ff3a6 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -256,6 +256,17 @@ function Build-PHPTable { } } +function Build-PHPSection { + $output = "" + $output += New-MDHeader "PHP" -Level 3 + $output += Build-PHPTable | New-MDTable + $output += New-MDCode -Lines @( + "Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled." + ) + + return $output +} + function Get-GHCVersion { $(ghc --version) -match "version (?\d+\.\d+\.\d+)" | Out-Null $ghcVersion = $Matches.version diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index efe543050..6941c36ce 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -179,9 +179,7 @@ if (Test-IsUbuntu20) { $markdown += New-MDNewLine } -$markdown += New-MDHeader "PHP" -Level 3 -$markdown += Build-PHPTable | New-MDTable -$markdown += New-MDNewLine +$markdown += Build-PHPSection $markdown += New-MDHeader "Haskell" -Level 3 $markdown += New-MDList -Style Unordered -Lines (@( diff --git a/images/linux/scripts/installers/php.sh b/images/linux/scripts/installers/php.sh index 1facaf4e9..511c369d4 100644 --- a/images/linux/scripts/installers/php.sh +++ b/images/linux/scripts/installers/php.sh @@ -80,7 +80,8 @@ for version in $php_versions; do apt-fast install -y --no-install-recommends php$version-pcov # Disable PCOV, as Xdebug is enabled by default - echo "" | sudo tee /etc/php/$version/mods-available/pcov.ini + # https://github.com/krakjoe/pcov#interoperability + phpdismod -v $version pcov fi if [[ $version = "7.0" || $version = "7.1" ]]; then @@ -117,4 +118,4 @@ if isUbuntu20 ; then apt-get update fi -invoke_tests "Common" "PHP" \ No newline at end of file +invoke_tests "Common" "PHP"