From 7fe31b79878dcbe5720cc40e0cb8841ff5043110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?CS=C3=89CSY=20L=C3=A1szl=C3=B3?=
 <laszlo.csecsy@pronovix.com>
Date: Thu, 12 Oct 2023 18:51:26 +0200
Subject: [PATCH] Distinguish apigee baseFields during __get (#948)

---
 src/Entity/FieldableEdgeEntityBase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entity/FieldableEdgeEntityBase.php b/src/Entity/FieldableEdgeEntityBase.php
index 0a0a391a4..e1b78e239 100644
--- a/src/Entity/FieldableEdgeEntityBase.php
+++ b/src/Entity/FieldableEdgeEntityBase.php
@@ -569,7 +569,7 @@ public function &__get($name) {
     if (!isset($this->fieldDefinitions)) {
       $this->getFieldDefinitions();
     }
-    if (isset($this->fieldDefinitions[$name])) {
+    if (isset($this->fieldDefinitions[$name]) && !($this->fieldDefinitions[$name] instanceof BaseFieldDefinition)) {
       $return = $this->getField($name);
       return $return;
     }