Commit 9461c2b6 authored by Project Update Bot's avatar Project Update Bot Committed by Marcel Emmerich
Browse files

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

parent 8b25c80b

src/Service/HandlerService.php

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ class HandlerService { 
    }



    // Move file. This will also delete image styles.

    $result = file_move($file, $new_uri);

    $result = \Drupal::service('file.repository')->move($file, $new_uri);



    $this->logger->info(

      'Moved file ' . $file->id() . ' to private storage.'
@@ -386,7 +386,7 @@ class HandlerService { 
        }



        // Move file.

        file_move($file, $new_uri);

        \Drupal::service('file.repository')->move($file, $new_uri);



        $this->logger->info(

          'Moved file ' . $file->id() . ' to public storage.'

tests/src/Kernel/HandlerServiceTest.php

+4 −4
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ class HandlerServiceTest extends MediaKernelTestBase { 


    // File should have moved to private.

    $this->assertFileExists('private://text.txt');

    $this->assertFileNotExists('public://text.txt');

    $this->assertFileDoesNotExist('public://text.txt');

  }



  /**
@@ -321,7 +321,7 @@ class HandlerServiceTest extends MediaKernelTestBase { 
    $media->save();



    $this->assertFileExists('private://' . $filename);

    $this->assertFileNotExists('public://' . $filename);

    $this->assertFileDoesNotExist('public://' . $filename);

  }



  /**
@@ -340,7 +340,7 @@ class HandlerServiceTest extends MediaKernelTestBase { 


    // Make sure the file is initially stored as private.

    $this->assertFileExists('private://' . $filename);

    $this->assertFileNotExists('public://' . $filename);

    $this->assertFileDoesNotExist('public://' . $filename);



    // Set Media Entity status to published.

    $media->setPublished();
@@ -348,7 +348,7 @@ class HandlerServiceTest extends MediaKernelTestBase { 


    // The file should no be public.

    $this->assertFileExists('public://' . $filename);

    $this->assertFileNotExists('private://' . $filename);

    $this->assertFileDoesNotExist('private://' . $filename);

  }



  /**