diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56492c7..9238c65 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the dvf repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Check coding standards for dvf module
         uses: docker://hussainweb/drupalqa:php7.4
         with:
diff --git a/dvf.info.yml b/dvf.info.yml
index 0ca20d2..11337fc 100644
--- a/dvf.info.yml
+++ b/dvf.info.yml
@@ -2,5 +2,4 @@ name: Data Visualisation Framework
 description: 'Data Visualisation Framework makes it easy to generate visualisations from different data sources.'
 type: module
 package: Data Visualisation Framework
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/src/Plugin/Field/FieldWidget/VisualisationFileWidget.php b/src/Plugin/Field/FieldWidget/VisualisationFileWidget.php
index 29fd276..1933e40 100644
--- a/src/Plugin/Field/FieldWidget/VisualisationFileWidget.php
+++ b/src/Plugin/Field/FieldWidget/VisualisationFileWidget.php
@@ -72,7 +72,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#options' => $this->getVisualisationStyleOptions(),
       '#empty_option' => $this->t('- Select -'),
       '#empty_value' => '',
-      '#default_value' => isset($items[$delta]->options['visualisation_style']) ? $items[$delta]->options['visualisation_style'] : '',
+      '#default_value' => $items[$delta]->options['visualisation_style'] ?? '',
       '#required' => $element['#required'],
       '#ajax' => [
         'callback' => [$this, 'updateVisualisationOptions'],
diff --git a/src/Plugin/Field/FieldWidget/VisualisationUrlWidget.php b/src/Plugin/Field/FieldWidget/VisualisationUrlWidget.php
index 4efbbda..21cff09 100644
--- a/src/Plugin/Field/FieldWidget/VisualisationUrlWidget.php
+++ b/src/Plugin/Field/FieldWidget/VisualisationUrlWidget.php
@@ -33,7 +33,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#type' => 'url',
       '#title' => $this->t('URL'),
       '#description' => $this->t('External url to dataset.'),
-      '#default_value' => isset($items[$delta]->uri) ? $items[$delta]->uri : NULL,
+      '#default_value' => $items[$delta]->uri ??  NULL,
       '#maxlength' => 2048,
       '#required' => $element['#required'],
     ];
@@ -52,7 +52,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#options' => $this->getVisualisationStyleOptions(),
       '#empty_option' => $this->t('- Select -'),
       '#empty_value' => '',
-      '#default_value' => isset($items[$delta]->options['visualisation_style']) ? $items[$delta]->options['visualisation_style'] : '',
+      '#default_value' => $items[$delta]->options['visualisation_style'] ?? '',
       '#required' => $element['#required'],
       '#ajax' => [
         'callback' => [$this, 'updateVisualisationOptions'],
diff --git a/src/Plugin/Visualisation/Source/VisualisationSourceBase.php b/src/Plugin/Visualisation/Source/VisualisationSourceBase.php
index 47d6591..71a683a 100644
--- a/src/Plugin/Visualisation/Source/VisualisationSourceBase.php
+++ b/src/Plugin/Visualisation/Source/VisualisationSourceBase.php
@@ -186,6 +186,7 @@ public function current() {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function next() {
     $this->getIterator()->next();
   }
@@ -193,6 +194,7 @@ public function next() {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function key() {
     return $this->getIterator()->key();
   }
@@ -200,6 +202,7 @@ public function key() {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function valid() {
     return $this->getIterator()->valid();
   }
@@ -207,6 +210,7 @@ public function valid() {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function rewind() {
     $this->getIterator()->rewind();
   }
@@ -214,6 +218,7 @@ public function rewind() {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function count() {
     $iterator = $this->getIterator();
     return ($iterator instanceof \Countable) ? $iterator->count() : iterator_count($this->initializeIterator());
diff --git a/src/Plugin/Visualisation/VisualisationBase.php b/src/Plugin/Visualisation/VisualisationBase.php
index 39f1634..e409187 100644
--- a/src/Plugin/Visualisation/VisualisationBase.php
+++ b/src/Plugin/Visualisation/VisualisationBase.php
@@ -120,7 +120,7 @@ public function __construct(
     $this->source = $configuration['source'];
     $this->style = $configuration['style'];
     $this->moduleHandler = $module_handler;
-    $this->entity = isset($configuration['entity']) ? $configuration['entity'] : NULL;
+    $this->entity = $configuration['entity'] ?? NULL;
     $this->themeManager = $themeManager;
   }