From 409cf6fd0cf51149602a19b4049ee79449212217 Mon Sep 17 00:00:00 2001 From: Jakob Perry Date: Mon, 13 Apr 2020 15:24:44 -0700 Subject: [PATCH] 2960739 interdiff --- composer.json | 7 +++- page_manager.info.yml | 2 +- page_manager.post_update.php | 36 +++++++++---------- page_manager_ui/page_manager_ui.module | 8 +++-- src/Entity/PageVariant.php | 4 ++- src/EventSubscriber/CurrentUserContext.php | 2 +- .../PageManagerSectionStorage.php | 2 ++ .../fixtures/update/page_manager.2960739.php | 2 +- .../LayoutBuilderDisplayVariantTest.php | 2 +- 9 files changed, 38 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index 1fb50f2..28a77dd 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,11 @@ "minimum-stability": "dev", "require": { "drupal/core": "^8.8 || ^9", - "drupal/ctools": "~3.1" + "drupal/ctools": "^3.1" + }, + "extra": { + "branch-alias": { + "dev-8.x-4.x": "4.x-dev" + } } } diff --git a/page_manager.info.yml b/page_manager.info.yml index e9cb3a9..d7e7c14 100644 --- a/page_manager.info.yml +++ b/page_manager.info.yml @@ -5,4 +5,4 @@ package: Layout core_version_requirement: '^8.8 || ^9' dependencies: - drupal:block - - ctools:ctools (>=3.1) + - ctools:ctools diff --git a/page_manager.post_update.php b/page_manager.post_update.php index 241397a..dc2d578 100644 --- a/page_manager.post_update.php +++ b/page_manager.post_update.php @@ -14,26 +14,26 @@ use Drupal\page_manager\PageVariantInterface; function page_manager_post_update_replace_current_user_context(&$sandbox = NULL) { \Drupal::classResolver(ConfigEntityUpdater::class) ->update($sandbox, 'page_variant', function (PageVariantInterface $pageVariant) { - $process_contexts = function(&$context_mapping) { - foreach ($context_mapping as $type => $name) { - if ($name == 'current_user') { - $context_mapping[$type] = '@user.current_user_context:current_user'; + $process_contexts = function(&$context_mapping) { + foreach ($context_mapping as $type => $name) { + if ($name == 'current_user') { + $context_mapping[$type] = '@user.current_user_context:current_user'; + } } - } - }; + }; - $conditions = $pageVariant->get('selection_criteria'); - foreach ($conditions as &$condition) { - $process_contexts($condition['context_mapping']); - } - $pageVariant->set('selection_criteria', $conditions); + $conditions = $pageVariant->get('selection_criteria'); + foreach ($conditions as &$condition) { + $process_contexts($condition['context_mapping']); + } + $pageVariant->set('selection_criteria', $conditions); - $variant_settings = $pageVariant->get('variant_settings'); - foreach ($variant_settings['blocks'] as &$block) { - $process_contexts($block['context_mapping']); - } - $pageVariant->set('variant_settings', $variant_settings); + $variant_settings = $pageVariant->get('variant_settings'); + foreach ($variant_settings['blocks'] as &$block) { + $process_contexts($block['context_mapping']); + } + $pageVariant->set('variant_settings', $variant_settings); - $pageVariant->save(); - }); + $pageVariant->save(); + }); } diff --git a/page_manager_ui/page_manager_ui.module b/page_manager_ui/page_manager_ui.module index 5ffbb32..11438b2 100644 --- a/page_manager_ui/page_manager_ui.module +++ b/page_manager_ui/page_manager_ui.module @@ -5,6 +5,7 @@ * Provides a UI for Page Manager. */ +use Drupal\Core\Url; use Drupal\page_manager_ui\Entity\PageListBuilder; use Drupal\page_manager_ui\Form\PageDeleteForm; use Drupal\page_manager_ui\ConfigTranslation\PageConfigMapper; @@ -13,6 +14,7 @@ use Drupal\page_manager_ui\Wizard\PageAddWizard; use Drupal\page_manager_ui\Wizard\PageEditWizard; use Drupal\page_manager_ui\Wizard\PageVariantAddWizard; + /** * Implements hook_entity_type_build(). */ @@ -31,7 +33,7 @@ function page_manager_ui_entity_type_build(array &$entity_types) { ->setHandlerClass('wizard', [ 'add' => PageAddWizard::class, 'edit' => PageEditWizard::class, - ]); + ]); } if (isset($entity_types['page_variant'])) { @@ -40,7 +42,7 @@ function page_manager_ui_entity_type_build(array &$entity_types) { ->setLinkTemplate('edit-form', '/admin/structure/page_manager/manage/{machine_name}/{step}') ->setHandlerClass('wizard', [ 'add_variant' => PageVariantAddWizard::class, - ]); + ]); } } @@ -112,7 +114,7 @@ function template_preprocess_page_manager_wizard_tree(&$variables) { $parent[$step] = [ 'title' => !empty($operation['title']) ? $operation['title'] : '', - 'url' => new \Drupal\Core\Url($wizard->getRouteName(), $parameters), + 'url' => new Url($wizard->getRouteName(), $parameters), 'step' => $step, ]; } diff --git a/src/Entity/PageVariant.php b/src/Entity/PageVariant.php index e8a90a4..1a309c3 100644 --- a/src/Entity/PageVariant.php +++ b/src/Entity/PageVariant.php @@ -7,7 +7,6 @@ use Drupal\Core\Condition\ConditionPluginCollection; use Drupal\Core\Config\Entity\ConfigEntityBase; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityTypeInterface; -use Drupal\Core\Plugin\Context\ContextInterface; use Drupal\Core\Plugin\DefaultSingleLazyPluginCollection; use Drupal\page_manager\PageInterface; use Drupal\page_manager\PageVariantInterface; @@ -429,6 +428,7 @@ class PageVariant extends ConfigEntityBase implements PageVariantInterface { * Wraps the condition plugin manager. * * @return \Drupal\Core\Condition\ConditionManager + * The condition manager service. */ protected function getConditionManager() { return \Drupal::service('plugin.manager.condition'); @@ -438,6 +438,7 @@ class PageVariant extends ConfigEntityBase implements PageVariantInterface { * Wraps the context mapper. * * @return \Drupal\page_manager\ContextMapperInterface + * The context mapper service. */ protected function getContextMapper() { return \Drupal::service('page_manager.context_mapper'); @@ -447,6 +448,7 @@ class PageVariant extends ConfigEntityBase implements PageVariantInterface { * Wraps the page entity storage. * * @return \Drupal\Core\Entity\EntityStorageInterface + * The Page entity storage service. */ protected function getPageStorage() { return \Drupal::entityTypeManager()->getStorage('page'); diff --git a/src/EventSubscriber/CurrentUserContext.php b/src/EventSubscriber/CurrentUserContext.php index 69c2d4f..d36b8fc 100644 --- a/src/EventSubscriber/CurrentUserContext.php +++ b/src/EventSubscriber/CurrentUserContext.php @@ -36,7 +36,7 @@ class CurrentUserContext implements EventSubscriberInterface { * The page entity context event. */ public function onPageContext(PageManagerContextEvent $event) { - $contexts = $this->contextRepository->getRuntimeContexts(array('@user.current_user_context:current_user')); + $contexts = $this->contextRepository->getRuntimeContexts(['@user.current_user_context:current_user']); $context = reset($contexts); $event->getPage()->addContext('@user.current_user_context:current_user', $context); } diff --git a/src/Plugin/SectionStorage/PageManagerSectionStorage.php b/src/Plugin/SectionStorage/PageManagerSectionStorage.php index a50dc85..5c011f8 100644 --- a/src/Plugin/SectionStorage/PageManagerSectionStorage.php +++ b/src/Plugin/SectionStorage/PageManagerSectionStorage.php @@ -77,6 +77,8 @@ class PageManagerSectionStorage extends SectionStorageBase implements ContainerF * The sample entity generator. * @param \Drupal\Core\TempStore\SharedTempStoreFactory $tempstore * The tempstore factory. + * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info + * The entity bundle information. */ public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, SampleEntityGeneratorInterface $sample_entity_generator, SharedTempStoreFactory $tempstore, EntityTypeBundleInfoInterface $entity_type_bundle_info) { parent::__construct($configuration, $plugin_id, $plugin_definition); diff --git a/tests/fixtures/update/page_manager.2960739.php b/tests/fixtures/update/page_manager.2960739.php index db1b893..63bced9 100644 --- a/tests/fixtures/update/page_manager.2960739.php +++ b/tests/fixtures/update/page_manager.2960739.php @@ -2,7 +2,7 @@ /** * @file - * Test fixture for task #2960739 + * Test fixture for task #2960739. * * @see https://www.drupal.org/project/page_manager/issues/2960739 */ diff --git a/tests/src/FunctionalJavascript/LayoutBuilderDisplayVariantTest.php b/tests/src/FunctionalJavascript/LayoutBuilderDisplayVariantTest.php index db96b9b..75f9990 100644 --- a/tests/src/FunctionalJavascript/LayoutBuilderDisplayVariantTest.php +++ b/tests/src/FunctionalJavascript/LayoutBuilderDisplayVariantTest.php @@ -91,7 +91,7 @@ class LayoutBuilderDisplayVariantTest extends WebDriverTestBase { $assert_session->assertWaitOnAjaxRequest(); $assert_session->pageTextContains('User account menu'); - // Place user view block + // Place user view block. $page->find('css', '.layout__region--second .layout-builder__link--add') ->click(); $assert_session->assertWaitOnAjaxRequest(); -- 2.20.1