Unverified Commit 9fbc804e authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3057370 by Wim Leers, seanB: MediaLibraryState::fromRequest() may... 

Issue #3057370 by Wim Leers, seanB: MediaLibraryState::fromRequest() may result in invalid MediaLibraryState::create() call

(cherry picked from commit d2792e13)
parent 612e4c41

core/modules/media_library/src/MediaLibraryState.php

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public static function fromRequest(Request $request) { 
    // all validation runs.

    $state = static::create(

      $query->get('media_library_opener_id'),

      $query->get('media_library_allowed_types'),

      $query->get('media_library_allowed_types', []),

      $query->get('media_library_selected_type'),

      $query->get('media_library_remaining')

    );

core/modules/media_library/tests/src/Kernel/MediaLibraryStateTest.php

+9 −0
Original line number Diff line number Diff line
@@ -281,6 +281,15 @@ public function testFromRequest(array $query_overrides, $exception_expected) { 
    $this->assertInstanceOf(MediaLibraryState::class, $state);

  }



  /**

   * @covers ::fromRequest

   */

  public function testFromRequestQueryLess() {

    $this->setExpectedException(\InvalidArgumentException::class, 'The opener ID parameter is required and must be a string.');

    $state = MediaLibraryState::fromRequest(new Request());

    $this->assertInstanceOf(MediaLibraryState::class, $state);

  }



  /**

   * Data provider for testFromRequest().

   *