Issue #3480135 by daniel.j, plopesc, adwivedi008: Enforce return types to...

Issue #3480135 by daniel.j, plopesc, adwivedi008: Enforce return types to non-inheritable navigation methods

core/.phpstan-baseline.php

@@ -28063,42 +28063,12 @@
 	'count' => 1,
 	'path' => __DIR__ . '/modules/mysql/tests/src/Kernel/mysql/SchemaTest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Function navigation_post_update_set_logo_dimensions_default\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/navigation/navigation.post_update.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Function navigation_post_update_update_permissions\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/navigation/navigation.post_update.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method Drupal\\\\navigation\\\\Form\\\\LayoutForm\\:\\:create\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/navigation/src/Form/LayoutForm.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method Drupal\\\\navigation\\\\Form\\\\LayoutForm\\:\\:redirectOnSubmit\\(\\) has no return type specified\\.$#',
 	'identifier' => 'missingType.return',
 	'count' => 1,
 	'path' => __DIR__ . '/modules/navigation/src/Form/LayoutForm.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method Drupal\\\\navigation\\\\Form\\\\SettingsForm\\:\\:create\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/navigation/src/Form/SettingsForm.php',
-];
-$ignoreErrors[] = [
-	'message' => '#^Method Drupal\\\\navigation\\\\NavigationContentLinks\\:\\:create\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/navigation/src/NavigationContentLinks.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Method Drupal\\\\navigation\\\\Plugin\\\\SectionStorage\\\\NavigationSectionStorage\\:\\:buildLayoutRoutes\\(\\) has no return type specified\\.$#',
 	'identifier' => 'missingType.return',
@@ -28177,12 +28147,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/modules/navigation/tests/src/FunctionalJavascript/NavigationBlockUiTest.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Method Drupal\\\\Tests\\\\navigation\\\\Kernel\\\\NavigationMenuBlockTest\\:\\:testHtmlMarkup\\(\\) has no return type specified\\.$#',
-	'identifier' => 'missingType.return',
-	'count' => 1,
-	'path' => __DIR__ . '/modules/navigation/tests/src/Kernel/NavigationMenuBlockTest.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Function _node_mass_update_batch_finished\\(\\) has no return type specified\\.$#',
 	'identifier' => 'missingType.return',

core/modules/navigation/navigation.post_update.php

@@ -11,7 +11,7 @@
 /**
  * Grants navigation specific permission to roles with access to any layout.
  */
-function navigation_post_update_update_permissions(array &$sandbox) {
+function navigation_post_update_update_permissions(array &$sandbox): void {
   \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'user_role', function (RoleInterface $role) {
     $needs_save = FALSE;
     if ($role->hasPermission('configure any layout')) {
@@ -30,7 +30,7 @@ function navigation_post_update_update_permissions(array &$sandbox) {
 /**
  * Defines the values for the default logo dimensions.
  */
-function navigation_post_update_set_logo_dimensions_default(array &$sandbox) {
+function navigation_post_update_set_logo_dimensions_default(array &$sandbox): void {
   // Empty post_update hook.
 }
 

core/modules/navigation/src/Form/LayoutForm.php

@@ -54,7 +54,7 @@ public function __construct(protected LayoutTempstoreRepositoryInterface $layout
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container) {
+  public static function create(ContainerInterface $container): static {
     return new static(
       $container->get('layout_builder.tempstore_repository')
     );

core/modules/navigation/src/Form/SettingsForm.php

@@ -57,7 +57,7 @@ public function __construct(
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container) {
+  public static function create(ContainerInterface $container): static {
     return new static(
       $container->get('config.factory'),
       $container->get('config.typed'),

core/modules/navigation/src/NavigationContentLinks.php

@@ -36,7 +36,7 @@ public function __construct(private RouteProviderInterface $routeProvider, priva
   /**
    * {@inheritdoc}
    */
-  public static function create(ContainerInterface $container) {
+  public static function create(ContainerInterface $container): static {
     return new static(
       $container->get('router.route_provider'),
       $container->get('entity_type.manager')

core/modules/navigation/tests/src/Kernel/NavigationMenuBlockTest.php

@@ -316,7 +316,7 @@ public function testConfigLevelDepth(): void {
   /**
    * Tests the generated HTML markup.
    */
-  public function testHtmlMarkup() {
+  public function testHtmlMarkup(): void {
     $block = $this->blockManager->createInstance('navigation_menu:' . $this->menu->id(), [
       'region' => 'content',
       'id' => 'machine_name',