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

Update core 8.3.0

Browse source
This commit is contained in:
Rob Davies 2017-04-13 15:53:35 +01:00
parent da7a7918f8
commit cd7a898e66
6144 changed files with 132297 additions and 87747 deletions
Download patch file Download diff file Expand all files Collapse all files

96
web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
View file

@ -16,11 +16,11 @@ class BreakpointDiscoveryTest extends KernelTestBase {
*
* @var array
*/
public static $modules = array('system', 'breakpoint', 'breakpoint_module_test');
public static $modules = ['system', 'breakpoint', 'breakpoint_module_test'];
protected function setUp() {
parent::setUp();
\Drupal::service('theme_handler')->install(array('breakpoint_theme_test'));
\Drupal::service('theme_handler')->install(['breakpoint_theme_test']);
}
/**
@ -28,56 +28,56 @@ class BreakpointDiscoveryTest extends KernelTestBase {
*/
public function testThemeBreakpoints() {
// Verify the breakpoint group for breakpoint_theme_test was created.
$expected_breakpoints = array(
'breakpoint_theme_test.mobile' => array(
$expected_breakpoints = [
'breakpoint_theme_test.mobile' => [
'label' => 'mobile',
'mediaQuery' => '(min-width: 0px)',
'weight' => 0,
'multipliers' => array(
'multipliers' => [
'1x',
),
],
'provider' => 'breakpoint_theme_test',
'id' => 'breakpoint_theme_test.mobile',
'group' => 'breakpoint_theme_test',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
'breakpoint_theme_test.narrow' => array(
],
'breakpoint_theme_test.narrow' => [
'label' => 'narrow',
'mediaQuery' => '(min-width: 560px)',
'weight' => 1,
'multipliers' => array(
'multipliers' => [
'1x',
),
],
'provider' => 'breakpoint_theme_test',
'id' => 'breakpoint_theme_test.narrow',
'group' => 'breakpoint_theme_test',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
'breakpoint_theme_test.wide' => array(
],
'breakpoint_theme_test.wide' => [
'label' => 'wide',
'mediaQuery' => '(min-width: 851px)',
'weight' => 2,
'multipliers' => array(
'multipliers' => [
'1x',
),
],
'provider' => 'breakpoint_theme_test',
'id' => 'breakpoint_theme_test.wide',
'group' => 'breakpoint_theme_test',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
'breakpoint_theme_test.tv' => array(
],
'breakpoint_theme_test.tv' => [
'label' => 'tv',
'mediaQuery' => 'only screen and (min-width: 1220px)',
'weight' => 3,
'multipliers' => array(
'multipliers' => [
'1x',
),
],
'provider' => 'breakpoint_theme_test',
'id' => 'breakpoint_theme_test.tv',
'group' => 'breakpoint_theme_test',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
);
],
];
$breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test');
foreach ($expected_breakpoints as $id => $expected_breakpoint) {
@ -93,46 +93,46 @@ class BreakpointDiscoveryTest extends KernelTestBase {
*/
public function testCustomBreakpointGroups() {
// Verify the breakpoint group for breakpoint_theme_test.group2 was created.
$expected_breakpoints = array(
'breakpoint_theme_test.group2.narrow' => array(
$expected_breakpoints = [
'breakpoint_theme_test.group2.narrow' => [
'label' => 'narrow',
'mediaQuery' => '(min-width: 560px)',
'weight' => 0,
'multipliers' => array(
'multipliers' => [
'1x',
'2x',
),
],
'provider' => 'breakpoint_theme_test',
'id' => 'breakpoint_theme_test.group2.narrow',
'group' => 'breakpoint_theme_test.group2',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
'breakpoint_theme_test.group2.wide' => array(
],
'breakpoint_theme_test.group2.wide' => [
'label' => 'wide',
'mediaQuery' => '(min-width: 851px)',
'weight' => 1,
'multipliers' => array(
'multipliers' => [
'1x',
'2x',
),
],
'provider' => 'breakpoint_theme_test',
'id' => 'breakpoint_theme_test.group2.wide',
'group' => 'breakpoint_theme_test.group2',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
'breakpoint_module_test.breakpoint_theme_test.group2.tv' => array(
],
'breakpoint_module_test.breakpoint_theme_test.group2.tv' => [
'label' => 'tv',
'mediaQuery' => '(min-width: 6000px)',
'weight' => 2,
'multipliers' => array(
'multipliers' => [
'1x',
),
],
'provider' => 'breakpoint_module_test',
'id' => 'breakpoint_module_test.breakpoint_theme_test.group2.tv',
'group' => 'breakpoint_theme_test.group2',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
);
],
];
$breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test.group2');
foreach ($expected_breakpoints as $id => $expected_breakpoint) {
@ -144,33 +144,33 @@ class BreakpointDiscoveryTest extends KernelTestBase {
* Test the breakpoint group created for a module.
*/
public function testModuleBreakpoints() {
$expected_breakpoints = array(
'breakpoint_module_test.mobile' => array(
$expected_breakpoints = [
'breakpoint_module_test.mobile' => [
'label' => 'mobile',
'mediaQuery' => '(min-width: 0px)',
'weight' => 0,
'multipliers' => array(
'multipliers' => [
'1x',
),
],
'provider' => 'breakpoint_module_test',
'id' => 'breakpoint_module_test.mobile',
'group' => 'breakpoint_module_test',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
'breakpoint_module_test.standard' => array(
],
'breakpoint_module_test.standard' => [
'label' => 'standard',
'mediaQuery' => '(min-width: 560px)',
'weight' => 1,
'multipliers' => array(
'multipliers' => [
'1x',
'2x',
),
],
'provider' => 'breakpoint_module_test',
'id' => 'breakpoint_module_test.standard',
'group' => 'breakpoint_module_test',
'class' => 'Drupal\\breakpoint\\Breakpoint',
),
);
],
];
$breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_module_test');
$this->assertEqual(array_keys($expected_breakpoints), array_keys($breakpoints));
@ -180,20 +180,20 @@ class BreakpointDiscoveryTest extends KernelTestBase {
* Test the collection of breakpoint groups.
*/
public function testBreakpointGroups() {
$expected = array(
$expected = [
'bartik' => 'Bartik',
'breakpoint_module_test' => 'Breakpoint test module',
'breakpoint_theme_test' => 'Breakpoint test theme',
'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',
);
];
$breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups();
// Ensure the order is as expected. Should be sorted by label.
$this->assertIdentical($expected, $this->castSafeStrings($breakpoint_groups));
$expected = array(
$expected = [
'breakpoint_theme_test' => 'theme',
'breakpoint_module_test' => 'module',
);
];
$breakpoint_group_providers = \Drupal::service('breakpoint.manager')->getGroupProviders('breakpoint_theme_test.group2');
$this->assertEqual($expected, $breakpoint_group_providers);
}

12
web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
View file

@ -24,9 +24,9 @@ class BreakpointTest extends UnitTestCase {
*
* @var array
*/
protected $pluginDefinition = array(
protected $pluginDefinition = [
'id' => 'breakpoint',
);
];
/**
* The breakpoint under test.
@ -52,7 +52,7 @@ class BreakpointTest extends UnitTestCase {
* Sets up the breakpoint defaults.
*/
protected function setupBreakpoint() {
$this->breakpoint = new Breakpoint(array(), $this->pluginId, $this->pluginDefinition);
$this->breakpoint = new Breakpoint([], $this->pluginId, $this->pluginDefinition);
$this->breakpoint->setStringTranslation($this->stringTranslation);
}
@ -62,7 +62,7 @@ class BreakpointTest extends UnitTestCase {
public function testGetLabel() {
$this->pluginDefinition['label'] = 'Test label';
$this->setupBreakpoint();
$this->assertEquals(new TranslatableMarkup('Test label', array(), array('context' => 'breakpoint'), $this->stringTranslation), $this->breakpoint->getLabel());
$this->assertEquals(new TranslatableMarkup('Test label', [], ['context' => 'breakpoint'], $this->stringTranslation), $this->breakpoint->getLabel());
}
/**
@ -88,9 +88,9 @@ class BreakpointTest extends UnitTestCase {
* @covers ::getMultipliers
*/
public function testGetMultipliers() {
$this->pluginDefinition['multipliers'] = array('1x', '2x');
$this->pluginDefinition['multipliers'] = ['1x', '2x'];
$this->setupBreakpoint();
$this->assertSame(array('1x', '2x'), $this->breakpoint->getMultipliers());
$this->assertSame(['1x', '2x'], $this->breakpoint->getMultipliers());
}
/**