Merge pull request #27 from dof-dss/development

Unity release 0.30.3

Author: DuttonMa

.circleci/config.yml

@@ -14,7 +14,6 @@ jobs:
           name: Fetch phpcs and dependencies
           command: |
             composer require drupal/coder --prefer-stable --no-interaction --optimize-autoloader
-            composer require slevomat/coding-standard --prefer-stable --no-interaction --optimize-autoloader
             # Move vendor directory up a level as we don't want to code-check all of that.
             mv vendor ../
       - run:
@@ -36,6 +35,7 @@ jobs:
           name: Add OS and PHP extensions/config
           command: |
             sudo cp /home/circleci/origins_modules/.circleci/docker-php-circleci.ini /usr/local/etc/php/conf.d/
+            wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
             sudo apt --allow-releaseinfo-change update
             sudo apt install -y libpng-dev
             sudo docker-php-ext-install gd

cookie_content_blocker/src/Plugin/CKEditorPlugin/CookieContentBlocker.php

@@ -39,7 +39,7 @@ class CookieContentBlocker extends CKEditorPluginBase implements CKEditorPluginC
   public function __construct(array $configuration, $plugin_id, $plugin_definition) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     // Remove this deprecated code ('drupal_get_path')
-    //$this->modulePath = drupal_get_path('module', 'cookie_content_blocker');
+    // $this->modulePath = drupal_get_path('module', 'cookie_content_blocker');
     // Replace with a call to a Drupal service, which is not done in the correct way
     // using Dependency Injection, but that would involve a lot of work and this is just
     // a quick fix to this contrib module in order to get it through our CI checks.

cookie_content_blocker/src/Render/HtmlResponseAttachmentsProcessor.php

@@ -13,7 +13,6 @@
 use function in_array;
 use function is_callable;
 use function uasort;
-use Drupal;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
@@ -105,7 +104,9 @@ public function __construct(BlockedLibraryManagerInterface $library_manager, Ass
    *   The settings to merge.
    */
   protected function mergeSettings(array $settings): void {
-    self::$drupalSettings = NestedArray::mergeDeepArray([self::$drupalSettings, $settings], TRUE);
+    self::$drupalSettings = NestedArray::mergeDeepArray([
+        self::$drupalSettings, $settings
+    ], TRUE);
   }
 
   /**
@@ -182,7 +183,10 @@ private function generateAssetPlaceholder(array $asset): array {
 
     // Merge attached settings back into the original assets.
     $placeholder_asset = AttachedAssets::createFromRenderArray($attached);
-    $this->allowedAssets->setSettings(NestedArray::mergeDeepArray([$placeholder_asset->getSettings(), $this->allowedAssets->getSettings()], TRUE));
+    $this->allowedAssets->setSettings(NestedArray::mergeDeepArray([
+        $placeholder_asset->getSettings(),
+        $this->allowedAssets->getSettings()
+    ], TRUE));
     $this->mergeSettings(['data' => $this->allowedAssets->getSettings()]);
     return $placeholder;
   }
@@ -195,7 +199,9 @@ private function generateAssetPlaceholder(array $asset): array {
    */
   private function getCssAssetCollection(): array {
     $optimize_css = !defined('MAINTENANCE_MODE') && $this->config->get('css.preprocess');
-    return $this->getMergedAndSortedAssets(...$this->resolveAssets([$this->assetResolver, 'getCssAssets'], $optimize_css));
+    return $this->getMergedAndSortedAssets(...$this->resolveAssets([
+        $this->assetResolver, 'getCssAssets'
+        ], $optimize_css));
   }
 
   /**

unity_breadcrumbs/unity_breadcrumbs.module

@@ -15,11 +15,10 @@ use Drupal\Core\Link;
  *
  * Altering the search view page breadcrumbs, when facets are selected the breadcrumb trail is overwritten.
  */
-function unity_breadcrumbs_system_breadcrumb_alter(Breadcrumb &$breadcrumb, RouteMatchInterface $route_match, array
-$context) {
+function unity_breadcrumbs_system_breadcrumb_alter(Breadcrumb &$breadcrumb, RouteMatchInterface $route_match, array $context) {
   $links = $breadcrumb->getLinks();
 
-  if ($links) {
+  if (!empty($links)) {
     // Loop through the links for links that have facet queries added to them and unset the link of the last breadcrumb.
     // The facets module breadcrumb links them all by default.
     foreach ($links as $link) {

unity_landing_pages/unity_landing_pages.module

@@ -87,4 +87,3 @@ function unity_landing_pages_preprocess_page(&$variables) {
     $variables['#attached']['library'][] = 'unity_landing_pages/landing_page_admin';
   }
 }
-

unity_search_pages/src/Controller/SearchPagesController.php

@@ -93,21 +93,21 @@ public function getTitle($route = NULL) {
    *   The page title.
    */
   public function getTitleFromRoute($route = NULL) {
-    // For example, route
-    // view.publications_search.publication_search_page
+    // For example, route view.publications_search.publication_search_page
     // gives the title 'Publications'.
-    $title = "";
+    $title = '';
     $route_parts = explode('.', $route);
-    if ((count($route_parts) > 2) && isset($route_parts[2])) {
+    if ((count($route_parts) > 2) && !empty($route_parts[2])) {
       $title = $route_parts[2];
-      $title = str_replace(['search_page','_'],'',$title);
+      $title = str_replace(['search_page', '_'], '', $title);
       if (strlen($title) == 0) {
         // This must be the site search page.
         $title = 'Search';
-      } else {
+      }
+      else {
         // Capitalise the first letter and pluralise.
         $title = ucfirst($title);
-        if ((substr($title, -1) != 's') && ($title !== 'Evidence') ) {
+        if ((substr($title, -1) != 's') && ($title !== 'Evidence')) {
           $title .= 's';
         }
       }

unity_search_pages/unity_search_pages.module

@@ -9,7 +9,7 @@ use Solarium\Core\Query\QueryInterface;
 use Drupal\search_api\Query\QueryInterface as SearchApiQueryInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Component\Utility\Html;
-use \Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Implements hook_preprocess_views_view() for views_view.
@@ -169,11 +169,14 @@ function unity_search_pages_preprocess_page_title(&$variables) {
   if (preg_match($pattern, $current_route)) {
     if ($title_raw instanceof TranslatableMarkup) {
       $title_text = $title_raw->render();
-    } elseif (is_array($title_raw) && isset($title_raw['#markup'])) {
+    }
+    elseif (is_array($title_raw) && isset($title_raw['#markup'])) {
       $title_text = $title_raw['#markup'];
-    } else {
+    }
+    else {
       $title_text = $title_raw;
     }
+
     if (preg_match('/\w*\b\s- search results/', $title_text)) {
       $new_title = strtok($title_text, ' -');
       $variables['title'] = t($new_title);