Commit ceba2409 authored by catch's avatar catch
Browse files

Issue #3444232 by andypost, smustgrave: [8.4] Fix implicitly nullable type... 

Issue #3444232 by andypost, smustgrave: [8.4] Fix implicitly nullable type declarations for phpstan job (manual ones)

(cherry picked from commit 631c33c7)
parent a9d695f7

core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/DefaultSelection.php

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class DefaultSelection extends SelectionPluginBase implements ContainerFactoryPl 
   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository

   *   The entity repository.

   */

  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, AccountInterface $current_user, EntityFieldManagerInterface $entity_field_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, EntityRepositoryInterface $entity_repository) {

  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, ModuleHandlerInterface $module_handler, AccountInterface $current_user, EntityFieldManagerInterface $entity_field_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityRepositoryInterface $entity_repository) {

    parent::__construct($configuration, $plugin_id, $plugin_definition);



    $this->entityTypeManager = $entity_type_manager;

core/lib/Drupal/Core/Template/TwigNodeTrans.php

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class TwigNodeTrans extends Node { 
  /**

   * {@inheritdoc}

   */

  public function __construct(Node $body, Node $plural = NULL, AbstractExpression $count = NULL, AbstractExpression $options = NULL, $lineno, $tag = NULL) {

  public function __construct(Node $body, ?Node $plural = NULL, ?AbstractExpression $count = NULL, ?AbstractExpression $options = NULL, $lineno = 0, $tag = NULL) {

    $nodes['body'] = $body;

    if ($count !== NULL) {

      $nodes['count'] = $count;

core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public static function providerIsDefaultConfiguration() { 
   *

   * @dataProvider providerLoadByEntityTypeBundle

   */

  public function testLoadByEntityTypeBundle($config_id, ContentLanguageSettings $existing_config = NULL, $expected_langcode, $expected_language_alterable) {

  public function testLoadByEntityTypeBundle($config_id, ?ContentLanguageSettings $existing_config, $expected_langcode, $expected_language_alterable) {

    [$type, $bundle] = explode('.', $config_id);



    $nullConfig = new ContentLanguageSettings([

core/modules/node/src/NodeForm.php

+8 −1
Original line number Diff line number Diff line
@@ -56,7 +56,14 @@ class NodeForm extends ContentEntityForm { 
   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter

   *   The date formatter service.

   */

  public function __construct(EntityRepositoryInterface $entity_repository, PrivateTempStoreFactory $temp_store_factory, EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL, TimeInterface $time = NULL, AccountInterface $current_user, DateFormatterInterface $date_formatter) {

  public function __construct(

    EntityRepositoryInterface $entity_repository,

    PrivateTempStoreFactory $temp_store_factory,

    EntityTypeBundleInfoInterface $entity_type_bundle_info,

    TimeInterface $time,

    AccountInterface $current_user,

    DateFormatterInterface $date_formatter,

  ) {

    parent::__construct($entity_repository, $entity_type_bundle_info, $time);

    $this->tempStoreFactory = $temp_store_factory;

    $this->currentUser = $current_user;

core/modules/taxonomy/src/VocabularyListBuilder.php

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public function __construct( 
    EntityTypeInterface $entity_type,

    AccountInterface $current_user,

    EntityTypeManagerInterface $entity_type_manager,

    RendererInterface $renderer = NULL,

    RendererInterface $renderer,

    MessengerInterface $messenger,

  ) {

    parent::__construct($entity_type, $entity_type_manager->getStorage($entity_type->id()));