[ubuntu] Clean way to disable the pcov PHP Extension (#3472)

* Clean way to disable the pcov PHP Extension Fixes #3341 * Update php.sh * Update php.sh * Documentation
actions · Jun 3, 2021 · b870568 · b870568
1 parent 70582d1
commit b870568
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git 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 (?<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
@@ -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
@@ -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"
+invoke_tests "Common" "PHP"