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

Update to Drupal 8.1.2. For more information, see https://www.drupal.org/project/drupal/releases/8.1.2

Browse source
This commit is contained in:
Pantheon Automation 2016-06-02 15:56:09 -07:00 • committed by Greg Anderson
parent 9eae24d844
commit 28556d630e
1322 changed files with 6699 additions and 2064 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/modules/block_content/src/Plugin/Derivative/BlockContent.php
View file

@ -54,4 +54,5 @@ class BlockContent extends DeriverBase implements ContainerDeriverInterface {
}
return parent::getDerivativeDefinitions($base_plugin_definition);
}
}

1
core/modules/block_content/src/Tests/BlockContentCacheTagsTest.php
View file

@ -101,4 +101,5 @@ class BlockContentCacheTagsTest extends EntityCacheTagsTestBase {
$redirected_cid = $this->createCacheId($expected_block_cache_keys, Cache::mergeContexts($expected_block_cache_contexts, $expected_entity_cache_contexts));
$this->verifyRenderCache($cid, Cache::mergeTags($expected_block_cache_tags, $expected_entity_cache_tags), ($cid !== $redirected_cid) ? $redirected_cid : NULL);
}
}

1
core/modules/block_content/src/Tests/Views/BlockContentFieldFilterTest.php
View file

@ -105,4 +105,5 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
$this->assertEqual(substr_count($text, $this->blockContentInfos[$langcode]), $count, 'Translation ' . $langcode . ' has count ' . $count . ' with ' . $message);
}
}
}

6
core/modules/block_content/tests/modules/block_content_test/block_content_test.module
View file

@ -25,12 +25,12 @@ function block_content_test_block_content_view(array &$build, BlockContent $bloc
*/
function block_content_test_block_content_presave(BlockContent $block_content) {
if ($block_content->label() == 'testing_block_content_presave') {
$block_content->setInfo($block_content->label() .'_presave');
$block_content->setInfo($block_content->label() . '_presave');
}
// Determine changes.
if (!empty($block_content->original) && $block_content->original->label() == 'test_changes') {
if ($block_content->original->label() != $block_content->label()) {
$block_content->setInfo($block_content->label() .'_presave');
$block_content->setInfo($block_content->label() . '_presave');
// Drupal 1.0 release.
$block_content->changed = 979534800;
}
@ -44,7 +44,7 @@ function block_content_test_block_content_update(BlockContent $block_content) {
// Determine changes on update.
if (!empty($block_content->original) && $block_content->original->label() == 'test_changes') {
if ($block_content->original->label() != $block_content->label()) {
$block_content->setInfo($block_content->label() .'_update');
$block_content->setInfo($block_content->label() . '_update');
}
}
}

2
core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentBodyFieldTest.php
View file

@ -15,7 +15,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
*/
class MigrateBlockContentBodyFieldTest extends MigrateDrupal7TestBase {
static $modules = array('block', 'block_content', 'filter', 'text');
public static $modules = array('block', 'block_content', 'filter', 'text');
/**
* {@inheritdoc}

2
core/modules/block_content/tests/src/Kernel/Migrate/MigrateBlockContentTypeTest.php
View file

@ -13,7 +13,7 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
*/
class MigrateBlockContentTypeTest extends MigrateDrupal7TestBase {
static $modules = array('block', 'block_content', 'filter', 'text');
public static $modules = array('block', 'block_content', 'filter', 'text');
/**
* {@inheritdoc}