diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 410abd6dae0ca7926345f6b917af2e253112498a..e88d3c0123e0f25b79b05f035055d0496a72eb9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,6 @@ variables:
   # Show more log output
   # Convenient, and we have no secrets.
   _SHOW_ENVIRONMENT_VARIABLES: '1'
-  _PHPUNIT_EXTRA: '--verbose'
 
 .run-on-mr: &run-on-mr
   rules:
diff --git a/src/EventSubscriber/FieldStorageSubscriber.php b/src/EventSubscriber/FieldStorageSubscriber.php
index 8d9444bc5c289b3410710910273c60d1c91811c2..22a31536abe0dd6d9e58e56c7697b6cac1a895b1 100644
--- a/src/EventSubscriber/FieldStorageSubscriber.php
+++ b/src/EventSubscriber/FieldStorageSubscriber.php
@@ -116,12 +116,12 @@ class FieldStorageSubscriber implements EventSubscriberInterface {
    *
    * @param string $entity_type_id
    *   The entity type ID.
-   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface $field_storage_definition
+   * @param \Drupal\Core\Field\FieldStorageDefinitionInterface|null $field_storage_definition
    *   The field storage definition. It is only necessary to pass this if this
    *   a FieldStorageConfig object during presave and as such the definition is
    *   not yet available to the entity field manager.
    */
-  public function handleEntityType($entity_type_id, FieldStorageDefinitionInterface $field_storage_definition = NULL) {
+  public function handleEntityType($entity_type_id, ?FieldStorageDefinitionInterface $field_storage_definition = NULL) {
     $storage = $this->entityTypeManager->getStorage($entity_type_id);
     $der_fields = $this->entityFieldManager->getFieldMapByFieldType('dynamic_entity_reference');
     if ($field_storage_definition && ($field_storage_definition->getType() === 'dynamic_entity_reference')) {
diff --git a/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php b/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
index 93cfd1779f8b8bc8439edc2fb041ced96a20047a..58ef1fd69873e52c19f5eeeea4c73139943df269 100644
--- a/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
+++ b/src/Plugin/Field/FieldType/DynamicEntityReferenceItem.php
@@ -150,7 +150,7 @@ class DynamicEntityReferenceItem extends EntityReferenceItem {
    *
    * @see \Drupal\dynamic_entity_reference\Plugin\Field\FieldWidget\DynamicEntityReferenceOptionsTrait::massageFormValues()
    */
-  public function getSettableOptions(AccountInterface $account = NULL) {
+  public function getSettableOptions(?AccountInterface $account = NULL) {
     $field_definition = $this->getFieldDefinition();
     $entity_type_manager = \Drupal::entityTypeManager();
     $entity_type_bundles_info = \Drupal::service('entity_type.bundle.info');
diff --git a/src/Query/Tables.php b/src/Query/Tables.php
index 18e02e885afd0f47478ccb673a160ccff03b58da..45542e6b4bfd0d5df239d4d52c05877fa5b69861 100644
--- a/src/Query/Tables.php
+++ b/src/Query/Tables.php
@@ -15,7 +15,7 @@ class Tables extends BaseTables {
   /**
    * {@inheritdoc}
    */
-  protected function addNextBaseTable(EntityType $entity_type, $table, $sql_column, FieldStorageDefinitionInterface $field_storage = NULL) {
+  protected function addNextBaseTable(EntityType $entity_type, $table, $sql_column, ?FieldStorageDefinitionInterface $field_storage = NULL) {
     // Parent method is overridden in order to choose the correct columns to
     // join on (string or int for the id and type for the entity type
     // specifier).
diff --git a/src/SelectionPluginManager.php b/src/SelectionPluginManager.php
index 4f003342144e210e2c095b6d74d82f003c1577cb..37a667742aa0680ac863f8b12dca99dd3854be8e 100644
--- a/src/SelectionPluginManager.php
+++ b/src/SelectionPluginManager.php
@@ -17,7 +17,7 @@ class SelectionPluginManager extends CoreSelectionPluginManager {
   /**
    * {@inheritdoc}
    */
-  public function getSelectionHandler(FieldDefinitionInterface $field_definition, EntityInterface $entity = NULL, $target_type = NULL) {
+  public function getSelectionHandler(FieldDefinitionInterface $field_definition, ?EntityInterface $entity = NULL, $target_type = NULL) {
     if ($target_type === NULL) {
       return parent::getSelectionHandler($field_definition, $entity);
     }