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

Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-04-20 09:56:34 -07:00 • committed by Greg Anderson
parent b11a755ba8
commit c0a0d5a94c
6920 changed files with 64395 additions and 57312 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/modules/menu_link_content/config/schema/menu_link_content.schema.yml
View file

@ -1,7 +0,0 @@
migrate.source.menu_link:
type: migrate_source_sql
label: 'Menu link'
mapping:
constants:
type: migrate_entity_constant
label: 'Constants'

5
core/modules/menu_link_content/src/Controller/MenuController.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Controller\MenuController.
*/
namespace Drupal\menu_link_content\Controller;
use Drupal\Core\Controller\ControllerBase;

5
core/modules/menu_link_content/src/Entity/MenuLinkContent.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Entity\MenuLinkContent.
*/
namespace Drupal\menu_link_content\Entity;
use Drupal\Core\Entity\ContentEntityBase;

5
core/modules/menu_link_content/src/Form/MenuLinkContentDeleteForm.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Form\MenuLinkContentDeleteForm.
*/
namespace Drupal\menu_link_content\Form;
use Drupal\Core\Entity\ContentEntityDeleteForm;

5
core/modules/menu_link_content/src/Form/MenuLinkContentForm.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Form\MenuLinkContentForm.
*/
namespace Drupal\menu_link_content\Form;
use Drupal\Core\Entity\ContentEntityForm;

8
core/modules/menu_link_content/src/MenuLinkContentAccessControlHandler.php
View file

@ -1,8 +1,4 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\MenuLinkContentAccessControlHandler.
*/
namespace Drupal\menu_link_content;
@ -64,7 +60,7 @@ class MenuLinkContentAccessControlHandler extends EntityAccessControlHandler imp
}
else {
// If there is a URL, this is an external link so always accessible.
$access = AccessResult::allowed()->cachePerPermissions()->cacheUntilEntityChanges($entity);
$access = AccessResult::allowed()->cachePerPermissions()->addCacheableDependency($entity);
/** @var \Drupal\menu_link_content\MenuLinkContentInterface $entity */
// We allow access, but only if the link is accessible as well.
if (($url_object = $entity->getUrlObject()) && $url_object->isRouted()) {
@ -75,7 +71,7 @@ class MenuLinkContentAccessControlHandler extends EntityAccessControlHandler imp
}
case 'delete':
return AccessResult::allowedIf(!$entity->isNew() && $account->hasPermission('administer menu'))->cachePerPermissions()->cacheUntilEntityChanges($entity);
return AccessResult::allowedIf(!$entity->isNew() && $account->hasPermission('administer menu'))->cachePerPermissions()->addCacheableDependency($entity);
}
}

5
core/modules/menu_link_content/src/MenuLinkContentInterface.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\MenuLinkContentInterface.
*/
namespace Drupal\menu_link_content;
use Drupal\Core\Entity\EntityChangedInterface;

5
core/modules/menu_link_content/src/MenuLinkContentStorageSchema.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\MenuLinkContentStorageSchema.
*/
namespace Drupal\menu_link_content;
use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;

5
core/modules/menu_link_content/src/Plugin/Deriver/MenuLinkContentDeriver.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Plugin\Deriver\MenuLinkContentDeriver.
*/
namespace Drupal\menu_link_content\Plugin\Deriver;
use Drupal\Component\Plugin\Derivative\DeriverBase;

5
core/modules/menu_link_content/src/Plugin/Menu/MenuLinkContent.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Plugin\Menu\MenuLinkContent.
*/
namespace Drupal\menu_link_content\Plugin\Menu;
use Drupal\Component\Plugin\Exception\PluginException;

5
core/modules/menu_link_content/src/Plugin/migrate/process/d6/InternalUri.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Plugin\migrate\process\d6\InternalUri.
*/
namespace Drupal\menu_link_content\Plugin\migrate\process\d6;
use Drupal\migrate\MigrateExecutableInterface;

5
core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Plugin\migrate\source\MenuLink.
*/
namespace Drupal\menu_link_content\Plugin\migrate\source;
use Drupal\Component\Utility\Unicode;

21
core/modules/menu_link_content/src/Tests/LinksTest.php
View file

