From d4f25b73bd47ac497aac45a30cfb97c9f0c5870e Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:05:48 +0530
Subject: [PATCH 01/19] New DDEV Commands for core development added.

---
 commands/web/code-check    | 541 +++++++++++++++++++++++++++++++++++++
 commands/web/cspell-check  |  18 ++
 commands/web/install       |   8 +
 commands/web/nightwatch    |   7 +-
 commands/web/phpcbf        |  16 ++
 commands/web/phpcs         |  16 ++
 commands/web/phpstan       |  16 ++
 commands/web/phpunit       |  16 +-
 commands/web/tests-cleanup |  19 ++
 9 files changed, 650 insertions(+), 7 deletions(-)
 create mode 100755 commands/web/code-check
 create mode 100755 commands/web/cspell-check
 create mode 100755 commands/web/install
 create mode 100755 commands/web/phpcbf
 create mode 100755 commands/web/phpcs
 create mode 100755 commands/web/phpstan
 create mode 100755 commands/web/tests-cleanup

diff --git a/commands/web/code-check b/commands/web/code-check
new file mode 100755
index 0000000..d0ce547
--- /dev/null
+++ b/commands/web/code-check
@@ -0,0 +1,541 @@
+#!/bin/bash
+
+## Description: This script performs code quality checks.
+## Usage: code-check [flags]
+## Example: "ddev code-check" or "ddev code-check --cached"
+
+# This script performs code quality checks.
+#
+# @internal
+#   This script is not covered by Drupal core's backwards compatibility promise.
+#   It exists only for core development purposes.
+#
+# The script makes the following checks:
+# - Spell checking.
+# - File modes.
+# - No changes to core/node_modules directory.
+# - PHPCS checks PHP and YAML files.
+# - PHPStan checks PHP files.
+# - ESLint checks JavaScript and YAML files.
+# - Stylelint checks CSS files.
+# - Checks .pcss.css and .css files are equivalent.
+
+# cSpell:disable
+
+TOP_LEVEL="/var/www/html/repos/drupal"
+cd $TOP_LEVEL/core
+
+printf "\033[0;33mIf you have just started DDEV wait for couple of minutes \n"
+printf "before using {ddev code-check} command, mutagen file sync of \n"
+printf "node_modules takes time.\n\033[0m"
+
+corepack enable
+
+echo "NPM Version :"
+npm --version
+
+echo "Yarn Version :"
+yarn --version
+
+# Installs dependencies if not already run.
+if [ ! -d /var/www/html/repos/drupal/core/node_modules/.bin ]; then
+
+  corepack enable
+
+  yarn --cwd /var/www/html/repos/drupal/core install
+
+fi
+
+cd $TOP_LEVEL
+
+# Searches an array.
+contains_element() {
+  local e
+  for e in ${@:2}; do [[ "$e" == "$1" ]] && return 0; done
+  return 1
+}
+
+CACHED=0
+DRUPALCI=0
+BRANCH=""
+while test $# -gt 0; do
+  case "$1" in
+    -h|--help)
+      echo "Drupal code quality checks"
+      echo " "
+      echo "options:"
+      echo "-h, --help                show brief help"
+      echo "--branch BRANCH           creates list of files to check by comparing against a branch"
+      echo "--cached                  checks staged files"
+      echo "--drupalci                a special mode for DrupalCI"
+      echo " "
+      echo "Example usage: sh ./core/scripts/dev/commit-code-check.sh --branch 9.2.x"
+      exit 0
+      ;;
+    --branch)
+      BRANCH="$2"
+      if [[ "$BRANCH" == "" ]]; then
+        printf "The --branch option requires a value. For example: --branch 9.2.x\n"
+        exit;
+      fi
+      shift 2
+      ;;
+    --cached)
+      CACHED=1
+      shift
+      ;;
+    --drupalci)
+      DRUPALCI=1
+      shift
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+# Set up variables to make colored output simple. Color output is disabled on
+# DrupalCI because it is breaks reporting.
+# @todo https://www.drupal.org/project/drupalci_testbot/issues/3181869
+if [[ "$DRUPALCI" == "1" ]]; then
+  red=""
+  green=""
+  reset=""
+  DRUPAL_VERSION=$(php -r "include 'vendor/autoload.php'; print preg_replace('#\.[0-9]+-dev#', '.x', \Drupal::VERSION);")
+  GIT="sudo -u www-data git"
+else
+  red=$(tput setaf 1 && tput bold)
+  green=$(tput setaf 2)
+  reset=$(tput sgr0)
+  GIT="git"
+fi
+
+# Gets list of files to check.
+if [[ "$BRANCH" != "" ]]; then
+  FILES=$($GIT diff --name-only $BRANCH HEAD);
+elif [[ "$CACHED" == "0" ]]; then
+  # For DrupalCI patch testing or when running without --cached or --branch,
+  # list of all changes in the working directory.
+  FILES=$($GIT ls-files --other --modified --exclude-standard --exclude=vendor --exclude=node_modules --exclude=sites --exclude=*.patch --exclude=*.diff --exclude=.DS_Store)
+else
+  # Check staged files only.
+  if $GIT rev-parse --verify HEAD >/dev/null 2>&1
+  then
+    AGAINST=HEAD
+  else
+    # Initial commit: diff against an empty tree object
+    AGAINST=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+  fi
+  FILES=$($GIT diff --cached --name-only $AGAINST);
+fi
+
+if [[ "$FILES" == "" ]] && [[ "$DRUPALCI" == "1" ]]; then
+  # If the FILES is empty we might be testing a merge request on DrupalCI. We
+  # need to diff against the Drupal branch or tag related to the Drupal version.
+  printf "Creating list of files to check by comparing branch to %s\n" "$DRUPAL_VERSION"
+  # On DrupalCI there's a merge commit so we can compare to HEAD~1.
+  FILES=$($GIT diff --name-only HEAD~1 HEAD);
+fi
+
+TOP_LEVEL=$($GIT rev-parse --show-toplevel)
+
+# This variable will be set to one when the file core/phpcs.xml.dist is changed.
+PHPCS_XML_DIST_FILE_CHANGED=0
+
+# This variable will be set to one when the files core/.phpstan-baseline.php or
+# core/phpstan.neon.dist are changed.
+PHPSTAN_DIST_FILE_CHANGED=0
+
+# This variable will be set to one when one of the eslint config file is
+# changed:
+#  - core/.eslintrc.passing.json
+#  - core/.eslintrc.json
+#  - core/.eslintrc.jquery.json
+ESLINT_CONFIG_PASSING_FILE_CHANGED=0
+
+# This variable will be set to one when the stylelint config file is changed.
+# changed:
+#  - core/.stylelintignore
+#  - core/.stylelintrc.json
+STYLELINT_CONFIG_FILE_CHANGED=0
+
+# This variable will be set to one when JavaScript packages files are changed.
+# changed:
+#  - core/package.json
+#  - core/yarn.lock
+JAVASCRIPT_PACKAGES_CHANGED=0
+
+# This variable will be set when a Drupal-specific CKEditor 5 plugin has changed
+# it is used to make sure the compiled JS is valid.
+CKEDITOR5_PLUGINS_CHANGED=0
+
+# This variable will be set to when the dictionary has changed.
+CSPELL_DICTIONARY_FILE_CHANGED=0
+
+# Build up a list of absolute file names.
+ABS_FILES=
+for FILE in $FILES; do
+  if [ -f "$TOP_LEVEL/$FILE" ]; then
+    ABS_FILES="$ABS_FILES $TOP_LEVEL/$FILE"
+  fi
+
+  if [[ $FILE == "core/phpcs.xml.dist" ]]; then
+    PHPCS_XML_DIST_FILE_CHANGED=1;
+  fi;
+
+  if [[ $FILE == "core/.phpstan-baseline.php" || $FILE == "core/phpstan.neon.dist" ]]; then
+    PHPSTAN_DIST_FILE_CHANGED=1;
+  fi;
+
+  if [[ $FILE == "core/.eslintrc.json" || $FILE == "core/.eslintrc.passing.json" || $FILE == "core/.eslintrc.jquery.json" ]]; then
+    ESLINT_CONFIG_PASSING_FILE_CHANGED=1;
+  fi;
+
+  if [[ $FILE == "core/.stylelintignore" || $FILE == "core/.stylelintrc.json" ]]; then
+    STYLELINT_CONFIG_FILE_CHANGED=1;
+  fi;
+
+  # If JavaScript packages change, then rerun all JavaScript style checks.
+  if [[ $FILE == "core/package.json" || $FILE == "core/yarn.lock" ]]; then
+    ESLINT_CONFIG_PASSING_FILE_CHANGED=1;
+    STYLELINT_CONFIG_FILE_CHANGED=1;
+    JAVASCRIPT_PACKAGES_CHANGED=1;
+  fi;
+
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.js$ ]] && [[ $FILE =~ ^core/modules/ckeditor5/js/build || $FILE =~ ^core/modules/ckeditor5/js/ckeditor5_plugins ]]; then
+    CKEDITOR5_PLUGINS_CHANGED=1;
+  fi;
+
+  if [[ $FILE == "core/misc/cspell/dictionary.txt" || $FILE == "core/misc/cspell/drupal-dictionary.txt" ]]; then
+    CSPELL_DICTIONARY_FILE_CHANGED=1;
+  fi
+done
+
+# Exit early if there are no files.
+if [[ "$ABS_FILES" == "" ]]; then
+  printf "There are no files to check. If you have staged a commit use the --cached option.\n"
+  exit;
+fi;
+
+# This script assumes that composer install and yarn install have already been
+# run and all dependencies are updated.
+FINAL_STATUS=0
+
+DEPENDENCIES_NEED_INSTALLING=0
+# Ensure PHP development dependencies are installed.
+# @todo https://github.com/composer/composer/issues/4497 Improve this to
+#  determine if dependencies in the lock file match the installed versions.
+#  Using composer install --dry-run is not valid because it would depend on
+#  user-facing strings in Composer.
+if ! [[ -f 'vendor/bin/phpcs' ]]; then
+  printf "Drupal's PHP development dependencies are not installed. Run 'composer install' from the root directory.\n"
+  DEPENDENCIES_NEED_INSTALLING=1;
+fi
+
+cd "$TOP_LEVEL/core"
+
+# Ensure JavaScript development dependencies are installed.
+yarn --version
+yarn >/dev/null
+
+# Check all files for spelling in one go for better performance.
+if [[ $CSPELL_DICTIONARY_FILE_CHANGED == "1" ]] ; then
+  printf "\nRunning spellcheck on *all* files.\n"
+  yarn run spellcheck:core --no-must-find-files --no-progress
+else
+  # Check all files for spelling in one go for better performance. We pipe the
+  # list files in so we obey the globs set on the spellcheck:core command in
+  # core/package.json.
+  echo "${ABS_FILES}" | tr ' ' '\n' | yarn run spellcheck:core --no-must-find-files --file-list stdin
+fi
+
+if [ "$?" -ne "0" ]; then
+  # If there are failures set the status to a number other than 0.
+  FINAL_STATUS=1
+  printf "\nCSpell: ${red}failed${reset}\n"
+else
+  printf "\nCSpell: ${green}passed${reset}\n"
+fi
+cd "$TOP_LEVEL"
+
+# Add a separator line to make the output easier to read.
+printf "\n"
+printf -- '-%.0s' {1..100}
+printf "\n"
+
+# Run PHPStan on all files on DrupalCI or when phpstan files are changed.
+# APCu is disabled to ensure that the composer classmap is not corrupted.
+if [[ $PHPSTAN_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then
+  printf "\nRunning PHPStan on *all* files.\n"
+  php -d apc.enabled=0 -d apc.enable_cli=0 vendor/bin/phpstan analyze --no-progress --configuration="$TOP_LEVEL/core/phpstan.neon.dist"
+else
+  # Only run PHPStan on changed files locally.
+  printf "\nRunning PHPStan on changed files.\n"
+  php -d apc.enabled=0 -d apc.enable_cli=0 vendor/bin/phpstan analyze --memory-limit=2G --no-progress --configuration="$TOP_LEVEL/core/phpstan-partial.neon" $ABS_FILES
+fi
+
+if [ "$?" -ne "0" ]; then
+  # If there are failures set the status to a number other than 0.
+  FINAL_STATUS=1
+  printf "\nPHPStan: ${red}failed${reset}\n"
+else
+  printf "\nPHPStan: ${green}passed${reset}\n"
+fi
+
+# Add a separator line to make the output easier to read.
+printf "\n"
+printf -- '-%.0s' {1..100}
+printf "\n"
+
+# Run PHPCS on all files on DrupalCI or when phpcs files are changed.
+if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then
+  # Test all files with phpcs rules.
+  vendor/bin/phpcs -ps --parallel="$( (nproc || sysctl -n hw.logicalcpu || echo 4) 2>/dev/null)" --standard="$TOP_LEVEL/core/phpcs.xml.dist"
+  PHPCS=$?
+  if [ "$PHPCS" -ne "0" ]; then
+    # If there are failures set the status to a number other than 0.
+    FINAL_STATUS=1
+    printf "\nPHPCS: ${red}failed${reset}\n"
+  else
+    printf "\nPHPCS: ${green}passed${reset}\n"
+  fi
+  # Add a separator line to make the output easier to read.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+fi
+
+# When the eslint config has been changed, then eslint must check all files.
+if [[ $ESLINT_CONFIG_PASSING_FILE_CHANGED == "1" ]]; then
+  cd "$TOP_LEVEL/core"
+  yarn run lint:core-js-passing "$TOP_LEVEL/core"
+  CORRECTJS=$?
+  if [ "$CORRECTJS" -ne "0" ]; then
+    # If there are failures set the status to a number other than 0.
+    FINAL_STATUS=1
+    printf "\neslint: ${red}failed${reset}\n"
+  else
+    printf "\neslint: ${green}passed${reset}\n"
+  fi
+  cd $TOP_LEVEL
+  # Add a separator line to make the output easier to read.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+fi
+
+# When the stylelint config has been changed, then stylelint must check all files.
+if [[ $STYLELINT_CONFIG_FILE_CHANGED == "1" ]]; then
+  cd "$TOP_LEVEL/core"
+  yarn run lint:css
+  if [ "$?" -ne "0" ]; then
+    # If there are failures set the status to a number other than 0.
+    FINAL_STATUS=1
+    printf "\nstylelint: ${red}failed${reset}\n"
+  else
+    printf "\nstylelint: ${green}passed${reset}\n"
+  fi
+  cd $TOP_LEVEL
+  # Add a separator line to make the output easier to read.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+fi
+
+# When a Drupal-specific CKEditor 5 plugin changed ensure that it is compiled
+# properly. Only check on DrupalCI, since we're concerned about the build being
+# run with the expected package versions and making sure the result of the build
+# is in sync and conform to expectations.
+if [[ "$DRUPALCI" == "1" ]] && [[ $CKEDITOR5_PLUGINS_CHANGED == "1" ]]; then
+  cd "$TOP_LEVEL/core"
+  yarn run check:ckeditor5
+  if [ "$?" -ne "0" ]; then
+    # If there are failures set the status to a number other than 0.
+    FINAL_STATUS=1
+    printf "\nDrupal-specific CKEditor 5 plugins: ${red}failed${reset}\n"
+  else
+    printf "\nDrupal-specific CKEditor 5 plugins: ${green}passed${reset}\n"
+  fi
+  cd $TOP_LEVEL
+  # Add a separator line to make the output easier to read.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+fi
+
+# When JavaScript packages change, then rerun all JavaScript style checks.
+if [[ "$JAVASCRIPT_PACKAGES_CHANGED" == "1" ]]; then
+  cd "$TOP_LEVEL/core"
+  yarn run build:css --check
+  CORRECTCSS=$?
+  if [ "$CORRECTCSS" -ne "0" ]; then
+    FINAL_STATUS=1
+    printf "\n${red}ERROR: The compiled CSS from the PCSS files"
+    printf "\n       does not match the current CSS files. Some added"
+    printf "\n       or updated JavaScript package made changes."
+    printf "\n       Recompile the CSS with: yarn run build:css${reset}\n\n"
+  fi
+  cd $TOP_LEVEL
+  # Add a separator line to make the output easier to read.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+fi
+
+for FILE in $FILES; do
+  STATUS=0;
+  # Print a line to separate spellcheck output from per file output.
+  printf "Checking %s\n" "$FILE"
+  printf "\n"
+
+  # Ensure the file still exists (i.e. is not being deleted).
+  if [ -a $FILE ]; then
+    if [ ${FILE: -3} != ".sh" ]; then
+      if [ -x $FILE ]; then
+        printf "${red}check failed:${reset} file $FILE should not be executable\n"
+        STATUS=1
+      fi
+    fi
+  fi
+
+  # Don't commit changes to vendor.
+  if [[ "$FILE" =~ ^vendor/ ]]; then
+    printf "${red}check failed:${reset} file in vendor directory being committed ($FILE)\n"
+    STATUS=1
+  fi
+
+  # Don't commit changes to core/node_modules.
+  if [[ "$FILE" =~ ^core/node_modules/ ]]; then
+    printf "${red}check failed:${reset} file in core/node_modules directory being committed ($FILE)\n"
+    STATUS=1
+  fi
+
+  ############################################################################
+  ### PHP AND YAML FILES
+  ############################################################################
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.(inc|install|module|php|profile|test|theme|yml)$ ]] && [[ $PHPCS_XML_DIST_FILE_CHANGED == "0" ]] && [[ "$DRUPALCI" == "0" ]]; then
+    # Test files with phpcs rules.
+    vendor/bin/phpcs "$TOP_LEVEL/$FILE" --standard="$TOP_LEVEL/core/phpcs.xml.dist"
+    PHPCS=$?
+    if [ "$PHPCS" -ne "0" ]; then
+      # If there are failures set the status to a number other than 0.
+      STATUS=1
+    else
+      printf "PHPCS: $FILE ${green}passed${reset}\n"
+    fi
+  fi
+
+  ############################################################################
+  ### YAML FILES
+  ############################################################################
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.yml$ ]]; then
+    # Test files with ESLint.
+    cd "$TOP_LEVEL/core"
+    node ./node_modules/eslint/bin/eslint.js --quiet --resolve-plugins-relative-to . "$TOP_LEVEL/$FILE"
+    YAMLLINT=$?
+    if [ "$YAMLLINT" -ne "0" ]; then
+      # If there are failures set the status to a number other than 0.
+      STATUS=1
+    else
+      printf "ESLint: $FILE ${green}passed${reset}\n"
+    fi
+    cd $TOP_LEVEL
+  fi
+
+  ############################################################################
+  ### JAVASCRIPT FILES
+  ############################################################################
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.js$ ]]; then
+    cd "$TOP_LEVEL/core"
+    # Check the coding standards.
+    node ./node_modules/eslint/bin/eslint.js --quiet --config=.eslintrc.passing.json "$TOP_LEVEL/$FILE"
+    JSLINT=$?
+    if [ "$JSLINT" -ne "0" ]; then
+      # No need to write any output the node command will do this for us.
+      STATUS=1
+    else
+      printf "ESLint: $FILE ${green}passed${reset}\n"
+    fi
+    cd $TOP_LEVEL
+  fi
+
+  ############################################################################
+  ### CSS FILES
+  ############################################################################
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.css$ ]]; then
+    # Work out the root name of the CSS so we can ensure that the PostCSS
+    # version has been compiled correctly.
+    if [[ $FILE =~ \.pcss\.css$ ]]; then
+      BASENAME=${FILE%.pcss.css}
+      COMPILE_CHECK=1
+    else
+      BASENAME=${FILE%.css}
+      # We only need to compile check if the .pcss.css file is not also
+      # changing. This is because the compile check will occur for the
+      # .pcss.css file. This might occur if the compiled stylesheets have
+      # changed.
+      contains_element "$BASENAME.pcss.css" "${FILES[@]}"
+      HASPOSTCSS=$?
+      if [ "$HASPOSTCSS" -ne "0" ]; then
+        COMPILE_CHECK=1
+      else
+        COMPILE_CHECK=0
+      fi
+    fi
+    # PostCSS
+    if [[ "$COMPILE_CHECK" == "1" ]] && [[ -f "$TOP_LEVEL/$BASENAME.pcss.css" ]]; then
+      cd "$TOP_LEVEL/core"
+      yarn run build:css --check --file "$TOP_LEVEL/$BASENAME.pcss.css"
+      CORRECTCSS=$?
+      if [ "$CORRECTCSS" -ne "0" ]; then
+        # If the CSS does not match the PCSS, set the status to a number other
+        # than 0.
+        STATUS=1
+        printf "\n${red}ERROR: The compiled CSS from"
+        printf "\n       ${BASENAME}.pcss.css"
+        printf "\n       does not match its CSS file. Recompile the CSS with:"
+        printf "\n       yarn run build:css${reset}\n\n"
+      fi
+      cd $TOP_LEVEL
+    fi
+  fi
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.css$ ]] && [[ -f "core/node_modules/.bin/stylelint" ]]; then
+    BASENAME=${FILE%.css}
+    # We only need to use stylelint on the .pcss.css file. So if this CSS file
+    # has a corresponding .pcss don't do stylelint.
+    if [[ $FILE =~ \.pcss\.css$ ]] || [[ ! -f "$TOP_LEVEL/$BASENAME.pcss.css" ]]; then
+      cd "$TOP_LEVEL/core"
+      node_modules/.bin/stylelint --allow-empty-input "$TOP_LEVEL/$FILE"
+      if [ "$?" -ne "0" ]; then
+        STATUS=1
+      else
+        printf "STYLELINT: $FILE ${green}passed${reset}\n"
+      fi
+      cd $TOP_LEVEL
+    fi
+  fi
+
+  if [[ "$STATUS" == "1" ]]; then
+    FINAL_STATUS=1
+    # There is no need to print a failure message. The fail will be described
+    # already.
+  else
+    printf "%s ${green}passed${reset}\n" "$FILE"
+  fi
+
+  # Print a line to separate each file's checks.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+done
+
+if [[ "$FINAL_STATUS" == "1" ]] && [[ "$DRUPALCI" == "1" ]]; then
+  printf "${red}Drupal code quality checks failed.${reset}\n"
+  printf "To reproduce this output locally:\n"
+  printf "* Apply the change as a patch\n"
+  printf "* Run this command locally: sh ./core/scripts/dev/commit-code-check.sh\n"
+  printf "OR:\n"
+  printf "* From the merge request branch\n"
+  printf "* Run this command locally: sh ./core/scripts/dev/commit-code-check.sh --branch %s\n" "$DRUPAL_VERSION"
+fi
+exit $FINAL_STATUS
diff --git a/commands/web/cspell-check b/commands/web/cspell-check
new file mode 100755
index 0000000..b858f56
--- /dev/null
+++ b/commands/web/cspell-check
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+## Description: This script performs cspell checks.
+## Usage: cspell-check [flags]
+## Example: "ddev cspell-check"
+
+# Installs dependencies if not already run.
+if [ ! -d /var/www/html/repos/drupal/core/node_modules/.bin ]; then
+
+  corepack enable
+
+  yarn --cwd /var/www/html/repos/drupal/core install
+fi
+
+TOP_LEVEL="/var/www/html/repos/drupal/core"
+cd $TOP_LEVEL
+
+yarn run spellcheck:core --no-must-find-files --cache --cache-strategy content
diff --git a/commands/web/install b/commands/web/install
new file mode 100755
index 0000000..d42fff5
--- /dev/null
+++ b/commands/web/install
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+## Description: Performs a default drupal installation
+## Usage: install
+## Example: "ddev install"
+
+drush site:install standard --account-name=admin --account-pass=admin --site-name="Drupal 11" -y
+# drush en admin_toolbar admin_toolbar_tools devel
diff --git a/commands/web/nightwatch b/commands/web/nightwatch
index b6bc976..c8cbb56 100644
--- a/commands/web/nightwatch
+++ b/commands/web/nightwatch
@@ -7,4 +7,9 @@
 
 echo "Clearing old webdriver sessions"
 curl -f -s http://chrome:4444/status | jq -r '.value.nodes[].slots[].session.sessionId' | while read -r session; do if [ "$session" != "null" ]; then curl -X DELETE "http://chrome:4444/session/$session"; fi; done
