From 3eeb0011fa2a1476c993066163d142f4992fed94 Mon Sep 17 00:00:00 2001
From: Steven Ayers <steven.ayers@portlandwebworks.com>
Date: Wed, 19 Mar 2025 11:12:26 -0500
Subject: [PATCH] Issue #3514064 by bluegeek9: Implicitly marking parameter as
nullable is deprecated
---
.../css/page-manager-ui-page-variants.css | 12 +++--
page_manager_ui/css/page-manager-ui.admin.css | 26 +++++-----
.../src/Form/VariantPluginAddBlockForm.php | 2 +-
src/Entity/PageVariantViewBuilder.php | 2 +-
.../PageManagerSectionStorage.php | 2 +-
.../src/Unit/PageBlockDisplayVariantTest.php | 14 +++++-
tests/src/Unit/PageManagerRoutesTest.php | 25 ++++++++--
tests/src/Unit/RouteAttributesTest.php | 9 +++-
tests/src/Unit/VariantRouteFilterTest.php | 50 ++++++++++++++-----
9 files changed, 102 insertions(+), 40 deletions(-)
diff --git a/page_manager_ui/css/page-manager-ui-page-variants.css b/page_manager_ui/css/page-manager-ui-page-variants.css
index 71d0d66..8da0593 100644
--- a/page_manager_ui/css/page-manager-ui-page-variants.css
+++ b/page_manager_ui/css/page-manager-ui-page-variants.css
@@ -17,12 +17,16 @@
cursor: pointer;
text-decoration: underline;
}
-.page-manager-wizard-tree .page__section_item__1 > .page__section__label.active {
+.page-manager-wizard-tree
+ .page__section_item__1
+ > .page__section__label.active {
font-weight: bold;
}
-.page-manager-wizard-tree .page__section_item__1 > .page__section__label.current_variant:before {
- content: '\00bb';
- font-weight: bold;
+.page-manager-wizard-tree
+ .page__section_item__1
+ > .page__section__label.current_variant::before {
+ content: "\00bb";
color: black;
font-size: 18px;
+ font-weight: bold;
}
diff --git a/page_manager_ui/css/page-manager-ui.admin.css b/page_manager_ui/css/page-manager-ui.admin.css
index 820be5a..2cf4579 100644
--- a/page_manager_ui/css/page-manager-ui.admin.css
+++ b/page_manager_ui/css/page-manager-ui.admin.css
@@ -26,8 +26,8 @@
border-left: 1px solid black;
}
.page-manager-wizard-actions ul.inline li {
+ padding: 0.5em;
border-right: 1px solid black;
- padding: .5em;
}
/**
@@ -42,41 +42,41 @@
margin-left: 1em;
}
.page-manager-wizard-tree > ul {
- border: 1px solid black;
- padding-bottom: .5em;
margin-bottom: 20px;
+ padding-bottom: 0.5em;
+ border: 1px solid black;
}
.page-manager-wizard-tree li {
- border-bottom: 1px solid black;
- padding: .5em;
+ padding: 0.5em;
padding-right: 0;
+ border-bottom: 1px solid black;
}
.page-manager-wizard-tree li:last-child {
- border-bottom: 0;
padding-bottom: 0;
+ border-bottom: 0;
}
/**
* The wizard form.
*/
.page-manager-wizard-form {
- border: 1px solid black;
- padding: 1em;
margin-bottom: 20px;
+ padding: 1em;
+ border: 1px solid black;
}
/* Wide screens */
-@media screen and (min-width: 780px), (orientation: landscape) and (min-device-height: 780px) {
-
+@media screen and (min-width: 780px),
+ (orientation: landscape) and (min-device-height: 780px) {
/* Overall layout. */
.page-manager-wizard-main {
display: flex;
}
.page-manager-wizard-tree {
- flex: .2;
+ flex: 0.2;
}
.page-manager-wizard-form {
- flex: .8;
+ flex: 0.8;
}
.page-manager-wizard-form-actions {
margin-left: 20%; /* LTR */
@@ -93,8 +93,8 @@
float: right;
}
[dir="rtl"] .page-manager-wizard-form-actions {
- margin-left: 0;
margin-right: 20%;
+ margin-left: 0;
}
[dir="rtl"] .page-manager-wizard-tree > ul {
border-right: 1px solid black;
diff --git a/page_manager_ui/src/Form/VariantPluginAddBlockForm.php b/page_manager_ui/src/Form/VariantPluginAddBlockForm.php
index bae19ff..de3566e 100644
--- a/page_manager_ui/src/Form/VariantPluginAddBlockForm.php
+++ b/page_manager_ui/src/Form/VariantPluginAddBlockForm.php
@@ -62,7 +62,7 @@ class VariantPluginAddBlockForm extends VariantPluginConfigureBlockFormBase {
/**
* {@inheritdoc}
*/
- public function buildForm(array $form, FormStateInterface $form_state, $block_display = NULL, $block_id = NULL, Request $request = NULL) {
+ public function buildForm(array $form, FormStateInterface $form_state, $block_display = NULL, $block_id = NULL, ?Request $request = NULL) {
$form = parent::buildForm($form, $form_state, $block_display, $block_id);
$form['region']['#default_value'] = $request->query->get('region');
return $form;
diff --git a/src/Entity/PageVariantViewBuilder.php b/src/Entity/PageVariantViewBuilder.php
index 79fe928..f123b83 100644
--- a/src/Entity/PageVariantViewBuilder.php
+++ b/src/Entity/PageVariantViewBuilder.php
@@ -43,7 +43,7 @@ class PageVariantViewBuilder implements EntityViewBuilderInterface {
/**
* {@inheritdoc}
*/
- public function resetCache(array $entities = NULL) {
+ public function resetCache(?array $entities = NULL) {
// Intentionally empty.
}
diff --git a/src/Plugin/SectionStorage/PageManagerSectionStorage.php b/src/Plugin/SectionStorage/PageManagerSectionStorage.php
index 9ad98e4..5e9c2e6 100644
--- a/src/Plugin/SectionStorage/PageManagerSectionStorage.php
+++ b/src/Plugin/SectionStorage/PageManagerSectionStorage.php
@@ -203,7 +203,7 @@ class PageManagerSectionStorage extends SectionStorageBase implements ContainerF
/**
* {@inheritdoc}
*/
- public function access($operation, AccountInterface $account = NULL, $return_as_object = FALSE) {
+ public function access($operation, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
$result = AccessResult::allowedIf($this->isLayoutBuilderEnabled())->addCacheableDependency($this);
return $return_as_object ? $result : $result->isAllowed();
}
diff --git a/tests/src/Unit/PageBlockDisplayVariantTest.php b/tests/src/Unit/PageBlockDisplayVariantTest.php
index 362dab6..8f0ee38 100644
--- a/tests/src/Unit/PageBlockDisplayVariantTest.php
+++ b/tests/src/Unit/PageBlockDisplayVariantTest.php
@@ -151,8 +151,18 @@ class PageBlockDisplayVariantTest extends UnitTestCase {
$condition_manager = $this->prophesize(ConditionManager::class);
$variant_plugin = $this->getMockBuilder(PageBlockDisplayVariant::class)
- // phpcs:ignore
- ->setConstructorArgs([['page_title' => $page_title, 'uuid' => 'UUID'], 'test', [], $context_handler->reveal(), $account->reveal(), $uuid_generator->reveal(), $token, $block_manager->reveal(), $condition_manager->reveal(), $module_handler->reveal()])
+ ->setConstructorArgs([
+ ['page_title' => $page_title, 'uuid' => 'UUID'],
+ 'test',
+ [],
+ $context_handler->reveal(),
+ $account->reveal(),
+ $uuid_generator->reveal(),
+ $token,
+ $block_manager->reveal(),
+ $condition_manager->reveal(),
+ $module_handler->reveal(),
+ ])
->onlyMethods(['renderPageTitle'])
->getMock();
diff --git a/tests/src/Unit/PageManagerRoutesTest.php b/tests/src/Unit/PageManagerRoutesTest.php
index 1e7291a..04740fd 100644
--- a/tests/src/Unit/PageManagerRoutesTest.php
+++ b/tests/src/Unit/PageManagerRoutesTest.php
@@ -190,8 +190,15 @@ class PageManagerRoutesTest extends UnitTestCase {
$collection = new RouteCollection();
$collection->add("$route_name.POST", new Route($existing_route_path, ['default_exists' => 'default_value'], $requirements, ['parameters' => ['foo' => ['type' => 'bar']]], '', [], ['POST']));
- // phpcs:ignore
- $collection->add("$route_name.POST_with_format", new Route($existing_route_path, ['default_exists' => 'default_value'], $requirements + ['_format' => 'json'], ['parameters' => ['foo' => ['type' => 'bar']]], '', [], ['GET', 'POST']));
+ $collection->add("$route_name.POST_with_format", new Route(
+ $existing_route_path,
+ ['default_exists' => 'default_value'],
+ $requirements + ['_format' => 'json'],
+ ['parameters' => ['foo' => ['type' => 'bar']]],
+ '',
+ [],
+ ['GET', 'POST']
+ ));
$collection->add($route_name, new Route($existing_route_path, ['default_exists' => 'default_value'], $requirements, ['parameters' => ['foo' => ['type' => 'bar']]]));
$route_event = new RouteBuildEvent($collection);
$this->routeSubscriber->onAlterRoutes($route_event);
@@ -372,8 +379,18 @@ class PageManagerRoutesTest extends UnitTestCase {
$page->id()->willReturn('page1');
$page->label()->willReturn(NULL);
$page->usesAdminTheme()->willReturn(FALSE);
- // phpcs:ignore
- $page->getParameters()->willReturn(['foo' => ['machine_name' => 'foo', 'type' => 'integer', 'label' => 'Foo'], 'test_route' => ['machine_name' => 'test_route', 'type' => '', 'label' => '']]);
+ $page->getParameters()->willReturn([
+ 'foo' => [
+ 'machine_name' => 'foo',
+ 'type' => 'integer',
+ 'label' => 'Foo',
+ ],
+ 'test_route' => [
+ 'machine_name' => 'test_route',
+ 'type' => '',
+ 'label' => '',
+ ],
+ ]);
$variant1 = $this->prophesize(PageVariantInterface::class);
$variant1->getWeight()->willReturn(0);
diff --git a/tests/src/Unit/RouteAttributesTest.php b/tests/src/Unit/RouteAttributesTest.php
index ed99960..b157053 100644
--- a/tests/src/Unit/RouteAttributesTest.php
+++ b/tests/src/Unit/RouteAttributesTest.php
@@ -31,8 +31,13 @@ class RouteAttributesTest extends UnitTestCase {
$data['no-parameters'] = [new Route('/prefix/a'), 'a_route', '/prefix', []];
$data['no-matching-parameters'] = [new Route('/prefix/{x}'), 'a_route', '/different-prefix/b', []];
$data['matching-parameters'] = [new Route('/prefix/{x}'), 'a_route', '/prefix/b', ['x' => 'b']];
- // phpcs:ignore
- $data['with-defaults'] = [new Route('/prefix/{x}', ['foo' => 'bar']), 'a_route', '/different-prefix/b', ['foo' => 'bar']];
+ $data['with-defaults'] = [new Route(
+ '/prefix/{x}',
+ ['foo' => 'bar']),
+ 'a_route',
+ '/different-prefix/b',
+ ['foo' => 'bar'],
+ ];
return $data;
}
diff --git a/tests/src/Unit/VariantRouteFilterTest.php b/tests/src/Unit/VariantRouteFilterTest.php
index 9ee6b90..1cd3879 100644
--- a/tests/src/Unit/VariantRouteFilterTest.php
+++ b/tests/src/Unit/VariantRouteFilterTest.php
@@ -203,10 +203,18 @@ class VariantRouteFilterTest extends UnitTestCase {
$route_collection = new RouteCollection();
$request = new Request();
- // phpcs:ignore
- $route1 = new Route('/path/with/{slug}', ['_page_manager_page_variant' => 'variant_1', '_page_manager_page_variant_weight' => 0]);
- // phpcs:ignore
- $route2 = new Route('/path/with/{slug}', ['_page_manager_page_variant' => 'variant_2', '_page_manager_page_variant_weight' => 2]);
+ $route1 = new Route(
+ '/path/with/{slug}',
+ [
+ '_page_manager_page_variant' => 'variant_1',
+ '_page_manager_page_variant_weight' => 0,
+ ]);
+ $route2 = new Route(
+ '/path/with/{slug}',
+ [
+ '_page_manager_page_variant' => 'variant_2',
+ '_page_manager_page_variant_weight' => 2,
+ ]);
// Add route2 first to ensure that the routes get sorted by weight.
$route_collection->add('route_2', $route2);
$route_collection->add('route_1', $route1);
@@ -239,8 +247,12 @@ class VariantRouteFilterTest extends UnitTestCase {
$route_collection = new RouteCollection();
$request = new Request();
- // phpcs:ignore
- $route1 = new Route('/path/with/{slug}', ['_page_manager_page_variant' => 'variant_1', '_page_manager_page_variant_weight' => 1]);
+ $route1 = new Route(
+ '/path/with/{slug}',
+ [
+ '_page_manager_page_variant' => 'variant_1',
+ '_page_manager_page_variant_weight' => 1,
+ ]);
$defaults = [
'_page_manager_page_variant' => 'variant_2',
'_page_manager_page_variant_weight' => 2,
@@ -291,8 +303,12 @@ class VariantRouteFilterTest extends UnitTestCase {
];
$route1 = new Route('/path/with/{slug}');
$route2 = new Route('/path/with/{slug}', $defaults);
- // phpcs:ignore
- $route3 = new Route('/path/with/{slug}', ['_page_manager_page_variant' => 'variant2', '_page_manager_page_variant_weight' => -1]);
+ $route3 = new Route(
+ '/path/with/{slug}',
+ [
+ '_page_manager_page_variant' => 'variant2',
+ '_page_manager_page_variant_weight' => -1,
+ ]);
$route4 = new Route('/path/with/{slug}');
// Add routes in different order to test sorting.
$route_collection->add('route_3', $route3);
@@ -407,10 +423,20 @@ class VariantRouteFilterTest extends UnitTestCase {
$request = new Request();
// Add routes in different order to also test order preserving.
- // phpcs:ignore
- $route1 = new Route('/path/with/{slug}', ['_page_manager_page_variant' => 'variant1', '_page_manager_page_variant_weight' => -10, '_overridden_route_name' => 'preserved_route_name']);
- // phpcs:ignore
- $route2 = new Route('/path/with/{slug}', ['_page_manager_page_variant' => 'variant2', '_page_manager_page_variant_weight' => -5]);
+ $route1 = new Route(
+ '/path/with/{slug}',
+ [
+ '_page_manager_page_variant' => 'variant1',
+ '_page_manager_page_variant_weight' => -10,
+ '_overridden_route_name' => 'preserved_route_name',
+ ]);
+ $route2 = new Route(
+ '/path/with/{slug}',
+ [
+ '_page_manager_page_variant' => 'variant2',
+ '_page_manager_page_variant_weight' => -5,
+ ]
+ );
$route3 = new Route('/path/with/{slug}', []);
$route4 = new Route('/path/with/{slug}', []);
$route_collection->add('route_4', $route4);
--
GitLab