Merge pull request #142 from localgovdrupal/2.x

2.3.5 release

Author: andybroomfield

.github/workflows/test.yml

@@ -1,6 +1,3 @@
-##
-# Managed by https://github.com/localgovdrupal/github_workflow_manager
----
 name: Test localgovdrupal/localgov_subsites drupal-module
 
 on:
@@ -211,4 +208,4 @@ jobs:
           mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
           sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
           docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
-          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
+          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"

src/Plugin/Block/SubsitesHierarchyTrait.php

@@ -102,7 +102,7 @@ protected function getNestedSetStorage(string $section): NestedSetStorage {
   /**
    * Get the entity_id of the ultimate parent drupal entity.
    *
-   * @param Drupal\Core\Entity\EntityInterface $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   Entity to find root ancestor of.
    *
    * @return null|int