Raw values work independently of MappedObject

Author: mabar

src/MappedObject.php

@@ -3,50 +3,15 @@
 namespace Orisai\ObjectMapper;
 
 use Nette\Utils\ObjectHelpers;
-use Orisai\Exceptions\Logic\InvalidState;
-use Orisai\ObjectMapper\Processing\Options;
 use ReflectionException;
 use ReflectionProperty;
-use function sprintf;
 
 /**
  * Base class required for mapped objects
  */
 abstract class MappedObject
 {
 
-	private bool $hasRawValues = false;
-
-	/** @var mixed */
-	private $rawValues;
-
-	/**
-	 * @param mixed $values
-	 *
-	 * @internal
-	 */
-	public function setRawValues($values): void
-	{
-		$this->hasRawValues = true;
-		$this->rawValues = $values;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getRawValues()
-	{
-		if (!$this->hasRawValues) {
-			throw InvalidState::create()
-				->withMessage(sprintf(
-					'Cannot get raw values as they were never set. You may achieve it by setting %s::setFillRawValues(true)',
-					Options::class,
-				));
-		}
-
-		return $this->rawValues;
-	}
-
 	public function isInitialized(string $property): bool
 	{
 		return (new ReflectionProperty($this, $property))->isInitialized($this);

src/Processing/DefaultProcessor.php

@@ -55,12 +55,15 @@ final class DefaultProcessor implements Processor
 
 	private SkippedPropertiesContextMap $skippedMap;
 
+	private RawValuesMap $rawValuesMap;
+
 	public function __construct(MetaLoader $metaLoader, RuleManager $ruleManager, ObjectCreator $objectCreator)
 	{
 		$this->metaLoader = $metaLoader;
 		$this->ruleManager = $ruleManager;
 		$this->objectCreator = $objectCreator;
 		$this->skippedMap = new SkippedPropertiesContextMap();
+		$this->rawValuesMap = new RawValuesMap();
 	}
 
 	/**
@@ -643,7 +646,7 @@ private function fillObject(
 
 		// Set raw data
 		if ($options->isFillRawValues()) {
-			$object->setRawValues($rawData);
+			$this->rawValuesMap->setRawValues($object, $rawData);
 		}
 
 		// Reset mapped properties state
@@ -681,6 +684,14 @@ private function createHolder(string $class, ClassRuntimeMeta $meta, ?MappedObje
 		return new ObjectHolder($this->objectCreator, $meta, $class, $object);
 	}
 
+	/**
+	 * @return mixed
+	 */
+	public function getRawValues(MappedObject $object)
+	{
+		return $this->rawValuesMap->getRawValues($object);
+	}
+
 	// ////////////// //
 	// Late processing //
 	// ////////////// //

src/Processing/RawValuesMap.php

@@ -0,0 +1,45 @@
+<?php declare(strict_types = 1);
+
+namespace Orisai\ObjectMapper\Processing;
+
+use Orisai\Exceptions\Logic\InvalidState;
+use Orisai\ObjectMapper\MappedObject;
+use WeakMap;
+use function sprintf;
+
+final class RawValuesMap
+{
+
+	/** @var WeakMap<MappedObject, mixed> */
+	private WeakMap $map;
+
+	public function __construct()
+	{
+		$this->map = new WeakMap();
+	}
+
+	/**
+	 * @param mixed $values
+	 */
+	public function setRawValues(MappedObject $object, $values): void
+	{
+		$this->map->offsetSet($object, $values);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getRawValues(MappedObject $object)
+	{
+		if (!$this->map->offsetExists($object)) {
+			throw InvalidState::create()
+				->withMessage(sprintf(
+					'Cannot get raw values as they were never set. You may achieve it by setting %s::setFillRawValues(true)',
+					Options::class,
+				));
+		}
+
+		return $this->map->offsetGet($object);
+	}
+
+}

tests/Toolkit/ProcessingTestCase.php

@@ -7,8 +7,8 @@
 use Orisai\ObjectMapper\Context\TypeContext;
 use Orisai\ObjectMapper\Meta\DefaultValueMeta;
 use Orisai\ObjectMapper\Meta\MetaLoader;
+use Orisai\ObjectMapper\Processing\DefaultProcessor;
 use Orisai\ObjectMapper\Processing\Options;
-use Orisai\ObjectMapper\Processing\Processor;
 use Orisai\ObjectMapper\Rules\DefaultRuleManager;
 use Orisai\ObjectMapper\Tester\ObjectMapperTester;
 use Orisai\ObjectMapper\Tester\TesterDependencies;
@@ -26,7 +26,7 @@ abstract class ProcessingTestCase extends TestCase
 
 	protected DefaultRuleManager $ruleManager;
 
-	protected Processor $processor;
+	protected DefaultProcessor $processor;
 
 	protected function setUp(): void
 	{

tests/Unit/Processing/DefaultProcessorTest.php

@@ -409,7 +409,7 @@ public function testTransformation(): void
 		self::assertSame(123.456, $vo->float);
 		self::assertNull($vo->stdClassOrNull);
 
-		self::assertSame($data, $vo->getRawValues());
+		self::assertSame($data, $this->processor->getRawValues($vo));
 	}
 
 	public function testDontUseConstructor(): void
@@ -655,7 +655,7 @@ public function testBeforeClassCallbackMixedValue(): void
 			$this->formatter->printError($exception),
 		);
 		$vo = $this->processor->process(true, BeforeClassCallbackMixedValueVO::class, $options);
-		self::assertTrue($vo->getRawValues());
+		self::assertTrue($this->processor->getRawValues($vo));
 	}
 
 	public function testBeforeClassCallbackRuleException(): void

tools/phpstan.tests.neon

@@ -10,5 +10,9 @@ parameters:
 
 	ignoreErrors:
 		# Tests are expected to throw exceptions
-		- message: "#^Method (.+) throws checked exception (.+) but it's missing from the PHPDoc @throws tag\\.$#"
-		  path: %currentWorkingDirectory%/tests/Unit
+		- message: '#^Method (.+) throws checked exception (.+) but it''s missing from the PHPDoc @throws tag\.$#'
+		  path: ../tests/Unit
+
+		# Temporary workaround
+		- message: '#^Property (.+)\:\:\$processor \((.+)DefaultProcessor\) does not accept (.+)\\Processor\.$#'
+		  path: ../tests/Toolkit/ProcessingTestCase.php