-cd web/core && yarn test:nightwatch "$@"
+
+if [ ! -d /var/www/html/repos/drupal/core/node_modules ]; then
+  yarn --cwd /var/www/html/repos/drupal/core install
+fi
+
+yarn --cwd /var/www/html/repos/drupal/core test:nightwatch $@
diff --git a/commands/web/phpcbf b/commands/web/phpcbf
new file mode 100755
index 0000000..2451b8a
--- /dev/null
+++ b/commands/web/phpcbf
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+## Description: Run phpcbf
+## Usage: phpcbf [flags] [args]
+## Example: "ddev phpcbf core/modules/user/src/RegisterForm.php"
+
+TOP_LEVEL="/var/www/html/repos/drupal"
+cd $TOP_LEVEL
+
+if ! command -v /var/www/html/vendor/bin/phpcbf >/dev/null; then
+  echo "phpcbf is not in PATH in the web container. You probably forgot to 'ddev composer install'"
+  exit 2
+fi
+
+/var/www/html/vendor/bin/phpcbf --standard=Drupal,DrupalPractice $@ || \
+echo "Return code ignored"
diff --git a/commands/web/phpcs b/commands/web/phpcs
new file mode 100755
index 0000000..01a47c3
--- /dev/null
+++ b/commands/web/phpcs
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+## Description: Run phpcs
+## Usage: phpcs [flags] [args]
+## Example: "ddev phpcs core/modules/user/src/RegisterForm.php"
+
+TOP_LEVEL="/var/www/html/repos/drupal"
+cd $TOP_LEVEL
+
+if ! command -v /var/www/html/vendor/bin/phpcs >/dev/null; then
+  echo "phpcs is not in PATH in the web container. You probably forgot to 'ddev composer install'"
+  exit 2
+fi
+
+/var/www/html/vendor/bin/phpcs --standard=Drupal,DrupalPractice $@ || \
+echo "Return code ignored"
diff --git a/commands/web/phpstan b/commands/web/phpstan
new file mode 100755
index 0000000..f90f76b
--- /dev/null
+++ b/commands/web/phpstan
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+## Description: Run phpstan
+## Usage: phpstan [flags] [args]
+## Example: "ddev phpstan core/modules/migrate_drupal_ui"
+
+TOP_LEVEL="/var/www/html/repos/drupal"
+cd $TOP_LEVEL
+
+if ! command -v /var/www/html/vendor/bin/phpstan >/dev/null; then
+  echo "phpstan is not in PATH in the web container. You probably forgot to 'ddev composer install'"
+  exit 2
+fi
+
+/var/www/html/vendor/bin/phpstan analyze  --configuration="$TOP_LEVEL/core/phpstan.neon.dist" --xdebug --no-ansi --memory-limit=2G $@ || \
+echo "Return code ignored"
diff --git a/commands/web/phpunit b/commands/web/phpunit
index 37984d3..800855e 100644
--- a/commands/web/phpunit
+++ b/commands/web/phpunit
@@ -3,21 +3,25 @@
 #ddev-generated
 ## Description: Run PHPUnit
 ## Usage: phpunit
