Merge pull request #16753 from agh1/consolidated-php-version

[civicrm-core.git] / setup / src / Setup / Model.php

diff --git a/setup/src/Setup/Model.php b/setup/src/Setup/Model.php
index 68100aef34ce15e4ae3247321cdba78028eec2f9..717421e7a680819d42a232fd73b91b325050b9a7 100644 (file)
--- a/setup/src/Setup/Model.php
+++ b/setup/src/Setup/Model.php
@@ -176,7 +176,7 @@ class Model {
     $field = array_merge($defaults, $field);
 
     if (array_key_exists('value', $field) || !array_key_exists($field['name'], $this->values)) {
-      $this->values[$field['name']] = isset($field['value']) ? $field['value'] : NULL;
+      $this->values[$field['name']] = $field['value'] ?? NULL;
       unset($field['value']);
     }
 
@@ -202,10 +202,10 @@ class Model {
    */
   public function getField($field, $property = NULL) {
     if ($property) {
-      return isset($this->fields[$field][$property]) ? $this->fields[$field][$property] : NULL;
+      return $this->fields[$field][$property] ?? NULL;
     }
     else {
-      return isset($this->fields[$field]) ? $this->fields[$field] : NULL;
+      return $this->fields[$field] ?? NULL;
     }
   }