Fix magic access property (#443)

dachcom-digital · Apr 3, 2024 · 59a4a24 · 59a4a24
1 parent 1b2bdaa
commit 59a4a24
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -40,9 +40,9 @@ jobs:
             matrix:
                 php: [ 8.2 ]
                 symfony: [ ^6.2 ]
-                pimcore: [ ~11.0.0 ]
+                pimcore: [ ~11.2.0 ]
                 include:
-                    -   pimcore: ~11.0.0
+                    -   pimcore: ~11.2.0
                         template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -39,9 +39,9 @@ jobs:
             matrix:
                 php: [ 8.2 ]
                 symfony: [ ^6.2 ]
-                pimcore: [ ~11.0.0 ]
+                pimcore: [ ~11.2.0 ]
                 include:
-                    -   pimcore: ~11.0.0
+                    -   pimcore: ~11.2.0
                         template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -39,9 +39,9 @@ jobs:
             matrix:
                 php: [ 8.2 ]
                 symfony: [ ^6.2 ]
-                pimcore: [ ~11.0.0 ]
+                pimcore: [ ~11.2.0 ]
                 include:
-                    -   pimcore: ~11.0.0
+                    -   pimcore: ~11.2.0
                         template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,8 @@
 # Upgrade Notes
 
+## 5.0.6
+- Fix magic property access [#442](https://github.com/dachcom-digital/pimcore-formbuilder/issues/442)
+
 ## 5.0.5
 - Sort chunked uploaded files before merging
 

diff --git a/src/Form/Data/FormData.php b/src/Form/Data/FormData.php
@@ -47,11 +47,8 @@ public function addAttachment(File $attachmentFile): void
     public function getFieldValue(string $name): mixed
     {
         $array = $this->getData();
-        if (isset($array[$name])) {
-            return $array[$name];
-        }
 
-        return null;
+        return $array[$name] ?? null;
     }
 
     public function setFieldValue(string $name, $value): void
@@ -66,13 +63,9 @@ public function __set(string $name, mixed $value)
 
     public function __isset(string $name): bool
     {
-        if (!is_string($name)) {
-            return false;
-        }
-
-        $data = $this->getData();
+        $reflectionClass = new \ReflectionClass($this);
 
-        return isset($data[$name]);
+        return !$reflectionClass->hasProperty($name);
     }
 
     public function __get(string $name): mixed