Verified Commit 7527a854 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3338973 by Lendude, cbfannin, ericdsd, marc.groth: Deprecated:... 

Issue #3338973 by Lendude, cbfannin, ericdsd, marc.groth: Deprecated: preg_split(): Passing null in argument_validator

(cherry picked from commit c4bbc93c)
parent 9331f98b

core/modules/views/src/Plugin/views/argument_validator/Entity.php

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state, &$opti 
  public function validateArgument($argument) {

    $entity_type = $this->definition['entity_type'];



    if ($this->multipleCapable && $this->options['multiple']) {

    if ($this->multipleCapable && $this->options['multiple'] && isset($argument)) {

      // At this point only interested in individual IDs no matter what type,

      // just splitting by the allowed delimiters.

      $ids = array_filter(preg_split('/[,+ ]/', $argument));

core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ public function testValidateArgumentNoAccess() { 


    $this->assertFalse($this->argumentValidator->validateArgument(3));

    $this->assertFalse($this->argumentValidator->validateArgument(''));

    $this->assertFalse($this->argumentValidator->validateArgument(NULL));



    $this->assertTrue($this->argumentValidator->validateArgument(1));

    $this->assertTrue($this->argumentValidator->validateArgument(2));
@@ -249,6 +250,8 @@ public function testValidateArgumentMultiple() { 
    $this->assertFalse($this->argumentValidator->validateArgument('1,2'));

    $this->assertFalse($this->argumentValidator->validateArgument('1+2'));



    $this->assertFalse($this->argumentValidator->validateArgument(NULL));



    $options = [];

    $options['access'] = TRUE;

    $options['bundles'] = [];