summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-07-13 11:56:25 (GMT)
committerAlex Pott2015-07-13 11:56:25 (GMT)
commitfaada60f3d5c54d46b16fc85cf784d1f39738656 (patch)
treea8406d51ed1e083369e56ae6fc7f2259da49bd85
parent08baa72aeeb4cc12413cd9ea9636df6c09734bb3 (diff)
Issue #2321969 by rpayanm, subhojit777, prics, LinL, JeroenT, Temoor, prashantgoel, Mile23, pcambra, Sumi: Replace all instances of file_load(), file_load_multiple(), entity_load('file') and entity_load_multiple('file') with static method calls
-rw-r--r--core/modules/editor/src/Form/EditorImageDialog.php30
-rw-r--r--core/modules/file/file.module5
-rw-r--r--core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php3
-rw-r--r--core/modules/file/src/Tests/CopyTest.php20
-rw-r--r--core/modules/file/src/Tests/DeleteTest.php10
-rw-r--r--core/modules/file/src/Tests/FileFieldDisplayTest.php3
-rw-r--r--core/modules/file/src/Tests/FileFieldPathTest.php8
-rw-r--r--core/modules/file/src/Tests/FileFieldRSSContentTest.php3
-rw-r--r--core/modules/file/src/Tests/FileFieldRevisionTest.php12
-rw-r--r--core/modules/file/src/Tests/FileFieldTestBase.php8
-rw-r--r--core/modules/file/src/Tests/FileFieldValidateTest.php13
-rw-r--r--core/modules/file/src/Tests/FileFieldWidgetTest.php5
-rw-r--r--core/modules/file/src/Tests/FileListingTest.php9
-rw-r--r--core/modules/file/src/Tests/FileTokenReplaceTest.php3
-rw-r--r--core/modules/file/src/Tests/LoadTest.php17
-rw-r--r--core/modules/file/src/Tests/MoveTest.php18
-rw-r--r--core/modules/file/src/Tests/SaveDataTest.php14
-rw-r--r--core/modules/file/src/Tests/SaveTest.php4
-rw-r--r--core/modules/file/src/Tests/SaveUploadTest.php10
-rw-r--r--core/modules/image/src/Tests/ImageAdminStylesTest.php5
-rw-r--r--core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php7
-rw-r--r--core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php3
-rw-r--r--core/modules/rdf/src/Tests/FileFieldAttributesTest.php4
-rw-r--r--core/modules/rdf/src/Tests/ImageFieldAttributesTest.php3
-rw-r--r--core/modules/system/src/Tests/Entity/EntityCrudHookTest.php3
-rw-r--r--core/modules/taxonomy/src/Tests/TaxonomyImageTest.php3
-rw-r--r--core/modules/user/src/Tests/UserPictureTest.php5
27 files changed, 144 insertions, 84 deletions
diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php
index 8b37f72..9c2feb5 100644
--- a/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/core/modules/editor/src/Form/EditorImageDialog.php
@@ -15,6 +15,8 @@ use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\HtmlCommand;
use Drupal\editor\Ajax\EditorDialogSave;
use Drupal\Core\Ajax\CloseModalDialogCommand;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
/**
* Provides an image dialog for text editors.
@@ -22,6 +24,32 @@ use Drupal\Core\Ajax\CloseModalDialogCommand;
class EditorImageDialog extends FormBase {
/**
+ * The file storage service.
+ *
+ * @var \Drupal\Core\Entity\EntityStorageInterface
+ */
+ protected $fileStorage;
+
+ /**
+ * Constructs a form object for image dialog.
+ *
+ * @param \Drupal\Core\Entity\EntityStorageInterface $file_storage
+ * The file storage service.
+ */
+ public function __construct(EntityStorageInterface $file_storage) {
+ $this->fileStorage = $file_storage;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function create(ContainerInterface $container) {
+ return new static(
+ $container->get('entity.manager')->getStorage('file')
+ );
+ }
+
+ /**
* {@inheritdoc}
*/
public function getFormId() {
@@ -208,7 +236,7 @@ class EditorImageDialog extends FormBase {
// attributes and set data-entity-type to 'file'.
$fid = $form_state->getValue(array('fid', 0));
if (!empty($fid)) {
- $file = file_load($fid);
+ $file = $this->fileStorage->load($fid);
$file_url = file_create_url($file->getFileUri());
// Transform absolute image URLs to relative image URLs: prevent problems
// on multisite set-ups and prevent mixed content errors.
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 01b4ddb..2458582 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -631,6 +631,7 @@ function file_file_download($uri) {
*/
function file_cron() {
$age = \Drupal::config('system.file')->get('temporary_maximum_age');
+ $file_storage = \Drupal::entityManager()->getStorage('file');
// Only delete temporary files if older than $age. Note that automatic cleanup
// is disabled if $age set to 0.
@@ -640,7 +641,7 @@ function file_cron() {
->condition('changed', REQUEST_TIME - $age, '<')
->range(0, 100)
->execute();
- $files = file_load_multiple($fids);
+ $files = $file_storage->loadMultiple($fids);
foreach ($files as $file) {
$references = \Drupal::service('file.usage')->listUsage($file);
if (empty($references)) {
@@ -1225,7 +1226,7 @@ function template_preprocess_file_link(&$variables) {
$file = $variables['file'];
$options = array();
- $file_entity = ($file instanceof File) ? $file : file_load($file->fid);
+ $file_entity = ($file instanceof File) ? $file : File::load($file->fid);
$url = file_create_url($file_entity->getFileUri());
$mime_type = $file->getMimeType();
diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index fbc30d8..137d841 100644
--- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -20,6 +20,7 @@ use Drupal\Core\Render\ElementInfoManagerInterface;
use Drupal\Core\Url;
use Drupal\file\Element\ManagedFile;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\file\Entity\File;
/**
* Plugin implementation of the 'file_generic' widget.
@@ -346,7 +347,7 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface {
$removed_files = array_slice($values['fids'], $keep);
$removed_names = array();
foreach ($removed_files as $fid) {
- $file = file_load($fid);
+ $file = File::load($fid);
$removed_names[] = $file->getFilename();
}
$args = array('%field' => $field_storage->getFieldName(), '@max' => $field_storage->getCardinality(), '@count' => $keep, '%list' => implode(', ', $removed_names));
diff --git a/core/modules/file/src/Tests/CopyTest.php b/core/modules/file/src/Tests/CopyTest.php
index 4b94449..68c589b 100644
--- a/core/modules/file/src/Tests/CopyTest.php
+++ b/core/modules/file/src/Tests/CopyTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests the file copy function.
*
@@ -39,7 +41,7 @@ class CopyTest extends FileManagedUnitTestBase {
// Reload the file from the database and check that the changes were
// actually saved.
- $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+ $this->assertFileUnchanged($result, File::load($result->id()));
}
/**
@@ -66,9 +68,9 @@ class CopyTest extends FileManagedUnitTestBase {
// Load all the affected files to check the changes that actually made it
// to the database.
- $loaded_source = file_load($source->id(), TRUE);
- $loaded_target = file_load($target->id(), TRUE);
- $loaded_result = file_load($result->id(), TRUE);
+ $loaded_source = File::load($source->id());
+ $loaded_target = File::load($target->id());
+ $loaded_result = File::load($result->id());
// Verify that the source file wasn't changed.
$this->assertFileUnchanged($source, $loaded_source);
@@ -106,9 +108,9 @@ class CopyTest extends FileManagedUnitTestBase {
// Load all the affected files to check the changes that actually made it
// to the database.
- $loaded_source = file_load($source->id(), TRUE);
- $loaded_target = file_load($target->id(), TRUE);
- $loaded_result = file_load($result->id(), TRUE);
+ $loaded_source = File::load($source->id());
+ $loaded_target = File::load($target->id());
+ $loaded_result = File::load($result->id());
// Verify that the source file wasn't changed.
$this->assertFileUnchanged($source, $loaded_source);
@@ -141,7 +143,7 @@ class CopyTest extends FileManagedUnitTestBase {
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array());
- $this->assertFileUnchanged($source, file_load($source->id(), TRUE));
- $this->assertFileUnchanged($target, file_load($target->id(), TRUE));
+ $this->assertFileUnchanged($source, File::load($source->id()));
+ $this->assertFileUnchanged($target, File::load($target->id()));
}
}
diff --git a/core/modules/file/src/Tests/DeleteTest.php b/core/modules/file/src/Tests/DeleteTest.php
index f89dfbf..1ec0376 100644
--- a/core/modules/file/src/Tests/DeleteTest.php
+++ b/core/modules/file/src/Tests/DeleteTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests the file delete function.
*
@@ -24,7 +26,7 @@ class DeleteTest extends FileManagedUnitTestBase {
$file->delete();
$this->assertFileHooksCalled(array('delete'));
$this->assertFalse(file_exists($file->getFileUri()), 'Test file has actually been deleted.');
- $this->assertFalse(file_load($file->id()), 'File was removed from the database.');
+ $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
}
/**
@@ -40,7 +42,7 @@ class DeleteTest extends FileManagedUnitTestBase {
$usage = $file_usage->listUsage($file);
$this->assertEqual($usage['testing']['test'], array(1 => 1), 'Test file is still in use.');
$this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
- $this->assertTrue(file_load($file->id()), 'File still exists in the database.');
+ $this->assertTrue(File::load($file->id()), 'File still exists in the database.');
// Clear out the call to hook_file_load().
file_test_reset();
@@ -50,7 +52,7 @@ class DeleteTest extends FileManagedUnitTestBase {
$this->assertFileHooksCalled(array('load', 'update'));
$this->assertTrue(empty($usage), 'File usage data was removed.');
$this->assertTrue(file_exists($file->getFileUri()), 'File still exists on the disk.');
- $file = file_load($file->id());
+ $file = File::load($file->id());
$this->assertTrue($file, 'File still exists in the database.');
$this->assertTrue($file->isTemporary(), 'File is temporary.');
file_test_reset();
@@ -69,6 +71,6 @@ class DeleteTest extends FileManagedUnitTestBase {
// file_cron() loads
$this->assertFileHooksCalled(array('delete'));
$this->assertFalse(file_exists($file->getFileUri()), 'File has been deleted after its last usage was removed.');
- $this->assertFalse(file_load($file->id()), 'File was removed from the database.');
+ $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
}
}
diff --git a/core/modules/file/src/Tests/FileFieldDisplayTest.php b/core/modules/file/src/Tests/FileFieldDisplayTest.php
index f4db765..5cbb970 100644
--- a/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/src/Tests/FileFieldDisplayTest.php
@@ -8,6 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\file\Entity\File;
/**
* Tests the display of file fields in node and views.
@@ -57,7 +58,7 @@ class FileFieldDisplayTest extends FileFieldTestBase {
$node_storage = $this->container->get('entity.manager')->getStorage('node');
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$file_link = array(
'#theme' => 'file_link',
'#file' => $node_file,
diff --git a/core/modules/file/src/Tests/FileFieldPathTest.php b/core/modules/file/src/Tests/FileFieldPathTest.php
index d7e0346..346fc7a 100644
--- a/core/modules/file/src/Tests/FileFieldPathTest.php
+++ b/core/modules/file/src/Tests/FileFieldPathTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests that files are uploaded to proper locations.
*
@@ -29,7 +31,7 @@ class FileFieldPathTest extends FileFieldTestBase {
// Check that the file was uploaded to the file root.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertPathMatch('public://' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', array('%file' => $node_file->getFileUri())));
// Change the path to contain multiple subdirectories.
@@ -41,7 +43,7 @@ class FileFieldPathTest extends FileFieldTestBase {
// Check that the file was uploaded into the subdirectory.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id, TRUE);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertPathMatch('public://foo/bar/baz/' . $test_file->getFilename(), $node_file->getFileUri(), format_string('The file %file was uploaded to the correct path.', array('%file' => $node_file->getFileUri())));
// Check the path when used with tokens.
@@ -54,7 +56,7 @@ class FileFieldPathTest extends FileFieldTestBase {
// Check that the file was uploaded into the subdirectory.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
// Do token replacement using the same user which uploaded the file, not
// the user running the test case.
$data = array('user' => $this->adminUser);
diff --git a/core/modules/file/src/Tests/FileFieldRSSContentTest.php b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
index 7455301..5314a7b 100644
--- a/core/modules/file/src/Tests/FileFieldRSSContentTest.php
+++ b/core/modules/file/src/Tests/FileFieldRSSContentTest.php
@@ -8,6 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
/**
* Ensure that files added to nodes appear correctly in RSS feeds.
@@ -63,7 +64,7 @@ class FileFieldRSSContentTest extends FileFieldTestBase {
// Get the uploaded file from the node.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
// Check that the RSS enclosure appears in the RSS feed.
$this->drupalGet('rss.xml');
diff --git a/core/modules/file/src/Tests/FileFieldRevisionTest.php b/core/modules/file/src/Tests/FileFieldRevisionTest.php
index bb3cf8a..7da2a90 100644
--- a/core/modules/file/src/Tests/FileFieldRevisionTest.php
+++ b/core/modules/file/src/Tests/FileFieldRevisionTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests creating and deleting revisions with files attached.
*
@@ -40,7 +42,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
// Check that the file exists on disk and in the database.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file_r1 = file_load($node->{$field_name}->target_id);
+ $node_file_r1 = File::load($node->{$field_name}->target_id);
$node_vid_r1 = $node->getRevisionId();
$this->assertFileExists($node_file_r1, 'New file saved to disk on node creation.');
$this->assertFileEntryExists($node_file_r1, 'File entry exists in database on node creation.');
@@ -50,7 +52,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
$this->replaceNodeFile($test_file, $field_name, $nid);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file_r2 = file_load($node->{$field_name}->target_id);
+ $node_file_r2 = File::load($node->{$field_name}->target_id);
$node_vid_r2 = $node->getRevisionId();
$this->assertFileExists($node_file_r2, 'Replacement file exists on disk after creating new revision.');
$this->assertFileEntryExists($node_file_r2, 'Replacement file entry exists in database after creating new revision.');
@@ -58,7 +60,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
// Check that the original file is still in place on the first revision.
$node = node_revision_load($node_vid_r1);
- $current_file = file_load($node->{$field_name}->target_id);
+ $current_file = File::load($node->{$field_name}->target_id);
$this->assertEqual($node_file_r1->id(), $current_file->id(), 'Original file still in place after replacing file in new revision.');
$this->assertFileExists($node_file_r1, 'Original file still in place after replacing file in new revision.');
$this->assertFileEntryExists($node_file_r1, 'Original file entry still in place after replacing file in new revision');
@@ -69,7 +71,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
$this->drupalPostForm('node/' . $nid . '/edit', array('revision' => '1'), t('Save and keep published'));
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file_r3 = file_load($node->{$field_name}->target_id);
+ $node_file_r3 = File::load($node->{$field_name}->target_id);
$node_vid_r3 = $node->getRevisionId();
$this->assertEqual($node_file_r2->id(), $node_file_r3->id(), 'Previous revision file still in place after creating a new revision without a new file.');
$this->assertFileIsPermanent($node_file_r3, 'New revision file is permanent.');
@@ -78,7 +80,7 @@ class FileFieldRevisionTest extends FileFieldTestBase {
$this->drupalPostForm('node/' . $nid . '/revisions/' . $node_vid_r1 . '/revert', array(), t('Revert'));
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file_r4 = file_load($node->{$field_name}->target_id);
+ $node_file_r4 = File::load($node->{$field_name}->target_id);
$this->assertEqual($node_file_r1->id(), $node_file_r4->id(), 'Original revision file still in place after reverting to the original revision.');
$this->assertFileIsPermanent($node_file_r4, 'Original revision file still permanent after reverting to the original revision.');
diff --git a/core/modules/file/src/Tests/FileFieldTestBase.php b/core/modules/file/src/Tests/FileFieldTestBase.php
index 4f8d9c8..c03da58 100644
--- a/core/modules/file/src/Tests/FileFieldTestBase.php
+++ b/core/modules/file/src/Tests/FileFieldTestBase.php
@@ -11,6 +11,7 @@ use Drupal\field\Entity\FieldStorageConfig;
use Drupal\field\Entity\FieldConfig;
use Drupal\file\FileInterface;
use Drupal\simpletest\WebTestBase;
+use Drupal\file\Entity\File;
/**
* Provides methods specifically for testing File module's field handling.
@@ -45,7 +46,8 @@ abstract class FileFieldTestBase extends WebTestBase {
// Get a file to upload.
$file = current($this->drupalGetTestFiles($type_name, $size));
- // Add a filesize property to files as would be read by file_load().
+ // Add a filesize property to files as would be read by
+ // \Drupal\file\Entity\File::load().
$file->filesize = filesize($file->uri);
return entity_create('file', (array) $file);
@@ -221,7 +223,7 @@ abstract class FileFieldTestBase extends WebTestBase {
*/
function assertFileEntryExists($file, $message = NULL) {
$this->container->get('entity.manager')->getStorage('file')->resetCache();
- $db_file = file_load($file->id());
+ $db_file = File::load($file->id());
$message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
$this->assertEqual($db_file->getFileUri(), $file->getFileUri(), $message);
}
@@ -240,7 +242,7 @@ abstract class FileFieldTestBase extends WebTestBase {
function assertFileEntryNotExists($file, $message) {
$this->container->get('entity.manager')->getStorage('file')->resetCache();
$message = isset($message) ? $message : format_string('File %file exists in database at the correct path.', array('%file' => $file->getFileUri()));
- $this->assertFalse(file_load($file->id()), $message);
+ $this->assertFalse(File::load($file->id()), $message);
}
/**
diff --git a/core/modules/file/src/Tests/FileFieldValidateTest.php b/core/modules/file/src/Tests/FileFieldValidateTest.php
index d98f6cd..46e34ee 100644
--- a/core/modules/file/src/Tests/FileFieldValidateTest.php
+++ b/core/modules/file/src/Tests/FileFieldValidateTest.php
@@ -9,6 +9,7 @@ namespace Drupal\file\Tests;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\field\Entity\FieldConfig;
+use Drupal\file\Entity\File;
/**
* Tests validation functions such as file type, max file size, max size per
@@ -44,7 +45,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, 'File exists after uploading to the required field.');
$this->assertFileEntryExists($node_file, 'File entry exists after uploading to the required field.');
@@ -63,7 +64,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, 'File exists after uploading to the required multiple value field.');
$this->assertFileEntryExists($node_file, 'File entry exists after uploading to the required multiple value field.');
}
@@ -95,7 +96,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($small_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize)));
$this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) under the max limit (%maxsize).', array('%filesize' => format_size($small_file->getSize()), '%maxsize' => $max_filesize)));
@@ -112,7 +113,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($large_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, format_string('File exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->getSize()))));
$this->assertFileEntryExists($node_file, format_string('File entry exists after uploading a file (%filesize) with no max limit.', array('%filesize' => format_size($large_file->getSize()))));
}
@@ -136,7 +137,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, 'File exists after uploading a file with no extension checking.');
$this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with no extension checking.');
@@ -155,7 +156,7 @@ class FileFieldValidateTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, 'File exists after uploading a file with extension checking.');
$this->assertFileEntryExists($node_file, 'File entry exists after uploading a file with extension checking.');
}
diff --git a/core/modules/file/src/Tests/FileFieldWidgetTest.php b/core/modules/file/src/Tests/FileFieldWidgetTest.php
index c03e118..b696596 100644
--- a/core/modules/file/src/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/src/Tests/FileFieldWidgetTest.php
@@ -12,6 +12,7 @@ use Drupal\comment\Tests\CommentTestTrait;
use Drupal\field\Entity\FieldConfig;
use Drupal\field_ui\Tests\FieldUiTestTrait;
use Drupal\user\RoleInterface;
+use Drupal\file\Entity\File;
/**
* Tests the file field widget, single and multi-valued, with and without AJAX,
@@ -58,7 +59,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, 'New file saved to disk on node creation.');
// Ensure the file can be downloaded.
@@ -238,7 +239,7 @@ class FileFieldWidgetTest extends FileFieldTestBase {
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $node_file = file_load($node->{$field_name}->target_id);
+ $node_file = File::load($node->{$field_name}->target_id);
$this->assertFileExists($node_file, 'New file saved to disk on node creation.');
// Ensure the private file is available to the user who uploaded it.
diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index b752c3f..72b2378 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -8,6 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
/**
* Tests file listing page functionality.
@@ -103,7 +104,7 @@ class FileListingTest extends FileFieldTestBase {
$this->drupalGet('admin/content/files');
foreach ($nodes as $node) {
- $file = entity_load('file', $node->file->target_id);
+ $file = File::load($node->file->target_id);
$this->assertText($file->getFilename());
$this->assertLinkByHref(file_create_url($file->getFileUri()));
$this->assertLinkByHref('admin/content/files/usage/' . $file->id());
@@ -117,11 +118,11 @@ class FileListingTest extends FileFieldTestBase {
$nodes[1]->save();
$this->drupalGet('admin/content/files');
- $file = entity_load('file', $orphaned_file);
+ $file = File::load($orphaned_file);
$usage = $this->sumUsages($file_usage->listUsage($file));
$this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
- $file = entity_load('file', $used_file);
+ $file = File::load($used_file);
$usage = $this->sumUsages($file_usage->listUsage($file));
$this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
@@ -130,7 +131,7 @@ class FileListingTest extends FileFieldTestBase {
// Test file usage page.
foreach ($nodes as $node) {
- $file = entity_load('file', $node->file->target_id);
+ $file = File::load($node->file->target_id);
$usage = $file_usage->listUsage($file);
$this->drupalGet('admin/content/files/usage/' . $file->id());
$this->assertResponse(200);
diff --git a/core/modules/file/src/Tests/FileTokenReplaceTest.php b/core/modules/file/src/Tests/FileTokenReplaceTest.php
index 1f0d733..f5f478a 100644
--- a/core/modules/file/src/Tests/FileTokenReplaceTest.php
+++ b/core/modules/file/src/Tests/FileTokenReplaceTest.php
@@ -8,6 +8,7 @@
namespace Drupal\file\Tests;
use Drupal\Component\Utility\SafeMarkup;
+use Drupal\file\Entity\File;
/**
* Generates text using placeholders for dummy content to check file token
@@ -40,7 +41,7 @@ class FileTokenReplaceTest extends FileFieldTestBase {
// Load the node and the file.
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
- $file = file_load($node->{$field_name}->target_id);
+ $file = File::load($node->{$field_name}->target_id);
// Generate and test sanitized tokens.
$tests = array();
diff --git a/core/modules/file/src/Tests/LoadTest.php b/core/modules/file/src/Tests/LoadTest.php
index a9cf131..7a0fde9 100644
--- a/core/modules/file/src/Tests/LoadTest.php
+++ b/core/modules/file/src/Tests/LoadTest.php
@@ -7,8 +7,10 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
- * Tests the file_load() function.
+ * Tests \Drupal\file\Entity\File::load().
*
* @group file
*/
@@ -17,7 +19,7 @@ class LoadTest extends FileManagedUnitTestBase {
* Try to load a non-existent file by fid.
*/
function testLoadMissingFid() {
- $this->assertFalse(file_load(-1), 'Try to load an invalid fid fails.');
+ $this->assertFalse(File::load(-1), 'Try to load an invalid fid fails.');
$this->assertFileHooksCalled(array());
}
@@ -45,10 +47,9 @@ class LoadTest extends FileManagedUnitTestBase {
function testSingleValues() {
// Create a new file entity from scratch so we know the values.
$file = $this->createFile('druplicon.txt', NULL, 'public');
-
- $by_fid_file = file_load($file->id());
+ $by_fid_file = File::load($file->id());
$this->assertFileHookCalled('load');
- $this->assertTrue(is_object($by_fid_file), 'file_load() returned an object.');
+ $this->assertTrue(is_object($by_fid_file), '\Drupal\file\Entity\File::load() returned an object.');
$this->assertEqual($by_fid_file->id(), $file->id(), 'Loading by fid got the same fid.', 'File');
$this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
$this->assertEqual($by_fid_file->getFilename(), $file->getFilename(), 'Loading by fid got the correct filename.', 'File');
@@ -68,16 +69,16 @@ class LoadTest extends FileManagedUnitTestBase {
file_test_reset();
$by_path_files = entity_load_multiple_by_properties('file', array('uri' => $file->getFileUri()));
$this->assertFileHookCalled('load');
- $this->assertEqual(1, count($by_path_files), 'file_load_multiple() returned an array of the correct size.');
+ $this->assertEqual(1, count($by_path_files), 'entity_load_multiple_by_properties() returned an array of the correct size.');
$by_path_file = reset($by_path_files);
$this->assertTrue($by_path_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
$this->assertEqual($by_path_file->id(), $file->id(), 'Loading by filepath got the correct fid.', 'File');
// Load by fid.
file_test_reset();
- $by_fid_files = file_load_multiple(array($file->id()));
+ $by_fid_files = File::loadMultiple(array($file->id()));
$this->assertFileHooksCalled(array());
- $this->assertEqual(1, count($by_fid_files), 'file_load_multiple() returned an array of the correct size.');
+ $this->assertEqual(1, count($by_fid_files), '\Drupal\file\Entity\File::loadMultiple() returned an array of the correct size.');
$by_fid_file = reset($by_fid_files);
$this->assertTrue($by_fid_file->file_test['loaded'], 'file_test_file_load() was able to modify the file during load.');
$this->assertEqual($by_fid_file->getFileUri(), $file->getFileUri(), 'Loading by fid got the correct filepath.', 'File');
diff --git a/core/modules/file/src/Tests/MoveTest.php b/core/modules/file/src/Tests/MoveTest.php
index f3380db..8177992 100644
--- a/core/modules/file/src/Tests/MoveTest.php
+++ b/core/modules/file/src/Tests/MoveTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests the file move function.
*
@@ -38,7 +40,7 @@ class MoveTest extends FileManagedUnitTestBase {
// Reload the file from the database and check that the changes were
// actually saved.
- $loaded_file = file_load($result->id(), TRUE);
+ $loaded_file = File::load($result->id());
$this->assertTrue($loaded_file, 'File can be loaded from the database.');
$this->assertFileUnchanged($result, $loaded_file);
}
@@ -66,14 +68,14 @@ class MoveTest extends FileManagedUnitTestBase {
$this->assertFileHooksCalled(array('move', 'load', 'update'));
// Compare the returned value to what made it into the database.
- $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+ $this->assertFileUnchanged($result, File::load($result->id()));
// The target file should not have been altered.
- $this->assertFileUnchanged($target, file_load($target->id(), TRUE));
+ $this->assertFileUnchanged($target, File::load($target->id()));
// Make sure we end up with two distinct files afterwards.
$this->assertDifferentFile($target, $result);
// Compare the source and results.
- $loaded_source = file_load($source->id(), TRUE);
+ $loaded_source = File::load($source->id());
$this->assertEqual($loaded_source->id(), $result->id(), "Returned file's id matches the source.");
$this->assertNotEqual($loaded_source->getFileUri(), $source->getFileUri(), 'Returned file path has changed from the original.');
}
@@ -102,7 +104,7 @@ class MoveTest extends FileManagedUnitTestBase {
// Reload the file from the database and check that the changes were
// actually saved.
- $loaded_result = file_load($result->id(), TRUE);
+ $loaded_result = File::load($result->id());
$this->assertFileUnchanged($result, $loaded_result);
// Check that target was re-used.
$this->assertSameFile($target, $loaded_result);
@@ -129,7 +131,7 @@ class MoveTest extends FileManagedUnitTestBase {
// Load the file from the database and make sure it is identical to what
// was returned.
- $this->assertFileUnchanged($source, file_load($source->id(), TRUE));
+ $this->assertFileUnchanged($source, File::load($source->id()));
}
/**
@@ -156,7 +158,7 @@ class MoveTest extends FileManagedUnitTestBase {
// Load the file from the database and make sure it is identical to what
// was returned.
- $this->assertFileUnchanged($source, file_load($source->id(), TRUE));
- $this->assertFileUnchanged($target, file_load($target->id(), TRUE));
+ $this->assertFileUnchanged($source, File::load($source->id()));
+ $this->assertFileUnchanged($target, File::load($target->id()));
}
}
diff --git a/core/modules/file/src/Tests/SaveDataTest.php b/core/modules/file/src/Tests/SaveDataTest.php
index 24d8fb5..4ca49ad 100644
--- a/core/modules/file/src/Tests/SaveDataTest.php
+++ b/core/modules/file/src/Tests/SaveDataTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests the file_save_data() function.
*
@@ -32,7 +34,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
$this->assertFileHooksCalled(array('insert'));
// Verify that what was returned is what's in the database.
- $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+ $this->assertFileUnchanged($result, File::load($result->id()));
}
/**
@@ -57,7 +59,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
$this->assertFileHooksCalled(array('insert'));
// Verify that what was returned is what's in the database.
- $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+ $this->assertFileUnchanged($result, File::load($result->id()));
}
/**
@@ -82,10 +84,10 @@ class SaveDataTest extends FileManagedUnitTestBase {
// Ensure that the existing file wasn't overwritten.
$this->assertDifferentFile($existing, $result);
- $this->assertFileUnchanged($existing, file_load($existing->id(), TRUE));
+ $this->assertFileUnchanged($existing, File::load($existing->id()));
// Verify that was returned is what's in the database.
- $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+ $this->assertFileUnchanged($result, File::load($result->id()));
}
/**
@@ -112,7 +114,7 @@ class SaveDataTest extends FileManagedUnitTestBase {
$this->assertSameFile($existing, $result);
// Verify that what was returned is what's in the database.
- $this->assertFileUnchanged($result, file_load($result->id(), TRUE));
+ $this->assertFileUnchanged($result, File::load($result->id()));
}
/**
@@ -131,6 +133,6 @@ class SaveDataTest extends FileManagedUnitTestBase {
$this->assertFileHooksCalled(array());
// Ensure that the existing file wasn't overwritten.
- $this->assertFileUnchanged($existing, file_load($existing->id(), TRUE));
+ $this->assertFileUnchanged($existing, File::load($existing->id()));
}
}
diff --git a/core/modules/file/src/Tests/SaveTest.php b/core/modules/file/src/Tests/SaveTest.php
index 2549177..97d4882 100644
--- a/core/modules/file/src/Tests/SaveTest.php
+++ b/core/modules/file/src/Tests/SaveTest.php
@@ -36,7 +36,7 @@ class SaveTest extends FileManagedUnitTestBase {
$this->assertFileHooksCalled(array('insert'));
$this->assertTrue($file->id() > 0, 'A new file ID is set when saving a new file to the database.', 'File');
- $loaded_file = file_load($file->id());
+ $loaded_file = File::load($file->id());
$this->assertNotNull($loaded_file, 'Record exists in the database.');
$this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
$this->assertEqual($file->getSize(), filesize($file->getFileUri()), 'File size was set correctly.', 'File');
@@ -53,7 +53,7 @@ class SaveTest extends FileManagedUnitTestBase {
$this->assertEqual($file->id(), $file->id(), 'The file ID of an existing file is not changed when updating the database.', 'File');
$this->assertTrue($file->getChangedTime() >= $file->getChangedTime(), "Timestamp didn't go backwards.", 'File');
- $loaded_file = file_load($file->id());
+ $loaded_file = File::load($file->id());
$this->assertNotNull($loaded_file, 'Record still exists in the database.', 'File');
$this->assertEqual($loaded_file->isPermanent(), $file->isPermanent(), 'Status was saved correctly.');
$this->assertEqual($loaded_file->langcode->value, 'en', 'Langcode was saved correctly.');
diff --git a/core/modules/file/src/Tests/SaveUploadTest.php b/core/modules/file/src/Tests/SaveUploadTest.php
index 155a67a..baeb443 100644
--- a/core/modules/file/src/Tests/SaveUploadTest.php
+++ b/core/modules/file/src/Tests/SaveUploadTest.php
@@ -7,6 +7,8 @@
namespace Drupal\file\Tests;
+use Drupal\file\Entity\File;
+
/**
* Tests the file_save_upload() function.
*
@@ -81,7 +83,7 @@ class SaveUploadTest extends FileManagedTestBase {
function testNormal() {
$max_fid_after = db_query('SELECT MAX(fid) AS fid FROM {file_managed}')->fetchField();
$this->assertTrue($max_fid_after > $this->maxFidBefore, 'A new file was created.');
- $file1 = file_load($max_fid_after);
+ $file1 = File::load($max_fid_after);
$this->assertTrue($file1, 'Loaded the file.');
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file1->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
@@ -100,13 +102,13 @@ class SaveUploadTest extends FileManagedTestBase {
// Check that the correct hooks were called.
$this->assertFileHooksCalled(array('validate', 'insert'));
- $file2 = file_load($max_fid_after);
+ $file2 = File::load($max_fid_after);
$this->assertTrue($file2, 'Loaded the file');
// MIME type of the uploaded image may be either image/jpeg or image/png.
$this->assertEqual(substr($file2->getMimeType(), 0, 5), 'image', 'A MIME type was set.');
- // Load both files using file_load_multiple().
- $files = file_load_multiple(array($file1->id(), $file2->id()));
+ // Load both files using File::loadMultiple().
+ $files = File::loadMultiple(array($file1->id(), $file2->id()));
$this->assertTrue(isset($files[$file1->id()]), 'File was loaded successfully');
$this->assertTrue(isset($files[$file2->id()]), 'File was loaded successfully');
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 5501d80..194c016 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -11,6 +11,7 @@ use Drupal\Component\Utility\SafeMarkup;
use Drupal\image\Entity\ImageStyle;
use Drupal\image\ImageStyleInterface;
use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
/**
* Tests creation, deletion, and editing of image styles and effects.
@@ -302,7 +303,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
// Get node field original image URI.
$fid = $node->get($field_name)->target_id;
- $original_uri = file_load($fid)->getFileUri();
+ $original_uri = File::load($fid)->getFileUri();
// Test that image is displayed using newly created style.
$this->drupalGet('node/' . $nid);
@@ -436,7 +437,7 @@ class ImageAdminStylesTest extends ImageFieldTestBase {
// Get node field original image URI.
$fid = $node->get($field_name)->target_id;
- $original_uri = file_load($fid)->getFileUri();
+ $original_uri = File::load($fid)->getFileUri();
// Test that image is displayed using newly created style.
$this->drupalGet('node/' . $nid);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
index a2989d4..0ec3b78 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileTest.php
@@ -12,6 +12,7 @@ use Drupal\migrate\MigrateExecutable;
use Drupal\migrate\Tests\MigrateDumpAlterInterface;
use Drupal\Core\Database\Database;
use Drupal\simpletest\TestBase;
+use Drupal\file\Entity\File;
/**
* file migration.
@@ -62,7 +63,7 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
*/
public function testFiles() {
/** @var \Drupal\file\FileInterface $file */
- $file = entity_load('file', 1);
+ $file = File::load(1);
$this->assertIdentical('Image1.png', $file->getFilename());
$this->assertIdentical('39325', $file->getSize());
$this->assertIdentical('public://image-1.png', $file->getFileUri());
@@ -96,11 +97,11 @@ class MigrateFileTest extends MigrateDrupal6TestBase implements MigrateDumpAlter
$executable = new MigrateExecutable($migration, $this);
$executable->import();
- $file = entity_load('file', 2);
+ $file = File::load(2);
$this->assertIdentical('public://core/modules/simpletest/files/image-2.jpg', $file->getFileUri());
// Ensure that a temporary file has been migrated.
- $file = entity_load('file', 6);
+ $file = File::load(6);
$this->assertIdentical('temporary://' . static::getUniqueFilename(), $file->getFileUri());
}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
index b3d15d7..969176c 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureFileTest.php
@@ -9,6 +9,7 @@ namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
+use Drupal\file\Entity\File;
/**
* User pictures migration.
@@ -56,7 +57,7 @@ class MigrateUserPictureFileTest extends MigrateDrupal6TestBase {
foreach (entity_load('migration', 'd6_user_picture_file')->getIdMap() as $destination_ids) {
$file_ids[] = reset($destination_ids);
}
- $files = entity_load_multiple('file', $file_ids);
+ $files = File::loadMultiple($file_ids);
/** @var \Drupal\file\FileInterface $file */
$file = array_shift($files);
$this->assertIdentical('image-test.jpg', $file->getFilename());
diff --git a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
index ead4c2b..4883d91 100644
--- a/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/FileFieldAttributesTest.php
@@ -8,6 +8,7 @@
namespace Drupal\rdf\Tests;
use Drupal\file\Tests\FileFieldTestBase;
+use Drupal\file\Entity\File;
/**
* Tests the RDFa markup of filefields.
@@ -68,8 +69,7 @@ class FileFieldAttributesTest extends FileFieldTestBase {
$node_storage->resetCache(array($nid));
$this->node = $node_storage->load($nid);
- $this->file = file_load($this->node->{$this->fieldName}->target_id);
-
+ $this->file = File::load($this->node->{$this->fieldName}->target_id);
}
/**
diff --git a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
index c5b482a..a36a0a8 100644
--- a/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
+++ b/core/modules/rdf/src/Tests/ImageFieldAttributesTest.php
@@ -10,6 +10,7 @@ namespace Drupal\rdf\Tests;
use Drupal\image\Entity\ImageStyle;
use Drupal\image\Tests\ImageFieldTestBase;
use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
/**
* Tests the RDFa markup of imagefields.
@@ -69,7 +70,7 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
// Save a node with the image.
$nid = $this->uploadNodeImage($image, $this->fieldName, 'article', $this->randomMachineName());
$this->node = Node::load($nid);
- $this->file = file_load($this->node->{$this->fieldName}->target_id);
+ $this->file = File::load($this->node->{$this->fieldName}->target_id);
}
/**
diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
index b7d996f..2885d47 100644
--- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php
@@ -17,6 +17,7 @@ use Drupal\taxonomy\Entity\Term;
use Drupal\node\Entity\Node;
use Drupal\taxonomy\Entity\Vocabulary;
use Drupal\user\Entity\User;
+use Drupal\file\Entity\File;
/**
* Tests the invocation of hooks when creating, inserting, loading, updating or
@@ -257,7 +258,7 @@ class EntityCrudHookTest extends EntityUnitTestBase {
));
$GLOBALS['entity_crud_hook_test'] = array();
- $file = file_load($file->id());
+ $file = File::load($file->id());
$this->assertHookMessageOrder(array(
'entity_crud_hook_test_entity_load called for type file',
diff --git a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
index fba0f15..550c5f5 100644
--- a/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
+++ b/core/modules/taxonomy/src/Tests/TaxonomyImageTest.php
@@ -8,6 +8,7 @@
namespace Drupal\taxonomy\Tests;
use Drupal\user\RoleInterface;
+use Drupal\file\Entity\File;
/**
* Tests access checks of private image fields.
@@ -86,7 +87,7 @@ class TaxonomyImageTest extends TaxonomyTestBase {
// Create a user that should have access to the file and one that doesn't.
$access_user = $this->drupalCreateUser(array('access content'));
$no_access_user = $this->drupalCreateUser();
- $image = file_load($term->field_test->target_id);
+ $image = File::load($term->field_test->target_id);
$this->drupalLogin($access_user);
$this->drupalGet(file_create_url($image->getFileUri()));
$this->assertResponse(200, 'Private image on term is accessible with right permission');
diff --git a/core/modules/user/src/Tests/UserPictureTest.php b/core/modules/user/src/Tests/UserPictureTest.php
index efadce5..4f046ab 100644
--- a/core/modules/user/src/Tests/UserPictureTest.php
+++ b/core/modules/user/src/Tests/UserPictureTest.php
@@ -8,6 +8,7 @@
namespace Drupal\user\Tests;
use Drupal\simpletest\WebTestBase;
+use Drupal\file\Entity\File;
/**
* Tests user picture functionality.
@@ -75,7 +76,7 @@ class UserPictureTest extends WebTestBase {
\Drupal::service('cron')->run();
// Verify that the image has been deleted.
- $this->assertFalse(file_load($file->id(), TRUE), 'File was removed from the database.');
+ $this->assertFalse(File::load($file->id()), 'File was removed from the database.');
// Clear out PHP's file stat cache so we see the current value.
clearstatcache(TRUE, $file->getFileUri());
$this->assertFalse(is_file($file->getFileUri()), 'File was removed from the file system.');
@@ -133,6 +134,6 @@ class UserPictureTest extends WebTestBase {
$user_storage = $this->container->get('entity.manager')->getStorage('user');
$user_storage->resetCache(array($this->webUser->id()));
$account = $user_storage->load($this->webUser->id());
- return file_load($account->user_picture->target_id, TRUE);
+ return File::load($account->user_picture->target_id);
}
}