Merge branch '3.x' into 4.x

Author: jrfnl

.github/CONTRIBUTING.md

@@ -399,7 +399,7 @@ To run the tests specific to the use of `PHP_CODESNIFFER_CBF === true`:
 
 ### Writing End-to-End Tests
 
-Bash-based end-to-end tests can be written using the [Bashunit](https://bashunit.typeddevs.com/) test tooling.
+Bash-based end-to-end tests can be written using the [Bashunit](https://bashunit.typeddevs.com/) test tooling using version 0.26.0 or higher.
 
 To install bashunit, follow the [installation guide](https://bashunit.typeddevs.com/installation).
 

tests/EndToEnd/outofmemory_test.sh

@@ -6,7 +6,8 @@ function tear_down() {
 
 function test_phpcs_out_of_memory_error_handling() {
   OUTPUT="$( { bin/phpcs -d memory_limit=4M --standard=tests/EndToEnd/Fixtures/endtoend.xml.dist tests/EndToEnd/Fixtures/; } 2>&1)"
-  assert_exit_code 255
+  # The exact exit code is not our concern, just that it's non-zero.
+  assert_unsuccessful_code
 
   assert_contains "The PHP_CodeSniffer \"phpcs\" command ran out of memory." "$OUTPUT"
   assert_contains "Either raise the \"memory_limit\" of PHP in the php.ini file or raise the memory limit at runtime" "$OUTPUT"
@@ -15,7 +16,8 @@ function test_phpcs_out_of_memory_error_handling() {
 
 function test_phpcbf_out_of_memory_error_handling() {
   OUTPUT="$( { bin/phpcbf -d memory_limit=4M --standard=tests/EndToEnd/Fixtures/endtoend.xml.dist tests/EndToEnd/Fixtures/ --suffix=.fixed; } 2>&1)"
-  assert_exit_code 255
+  # The exact exit code is not our concern, just that it's non-zero.
+  assert_unsuccessful_code
 
   assert_contains "The PHP_CodeSniffer \"phpcbf\" command ran out of memory." "$OUTPUT"
   assert_contains "Either raise the \"memory_limit\" of PHP in the php.ini file or raise the memory limit at runtime" "$OUTPUT"