Helper function should only return the parameters needed to create the object for the constructor

Author: Cyperghost

wcfsetup/install/files/lib/system/cache/ephemeral/AbstractEphemeralCache.class.php

@@ -43,7 +43,7 @@ function (ItemInterface $item, bool &$save) {
                         new EphemeralCacheRebuildBackgroundJob(
                             $item,
                             \get_class($this),
-                            ClassUtil::getObjectProperties($this, \ReflectionProperty::IS_READONLY)
+                            ClassUtil::getConstructorProperties($this)
                         )
                     );
 
@@ -68,7 +68,7 @@ private function getCacheKey(): string
                 \get_class($this)
             );
 
-            $parameters = ClassUtil::getObjectProperties($this, \ReflectionProperty::IS_READONLY);
+            $parameters = ClassUtil::getConstructorProperties($this);
 
             if ($parameters !== []) {
                 $this->cacheName .= '-' . CacheHandler::getInstance()->getCacheIndex($parameters);

wcfsetup/install/files/lib/system/cache/persistent/AbstractPersistentCache.class.php

@@ -53,7 +53,7 @@ private function getCacheKey(): string
                 \get_class($this)
             );
 
-            $parameters = ClassUtil::getObjectProperties($this, \ReflectionProperty::IS_READONLY);
+            $parameters = ClassUtil::getConstructorProperties($this);
 
             if ($parameters !== []) {
                 $this->cacheName .= '-' . CacheHandler::getInstance()->getCacheIndex($parameters);

wcfsetup/install/files/lib/util/ClassUtil.class.php

@@ -98,23 +98,19 @@ public static function isDecoratedInstanceOf($className, $targetClass)
     }
 
     /**
-     * Returns the properties as a key-value array of the given object.
-     * This array doesn't contain properties with `null` as value.
-     *
-     * @param ?\ReflectionProperty::IS_* $filter
+     * Returns the properties as a key-value array to construct the given object.
      *
      * @return array<string, mixed>
      */
-    public static function getObjectProperties(object $object, ?int $filter = null): array
+    public static function getConstructorProperties(object $object): array
     {
         $reflection = new \ReflectionClass($object);
+
         $properties = [];
-        foreach ($reflection->getProperties($filter) as $property) {
-            if (!$property->isInitialized($object)) {
-                continue;
-            }
+        foreach ($reflection->getConstructor()?->getParameters() ?? [] as $parameter) {
+            $property = $reflection->getProperty($parameter->getName());
 
-            if ($property->getValue($object) === null) {
+            if (!$property->isInitialized($object)) {
                 continue;
             }