Merge pull request #137 from wmde/serialize

Implement _serialize()/__unserialize()
wmde · Oct 17, 2022 · af68301 · af68301
2 parents 7a80d7c + 38f2f48
commit af68301
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/src/DataValues/DecimalValue.php b/src/DataValues/DecimalValue.php
@@ -189,6 +189,10 @@ public function serialize() {
 		return serialize( $this->value );
 	}
 
+	public function __serialize(): array {
+		return [ $this->value ];
+	}
+
 	/**
 	 * @see Serializable::unserialize
 	 *
@@ -198,6 +202,10 @@ public function unserialize( $data ) {
 		$this->__construct( unserialize( $data ) );
 	}
 
+	public function __unserialize( array $data ): void {
+		$this->__construct( $data[0] );
+	}
+
 	/**
 	 * @see DataValue::getType
 	 *

diff --git a/src/DataValues/QuantityValue.php b/src/DataValues/QuantityValue.php
@@ -102,12 +102,16 @@ public static function newFromNumber( $amount, $unit = '1', $upperBound = null,
 	 * @return string
 	 */
 	public function serialize() {
-		return serialize( [
+		return serialize( $this->__serialize() );
+	}
+
+	public function __serialize(): array {
+		return [
 			$this->amount,
 			$this->unit,
 			$this->upperBound,
 			$this->lowerBound,
-		] );
+		];
 	}
 
 	/**
@@ -118,7 +122,11 @@ public function serialize() {
 	 * @param string $data
 	 */
 	public function unserialize( $data ) {
-		list( $amount, $unit, $upperBound, $lowerBound ) = unserialize( $data );
+		$this->__unserialize( unserialize( $data ) );
+	}
+
+	public function __unserialize( array $data ): void {
+		list( $amount, $unit, $upperBound, $lowerBound ) = $data;
 		$this->__construct( $amount, $unit, $upperBound, $lowerBound );
 	}
 

diff --git a/src/DataValues/UnboundedQuantityValue.php b/src/DataValues/UnboundedQuantityValue.php
@@ -115,10 +115,14 @@ protected static function asDecimalValue( $name, $number, DecimalValue $default
 	 * @return string
 	 */
 	public function serialize() {
-		return serialize( [
+		return serialize( $this->__serialize() );
+	}
+
+	public function __serialize(): array {
+		return [
 			$this->amount,
 			$this->unit
-		] );
+		];
 	}
 
 	/**
@@ -127,7 +131,11 @@ public function serialize() {
 	 * @param string $data
 	 */
 	public function unserialize( $data ) {
-		list( $amount, $unit ) = unserialize( $data );
+		$this->__unserialize( unserialize( $data ) );
+	}
+
+	public function __unserialize( array $data ): void {
+		list( $amount, $unit ) = $data;
 		$this->__construct( $amount, $unit );
 	}
 

diff --git a/tests/DataValues/DecimalValueTest.php b/tests/DataValues/DecimalValueTest.php
@@ -88,11 +88,13 @@ public function testTrailingNewlineRobustness() {
 		$value = DecimalValue::newFromArray( "-0.0\n" );
 
 		$this->assertTrue( $value->isZero() );
-		$this->assertSame( 'C:23:"DataValues\DecimalValue":11:{s:4:"+0.0";}', serialize( $value ) );
 		$this->assertSame( '+0.0', $value->getValue(), 'getValue' );
 		$this->assertSame( '+0.0', $value->getArrayValue(), 'getArrayValue' );
 		$this->assertSame( '+0.0', $value->__toString(), '__toString' );
 		$this->assertSame( '0', $value->getFractionalPart(), 'getFractionalPart' );
+
+		$referenceValue = unserialize( 'C:23:"DataValues\DecimalValue":11:{s:4:"+0.0";}' );
+		$this->assertTrue( $value->equals( $referenceValue ), 'equal to hard-coded serialization' );
 	}
 
 	/**