Update to Drupal 8.0.0-rc3. For more information, see https://www.drupal.org/node/2608078

This commit is contained in:
Pantheon Automation 2015-11-04 11:11:27 -08:00 committed by Greg Anderson
parent 6419a031d7
commit 4afb23bbd3
762 changed files with 20080 additions and 6368 deletions

View file

@ -5,8 +5,6 @@ drupal.file:
css:
theme:
css/file.admin.css: {}
component:
css/file.theme.css: {}
dependencies:
- core/jquery
- core/jquery.once

View file

@ -45,7 +45,7 @@ class DatabaseFileUsageBackend extends FileUsageBase {
}
/**
* Implements Drupal\file\FileUsage\FileUsageInterface::add().
* {@inheritdoc}
*/
public function add(FileInterface $file, $module, $type, $id, $count = 1) {
$this->connection->merge($this->tableName)
@ -63,7 +63,7 @@ class DatabaseFileUsageBackend extends FileUsageBase {
}
/**
* Implements Drupal\file\FileUsage\FileUsageInterface::delete().
* {@inheritdoc}
*/
public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $count = 1) {
// Delete rows that have a exact or less value to prevent empty rows.
@ -98,7 +98,7 @@ class DatabaseFileUsageBackend extends FileUsageBase {
}
/**
* Implements Drupal\file\FileUsage\FileUsageInterface::listUsage().
* {@inheritdoc}
*/
public function listUsage(FileInterface $file) {
$result = $this->connection->select($this->tableName, 'f')

View file

@ -15,7 +15,7 @@ use Drupal\file\FileInterface;
abstract class FileUsageBase implements FileUsageInterface {
/**
* Implements Drupal\file\FileUsage\FileUsageInterface::add().
* {@inheritdoc}
*/
public function add(FileInterface $file, $module, $type, $id, $count = 1) {
// Make sure that a used file is permanent.
@ -26,7 +26,7 @@ abstract class FileUsageBase implements FileUsageInterface {
}
/**
* Implements Drupal\file\FileUsage\FileUsageInterface::delete().
* {@inheritdoc}
*/
public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $count = 1) {
// If there are no more remaining usages of this file, mark it as temporary,

View file

@ -8,10 +8,13 @@
namespace Drupal\file\Plugin\migrate\cckfield;
use Drupal\migrate\Entity\MigrationInterface;
use Drupal\migrate\Row;
use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase;
/**
* @PluginID("filefield")
* @MigrateCckField(
* id = "filefield"
* )
*/
class FileField extends CckFieldPluginBase {
@ -49,4 +52,11 @@ class FileField extends CckFieldPluginBase {
$migration->mergeProcessOfProperty($field_name, $process);
}
/**
* {@inheritdoc}
*/
public function getFieldType(Row $row) {
return $row->getSourceProperty('widget_type') == 'imagefield_widget' ? 'image' : 'file';
}
}

View file

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\migrate\Plugin\migrate\destination\EntityFile.
* Contains \Drupal\file\Plugin\migrate\destination\EntityFile.
*/
namespace Drupal\file\Plugin\migrate\destination;

View file

@ -26,7 +26,7 @@ class File extends WizardPluginBase {
protected $createdColumn = 'created';
/**
* Overrides Drupal\views\Plugin\views\wizard\WizardPluginBase::defaultDisplayOptions().
* {@inheritdoc}
*/
protected function defaultDisplayOptions() {
$display_options = parent::defaultDisplayOptions();