Merge branch 'release/2.4.0'

bin/travis/_includes.sh

@@ -20,14 +20,12 @@ function assert {
   fi
 }
 
-# Asserts that necessary environment variables are set.
-function assert_env_vars {
-  if [[ "$ORCA_JOB" != "DEPRECATED_CODE_SCAN_CONTRIB" ]]; then
-    assert "$ORCA_SUT_NAME" "Missing required ORCA_SUT_NAME environment variable.\nHint: ORCA_SUT_NAME=drupal/example"
-    if [[ "$TRAVIS" ]]; then assert "$ORCA_SUT_BRANCH" "Missing required ORCA_SUT_BRANCH environment variable.\nHint: ORCA_SUT_BRANCH=8.x-1.x"; fi
-  fi
-  if [[ ! "$TRAVIS" && "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then assert "$ORCA_SUT_DIR" "Missing required ORCA_SUT_DIR environment variable.\nHint: ORCA_SUT_DIR=~/Projects/example"; fi
-}
+# Assert that necessary environment variables are set.
+if [[ "$ORCA_JOB" != "DEPRECATED_CODE_SCAN_CONTRIB" ]]; then
+  assert "$ORCA_SUT_NAME" "Missing required ORCA_SUT_NAME environment variable.\nHint: ORCA_SUT_NAME=drupal/example"
+  if [[ "$TRAVIS" ]]; then assert "$ORCA_SUT_BRANCH" "Missing required ORCA_SUT_BRANCH environment variable.\nHint: ORCA_SUT_BRANCH=8.x-1.x"; fi
+fi
+if [[ ! "$TRAVIS" && "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then assert "$ORCA_SUT_DIR" "Missing required ORCA_SUT_DIR environment variable.\nHint: ORCA_SUT_DIR=~/Projects/example"; fi
 
 # Set environment variables.
 ORCA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"

bin/travis/install.sh

@@ -11,8 +11,6 @@
 
 cd "$(dirname "$0")" || exit; source _includes.sh
 
-assert_env_vars
-
 case "$ORCA_JOB" in
   "STATIC_CODE_ANALYSIS") unset ORCA_ENABLE_NIGHTWATCH ;;
   "DEPRECATED_CODE_SCAN") orca debug:packages; eval "orca fixture:init -f --sut=$ORCA_SUT_NAME --sut-only --no-site-install"; unset ORCA_ENABLE_NIGHTWATCH ;;

bin/travis/script.sh

@@ -11,8 +11,6 @@
 
 cd "$(dirname "$0")" || exit; source _includes.sh
 
-assert_env_vars
-
 [[ ! -d "$ORCA_FIXTURE_DIR" ]] || orca fixture:status
 
 # The Drupal installation profile is such a fundamental aspect of the fixture

config/VERSION

@@ -1 +1 @@
-v2.3.0
+v2.4.0

config/packages.yml

@@ -68,13 +68,8 @@ drupal/acquia_lift:
       version_dev: ~
 
 drupal/acquia_purge:
-  core_matrix:
-    '<9':
-      version: 1.x
-      version_dev: 1.x-dev
-    '*':
-      version: ~
-      version_dev: ~
+  version: 1.x
+  version_dev: 1.x-dev
 
 drupal/acsf: []
 

resources/phpstan.neon

@@ -32,9 +32,5 @@ parameters:
     # @see https://www.drupal.org/project/libraries/issues/2882709
     - %currentWorkingDirectory%/docroot/modules/contrib/libraries/src/*
 
-  ignoreErrors:
-    # @see https://github.com/acquia/orca/issues/27
-    - '#Call to deprecated method registerFile\(\) of class Doctrine\\Common\\Annotations\\AnnotationRegistry#'
-
 includes:
   - %currentWorkingDirectory%/vendor/mglaman/phpstan-drupal-deprecations/deprecation_testing.neon