Merge branch 'release/3.10.1'

Author: TravisCarden

bin/ci/before_install.sh

@@ -24,9 +24,18 @@ echo "$TRAVIS_NODE_VERSION"
 yarn --version
 
 # Disable Xdebug except on code coverage jobs.
-if [[ ! "$ORCA_COVERAGE_ENABLE" ]]; then
+if [[ ! "$ORCA_COVERAGE_ENABLE" == TRUE ]]; then
   if [[ "$TRAVIS" ]]; then phpenv config-rm xdebug.ini; fi
-  if [[ "$GITHUB_ACTIONS" ]]; then sudo phpdismod -v ALL xdebug; fi
+  if [[ "$GITHUB_ACTIONS" ]]; then
+    # phpdismod would be simpler but flaky
+    # @see https://github.com/shivammathur/setup-php/issues/350#issuecomment-735370872
+    scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||")
+    ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
+    pecl_file="$scan_dir"/99-pecl.ini
+    sudo sed -Ei "/xdebug/d" "${ini_file:?}"
+    sudo sed -Ei "/xdebug/d" "${pecl_file:?}"
+    sudo rm -rf "$scan_dir"/*xdebug*
+  fi
 fi
 
 # Travis CI installs YAML from PECL, but it's already present in GitHub Actions.

bin/ci/self-test/script.sh

@@ -13,6 +13,17 @@ cd "$(dirname "$0")" || exit 1; source ../_includes.sh
 
 cd ../../../ || exit 1
 
+XDEBUG_IS_ENABLED=$(php -r 'echo function_exists("xdebug_get_code_coverage") ? "TRUE" : "FALSE";')
+
+if [[ "$ORCA_COVERAGE_ENABLE" == TRUE && "$XDEBUG_IS_ENABLED" == "FALSE" ]]; then
+  echo "ORCA_COVERAGE_ENABLE is on but Xdebug is disabled"
+  exit 1
+fi
+
+if [[ "$ORCA_COVERAGE_ENABLE" == FALSE && "$XDEBUG_IS_ENABLED" == "TRUE" ]]; then
+  echo "ORCA_COVERAGE_ENABLE is off but Xdebug is enabled"
+  exit 1
+fi
 
 if [[ "$ORCA_JOB" == "STATIC_CODE_ANALYSIS" ]]; then
   ./vendor/bin/phpcs

config/VERSION

@@ -1 +1 @@
-v3.10.0
+v3.10.1

docs/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v3.10.1](https://github.com/acquia/orca/tree/v3.10.1) (2021-10-01)
+
+[Full Changelog](https://github.com/acquia/orca/compare/v3.10.0...v3.10.1)
+
+**Fixed bugs:**
+
+- Xdebug never disabled on Travis CI [\#159](https://github.com/acquia/orca/pull/159) ([danepowell](https://github.com/danepowell))
+
 ## [v3.10.0](https://github.com/acquia/orca/tree/v3.10.0) (2021-09-29)
 
 [Full Changelog](https://github.com/acquia/orca/compare/v3.9.0...v3.10.0)