Issue #3427999 by andypost, Ayesh, bbrala: [PHP 8.4] Fix implicitly nullable type declarations

core/lib/Drupal/Core/Access/AccessArgumentsResolverFactory.php

@@ -15,7 +15,7 @@ class AccessArgumentsResolverFactory implements AccessArgumentsResolverFactoryIn
   /**
    * {@inheritdoc}
    */
-  public function getArgumentsResolver(RouteMatchInterface $route_match, AccountInterface $account, Request $request = NULL) {
+  public function getArgumentsResolver(RouteMatchInterface $route_match, AccountInterface $account, ?Request $request = NULL) {
     $route = $route_match->getRouteObject();
 
     // Defaults for the parameters defined on the route object need to be added

core/lib/Drupal/Core/Access/AccessArgumentsResolverFactoryInterface.php

@@ -24,6 +24,6 @@ interface AccessArgumentsResolverFactoryInterface {
    * @return \Drupal\Component\Utility\ArgumentsResolverInterface
    *   The parametrized arguments resolver instance.
    */
-  public function getArgumentsResolver(RouteMatchInterface $route_match, AccountInterface $account, Request $request = NULL);
+  public function getArgumentsResolver(RouteMatchInterface $route_match, AccountInterface $account, ?Request $request = NULL);
 
 }

core/lib/Drupal/Core/Access/AccessManager.php

@@ -79,7 +79,7 @@ public function __construct(RouteProviderInterface $route_provider, ParamConvert
   /**
    * {@inheritdoc}
    */
-  public function checkNamedRoute($route_name, array $parameters = [], AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function checkNamedRoute($route_name, array $parameters = [], ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     try {
       $route = $this->routeProvider->getRouteByName($route_name);
 
@@ -108,7 +108,7 @@ public function checkNamedRoute($route_name, array $parameters = [], AccountInte
   /**
    * {@inheritdoc}
    */
-  public function checkRequest(Request $request, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function checkRequest(Request $request, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     $route_match = RouteMatch::createFromRequest($request);
     return $this->check($route_match, $account, $request, $return_as_object);
   }
@@ -116,7 +116,7 @@ public function checkRequest(Request $request, AccountInterface $account = NULL,
   /**
    * {@inheritdoc}
    */
-  public function check(RouteMatchInterface $route_match, AccountInterface $account = NULL, Request $request = NULL, $return_as_object = FALSE) {
+  public function check(RouteMatchInterface $route_match, ?AccountInterface $account = NULL, ?Request $request = NULL, $return_as_object = FALSE) {
     if (!isset($account)) {
       $account = $this->currentUser;
     }

core/lib/Drupal/Core/Access/AccessManagerInterface.php

@@ -33,7 +33,7 @@ interface AccessManagerInterface {
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function checkNamedRoute($route_name, array $parameters = [], AccountInterface $account = NULL, $return_as_object = FALSE);
+  public function checkNamedRoute($route_name, array $parameters = [], ?AccountInterface $account = NULL, $return_as_object = FALSE);
 
   /**
    * Execute access checks against the incoming request.
@@ -53,7 +53,7 @@ public function checkNamedRoute($route_name, array $parameters = [], AccountInte
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function checkRequest(Request $request, AccountInterface $account = NULL, $return_as_object = FALSE);
+  public function checkRequest(Request $request, ?AccountInterface $account = NULL, $return_as_object = FALSE);
 
   /**
    * Checks a route against applicable access check services.
@@ -78,6 +78,6 @@ public function checkRequest(Request $request, AccountInterface $account = NULL,
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function check(RouteMatchInterface $route_match, AccountInterface $account = NULL, Request $request = NULL, $return_as_object = FALSE);
+  public function check(RouteMatchInterface $route_match, ?AccountInterface $account = NULL, ?Request $request = NULL, $return_as_object = FALSE);
 
 }

core/lib/Drupal/Core/Access/AccessibleInterface.php

@@ -29,6 +29,6 @@ interface AccessibleInterface {
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function access($operation, AccountInterface $account = NULL, $return_as_object = FALSE);
+  public function access($operation, ?AccountInterface $account = NULL, $return_as_object = FALSE);
 
 }

core/lib/Drupal/Core/Access/CustomAccessCheck.php

@@ -51,7 +51,7 @@ public function __construct(
    * @return \Drupal\Core\Access\AccessResultInterface
    *   The access result.
    */
-  public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account, Request $request = NULL) {
+  public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account, ?Request $request = NULL) {
     try {
       $callable = $this->callableResolver->getCallableFromDefinition($route->getRequirement('_custom_access'));
     }

core/lib/Drupal/Core/Access/RouteProcessorCsrf.php

@@ -33,7 +33,7 @@ public function __construct(CsrfTokenGenerator $csrf_token) {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($route_name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($route_name, Route $route, array &$parameters, ?BubbleableMetadata $bubbleable_metadata = NULL) {
     if ($route->hasRequirement('_csrf_token')) {
       $path = ltrim($route->getPath(), '/');
       // Replace the path parameters with values from the parameters array.

core/lib/Drupal/Core/Action/ActionInterface.php

@@ -56,6 +56,6 @@ public function executeMultiple(array $objects);
    *   returned, i.e. TRUE means access is explicitly allowed, FALSE means
    *   access is either explicitly forbidden or "no opinion".
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE);
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE);
 
 }

core/lib/Drupal/Core/Action/Plugin/Action/DeleteAction.php

@@ -94,7 +94,7 @@ public function execute($object = NULL) {
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     return $object->access('delete', $account, $return_as_object);
   }
 

core/lib/Drupal/Core/Action/Plugin/Action/EmailAction.php

@@ -209,7 +209,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     $result = AccessResult::allowed();
     return $return_as_object ? $result : $result->isAllowed();
   }

core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php

@@ -133,7 +133,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     $access = AccessResult::allowed();
     return $return_as_object ? $access : $access->isAllowed();
   }

core/lib/Drupal/Core/Action/Plugin/Action/MessageAction.php

@@ -127,7 +127,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     $result = AccessResult::allowed();
     return $return_as_object ? $result : $result->isAllowed();
   }

core/lib/Drupal/Core/Action/Plugin/Action/PublishAction.php

@@ -27,7 +27,7 @@ public function execute($entity = NULL) {
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     $key = $object->getEntityType()->getKey('published');
 
     /** @var \Drupal\Core\Entity\EntityInterface $object */

core/lib/Drupal/Core/Action/Plugin/Action/SaveAction.php

@@ -69,7 +69,7 @@ public function execute($entity = NULL) {
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     // It's not necessary to check the changed field access here, because
     // Drupal\Core\Field\ChangedFieldItemList would anyway return 'not allowed'.
     // Also changing the changed field value is only a workaround to trigger an

core/lib/Drupal/Core/Action/Plugin/Action/UnpublishAction.php

@@ -27,7 +27,7 @@ public function execute($entity = NULL) {
   /**
    * {@inheritdoc}
    */
-  public function access($object, AccountInterface $account = NULL, $return_as_object = FALSE) {
+  public function access($object, ?AccountInterface $account = NULL, $return_as_object = FALSE) {
     $key = $object->getEntityType()->getKey('published');
 
     /** @var \Drupal\Core\Entity\EntityInterface $object */

core/lib/Drupal/Core/Ajax/InsertCommand.php

@@ -55,7 +55,7 @@ class InsertCommand implements CommandInterface, CommandWithAttachedAssetsInterf
    * @param array $settings
    *   An array of JavaScript settings to be passed to any attached behaviors.
    */
-  public function __construct($selector, $content, array $settings = NULL) {
+  public function __construct($selector, $content, ?array $settings = NULL) {
     $this->selector = $selector;
     $this->content = $content;
     $this->settings = $settings;

core/lib/Drupal/Core/Asset/AssetResolver.php

@@ -121,7 +121,7 @@ protected function getLibrariesToLoad(AttachedAssetsInterface $assets) {
   /**
    * {@inheritdoc}
    */
-  public function getCssAssets(AttachedAssetsInterface $assets, $optimize, LanguageInterface $language = NULL) {
+  public function getCssAssets(AttachedAssetsInterface $assets, $optimize, ?LanguageInterface $language = NULL) {
     if (!$assets->getLibraries()) {
       return [];
     }
@@ -225,7 +225,7 @@ protected function getJsSettingsAssets(AttachedAssetsInterface $assets) {
   /**
    * {@inheritdoc}
    */
-  public function getJsAssets(AttachedAssetsInterface $assets, $optimize, LanguageInterface $language = NULL) {
+  public function getJsAssets(AttachedAssetsInterface $assets, $optimize, ?LanguageInterface $language = NULL) {
     if (!$assets->getLibraries() && !$assets->getSettings()) {
       return [[], []];
     }

core/lib/Drupal/Core/Asset/AssetResolverInterface.php

@@ -51,7 +51,7 @@ interface AssetResolverInterface {
    * @return array
    *   A (possibly optimized) collection of CSS assets.
    */
-  public function getCssAssets(AttachedAssetsInterface $assets, $optimize, LanguageInterface $language = NULL);
+  public function getCssAssets(AttachedAssetsInterface $assets, $optimize, ?LanguageInterface $language = NULL);
 
   /**
    * Returns the JavaScript assets for the current response's libraries.
@@ -83,6 +83,6 @@ public function getCssAssets(AttachedAssetsInterface $assets, $optimize, Languag
    *   - at index one: the (possibly optimized) collection of JavaScript assets
    *     for the bottom of the page
    */
-  public function getJsAssets(AttachedAssetsInterface $assets, $optimize, LanguageInterface $language = NULL);
+  public function getJsAssets(AttachedAssetsInterface $assets, $optimize, ?LanguageInterface $language = NULL);
 
 }

core/lib/Drupal/Core/Block/BlockManager.php

@@ -71,7 +71,7 @@ public function processDefinition(&$definition, $plugin_id) {
   /**
    * {@inheritdoc}
    */
-  public function getSortedDefinitions(array $definitions = NULL) {
+  public function getSortedDefinitions(?array $definitions = NULL) {
     // Sort the plugins first by category, then by admin label.
     $definitions = $this->traitGetSortedDefinitions($definitions, 'admin_label');
     // Do not display the 'broken' plugin in the UI.

core/lib/Drupal/Core/Cache/ChainedFastBackendFactory.php

@@ -54,7 +54,7 @@ public function setContainer(ContainerInterface $container): void {
    *   - 'cache.backend.apcu' (if the PHP process has APCu enabled)
    *   - NULL (if the PHP process doesn't have APCu enabled)
    */
-  public function __construct(Settings $settings = NULL, $consistent_service_name = NULL, $fast_service_name = NULL) {
+  public function __construct(?Settings $settings = NULL, $consistent_service_name = NULL, $fast_service_name = NULL) {
     // Default the consistent backend to the site's default backend.
     if (!isset($consistent_service_name)) {
       $cache_settings = isset($settings) ? $settings->get('cache') : [];