-## Example: "ddev phpunit core/modules/field"
+## Example: "ddev phpunit core/modules/user/tests/src/Functional/UserAdminTest.php"
 
-if ! command -v phpunit >/dev/null; then
+TOP_LEVEL="/var/www/html/repos/drupal"
+cd $TOP_LEVEL
+
+if ! command -v /var/www/html/vendor/bin/phpunit >/dev/null; then
   echo "phpunit is not in PATH in the web container. You probably forgot to 'ddev composer install'"
   exit 2
 fi
+
 echo "Clearing old webdriver sessions"
 curl -f -s http://chrome:4444/status | jq -r '.value.nodes[].slots[].session.sessionId' | while read -r session; do if [ "$session" != "null" ]; then curl -X DELETE "http://chrome:4444/session/$session"; fi; done
 
 # Prefer a phpunit.xml file in the project root if one exists; fall back on the
 # one in core if not.
-if [ ! -f 'phpunit.xml' ]; then
-  phpunit_c_option="-c core"
+if [ ! -f '/var/www/html/phpunit.xml' ]; then
+  PHPUNIT_C_OPTION="-c /var/www/html/web/core/phpunit.xml.dist"
 else
-  phpunit_c_option=""
+  PHPUNIT_C_OPTION=""
 fi
 
