Merge branch 'release/2.10.0'

Author: TravisCarden

.travis.yml

@@ -31,13 +31,15 @@ env:
     - ORCA_PACKAGES_CONFIG=example/tests/packages.yml
     - ORCA_PACKAGES_CONFIG_ALTER=example/tests/packages_alter.yml
     - ORCA_SUT_DIR=${TRAVIS_BUILD_DIR}/../example
+    - ORCA_SELF_TEST_COVERAGE_CLOVER=$HOME/build/logs/clover-self.xml
 
 jobs:
   fast_finish: true
   include:
     - { name: "Static code analysis", env: ORCA_JOB=STATIC_CODE_ANALYSIS }
     - { name: "Deprecated code scan", env: ORCA_JOB=DEPRECATED_CODE_SCAN }
     - { name: "Isolated test w/ recommended package versions", env: ORCA_JOB=ISOLATED_RECOMMENDED }
+    - { name: "Isolated test w/ recommended package versions and code coverage", env: ORCA_JOB=ISOLATED_RECOMMENDED ORCA_COVERALLS_ENABLE=TRUE }
     - { name: "Integrated test w/ recommended package versions", env: ORCA_JOB=INTEGRATED_RECOMMENDED }
     - { name: "Integrated test w/ recommended package versions & previous minor release of Drupal core", env: ORCA_JOB=CORE_PREVIOUS }
     - { name: "Isolated test w/ dev package versions", env: ORCA_JOB=ISOLATED_DEV }
@@ -66,6 +68,9 @@ script:
 
 after_script:
   - ../orca/bin/travis/before_cache.sh
+  - ../orca/bin/travis/self-test/after_success.sh
+  - unset ORCA_COVERAGE_ENABLE
+  - unset ORCA_COVERALLS_ENABLE
   - ../orca/bin/travis/after_success.sh
   - ../orca/bin/travis/after_failure.sh
   - ../orca/bin/travis/after_script.sh

acquia-pipelines.yml

@@ -4,7 +4,7 @@ version: 1.2.0
 services:
   - mysql
   - php:
-      version: 7.2
+      version: 7.3
 
 events:
   build:

bin/orca

@@ -6,4 +6,4 @@
  * ORCA command line executable.
  */
 
-require 'orca.php';
+require __DIR__ . '/orca.php';

bin/orca.php

@@ -10,7 +10,6 @@
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
 use Symfony\Component\Filesystem\Filesystem;
 
 if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
@@ -23,19 +22,8 @@
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'prod', TRUE);
-$debug = (bool) ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption('--no-debug', TRUE);
 
-if ($debug) {
-  umask(0000);
-
-  // phpcs:disable MySource.Debug.DebugCode.Found
-  if (class_exists(Debug::class)) {
-    Debug::enable();
-    // phpcs:enable
-  }
-}
-
-$kernel = new Kernel($env, $debug);
+$kernel = new Kernel($env, FALSE);
 
 // Handle a cache:clear pseudo command. This isn't implemented as a true console
 // command because a stale or corrupted cache would render it unusable--

bin/travis/_includes.sh

@@ -20,6 +20,13 @@ function assert {
   fi
 }
 
+# Outputs a formatted warning message.
+function notice {
+  CYAN="\e[34m"
+  NO_COLOR="\033[0m"
+  printf "\n%bNotice: %b%b\n" "$CYAN" "$1" "$NO_COLOR"
+}
+
 # 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"
