phpcs fixes

bluecadet · Jan 30, 2024 · 77eae60 · 77eae60
1 parent 3398325
commit 77eae60
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/bluecadet_accessibility.install b/bluecadet_accessibility.install
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Implements hook_install().
+ */
+
 /**
  * Implements hook_install().
  */
@@ -13,7 +18,7 @@ function bluecadet_accessibility_install() {
 function bluecadet_accessibility_enable_plugin() {
   // Enable ajax_ally_option plugin.
   $config = \Drupal::service('config.factory')->getEditable('views.settings');
-  $display_extenders = $config->get('display_extenders') ?: array();
+  $display_extenders = $config->get('display_extenders') ?: [];
   $display_extenders[] = 'ajax_ally_option';
   $config->set('display_extenders', $display_extenders);
   $config->save();
@@ -25,10 +30,10 @@ function bluecadet_accessibility_enable_plugin() {
 function bluecadet_accessibility_uninstall() {
   // Disable ajax_ally_option plugin.
   $config = \Drupal::service('config.factory')->getEditable('views.settings');
-  $display_extenders = $config->get('display_extenders') ?: array();
+  $display_extenders = $config->get('display_extenders') ?: [];
 
   $key = array_search('ajax_ally_option', $display_extenders);
-  if ($key!== FALSE) {
+  if ($key !== FALSE) {
     unset($display_extenders[$key]);
     $config->set('display_extenders', $display_extenders);
     $config->save();

diff --git a/bluecadet_accessibility.module b/bluecadet_accessibility.module
@@ -7,19 +7,13 @@
 
 use Drupal\views\ViewExecutable;
 
-/**
- * Implements hook_page_attachments().
- */
-// function bluecadet_accessibility_page_attachments(array &$attachments) {
-//   $attachments['#attached']['library'][] = 'bluecadet_accessibility/bluecadet_accessibility';
-// }
-
 /**
  * Implements hook_form_views_pre_render().
  *
  * Add instance dates to view results.
  */
-function bluecadet_accessibility_views_pre_render(ViewExecutable $view) {
+function bluecadet_accessibility_views_pre_render(ViewExecutable $view)
+{
   // Grab the current view display.
   $display = $view->getDisplay();
 
@@ -34,9 +28,9 @@ function bluecadet_accessibility_views_pre_render(ViewExecutable $view) {
       )
     ) &&
     empty($view->is_attachment) && empty($view->live_preview)
-    ) {
+  ) {
 
-      // Attach the library.
-      $view->element['#attached']['library'][] = 'bluecadet_accessibility/viewsAjaxA11y';
+    // Attach the library.
+    $view->element['#attached']['library'][] = 'bluecadet_accessibility/viewsAjaxA11y';
   }
 }
diff --git a/src/EventSubscriber/ViewsAjaxResponseSubscriber.php b/src/EventSubscriber/ViewsAjaxResponseSubscriber.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\bluecadet_accessibility\EventSubscriber;
 
-use Drupal\bluecadet_accessibility\Ajax\ViewsAjaxReFocusCommand;
 use Drupal\Core\Ajax\AnnounceCommand;
 use Drupal\Core\Ajax\FocusFirstCommand;
 use Drupal\views\Ajax\ViewAjaxResponse;
@@ -13,12 +12,14 @@
 /**
  * Alter a Views Ajax Response.
  */
-class ViewsAjaxResponseSubscriber implements EventSubscriberInterface {
+class ViewsAjaxResponseSubscriber implements EventSubscriberInterface
+{
 
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents()
+  {
     $events[KernelEvents::RESPONSE][] = ['onResponse'];
     return $events;
   }
@@ -29,7 +30,8 @@ public static function getSubscribedEvents() {
    * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
    *   The event process.
    */
-  public function onResponse(FilterResponseEvent $event) {
+  public function onResponse(FilterResponseEvent $event)
+  {
     $response = $event->getResponse();
 
     // Only act on a Views Ajax Response.
@@ -41,7 +43,12 @@ public function onResponse(FilterResponseEvent $event) {
 
       $display_extenders_options = $view->display_handler->getOption('display_extenders');
 
-      if (($view->ajaxEnabled() && (isset($display_extenders_options['ajax_ally_option']['enable_ally']) && $display_extenders_options['ajax_ally_option']['enable_ally'] == TRUE)) && empty($view->is_attachment) && empty($view->live_preview)) {
+      if (
+        ($view->ajaxEnabled() && (isset($display_extenders_options['ajax_ally_option']['enable_ally'])
+          && $display_extenders_options['ajax_ally_option']['enable_ally'] == TRUE)
+        )
+        && empty($view->is_attachment) && empty($view->live_preview)
+      ) {
         // Disable the default behavior of visually scrolling on view refreshes caused by form changes or pagination.
         foreach ($commands as &$command) {
           if (isset($command['command']) && $command['command'] === 'viewsScrollTop') {
@@ -52,20 +59,18 @@ public function onResponse(FilterResponseEvent $event) {
         // Add in Announce for number of results.
         $result_count = count($view->result);
         // @todo variablise this in a settings page.
-        $msg = \Drupal::translation()->formatPlural($result_count, '1 result loaded.', '@count results loaded.');;
+        $msg = \Drupal::translation()->formatPlural($result_count, '1 result loaded.', '@count results loaded.');
         $response->addCommand(new AnnounceCommand($msg, 'assertive'));
 
         // Add in focus command.
         if ($result_count > 0) {
           // @todo variablise this in a settings page.
           $response->addCommand(new FocusFirstCommand($view_selector . ' .view-content ul li'));
-        }
-        else {
+        } else {
           // @todo variablise this in a settings page.
           $response->addCommand(new FocusFirstCommand($view_selector . ' .view-empty [tabindex="0"]'));
         }
       }
     }
   }
-
 }
diff --git a/src/Plugin/views/display_extender/AjaxAllyOption.php b/src/Plugin/views/display_extender/AjaxAllyOption.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\bluecadet_accessibility\Plugin\views\display_extender;
 
-use Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase;
 
 /**
  * Ajax AJAX A11y display extender plugin.