bug #48559 [ExpressionLanguage] Fix BC of cached SerializedParsedExpression containing GetAttrNode (fancyweb)

nicolas-grekas · nicolas-grekas · commit 170c5b2fc7f7 · 2022-12-13T16:47:07.000+01:00
This PR was merged into the 6.2 branch. Discussion ---------- [ExpressionLanguage] Fix BC of cached SerializedParsedExpression containing GetAttrNode | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #48543 | License | MIT | Doc PR | - Ref #47058 `GetAttrNode` can be serialized and cached through `SerializedParsedExpression`. `@fsevestre` Can you try this small patch plz? Commits ------- 6c33582 [ExpressionLanguage] Fix BC of cached SerializedParsedExpression containing GetAttrNode
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -149,4 +149,15 @@ public function toArray()
                 return [$this->nodes['node'], '[', $this->nodes['attribute'], ']'];
         }
     }
+
+    /**
+     * Provides BC with instances serialized before v6.2
+     */
+    public function __unserialize(array $data): void
+    {
+        $this->nodes = $data['nodes'];
+        $this->attributes = $data['attributes'];
+        $this->attributes['is_null_coalesce'] ??= false;
+        $this->attributes['is_short_circuited'] ??= $data["\x00Symfony\Component\ExpressionLanguage\Node\GetAttrNode\x00isShortCircuited"] ?? false;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -149,4 +149,15 @@ public function toArray()`
`149`	`149`	`return [$this->nodes['node'], '[', $this->nodes['attribute'], ']'];`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+ /**`
	`154`	`+ * Provides BC with instances serialized before v6.2`
	`155`	`+ */`
	`156`	`+ public function __unserialize(array $data): void`
	`157`	`+ {`
	`158`	`+ $this->nodes = $data['nodes'];`
	`159`	`+ $this->attributes = $data['attributes'];`
	`160`	`+ $this->attributes['is_null_coalesce'] ??= false;`
	`161`	`+ $this->attributes['is_short_circuited'] ??= $data["\x00Symfony\Component\ExpressionLanguage\Node\GetAttrNode\x00isShortCircuited"] ?? false;`
	`162`	`+ }`
`152`	`163`	`}`