diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php index 49c46c1d17..cc8f694e78 100644 --- a/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php +++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php @@ -6,7 +6,6 @@ use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\TestFileCreationTrait; /** @@ -139,9 +138,9 @@ public function testImageFieldSync() { $field_values = [ 'uri' => $this->files[$index]->uri, 'uid' => \Drupal::currentUser()->id(), - 'status' => FileInterface::STATUS_PERMANENT, ]; $file = File::create($field_values); + $file->setPermanent(); $file->save(); $fid = $file->id(); $this->files[$index]->fid = $fid; diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 7c6ac4eac3..b68ddd9ecd 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -562,8 +562,8 @@ function file_save_data($data, $destination = NULL, $replace = FILE_EXISTS_RENAM $file = File::create([ 'uri' => $uri, 'uid' => $user->id(), - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); // If we are replacing an existing file re-use its database record. // @todo Do not create a new entity in order to update it. See // https://www.drupal.org/node/2241865. diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php index e96584ef11..c565a16864 100644 --- a/core/modules/file/src/Entity/File.php +++ b/core/modules/file/src/Entity/File.php @@ -134,7 +134,7 @@ public function getCreatedTime() { * {@inheritdoc} */ public function isPermanent() { - return $this->get('status')->value == FileInterface::STATUS_PERMANENT; + return $this->get('status')->value == static::STATUS_PERMANENT; } /** @@ -148,7 +148,7 @@ public function isTemporary() { * {@inheritdoc} */ public function setPermanent() { - $this->get('status')->value = FileInterface::STATUS_PERMANENT; + $this->get('status')->value = static::STATUS_PERMANENT; } /** diff --git a/core/modules/file/tests/src/Functional/FileListingTest.php b/core/modules/file/tests/src/Functional/FileListingTest.php index c449108d6c..5a176213c4 100644 --- a/core/modules/file/tests/src/Functional/FileListingTest.php +++ b/core/modules/file/tests/src/Functional/FileListingTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\file\Functional; -use Drupal\file\FileInterface; use Drupal\node\Entity\Node; use Drupal\file\Entity\File; use Drupal\entity_test\Entity\EntityTestConstraints; @@ -215,8 +214,8 @@ protected function createFile() { 'filemime' => 'text/plain', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); // Save it, inserting a new record. diff --git a/core/modules/file/tests/src/Functional/FileManagedAccessTest.php b/core/modules/file/tests/src/Functional/FileManagedAccessTest.php index f51dae4c8a..9e9fd70eef 100644 --- a/core/modules/file/tests/src/Functional/FileManagedAccessTest.php +++ b/core/modules/file/tests/src/Functional/FileManagedAccessTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\file\Functional; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\user\Entity\Role; /** @@ -36,8 +35,8 @@ public function testFileAccess() { 'filename' => 'drupal.txt', 'uri' => 'public://drupal.txt', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); // Save it, inserting a new record. @@ -61,8 +60,8 @@ public function testFileAccess() { 'filename' => 'drupal.txt', 'uri' => 'private://drupal.txt', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); // Save it, inserting a new record. diff --git a/core/modules/file/tests/src/Functional/Views/RelationshipUserFileDataTest.php b/core/modules/file/tests/src/Functional/Views/RelationshipUserFileDataTest.php index 43e34534cd..d20b53f538 100644 --- a/core/modules/file/tests/src/Functional/Views/RelationshipUserFileDataTest.php +++ b/core/modules/file/tests/src/Functional/Views/RelationshipUserFileDataTest.php @@ -4,7 +4,6 @@ use Drupal\field\Entity\FieldConfig; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\views\Functional\ViewTestBase; use Drupal\views\Views; use Drupal\views\Tests\ViewTestData; @@ -65,8 +64,8 @@ public function testViewsHandlerRelationshipUserFileData() { 'filemime' => 'image/jpeg', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->enforceIsNew(); file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png')); $file->save(); diff --git a/core/modules/file/tests/src/Kernel/AccessTest.php b/core/modules/file/tests/src/Kernel/AccessTest.php index 4841749298..8836641157 100644 --- a/core/modules/file/tests/src/Kernel/AccessTest.php +++ b/core/modules/file/tests/src/Kernel/AccessTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\file\Kernel; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\KernelTests\KernelTestBase; use Drupal\user\Entity\User; @@ -132,8 +131,8 @@ public function testFileCacheability() { 'filename' => 'green-scarf', 'uri' => 'private://green-scarf', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->save(); \Drupal::service('session')->set('anonymous_allowed_file_ids', [$file->id() => $file->id()]); diff --git a/core/modules/file/tests/src/Kernel/FileUriItemTest.php b/core/modules/file/tests/src/Kernel/FileUriItemTest.php index c8a4524c2c..120af7f51c 100644 --- a/core/modules/file/tests/src/Kernel/FileUriItemTest.php +++ b/core/modules/file/tests/src/Kernel/FileUriItemTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\file\Kernel; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; /** * File URI field item test. @@ -27,8 +26,8 @@ public function testCustomFileUriField() { 'filename' => 'druplicon.txt', 'uri' => $uri, 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); $file->save(); diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php index ca20f03436..a9e3d45989 100644 --- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php +++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\file\Kernel\Migrate\d6; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase; use Drupal\node\Entity\Node; @@ -41,8 +40,8 @@ protected function setUp() { 'filemime' => 'text/plain', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->enforceIsNew(); file_put_contents($file->getFileUri(), 'hello world'); diff --git a/core/modules/file/tests/src/Kernel/SaveTest.php b/core/modules/file/tests/src/Kernel/SaveTest.php index 38f2c97266..93394ace1e 100644 --- a/core/modules/file/tests/src/Kernel/SaveTest.php +++ b/core/modules/file/tests/src/Kernel/SaveTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\file\Kernel; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; /** * File saving tests. @@ -19,8 +18,8 @@ public function testFileSave() { 'filename' => 'druplicon.txt', 'uri' => 'public://druplicon.txt', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); // Save it, inserting a new record. @@ -59,8 +58,8 @@ public function testFileSave() { 'filename' => 'DRUPLICON.txt', 'uri' => 'public://DRUPLICON.txt', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]; + $file->setPermanent(); $uppercase_file = File::create($uppercase_values); file_put_contents($uppercase_file->getFileUri(), 'hello world'); $violations = $uppercase_file->validate(); @@ -89,8 +88,8 @@ public function testFileSave() { 'filename' => 'no-druplicon.txt', 'uri' => 'public://no-druplicon.txt', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), ''); diff --git a/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php b/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php index f9383eac42..953153b3f6 100644 --- a/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php +++ b/core/modules/hal/tests/src/Kernel/FileNormalizeTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\hal\Kernel; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; /** * Tests that file entities can be normalized in HAL. @@ -35,10 +34,10 @@ public function testNormalize() { 'filename' => 'test_1.txt', 'uri' => 'public://test_1.txt', 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]; // Create a new file entity. $file = File::create($file_params); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); $file->save(); diff --git a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php index 59603bd97d..ceafa08b26 100644 --- a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php +++ b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php @@ -3,7 +3,6 @@ namespace Drupal\Tests\image\FunctionalJavascript; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\image\Kernel\ImageFieldCreationTrait; use Drupal\Tests\quickedit\FunctionalJavascript\QuickEditJavascriptTestBase; use Drupal\Tests\TestFileCreationTrait; @@ -87,8 +86,8 @@ public function testImageInPlaceEditor() { $file = File::create([ 'uri' => $valid_images[0]->uri, 'uid' => $this->contentAuthorUser->id(), - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->save(); // Use the first valid image to create a new Node. diff --git a/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php b/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php index b6e5a2adc3..3f4e78d8c2 100644 --- a/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php +++ b/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php @@ -4,7 +4,6 @@ use Drupal\field\Entity\FieldConfig; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\views\Kernel\ViewsKernelTestBase; use Drupal\user\Entity\User; use Drupal\views\Views; @@ -70,8 +69,8 @@ public function testViewsHandlerRelationshipUserImageData() { 'filemime' => 'image/jpeg', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->enforceIsNew(); file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png')); $file->save(); diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php index fe0e33f509..a1350ef51f 100644 --- a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php +++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php @@ -218,8 +218,8 @@ protected function createPrivateFile($file_name) { 'filename' => $file_name, 'uri' => "private://$file_name", 'filemime' => 'text/plain', - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), $this->getFileSecret($file)); $file->save(); return $file; diff --git a/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php b/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php index 3b9a50bb1b..fa3c8b2fdf 100644 --- a/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php +++ b/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php @@ -5,7 +5,6 @@ use Drupal\Core\Database\Database; use Drupal\Core\StreamWrapper\PublicStream; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\BrowserTestBase; use Drupal\Component\Render\FormattableMarkup; @@ -138,8 +137,8 @@ protected function makePoFile($path, $filename, $timestamp = NULL, array $transl 'uri' => $path . '/' . $filename, 'filemime' => 'text/x-gettext-translation', 'timestamp' => $timestamp, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), $po_header . $text); touch(\Drupal::service('file_system')->realpath($file->getFileUri()), $timestamp); $file->save(); diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php index 382d23897b..e685abb94f 100644 --- a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php +++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserTest.php @@ -2,7 +2,6 @@ namespace Drupal\Tests\user\Kernel\Migrate\d6; -use Drupal\file\FileInterface; use Drupal\migrate\MigrateExecutable; use Drupal\Tests\file\Kernel\Migrate\d6\FileMigrationTestTrait; use Drupal\user\Entity\User; @@ -46,8 +45,8 @@ protected function setUp() { 'filemime' => 'image/jpeg', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->enforceIsNew(); file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-1.png')); $file->save(); @@ -60,8 +59,8 @@ protected function setUp() { 'filemime' => 'image/png', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); $file->enforceIsNew(); file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-2.jpg')); $file->save(); diff --git a/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php b/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php index a478b6004b..95b3b89d85 100644 --- a/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php @@ -5,7 +5,6 @@ use Drupal\Component\Gettext\PoHeader; use Drupal\Component\Gettext\PoItem; use Drupal\file\Entity\File; -use Drupal\file\FileInterface; use Drupal\Tests\views\Functional\ViewTestBase; /** @@ -149,8 +148,8 @@ protected function createFile() { 'filemime' => 'text/plain', 'created' => 1, 'changed' => 1, - 'status' => FileInterface::STATUS_PERMANENT, ]); + $file->setPermanent(); file_put_contents($file->getFileUri(), 'hello world'); // Save it, inserting a new record.