Merge pull request #64 from UN-OCHA/develop

[OPS-8092] core security update

.travis.yml

@@ -1,14 +1,18 @@
-dist: bionic
+dist: focal
 language: php
 cache:
   - composer
 
-addons:
-  chrome: stable
-
 php:
   - 8.0
 
+# Make sure we have a recent version of docker-compose and chrome.
+addons:
+  apt:
+    packages:
+      - docker-compose
+  chrome: stable
+
 services:
   - mysql
 
@@ -39,15 +43,15 @@ script:
   - test ! -d ./html/themes/custom || find -L ./html/themes/custom -iregex '.*\.\(php\|module\|inc\|install\)$' -print0 | xargs -0 -n 1 -P 4 php -l
 
   # PHP CS
-  - ./vendor/bin/phpcs --config-set installed_paths vendor/drupal/coder/coder_sniffer
   - test ! -d ./html/modules/custom || ./vendor/bin/phpcs -p --report=full ./html/modules/custom
 
   # Theme build.
   - composer run sass
 
   # Drupal install
+  - mysql -e "CREATE USER [email protected] IDENTIFIED BY 'drupal';"
   - mysql -e "CREATE DATABASE drupal;"
-  - mysql -e "GRANT ALL ON drupal.* to [email protected] IDENTIFIED BY 'drupal';"
+  - mysql -e "GRANT ALL ON drupal.* to [email protected];"
 
   - cd ${TRAVIS_BUILD_DIR}
   - mkdir -p ./html/sites/default

composer.json

@@ -46,7 +46,7 @@
         "drupal/r4032login": "^2.1",
         "drupal/redirect": "^1.6",
         "drupal/seckit": "^2.0",
-        "drupal/social_auth_hid": "^2.6",
+        "drupal/social_auth_hid": "^3.0",
         "drupal/user_expire": "^1.0",
         "drush/drush": "^10.2.2",
         "oomphinc/composer-installers-extender": "^2.0",
@@ -67,6 +67,7 @@
         "phpcompatibility/php-compatibility": "^9.3.5",
         "phpmd/phpmd": "^2.8.2",
         "phpunit/phpunit": "^8.4.1",
+        "slevomat/coding-standard": "^7.0",
         "weitzman/drupal-test-traits": "^1.5"
     },
     "conflict": {
@@ -80,6 +81,7 @@
         "allow-plugins": {
             "composer/installers": true,
             "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal-composer/preserve-paths": true,
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
@@ -114,6 +116,11 @@
         ]
     },
     "extra": {
+        "drush": {
+          "services": {
+            "drush.services.yml": "^10"
+          }
+        },
         "enable-patching": true,
         "composer-exit-on-patch-failure": true,
         "patchLevel": {