Commit 9cd201ab authored by Jacob Rockowitz's avatar Jacob Rockowitz
Browse files

Issue #3283614 by jrockowitz, Liam Morland, cilefen, jastraat, drupgirl: Support PHP 8.1

parent db69d54b

modules/webform_access/src/WebformAccessTypeListBuilder.php

+2 −1
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ class WebformAccessTypeListBuilder extends ConfigEntityListBuilder { 
  public function buildRow(EntityInterface $entity) {

    /** @var \Drupal\webform_access\WebformAccessTypeInterface $entity */



    $row = [];

    // Label.

    $row['label'] = $entity->toLink($entity->label(), 'edit-form');

    $row['label'] = $entity->toLink((string) $entity->label(), 'edit-form');



    // Groups.

    $entity_ids = $this->getEntityStorage('webform_access_group')->getQuery()

modules/webform_image_select/src/Form/WebformImageSelectImagesFilterForm.php

+4 −2
Original line number Diff line number Diff line
@@ -64,9 +64,11 @@ class WebformImageSelectImagesFilterForm extends FormBase { 
   * {@inheritdoc}

   */

  public function submitForm(array &$form, FormStateInterface $form_state) {

    $search = $form_state->getValue('search') ?? '';

    $category = $form_state->getValue('category') ?? '';

    $query = [

      'search' => trim($form_state->getValue('search')),

      'category' => trim($form_state->getValue('category')),

      'search' => trim($search),

      'category ' => trim($category),

    ];

    $form_state->setRedirect($this->getRouteMatch()->getRouteName(), $this->getRouteMatch()->getRawParameters()->all(), [

      'query' => $query ,

modules/webform_image_select/src/WebformImageSelectImagesListBuilder.php

+2 −1
Original line number Diff line number Diff line
@@ -144,8 +144,9 @@ class WebformImageSelectImagesListBuilder extends ConfigEntityListBuilder { 
   * {@inheritdoc}

   */

  public function buildRow(EntityInterface $entity) {

    $row = [];

    /** @var \Drupal\webform_image_select\WebformImageSelectImagesInterface $entity */

    $row['label'] = $entity->toLink($entity->label(), 'edit-form');

    $row['label'] = $entity->toLink((string) $entity->label(), 'edit-form');

    $row['category'] = $entity->get('category');

    $row['images'] = $this->buildImages($entity);

    $row['used_by'] = $this->buildUsedBy($entity);

modules/webform_image_select/tests/src/Functional/WebformImageSelectImagesTest.php

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ dog_4: 
    // Check invalid images.

    $this->assertEquals([], $webform_images->getImages());



    // Check admin user access denied.

    // Check normal user access denied.

    $this->drupalGet('/admin/structure/webform/options/images/manage');

    $assert_session->statusCodeEquals(403);

    $this->drupalGet('/admin/structure/webform/options/images/manage/add');

modules/webform_options_custom/src/Form/WebformOptionsCustomFilterForm.php

+4 −2
Original line number Diff line number Diff line
@@ -64,9 +64,11 @@ class WebformOptionsCustomFilterForm extends FormBase { 
   * {@inheritdoc}

   */

  public function submitForm(array &$form, FormStateInterface $form_state) {

    $search = $form_state->getValue('search') ?? '';

    $category = $form_state->getValue('category') ?? '';

    $query = [

      'search' => trim($form_state->getValue('search')),

      'category' => trim($form_state->getValue('category')),

      'search' => trim($search),

      'category ' => trim($category),

    ];

    $form_state->setRedirect($this->getRouteMatch()->getRouteName(), $this->getRouteMatch()->getRawParameters()->all(), [

      'query' => $query ,