@@ -30,6 +37,9 @@ if [[ ! "$TRAVIS" && "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then assert "$ORCA
 # Set environment variables.
 ORCA_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 export ORCA_ROOT
+export ORCA_COVERAGE_CLOVER=${ORCA_COVERAGE_CLOVER:="$HOME/build/logs/clover.xml"}
+export ORCA_COVERALLS_ENABLE=${ORCA_COVERALLS_ENABLE:=FALSE}
+export ORCA_COVERAGE_ENABLE=${ORCA_COVERAGE_ENABLE:="$ORCA_COVERALLS_ENABLE"}
 export ORCA_FIXTURE_DIR=${ORCA_FIXTURE_DIR:="$ORCA_ROOT/../orca-build"}
 export ORCA_FIXTURE_PROFILE=${ORCA_FIXTURE_PROFILE:="orca"}
 DEFAULT_PROJECT_TEMPLATE=$([[ "$ORCA_JOB" == "D9_READINESS" ]] && echo "acquia/drupal-recommended-project" || echo "acquia/blt-project")

bin/travis/after_script.sh

@@ -9,14 +9,16 @@
 # DESCRIPTION
 #     Conditionally logs the job and displays upstream ORCA status.
 
-cd "$(dirname "$0")" || exit; source _includes.sh
+cd "$(dirname "$0")" || exit 1; source _includes.sh
 
 # Log the job on cron if telemetry is enabled.
 if [[ "$TRAVIS_EVENT_TYPE" = "cron" && "$ORCA_TELEMETRY_ENABLE" = "TRUE" && "$ORCA_AMPLITUDE_API_KEY" && "$ORCA_AMPLITUDE_USER_ID" ]]; then
   orca internal:log-job
 fi
 if [[ "$ORCA_TELEMETRY_ENABLE" = "TRUE" ]]; then
   orca internal:log-job --simulate
+else
+  notice "No telemetry data sent."
 fi
 
 # Show ORCA's own current build status. A failure may signify an upstream issue

bin/travis/after_success.sh

@@ -1,10 +1,26 @@
 #!/usr/bin/env bash
 
 # NAME
-#     after_success.sh - Not yet implemented.
+#     after_success.sh - Perform post-success tasks.
 #
 # SYNOPSIS
 #     after_success.sh
 #
 # DESCRIPTION
-#     Reserved for future use.
+#     Conditionally sends code coverage data to Coveralls.
+
+cd "$(dirname "$0")" || exit 1; source _includes.sh
+
+# Send test coverage data to Coveralls (coveralls.io) if enabled.
+if [[ "$ORCA_COVERAGE_ENABLE" == TRUE && "$ORCA_COVERALLS_ENABLE" == TRUE ]]; then
+  (
+    cd "$ORCA_SUT_DIR" || exit 1
+    # shellcheck disable=SC1004
+    eval 'php-coveralls -vv \
+      --coverage_clover="$ORCA_COVERAGE_CLOVER" \
+      --json_path="${TMPDIR:-/tmp}/coveralls.json" \
+      --root_dir="$ORCA_SUT_DIR"'
+  )
+else
+  notice "No coverage data sent to Coveralls."
+fi

bin/travis/before_install.sh

@@ -23,8 +23,8 @@ echo "$TRAVIS_NODE_VERSION"
 # Display the Yarn version.
 yarn --version
 
-# Disable Xdebug.
-phpenv config-rm xdebug.ini
+# Disable Xdebug except on code coverage jobs.
+[[ "$ORCA_COVERAGE_ENABLE" == TRUE ]] || phpenv config-rm xdebug.ini
 
 {
   # Remove PHP memory limit.

bin/travis/self-test/after_success.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# NAME
+#     after_success.sh - Perform post-success tasks.
+#
+# SYNOPSIS
+#     after_success.sh
+#
+# DESCRIPTION
+#     Conditionally sends code coverage data to Coveralls.
+
+cd "$(dirname "$0")" || exit 1; source ../_includes.sh
+
+cd ../../../ || exit 1
+
+# Send test coverage data to Coveralls (coveralls.io).
+if [[ "$ORCA_COVERAGE_ENABLE" == TRUE && "$ORCA_COVERALLS_ENABLE" == TRUE ]]; then
+  # shellcheck disable=SC1004
+  eval 'php-coveralls -vv \
+    --coverage_clover="$ORCA_SELF_TEST_COVERAGE_CLOVER" \
+    --json_path="${TMPDIR:-/tmp}/coveralls.json"'
+else
+  notice "No coverage data sent to Coveralls."
+fi

bin/travis/self-test/before_install.sh

@@ -9,13 +9,15 @@
 # DESCRIPTION
 #     Places an example SUT.
 
-cd "$(dirname "$0")" || exit; source _includes.sh
+cd "$(dirname "$0")" || exit 1; source ../_includes.sh
 
 (
   cd ../../../
   cp -R example ../
-  git -C ../example init
-  git -C ../example add --all
-  git -C ../example commit --message="Initial commit."
-  git -C ../example branch --move master feature/example
+  cd ../example || exit 1
+  git init
+  git add --all
+  git commit --message="Initial commit."
+  git branch --move master feature/example
+  git remote add origin [email protected]:example/example.git
 )

bin/travis/self-test/script.sh

@@ -9,19 +9,25 @@
 # DESCRIPTION
 #     Runs static code analysis and automated tests on ORCA itself.
 
-cd "$(dirname "$0")" || exit; source _includes.sh
+cd "$(dirname "$0")" || exit 1; source ../_includes.sh
+
+cd ../../../ || exit 1
+
 
 if [[ "$ORCA_JOB" = "STATIC_CODE_ANALYSIS" ]]; then
-  (
-    cd ../../../
-    ./vendor/bin/phpcs
-    ./vendor/bin/parallel-lint --exclude vendor .
-    ./vendor/bin/phpmd . text phpmd.xml.dist --ignore-violations-on-exit
-    ./vendor/bin/phpunit
-    ./vendor/bin/security-checker security:check
-  )
+  ./vendor/bin/phpcs
+  ./vendor/bin/parallel-lint --exclude vendor .
+  ./vendor/bin/phpmd . text phpmd.xml.dist --ignore-violations-on-exit
+  ./vendor/bin/security-checker security:check
+fi
+
+echo
+if [[ "$ORCA_COVERAGE_ENABLE" == TRUE ]]; then
+  eval './vendor/bin/phpunit --coverage-clover="$ORCA_SELF_TEST_COVERAGE_CLOVER"'
+else
+  eval './vendor/bin/phpunit'
 fi
 
-if [[ "$ORCA_JOB" = "LIVE_TEST" ]]; then
+if [[ "$ORCA_JOB" == "LIVE_TEST" ]]; then
   orca qa:automated-tests
 fi

composer.json

@@ -21,6 +21,7 @@
         "hassankhan/config": "^2.1",
         "myclabs/php-enum": "^1.7",
         "oscarotero/env": "^1.2",
+        "php-coveralls/php-coveralls": "^2.2",
         "php-parallel-lint/php-console-highlighter": "^0.4.0",
         "php-parallel-lint/php-parallel-lint": "^1.2.0",
         "phploc/phploc": "^5.0",
@@ -90,7 +91,8 @@
         "phpcs": "phpcs -s --cache=var/cache/phpcs.json",
         "phplint": "parallel-lint --exclude vendor --ignore-fails .",
         "phpmd": "phpmd . text phpmd.xml.dist --ignore-violations-on-exit",
-        "phpunit": "phpunit"
+        "phpunit": "phpunit",
+        "update-docs": "./bin/orca --format=md > docs/commands.md"
     },
     "support": {
         "issues": "https://github.com/acquia/orca/issues",