Don't use closure binding for public methods and properties

orisai · Jan 21, 2025 · 62fcfac · 62fcfac
1 parent 2beb12f
commit 62fcfac
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Callbacks
 	- receive `FieldContext` (callback-specific) instead of `FieldContext` and `ObjectContext` instead of
 	  `MappedObjectContext`
+	- are not called via closure binding when public
 - Contexts
 	- `TypeContext`, `MappedObjectContext` and `FieldContext` replaced with `ServicesContext`, `DynamicContext`,
 	  `PropertyContext`, `FieldContext` (for callbacks) and `ObjectContext` (callback-specific)
@@ -56,6 +57,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 		- creates `MappedObjectType` only when necessary (performance optimization)
 		- automatic meta cache reset after main `process()` call (performance optimization) replaced with `reset()`
 		  method
+		- properties are not set/unset via closure binding when public
 
 ### Removed
 

diff --git a/src/Callbacks/BaseCallback.php b/src/Callbacks/BaseCallback.php
@@ -335,17 +335,24 @@ public static function invoke(
 		}
 
 		$method = $args->method;
+		$methodInst = $declaringClass->getMethod($method);
 
 		if ($args->isStatic) {
 			$class = $holder->getClass();
-			$callbackOutput = (static fn () => $class::$method($data, $context))
+
+			$callbackOutput = $methodInst->isPublic()
+				? $class::$method($data, $context)
+				: (static fn () => $class::$method($data, $context))
 				->bindTo(null, $declaringClass->getName())();
 		} else {
 			$instance = $holder->getInstance();
-			// Closure with bound instance cannot be static
+
 			// phpcs:disable SlevomatCodingStandard.Functions.StaticClosure.ClosureNotStatic
-			$callbackOutput = (fn () => $instance->$method($data, $context))
+			$callbackOutput = $methodInst->isPublic()
+				? $instance->$method($data, $context)
+				: (fn () => $instance->$method($data, $context))
 				->bindTo($instance, $declaringClass->getName())();
+			// phpcs:enable
 		}
 
 		return $args->returnsValue ? $callbackOutput : $data;

diff --git a/src/Processing/DefaultProcessor.php b/src/Processing/DefaultProcessor.php
@@ -35,6 +35,7 @@
 use function array_map;
 use function assert;
 use function is_array;
+use const PHP_VERSION_ID;
 
 final class DefaultProcessor implements Processor
 {
@@ -576,22 +577,30 @@ private function objectSet(MappedObject $object, ReflectionProperty $property, $
 		$declaringClass = $property->getDeclaringClass();
 		$name = $property->getName();
 
-		// phpcs:disable SlevomatCodingStandard.Functions.StaticClosure
-		(fn () => $object->$name = $value)
-			->bindTo($object, $declaringClass->getName())();
-		// phpcs:enable
+		if ($property->isPublic() && (PHP_VERSION_ID < 8_01_00 || !$property->isReadOnly())) {
+			$object->$name = $value;
+		} else {
+			// phpcs:disable SlevomatCodingStandard.Functions.StaticClosure
+			(fn () => $object->$name = $value)
+				->bindTo($object, $declaringClass->getName())();
+			// phpcs:enable
+		}
 	}
 
 	private function objectUnset(MappedObject $object, ReflectionProperty $property): void
 	{
 		$declaringClass = $property->getDeclaringClass();
 		$name = $property->getName();
 
-		// phpcs:disable SlevomatCodingStandard.Functions.StaticClosure
-		(function () use ($object, $name): void {
+		if ($property->isPublic() && (PHP_VERSION_ID < 8_01_00 || !$property->isReadOnly())) {
 			unset($object->$name);
-		})->bindTo($object, $declaringClass->getName())();
-		// phpcs:enable
+		} else {
+			// phpcs:disable SlevomatCodingStandard.Functions.StaticClosure
+			(function () use ($object, $name): void {
+				unset($object->$name);
+			})->bindTo($object, $declaringClass->getName())();
+			// phpcs:enable
+		}
 	}
 
 }