@ -1,14 +1,11 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\LinksTest.
*/
namespace Drupal\menu_link_content\Tests;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\menu_link_content\Entity\MenuLinkContent;
use Drupal\simpletest\WebTestBase;
use Drupal\system\Entity\Menu;
/**
* Tests handling of menu links hierarchies.
@ -39,7 +36,7 @@ class LinksTest extends WebTestBase {
$this->menuLinkManager = \Drupal::service('plugin.manager.menu.link');
entity_create('menu', array(
Menu::create(array(
'id' => 'menu_test',
'label' => 'Test menu',
'description' => 'Description text',
@ -68,7 +65,7 @@ class LinksTest extends WebTestBase {
$parent = $base_options + array(
'link' => ['uri' => 'internal:/menu-test/hierarchy/parent'],
);
$link = entity_create('menu_link_content', $parent);
$link = MenuLinkContent::create($parent);
$link->save();
$links['parent'] = $link->getPluginId();
@ -76,7 +73,7 @@ class LinksTest extends WebTestBase {
'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
'parent' => $links['parent'],
);
$link = entity_create('menu_link_content', $child_1);
$link = MenuLinkContent::create($child_1);
$link->save();
$links['child-1'] = $link->getPluginId();
@ -84,7 +81,7 @@ class LinksTest extends WebTestBase {
'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
'parent' => $links['child-1'],
);
$link = entity_create('menu_link_content', $child_1_1);
$link = MenuLinkContent::create($child_1_1);
$link->save();
$links['child-1-1'] = $link->getPluginId();
@ -92,7 +89,7 @@ class LinksTest extends WebTestBase {
'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
'parent' => $links['child-1'],
);
$link = entity_create('menu_link_content', $child_1_2);
$link = MenuLinkContent::create($child_1_2);
$link->save();
$links['child-1-2'] = $link->getPluginId();
@ -100,7 +97,7 @@ class LinksTest extends WebTestBase {
'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
'parent' => $links['parent'],
);
$link = entity_create('menu_link_content', $child_2);
$link = MenuLinkContent::create($child_2);
$link->save();
$links['child-2'] = $link->getPluginId();
@ -129,7 +126,7 @@ class LinksTest extends WebTestBase {
'bundle' => 'menu_link_content',
'link' => [['uri' => 'internal:/']],
);
$link = entity_create('menu_link_content', $options);
$link = MenuLinkContent::create($options);
$link->save();
// Make sure the changed timestamp is set.
$this->assertEqual($link->getChangedTime(), REQUEST_TIME, 'Creating a menu link sets the "changed" timestamp.');

6
core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\MenuLinkContentCacheabilityBubblingTest.
*/
namespace Drupal\menu_link_content\Tests;
use Drupal\Core\Cache\Cache;
@ -39,7 +34,6 @@ class MenuLinkContentCacheabilityBubblingTest extends KernelTestBase {
$this->installEntitySchema('menu_link_content');
$this->installEntitySchema('user');
$this->installSchema('system', ['url_alias', 'router']);
// Ensure that the weight of module_link_content is higher than system.
// @see menu_link_content_install()

6
core/modules/menu_link_content/src/Tests/MenuLinkContentDeleteFormTest.php
View file

@ -1,8 +1,4 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\MenuLinkContentDeleteFormTest.
*/
namespace Drupal\menu_link_content\Tests;
@ -56,6 +52,8 @@ class MenuLinkContentDeleteFormTest extends WebTestBase {
$this->assertLinkByHref($menu_link->url('edit-form'));
\Drupal::service('module_installer')->install(['menu_ui']);
\Drupal::service('router.builder')->rebuild();
// Make sure cancel URL points to menu_ui route now.
$this->drupalGet($menu_link->urlInfo('delete-form'));
$menu = Menu::load($menu_link->getMenuName());

8
core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
View file

@ -1,13 +1,7 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\MenuLinkContentDeriverTest.
*/
namespace Drupal\menu_link_content\Tests;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\menu_link_content\Entity\MenuLinkContent;
@ -33,7 +27,6 @@ class MenuLinkContentDeriverTest extends KernelTestBase {
parent::setUp();
$this->installEntitySchema('menu_link_content');
$this->installSchema('system', 'router');
}
/**
@ -73,7 +66,6 @@ class MenuLinkContentDeriverTest extends KernelTestBase {
$title = $tree_element->link->getTitle();
$this->assertFalse($title instanceof TranslatableMarkup);
$this->assertIdentical('<script>alert("Welcome to the discovered jungle!")</script>', $title);
$this->assertFalse(SafeMarkup::isSafe($title));
// Create a hierarchy.
\Drupal::state()->set('menu_link_content_dynamic_route.routes', [

4
core/modules/menu_link_content/src/Tests/MenuLinkContentFormTest.php
View file

@ -1,8 +1,4 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\MenuLinkContentFormTest.
*/
namespace Drupal\menu_link_content\Tests;

5
core/modules/menu_link_content/src/Tests/MenuLinkContentTranslationUITest.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\MenuLinkContentTranslationUITest.
*/
namespace Drupal\menu_link_content\Tests;
use Drupal\content_translation\Tests\ContentTranslationUITestBase;

6
core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\PathAliasMenuLinkContentTest.
*/
namespace Drupal\menu_link_content\Tests;
use Drupal\Core\DependencyInjection\ContainerBuilder;
@ -32,7 +27,6 @@ class PathAliasMenuLinkContentTest extends KernelTestBase {
parent::setUp();
$this->installEntitySchema('menu_link_content');
$this->installSchema('system', ['url_alias', 'router']);
// Ensure that the weight of module_link_content is higher than system.
// @see menu_link_content_install()

5
core/modules/menu_link_content/tests/menu_link_content_dynamic_route/src/Routes.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content_dynamic_route\Routes.
*/
namespace Drupal\menu_link_content_dynamic_route;
/**

9
core/modules/menu_link_content/src/Tests/Migrate/MigrateMenuLinkContentStubTest.php → core/modules/menu_link_content/tests/src/Kernel/Migrate/MigrateMenuLinkContentStubTest.php
View file

@ -1,13 +1,8 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\Migrate\MigrateMenuLinkContentStubTest.
*/
namespace Drupal\Tests\menu_link_content\Kernel\Migrate;
namespace Drupal\menu_link_content\Tests\Migrate;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\StubTestTrait;
/**

10
core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php → core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php
View file

@ -1,14 +1,9 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\Migrate\d6\MigrateMenuLinkTest.
*/
namespace Drupal\menu_link_content\Tests\Migrate\d6;
namespace Drupal\Tests\menu_link_content\Kernel\Migrate\d6;
use Drupal\menu_link_content\Entity\MenuLinkContent;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
/**
* Menu link migration.
@ -27,7 +22,6 @@ class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
*/
protected function setUp() {
parent::setUp();
$this->installSchema('system', ['router']);
$this->installEntitySchema('menu_link_content');
$this->executeMigrations(['menu', 'menu_links']);
}

11
core/modules/menu_link_content/src/Tests/Migrate/d7/MigrateMenuLinkTest.php → core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
View file

@ -1,18 +1,12 @@
<?php
/**
* @file
* Contains \Drupal\menu_link_content\Tests\Migrate\d7\MigrateMenuLinkTest.
*/
namespace Drupal\menu_link_content\Tests\Migrate\d7;
namespace Drupal\Tests\menu_link_content\Kernel\Migrate\d7;
use Drupal\Core\Database\Database;
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\Url;
use Drupal\menu_link_content\Entity\MenuLinkContent;
use Drupal\menu_link_content\MenuLinkContentInterface;
use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
/**
* Menu link migration.
@ -32,7 +26,6 @@ class MigrateMenuLinkTest extends MigrateDrupal7TestBase {
*/
protected function setUp() {
parent::setUp();
$this->installSchema('system', ['router']);
$this->installEntitySchema('menu_link_content');
$this->executeMigration('menu');
\Drupal::service('router.builder')->rebuild();

4
core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/source/MenuLinkSourceTest.php
View file

@ -1,9 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source\MenuLinkSourceTest.
*/
namespace Drupal\Tests\menu_link_content\Unit\Plugin\migrate\source;
use Drupal\Component\Utility\Unicode;