Commit 5ff22483 authored by git's avatar git Committed by Michael Strelan
Browse files

Issue #3297845 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent d077207f

pdfpreview.info.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ name: PDF Preview 
type: module

description: Show a snapshot of the first page of pdf files attached to nodes.

package: Media

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.3 || ^10

configure: pdfpreview.settings

dependencies:

  - drupal:image

src/Plugin/Field/FieldFormatter/PDFPreviewFormatter.php

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ class PDFPreviewFormatter extends ImageFormatter { 
        // context to ensure different file URLs are generated for different

        // sites in a multisite setup, including HTTP and HTTPS versions of the

        // same site. Fix in https://www.drupal.org/node/2646744.

        $url = Url::fromUri(file_create_url($image_uri));

        $url = \Drupal::service('file_url_generator')->generate($image_uri);

        $cache_contexts[] = 'url.site';

      }

      $cache_tags = Cache::mergeTags($cache_tags, $file->getCacheTags());

tests/src/Unit/PDFPreviewGeneratorTest.php

+8 −17
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\Tests\pdfpreview\Unit;



use Prophecy\PhpUnit\ProphecyTrait;

use Drupal\Component\Transliteration\TransliterationInterface;

use Drupal\Core\Config\ConfigFactoryInterface;

use Drupal\Core\Config\ImmutableConfig;
@@ -15,6 +16,7 @@ use Drupal\Tests\UnitTestCase; 
 */

class PDFPreviewGeneratorTest extends UnitTestCase {



  use ProphecyTrait;

  /**

   * The config factory.

   *
@@ -25,7 +27,7 @@ class PDFPreviewGeneratorTest extends UnitTestCase { 
  /**

   * {@inheritdoc}

   */

  public function setUp() {

  public function setUp(): void {

    parent::setUp();



    $this->configFactory = $this->prophesize(ConfigFactoryInterface::class);
@@ -78,17 +80,13 @@ class PDFPreviewGeneratorTest extends UnitTestCase { 
   *   Mocked PDF Preview Generator.

   */

  protected function getPdfPreviewGeneratorMock() {

    $file_system = $this->getMockBuilder('\Drupal\Core\File\FileSystem')

      ->disableOriginalConstructor()

      ->getMock();

    $file_system = $this->createMock('\Drupal\Core\File\FileSystem');

    $file_system

      ->expects($this->any())

      ->method('basename')

      ->with('public://Test File.pdf', '.pdf')

      ->willReturn('Test File');

    $transliteration = $this->getMockBuilder(TransliterationInterface::class)

      ->disableOriginalConstructor()

      ->getMock();

    $transliteration = $this->createMock(TransliterationInterface::class);

    $transliteration

      ->expects($this->any())

      ->method('transliterate')
@@ -97,17 +95,13 @@ class PDFPreviewGeneratorTest extends UnitTestCase { 


    $image_toolkit_manager = $this->createMock('\Drupal\Core\ImageToolkit\ImageToolkitManager');



    $language = $this->getMockBuilder('Drupal\Core\Language\Language')

      ->disableOriginalConstructor()

      ->getMock();

    $language = $this->createMock('Drupal\Core\Language\Language');

    $language

      ->expects($this->any())

      ->method('getId')

      ->willReturn('en');



    $language_manager = $this->getMockBuilder('Drupal\Core\Language\LanguageManager')

      ->disableOriginalConstructor()

      ->getMock();

    $language_manager = $this->createMock('Drupal\Core\Language\LanguageManager');

    $language_manager

      ->expects($this->any())

      ->method('getCurrentLanguage')
@@ -139,10 +133,7 @@ class PDFPreviewGeneratorTest extends UnitTestCase { 
   */

  protected function getFileMock($filename, $id) {

    $methods = ['id', 'getFileUri'];

    $file = $this->getMockBuilder('\Drupal\file\Entity\File')

      ->disableOriginalConstructor()

      ->setMethods($methods)

      ->getMock();

    $file = $this->createMock('\Drupal\file\Entity\File');

    $file->expects($this->any())

      ->method('id')

      ->willReturn($id);