opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

11
core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
View file

@ -57,6 +57,13 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
*/
protected $blockContent;
/**
* The URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface
*/
protected $urlGenerator;
/**
* Constructs a new BlockContentBlock.
*
@ -66,12 +73,14 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
* The plugin ID for the plugin instance.
* @param mixed $plugin_definition
* The plugin implementation definition.
* @param \Drupal\Core\Block\BlockManagerInterface
* @param \Drupal\Core\Block\BlockManagerInterface $block_manager
* The Plugin Block Manager.
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
* The entity manager service.
* @param \Drupal\Core\Session\AccountInterface $account
* The account for which view access should be checked.
* @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
* The URL generator.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, BlockManagerInterface $block_manager, EntityManagerInterface $entity_manager, AccountInterface $account, UrlGeneratorInterface $url_generator) {
parent::__construct($configuration, $plugin_id, $plugin_definition);

2
core/modules/block_content/src/Tests/BlockContentTestBase.php
View file

@ -65,7 +65,7 @@ abstract class BlockContentTestBase extends WebTestBase {
/**
* Creates a custom block.
*
* @param string $title
* @param bool|string $title
* (optional) Title of block. When no value is given uses a random name.
* Defaults to FALSE.
* @param string $bundle

10
core/modules/block_content/src/Tests/BlockContentTranslationUITest.php
View file

@ -44,7 +44,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
];
/**
* Overrides \Drupal\simpletest\WebTestBase::setUp().
* {@inheritdoc}
*/
protected function setUp() {
$this->entityTypeId = 'block_content';
@ -69,7 +69,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
}
/**
* Overrides \Drupal\content_translation\Tests\ContentTranslationUITestBase::getTranslatorPermission().
* {@inheritdoc}
*/
public function getTranslatorPermissions() {
return array_merge(parent::getTranslatorPermissions(), array(
@ -83,10 +83,10 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
/**
* Creates a custom block.
*
* @param string $title
* @param bool|string $title
* (optional) Title of block. When no value is given uses a random name.
* Defaults to FALSE.
* @param string $bundle
* @param bool|string $bundle
* (optional) Bundle name. When no value is given, defaults to
* $this->bundle. Defaults to FALSE.
*
@ -106,7 +106,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase {
}
/**
* Overrides \Drupal\content_translation\Tests\ContentTranslationUITestBase::getNewEntityValues().
* {@inheritdoc}
*/
protected function getNewEntityValues($langcode) {
return array('info' => Unicode::strtolower($this->randomMachineName())) + parent::getNewEntityValues($langcode);