bug #34801 [String] implement __sleep()/__wakeup() on strings (nicolas-grekas)

fabpot · fabpot · commit ed3e111e1de5 · 2019-12-07T14:35:22.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [String] implement __sleep()/__wakeup() on strings | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This resets the transient ignoreCase state on unserialized instances. Commits ------- 416e40d [String] implement __sleep()/__wakeup() on strings
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -692,6 +692,11 @@ public function wordwrap(int $width = 75, string $break = "\n", bool $cut = fals
         return $str;
     }
 
+    public function __sleep(): array
+    {
+        return ['string'];
+    }
+
     public function __clone()
     {
         $this->ignoreCase = false;
diff --git a/src/Symfony/Component/String/UnicodeString.php b/src/Symfony/Component/String/UnicodeString.php
@@ -347,6 +347,11 @@ public function startsWith($prefix): bool
         return $prefix === grapheme_extract($this->string, \strlen($prefix), GRAPHEME_EXTR_MAXBYTES);
     }
 
+    public function __wakeup()
+    {
+        normalizer_is_normalized($this->string) ?: $this->string = normalizer_normalize($this->string);
+    }
+
     public function __clone()
     {
         if (null === $this->ignoreCase) {

Original file line number	Diff line number	Diff line change
`@@ -692,6 +692,11 @@ public function wordwrap(int $width = 75, string $break = "\n", bool $cut = fals`
`692`	`692`	`return $str;`
`693`	`693`	`}`
`694`	`694`
	`695`	`+ public function __sleep(): array`
	`696`	`+ {`
	`697`	`+ return ['string'];`
	`698`	`+ }`
	`699`	`+`
`695`	`700`	`public function __clone()`
`696`	`701`	`{`
`697`	`702`	`$this->ignoreCase = false;`
Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,11 @@ public function startsWith($prefix): bool`
`347`	`347`	`return $prefix === grapheme_extract($this->string, \strlen($prefix), GRAPHEME_EXTR_MAXBYTES);`
`348`	`348`	`}`
`349`	`349`
	`350`	`+ public function __wakeup()`
	`351`	`+ {`
	`352`	`+ normalizer_is_normalized($this->string) ?: $this->string = normalizer_normalize($this->string);`
	`353`	`+ }`
	`354`	`+`
`350`	`355`	`public function __clone()`
`351`	`356`	`{`
`352`	`357`	`if (null === $this->ignoreCase) {`