-phpunit $phpunit_c_option "$@"
+/var/www/html/vendor/bin/phpunit $PHPUNIT_C_OPTION "$@"
diff --git a/commands/web/tests-cleanup b/commands/web/tests-cleanup
new file mode 100755
index 0000000..690a769
--- /dev/null
+++ b/commands/web/tests-cleanup
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+## Description: Clean up test results
+## Usage: tests-cleanup
+## Example: "ddev tests-cleanup"
+
+TOP_LEVEL="/var/www/html"
+cd $TOP_LEVEL
+
+if [ ! -d "web/sites/simpletest/browser_output" ]
+then
+  echo "The expected folder web/sites/simpletest/browser_output does not exist."
+  exit
+fi
+
+rm web/sites/simpletest/browser_output/*.counter
+rm web/sites/simpletest/browser_output/*.html
+
+echo "Test files removed."

From a3b18283843253294573120d874719de0f2a6371 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:06:31 +0530
Subject: [PATCH 02/19] Core Dev DDEV Config yaml updated.

---
 config.ddev-drupal-core-dev.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml
index 6c12f31..e84784c 100644
--- a/config.ddev-drupal-core-dev.yaml
+++ b/config.ddev-drupal-core-dev.yaml
@@ -8,3 +8,15 @@ upload_dirs:
 # but with DDEV + mutagen that isn't possible.
 # so just redirect the upload_dirs.
     - .ddev/tmp
+additional_hostnames:
+ - ${DDEV_SITENAME}-testing.${DDEV_TLD}
+web_environment:
+    - BROWSERTEST_OUTPUT_DIRECTORY=/var/www/html/web/sites/simpletest/browser_output
+    - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_SITENAME}-testing.${DDEV_TLD}
+    - SIMPLETEST_BASE_URL=${DDEV_PRIMARY_URL}
+    - SIMPLETEST_DB=mysql://root:root@db/phpunit
+corepack_enable: true
+hooks:
+    post-start:
+        - exec: mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS phpunit; GRANT ALL ON phpunit.* to 'db'@'%';"
+          service: db

From c02e50f1f904f6a70c975c291e7a4d91d636094a Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:07:40 +0530
Subject: [PATCH 03/19] Readme Updated.

---
 README.md | 51 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 0929471..b128314 100644
--- a/README.md
+++ b/README.md
@@ -10,18 +10,19 @@ The recommended way to set up Drupal core for development is with the Composer
 project template `joachim-n/drupal-core-development-project`. This addon can
 also be used with Drupal installed directly on a git clone of core.
 
-```
+``` bash
+# Use either of step 1A or 1B.
 # 1A: Install with Composer project template (recommended)
 # If you already installed a project using the template following the
 # instructions in its README then skip to step 2.
-ddev config --project-type=drupal --php-version=8.3
+ddev config --project-type=drupal --docroot=web --php-version=8.3
 ddev start
 ddev composer create joachim-n/drupal-core-development-project
 ddev config --update
 ddev restart
 
-# 1B: Install directly on a git clone
-git clone https://git.drupalcode.org/project/drupal.git drupal
+# 1B: Install directly on a git clone (advanced)
+git clone --branch=11.x https://git.drupalcode.org/project/drupal.git drupal
 cd drupal
 ddev config --disable-settings-management
 ddev start
@@ -36,11 +37,23 @@ ddev drush si -y --account-pass==admin
 
 ## Running tests
 
-### PHPUnit tests
+### DDEV Commands Usage
 
+```bash
+ddev phpcs core/modules/user/src/RegisterForm.php (from repos/drupal directory)
+ddev phpcbf core/modules/user/src/RegisterForm.php (from repos/drupal directory)
+ddev phpunit core/modules/user/tests/src/Functional/UserAdminTest.php (from repos/drupal directory)
+ddev code-check (ddev equivalent of running sh core/scripts/dev/commit-code-check.sh)
+ddev cspell-check (Checks for forbidden and new words which are not present in dictonary)
+ddev install (Installs new site)
+ddev drush [arguments] (from project root)
 ```
+
+### PHPUnit tests
+
+```bash
 # Run PHPUnit tests
-ddev phpunit web/core/modules/sdc
+ddev phpunit core/modules/sdc
 ```
 
 ### Nightwatch tests
@@ -50,42 +63,50 @@ for Chrome and https://drupal.ddev.site:7901 for Firefox. The password is
 "secret". YMMV using Firefox as core tests don't currently run on it.
 
 Only core tests
-```
+
+```bash
 ddev nightwatch --tag core
 ```
 
 Skip running core tests
-```
+
+```bash
 ddev nightwatch --skiptags core
 ```
 
 Run a single test
-```
+
+```bash
 ddev nightwatch tests/Drupal/Nightwatch/Tests/exampleTest.js
 ```
 
 a11y tests for both the admin and default themes
-```
+
+```bash
 ddev nightwatch --tag a11y
 ```
 
 a11y tests for the admin theme only
-```
+
+```bash
 ddev nightwatch --tag a11y:admin
 ```
 
 a11y tests for the default theme only
-```
+
+```bash
 ddev nightwatch --tag a11y:default
 ```
 
 a11y test for a custom theme used as the default theme
-```
+
+```bash
 ddev nightwatch --tag a11y:default --defaultTheme bartik
 ```
 
 a11y test for a custom admin theme
-```
+
+```bash
 ddev nightwatch --tag a11y:admin --adminTheme seven
 ```
 
@@ -93,7 +114,7 @@ ddev nightwatch --tag a11y:admin --adminTheme seven
 
 This will run static tests against core standards.
 
-```
+``` bash
 ddev drupal lint:phpstan
 ddev drupal lint:phpcs
 ddev drupal lint:js

From ea92e30ca3352a84b6ba3e6e3e9d7f60c093ea6d Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:34:23 +0530
Subject: [PATCH 04/19] Updated Post Install Actions.

---
 install.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/install.yaml b/install.yaml
index f8717de..975e6c8 100644
--- a/install.yaml
+++ b/install.yaml
@@ -31,9 +31,8 @@ post_install_actions:
   - perl -pi -e "'$DDEV_DOCROOT' and s|DDEV_DOCROOT|$DDEV_DOCROOT/|g" ../phpunit.xml
   - cp core-dev/.env ../.env
   - cp core-dev/gitignore ../.gitignore
-  - mkdir -p ../test_output
-  - chmod +w ../test_output
-  - cd ../web/core && ddev yarn
+  - mkdir -p ../web/sites/simpletest/browser_output
+  - chmod +w ../web/sites/simpletest/browser_output
 
 removal_actions:
   - |
@@ -42,4 +41,4 @@ removal_actions:
         rm -f ${item}
       fi
     done
-  - rm -rf ../test_output
+  - rm -rf ../web/sites/simpletest/browser_output

From 8319b01719014cba89f53c2227e5a0f4a55a6ddd Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:36:58 +0530
Subject: [PATCH 05/19] Updated Post Install Actions.

---
 commands/web/tests-cleanup       | 10 +++++-----
 config.ddev-drupal-core-dev.yaml |  4 ++--
 install.yaml                     |  7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/commands/web/tests-cleanup b/commands/web/tests-cleanup
index 690a769..3a5ca94 100755
--- a/commands/web/tests-cleanup
+++ b/commands/web/tests-cleanup
@@ -7,13 +7,13 @@
 TOP_LEVEL="/var/www/html"
 cd $TOP_LEVEL
 
-if [ ! -d "web/sites/simpletest/browser_output" ]
+if [ ! -d "web/test_output" ]
 then
-  echo "The expected folder web/sites/simpletest/browser_output does not exist."
-  exit
+  echo "The expected folder web/test_output does not exist."
+  exit 2
 fi
 
-rm web/sites/simpletest/browser_output/*.counter
-rm web/sites/simpletest/browser_output/*.html
+rm web/test_output/*.counter
+rm web/test_output/*.html
 
 echo "Test files removed."
diff --git a/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml
index e84784c..4e773d9 100644
--- a/config.ddev-drupal-core-dev.yaml
+++ b/config.ddev-drupal-core-dev.yaml
@@ -9,9 +9,9 @@ upload_dirs:
 # so just redirect the upload_dirs.
     - .ddev/tmp
 additional_hostnames:
- - ${DDEV_SITENAME}-testing.${DDEV_TLD}
+ - "${DDEV_SITENAME}"-testing
 web_environment:
-    - BROWSERTEST_OUTPUT_DIRECTORY=/var/www/html/web/sites/simpletest/browser_output
+    - BROWSERTEST_OUTPUT_DIRECTORY=/var/www/html/web/test_output
     - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_SITENAME}-testing.${DDEV_TLD}
     - SIMPLETEST_BASE_URL=${DDEV_PRIMARY_URL}
     - SIMPLETEST_DB=mysql://root:root@db/phpunit
diff --git a/install.yaml b/install.yaml
index 975e6c8..f8717de 100644
--- a/install.yaml
+++ b/install.yaml
@@ -31,8 +31,9 @@ post_install_actions:
   - perl -pi -e "'$DDEV_DOCROOT' and s|DDEV_DOCROOT|$DDEV_DOCROOT/|g" ../phpunit.xml
   - cp core-dev/.env ../.env
   - cp core-dev/gitignore ../.gitignore
-  - mkdir -p ../web/sites/simpletest/browser_output
-  - chmod +w ../web/sites/simpletest/browser_output
+  - mkdir -p ../test_output
+  - chmod +w ../test_output
+  - cd ../web/core && ddev yarn
 
 removal_actions:
   - |
@@ -41,4 +42,4 @@ removal_actions:
         rm -f ${item}
       fi
     done
-  - rm -rf ../web/sites/simpletest/browser_output
+  - rm -rf ../test_output

From 24815224584088c67d1ab1d96b246f6e7cc2b408 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:45:06 +0530
Subject: [PATCH 06/19] DDEV Config updated.

---
 config.ddev-drupal-core-dev.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml
index 4e773d9..c79038c 100644
--- a/config.ddev-drupal-core-dev.yaml
+++ b/config.ddev-drupal-core-dev.yaml
@@ -8,11 +8,9 @@ upload_dirs:
 # but with DDEV + mutagen that isn't possible.
 # so just redirect the upload_dirs.
     - .ddev/tmp
-additional_hostnames:
- - "${DDEV_SITENAME}"-testing
 web_environment:
     - BROWSERTEST_OUTPUT_DIRECTORY=/var/www/html/web/test_output
-    - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_SITENAME}-testing.${DDEV_TLD}
+    - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL}
     - SIMPLETEST_BASE_URL=${DDEV_PRIMARY_URL}
     - SIMPLETEST_DB=mysql://root:root@db/phpunit
 corepack_enable: true

From 845df4300e5ed463a4b3249af857795dcf7e3472 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:52:29 +0530
Subject: [PATCH 07/19] POst Install Actions Updated.

---
 config.ddev-drupal-core-dev.yaml | 1 +
 install.yaml                     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml
index c79038c..7fdc688 100644
--- a/config.ddev-drupal-core-dev.yaml
+++ b/config.ddev-drupal-core-dev.yaml
@@ -14,6 +14,7 @@ web_environment:
     - SIMPLETEST_BASE_URL=${DDEV_PRIMARY_URL}
     - SIMPLETEST_DB=mysql://root:root@db/phpunit
 corepack_enable: true
+nodejs_version: "20"
 hooks:
     post-start:
         - exec: mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS phpunit; GRANT ALL ON phpunit.* to 'db'@'%';"
diff --git a/install.yaml b/install.yaml
index f8717de..1116d74 100644
--- a/install.yaml
+++ b/install.yaml
@@ -33,7 +33,7 @@ post_install_actions:
   - cp core-dev/gitignore ../.gitignore
   - mkdir -p ../test_output
   - chmod +w ../test_output
-  - cd ../web/core && ddev yarn
+  # - cd ../web/core && ddev yarn
 
 removal_actions:
   - |
@@ -42,4 +42,5 @@ removal_actions:
         rm -f ${item}
       fi
     done
+  - echo removing test_output directory
   - rm -rf ../test_output

From e4f894eb33405c191d7a57927c0fb320cd8cc453 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 11:58:51 +0530
Subject: [PATCH 08/19] Install file Updated.

---
 install.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/install.yaml b/install.yaml
index 1116d74..2dbfc14 100644
--- a/install.yaml
+++ b/install.yaml
@@ -10,6 +10,13 @@ project_files:
   - commands/web/drupal
   - commands/web/phpunit
   - commands/web/nightwatch
+  - commands/web/install
+  - commands/web/code-check
+  - commands/web/cspell-check
+  - commands/web/phpcbf
+  - commands/web/phpcs
+  - commands/web/phpstan
+  - commands/web/tests-cleanup
   - core-dev/gitignore
   - core-dev/.env
   - core-dev/src/Command/AdminLoginCommand.php

From da77611dd93061014ba1c330bddf9bc302525a30 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 12:18:42 +0530
Subject: [PATCH 09/19] README Updated.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b128314..5d64f72 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ ddev drush si -y --account-pass==admin
 ```bash
 ddev phpcs core/modules/user/src/RegisterForm.php (from repos/drupal directory)
 ddev phpcbf core/modules/user/src/RegisterForm.php (from repos/drupal directory)
+ddev phpstan core/modules/user/src/RegisterForm.php (from repos/drupal directory)
 ddev phpunit core/modules/user/tests/src/Functional/UserAdminTest.php (from repos/drupal directory)
 ddev code-check (ddev equivalent of running sh core/scripts/dev/commit-code-check.sh)
 ddev cspell-check (Checks for forbidden and new words which are not present in dictonary)

From 42464df4bed56164b1c259356e02427655d45859 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 12:29:20 +0530
Subject: [PATCH 10/19] Folder permissions updated.

---
 install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.yaml b/install.yaml
index 2dbfc14..2f1f6a9 100644
--- a/install.yaml
+++ b/install.yaml
@@ -39,7 +39,7 @@ post_install_actions:
   - cp core-dev/.env ../.env
   - cp core-dev/gitignore ../.gitignore
   - mkdir -p ../test_output
-  - chmod +w ../test_output
+  - chmod -R 777 ../test_output
   # - cd ../web/core && ddev yarn
 
 removal_actions:

From a7ab89b38f8b65d88b0b7404b350e28356e5f591 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 12:33:02 +0530
Subject: [PATCH 11/19] DDEV Generated Tag added.

---
 commands/web/code-check    | 2 ++
 commands/web/cspell-check  | 2 ++
 commands/web/install       | 2 ++
 commands/web/nightwatch    | 1 +
 commands/web/phpcbf        | 2 ++
 commands/web/phpcs         | 2 ++
 commands/web/phpstan       | 2 ++
 commands/web/phpunit       | 1 +
 commands/web/tests-cleanup | 2 ++
 9 files changed, 16 insertions(+)

diff --git a/commands/web/code-check b/commands/web/code-check
index d0ce547..3ff81ff 100755
--- a/commands/web/code-check
+++ b/commands/web/code-check
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: This script performs code quality checks.
 ## Usage: code-check [flags]
 ## Example: "ddev code-check" or "ddev code-check --cached"
diff --git a/commands/web/cspell-check b/commands/web/cspell-check
index b858f56..be9a58f 100755
--- a/commands/web/cspell-check
+++ b/commands/web/cspell-check
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: This script performs cspell checks.
 ## Usage: cspell-check [flags]
 ## Example: "ddev cspell-check"
diff --git a/commands/web/install b/commands/web/install
index d42fff5..f14ddae 100755
--- a/commands/web/install
+++ b/commands/web/install
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: Performs a default drupal installation
 ## Usage: install
 ## Example: "ddev install"
diff --git a/commands/web/nightwatch b/commands/web/nightwatch
index c8cbb56..954af04 100644
--- a/commands/web/nightwatch
+++ b/commands/web/nightwatch
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 #ddev-generated
+
 ## Description: Run Nightwatch
 ## Usage: nightwatch
 ## Example: ddev nightwatch --tag core
diff --git a/commands/web/phpcbf b/commands/web/phpcbf
index 2451b8a..62d51cf 100755
--- a/commands/web/phpcbf
+++ b/commands/web/phpcbf
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: Run phpcbf
 ## Usage: phpcbf [flags] [args]
 ## Example: "ddev phpcbf core/modules/user/src/RegisterForm.php"
diff --git a/commands/web/phpcs b/commands/web/phpcs
index 01a47c3..7e5a44b 100755
--- a/commands/web/phpcs
+++ b/commands/web/phpcs
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: Run phpcs
 ## Usage: phpcs [flags] [args]
 ## Example: "ddev phpcs core/modules/user/src/RegisterForm.php"
diff --git a/commands/web/phpstan b/commands/web/phpstan
index f90f76b..90cefdd 100755
--- a/commands/web/phpstan
+++ b/commands/web/phpstan
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: Run phpstan
 ## Usage: phpstan [flags] [args]
 ## Example: "ddev phpstan core/modules/migrate_drupal_ui"
diff --git a/commands/web/phpunit b/commands/web/phpunit
index 800855e..3e4480f 100644
--- a/commands/web/phpunit
+++ b/commands/web/phpunit
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 #ddev-generated
+
 ## Description: Run PHPUnit
 ## Usage: phpunit
 ## Example: "ddev phpunit core/modules/user/tests/src/Functional/UserAdminTest.php"
diff --git a/commands/web/tests-cleanup b/commands/web/tests-cleanup
index 3a5ca94..2e09c45 100755
--- a/commands/web/tests-cleanup
+++ b/commands/web/tests-cleanup
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#ddev-generated
+
 ## Description: Clean up test results
 ## Usage: tests-cleanup
 ## Example: "ddev tests-cleanup"

From 22d31bfc2bbb4364235c86a40ef5a6fd05293c16 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 12:37:17 +0530
Subject: [PATCH 12/19] ENV Variable updated.

---
 config.ddev-drupal-core-dev.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.ddev-drupal-core-dev.yaml b/config.ddev-drupal-core-dev.yaml
index 7fdc688..554b0e4 100644
--- a/config.ddev-drupal-core-dev.yaml
+++ b/config.ddev-drupal-core-dev.yaml
@@ -9,7 +9,7 @@ upload_dirs:
 # so just redirect the upload_dirs.
     - .ddev/tmp
 web_environment:
-    - BROWSERTEST_OUTPUT_DIRECTORY=/var/www/html/web/test_output
+    - BROWSERTEST_OUTPUT_DIRECTORY=/var/www/html/test_output
     - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL}
     - SIMPLETEST_BASE_URL=${DDEV_PRIMARY_URL}
     - SIMPLETEST_DB=mysql://root:root@db/phpunit

From 88432e4e9f7b8115176173da53f12a9a48317a51 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 12:44:54 +0530
Subject: [PATCH 13/19] Post Removal Actions Updated.

---
 install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.yaml b/install.yaml
index 2f1f6a9..b787e66 100644
--- a/install.yaml
+++ b/install.yaml
@@ -44,7 +44,7 @@ post_install_actions:
 
 removal_actions:
   - |
-    for item in ../core/phpunit.xml ../core/.env ../.gitignore; do
+    for item in ../phpunit.xml ../.env ../.gitignore; do
       if grep '#ddev-generated' ${item} >/dev/null; then
         rm -f ${item}
       fi

From 103dcef29a5c931ab881a24f41ea9d075aa996d8 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:02:44 +0530
Subject: [PATCH 14/19] PHPCS Config updated.

---
 commands/web/phpcbf | 2 +-
 commands/web/phpcs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/commands/web/phpcbf b/commands/web/phpcbf
index 62d51cf..0b82a1c 100755
--- a/commands/web/phpcbf
+++ b/commands/web/phpcbf
@@ -14,5 +14,5 @@ if ! command -v /var/www/html/vendor/bin/phpcbf >/dev/null; then
   exit 2
 fi
 
-/var/www/html/vendor/bin/phpcbf --standard=Drupal,DrupalPractice $@ || \
+/var/www/html/vendor/bin/phpcbf --standard="$TOP_LEVEL/core/phpcs.xml.dist $@ || \
 echo "Return code ignored"
diff --git a/commands/web/phpcs b/commands/web/phpcs
index 7e5a44b..7f4c9d5 100755
--- a/commands/web/phpcs
+++ b/commands/web/phpcs
@@ -14,5 +14,5 @@ if ! command -v /var/www/html/vendor/bin/phpcs >/dev/null; then
   exit 2
 fi
 
-/var/www/html/vendor/bin/phpcs --standard=Drupal,DrupalPractice $@ || \
+/var/www/html/vendor/bin/phpcs --standard="$TOP_LEVEL/core/phpcs.xml.dist $@ || \
 echo "Return code ignored"

From fc4bede09c381413aa59e7bc1614471d9656c88b Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:05:34 +0530
Subject: [PATCH 15/19] PHPCS Config updated.

---
 commands/web/phpcbf | 2 +-
 commands/web/phpcs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/commands/web/phpcbf b/commands/web/phpcbf
index 0b82a1c..1854bb0 100755
--- a/commands/web/phpcbf
+++ b/commands/web/phpcbf
@@ -14,5 +14,5 @@ if ! command -v /var/www/html/vendor/bin/phpcbf >/dev/null; then
   exit 2
 fi
 
-/var/www/html/vendor/bin/phpcbf --standard="$TOP_LEVEL/core/phpcs.xml.dist $@ || \
+/var/www/html/vendor/bin/phpcbf --standard="$TOP_LEVEL/core/phpcs.xml.dist" $@ || \
 echo "Return code ignored"
diff --git a/commands/web/phpcs b/commands/web/phpcs
index 7f4c9d5..7355ead 100755
--- a/commands/web/phpcs
+++ b/commands/web/phpcs
@@ -14,5 +14,5 @@ if ! command -v /var/www/html/vendor/bin/phpcs >/dev/null; then
   exit 2
 fi
 
-/var/www/html/vendor/bin/phpcs --standard="$TOP_LEVEL/core/phpcs.xml.dist $@ || \
+/var/www/html/vendor/bin/phpcs --standard="$TOP_LEVEL/core/phpcs.xml.dist" $@ || \
 echo "Return code ignored"

From 0b4a844c346383fc01cd87ebac0cf99199bb5b11 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:35:38 +0530
Subject: [PATCH 16/19] Update post install actions.

---
 install.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/install.yaml b/install.yaml
index b787e66..b245927 100644
--- a/install.yaml
+++ b/install.yaml
@@ -33,7 +33,10 @@ project_files:
   - core-dev/src/Command/LintCommand.php
 
 post_install_actions:
-  - cp core-dev/phpunit-chrome.xml ../phpunit.xml
+  - mkdir -p ../repos
+  - git clone --branch=11.x https://git.drupalcode.org/project/drupal.git ../repos/drupal
+  - cp ../repos/drupal/core/phpunit.xml.dist ../phpunit.xml
+  - sed -i '2s/^/#ddev-generated\n/' ../phpunit.xml
   - perl -pi -e "s|DRUPAL_CORE_DDEV_URL|$DDEV_PRIMARY_URL|g" ../phpunit.xml
   - perl -pi -e "'$DDEV_DOCROOT' and s|DDEV_DOCROOT|$DDEV_DOCROOT/|g" ../phpunit.xml
   - cp core-dev/.env ../.env

From bf4e67a2b77cb6188a9799fc0335f857be229931 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 13:41:00 +0530
Subject: [PATCH 17/19] Update post install actions.

---
 install.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/install.yaml b/install.yaml
index b245927..df46f9f 100644
--- a/install.yaml
+++ b/install.yaml
@@ -33,8 +33,6 @@ project_files:
   - core-dev/src/Command/LintCommand.php
 
 post_install_actions:
-  - mkdir -p ../repos
-  - git clone --branch=11.x https://git.drupalcode.org/project/drupal.git ../repos/drupal
   - cp ../repos/drupal/core/phpunit.xml.dist ../phpunit.xml
   - sed -i '2s/^/#ddev-generated\n/' ../phpunit.xml
   - perl -pi -e "s|DRUPAL_CORE_DDEV_URL|$DDEV_PRIMARY_URL|g" ../phpunit.xml

From 35fd7a9b71998f2dac69ddfe666dc1da06c86aec Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 14:41:27 +0530
Subject: [PATCH 18/19] Update post install actions.

---
 install.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/install.yaml b/install.yaml
index df46f9f..582f9cb 100644
--- a/install.yaml
+++ b/install.yaml
@@ -34,7 +34,6 @@ project_files:
 
 post_install_actions:
   - cp ../repos/drupal/core/phpunit.xml.dist ../phpunit.xml
-  - sed -i '2s/^/#ddev-generated\n/' ../phpunit.xml
   - perl -pi -e "s|DRUPAL_CORE_DDEV_URL|$DDEV_PRIMARY_URL|g" ../phpunit.xml
   - perl -pi -e "'$DDEV_DOCROOT' and s|DDEV_DOCROOT|$DDEV_DOCROOT/|g" ../phpunit.xml
   - cp core-dev/.env ../.env

From 21cd6f63d7d4c066fe749bd44c85e10600762ba9 Mon Sep 17 00:00:00 2001
From: Bhanu <8525040+bhanu951@users.noreply.github.com>
Date: Sat, 2 Nov 2024 14:52:01 +0530
Subject: [PATCH 19/19] Command Updated.

---
 commands/web/tests-cleanup | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/commands/web/tests-cleanup b/commands/web/tests-cleanup
index 2e09c45..b128b67 100755
--- a/commands/web/tests-cleanup
+++ b/commands/web/tests-cleanup
@@ -9,13 +9,13 @@
 TOP_LEVEL="/var/www/html"
 cd $TOP_LEVEL
 
-if [ ! -d "web/test_output" ]
+if [ ! -d "./test_output" ]
 then
-  echo "The expected folder web/test_output does not exist."
+  echo "The expected folder test_output does not exist."
   exit 2
 fi
 
-rm web/test_output/*.counter
-rm web/test_output/*.html
+rm ./test_output/*.counter
+rm ./test_output/*.html
 
 echo "Test files removed."