From 8b810725ec4b9f1b17d7a956792694d571ff0664 Mon Sep 17 00:00:00 2001
From: Liam Morland <lkmorlan@uwaterloo.ca>
Date: Thu, 24 Jun 2021 10:20:15 -0400
Subject: [PATCH 1/2] Coding standards: Remove trailing whitespace

---
 README.md                          |  3 +--
 manifests/drupal7.sh               |  2 +-
 variables/development.services.yml |  2 +-
 variables/settings.local.php       | 26 +++++++++++++-------------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index bf77cb6..526b92e 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ https://www.vagrantup.com/vmware/downloads
 
    https://git.uwaterloo.ca/help/ssh/README
 
-4. You may need to add the LDAP config settings for LDAP to work. If you are part of the WCMS team you should already have access to the neccessary information. If you are an on-campus developer, you can contact the WCMS and ask how to set this up. 
+4. You may need to add the LDAP config settings for LDAP to work. If you are part of the WCMS team you should already have access to the neccessary information. If you are an on-campus developer, you can contact the WCMS and ask how to set this up.
 
 The folder is located here:
 
@@ -311,4 +311,3 @@ To use the commands, from the command line type the text on the left of the = to
  storegitpw='git config --global credential.helper store'
 
  si='drush si uw_base_profile --account-name=wcmsadmin --account-pass=a --site-name="WCMS Test"'
-
diff --git a/manifests/drupal7.sh b/manifests/drupal7.sh
index 7fb5596..c6bc4a0 100755
--- a/manifests/drupal7.sh
+++ b/manifests/drupal7.sh
@@ -123,4 +123,4 @@ do
   mkdir /var/www/$profile/apps
 done
 
-echo "Setting up all the things for Drupal8..."
\ No newline at end of file
+echo "Setting up all the things for Drupal8..."
diff --git a/variables/development.services.yml b/variables/development.services.yml
index a9fc52f..0553016 100644
--- a/variables/development.services.yml
+++ b/variables/development.services.yml
@@ -10,4 +10,4 @@ parameters:
     cache: false
 services:
   cache.backend.null:
-    class: Drupal\Core\Cache\NullBackendFactory
\ No newline at end of file
+    class: Drupal\Core\Cache\NullBackendFactory
diff --git a/variables/settings.local.php b/variables/settings.local.php
index 1b08ee8..3d433cb 100644
--- a/variables/settings.local.php
+++ b/variables/settings.local.php
@@ -1,5 +1,5 @@
 <?php
- 
+
 /**
  * @file
  * Local development override configuration feature.
@@ -13,7 +13,7 @@
  * this file to 'sites/example.com/settings.local.php', and uncomment the lines
  * at the bottom of 'sites/example.com/settings.php'.
  */
- 
+
 /**
  * Assertions.
  *
@@ -32,12 +32,12 @@
  */
 assert_options(ASSERT_ACTIVE, TRUE);
 \Drupal\Component\Assertion\Handle::register();
- 
+
 /**
  * Enable local development services.
  */
 $settings['container_yamls'][] = __DIR__  . '/development.services.yml';
- 
+
 /**
  * Show all error messages, with backtrace information.
  *
@@ -45,13 +45,13 @@ $settings['container_yamls'][] = __DIR__  . '/development.services.yml';
  * example the database connection failed, we rely only on this value.
  */
 $config['system.logging']['error_level'] = 'verbose';
- 
+
 /**
  * Disable CSS and JS aggregation.
  */
 $config['system.performance']['css']['preprocess'] = FALSE;
 $config['system.performance']['js']['preprocess'] = FALSE;
- 
+
 /**
  * Disable the render cache (this includes the page cache).
  *
@@ -65,7 +65,7 @@ $config['system.performance']['js']['preprocess'] = FALSE;
  * Do not use this setting until after the site is installed.
  */
 $settings['cache']['bins']['render'] = 'cache.backend.null';
- 
+
 /**
  * Disable caching for migrations.
  *
@@ -73,7 +73,7 @@ $settings['cache']['bins']['render'] = 'cache.backend.null';
  * database. This makes it easier to develop custom migrations.
  */
 # $settings['cache']['bins']['discovery_migration'] = 'cache.backend.memory';
- 
+
 /**
  * Disable Dynamic Page Cache.
  *
@@ -82,7 +82,7 @@ $settings['cache']['bins']['render'] = 'cache.backend.null';
  * in the early stages of development, you may want to disable it.
  */
 $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
- 
+
 /**
  * Allow test modules and themes to be installed.
  *
@@ -91,7 +91,7 @@ $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
  * purposes.
  */
 $settings['extension_discovery_scan_tests'] = FALSE;
- 
+
 /**
  * Enable access to rebuild.php.
  *
@@ -101,7 +101,7 @@ $settings['extension_discovery_scan_tests'] = FALSE;
  * using these parameters in a request to rebuild.php.
  */
 $settings['rebuild_access'] = TRUE;
- 
+
 /**
  * Skip file system permissions hardening.
  *
@@ -113,7 +113,7 @@ $settings['rebuild_access'] = TRUE;
  * directory.
  */
 $settings['skip_permissions_hardening'] = TRUE;
- 
+
 /**
  * Class Loader.
  *
@@ -121,4 +121,4 @@ $settings['skip_permissions_hardening'] = TRUE;
  * performance reasons. Detection can be prevented by setting
  * class_loader_auto_detect to false, as in the example below.
  */
-$settings['class_loader_auto_detect'] = FALSE;
\ No newline at end of file
+$settings['class_loader_auto_detect'] = FALSE;
-- 
GitLab


From 4d0f8d797fb8ed58b940ad78b7b2ada0e713e321 Mon Sep 17 00:00:00 2001
From: Liam Morland <lkmorlan@uwaterloo.ca>
Date: Thu, 24 Jun 2021 10:26:11 -0400
Subject: [PATCH 2/2] Remove condition which causes coding standards checks to
 hang

Prior to this change, phpcs would hang on this file.
---
 manifests/drupal7.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/drupal7.sh b/manifests/drupal7.sh
index c6bc4a0..5b93f7a 100755
--- a/manifests/drupal7.sh
+++ b/manifests/drupal7.sh
@@ -90,7 +90,7 @@ do
   server="${profile/drupal/d}"
   for site in $(seq 1 $sites)
     do
-      echo "<?php
+      echo "<""?php
       // Server domain name.
       ${VGUWHOST} = '$sitename';
       // Path to site root.
-- 
GitLab