minor #47058 [ExpressionLanguage] Remove usage of properties (fabpot)

fabpot · fabpot · commit 523ba821fb73 · 2022-07-25T14:47:58.000+02:00
This PR was merged into the 6.2 branch. Discussion ---------- [ExpressionLanguage] Remove usage of properties | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | n/a  | License | MIT | Doc PR | n/a Commits ------- 824703b [ExpressionLanguage] Remove usage of properties
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -24,14 +24,11 @@ class GetAttrNode extends Node
     public const METHOD_CALL = 2;
     public const ARRAY_CALL = 3;
 
-    private bool $isShortCircuited = false;
-    public bool $isNullCoalesce = false;
-
     public function __construct(Node $node, Node $attribute, ArrayNode $arguments, int $type)
     {
         parent::__construct(
             ['node' => $node, 'attribute' => $attribute, 'arguments' => $arguments],
-            ['type' => $type]
+            ['type' => $type, 'is_null_coalesce' => false, 'is_short_circuited' => false],
         );
     }
 
@@ -73,8 +70,8 @@ public function evaluate(array $functions, array $values)
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (null === $obj && ($this->nodes['attribute']->isNullSafe || $this->isNullCoalesce)) {
-                    $this->isShortCircuited = true;
+                if (null === $obj && ($this->nodes['attribute']->isNullSafe || $this->attributes['is_null_coalesce'])) {
+                    $this->attributes['is_short_circuited'] = true;
 
                     return null;
                 }
@@ -88,7 +85,7 @@ public function evaluate(array $functions, array $values)
 
                 $property = $this->nodes['attribute']->attributes['value'];
 
-                if ($this->isNullCoalesce) {
+                if ($this->attributes['is_null_coalesce']) {
                     return $obj->$property ?? null;
                 }
 
@@ -98,7 +95,7 @@ public function evaluate(array $functions, array $values)
                 $obj = $this->nodes['node']->evaluate($functions, $values);
 
                 if (null === $obj && $this->nodes['attribute']->isNullSafe) {
-                    $this->isShortCircuited = true;
+                    $this->attributes['is_short_circuited'] = true;
 
                     return null;
                 }
@@ -122,11 +119,11 @@ public function evaluate(array $functions, array $values)
                     return null;
                 }
 
-                if (!\is_array($array) && !$array instanceof \ArrayAccess && !(null === $array && $this->isNullCoalesce)) {
+                if (!\is_array($array) && !$array instanceof \ArrayAccess && !(null === $array && $this->attributes['is_null_coalesce'])) {
                     throw new \RuntimeException(sprintf('Unable to get an item of non-array "%s".', $this->nodes['node']->dump()));
                 }
 
-                if ($this->isNullCoalesce) {
+                if ($this->attributes['is_null_coalesce']) {
                     return $array[$this->nodes['attribute']->evaluate($functions, $values)] ?? null;
                 }
 
@@ -136,9 +133,7 @@ public function evaluate(array $functions, array $values)
 
     private function isShortCircuited(): bool
     {
-        return $this->isShortCircuited
-            || ($this->nodes['node'] instanceof self && $this->nodes['node']->isShortCircuited())
-        ;
+        return $this->attributes['is_short_circuited'] || ($this->nodes['node'] instanceof self && $this->nodes['node']->isShortCircuited());
     }
 
     public function toArray()
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NullCoalesceNode.php
@@ -39,7 +39,7 @@ public function compile(Compiler $compiler)
     public function evaluate(array $functions, array $values)
     {
         if ($this->nodes['expr1'] instanceof GetAttrNode) {
-            $this->nodes['expr1']->isNullCoalesce = true;
+            $this->nodes['expr1']->attributes['is_null_coalesce'] = true;
         }
 
         return $this->nodes['expr1']->evaluate($functions, $values) ?? $this->nodes['expr2']->evaluate($functions, $values);

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,11 @@ class GetAttrNode extends Node`
`24`	`24`	`public const METHOD_CALL = 2;`
`25`	`25`	`public const ARRAY_CALL = 3;`
`26`	`26`
`27`		`- private bool $isShortCircuited = false;`
`28`		`- public bool $isNullCoalesce = false;`
`29`		`-`
`30`	`27`	`public function __construct(Node $node, Node $attribute, ArrayNode $arguments, int $type)`
`31`	`28`	`{`
`32`	`29`	`parent::__construct(`
`33`	`30`	`['node' => $node, 'attribute' => $attribute, 'arguments' => $arguments],`
`34`		`- ['type' => $type]`
	`31`	`+ ['type' => $type, 'is_null_coalesce' => false, 'is_short_circuited' => false],`
`35`	`32`	`);`
`36`	`33`	`}`
`37`	`34`
`@@ -73,8 +70,8 @@ public function evaluate(array $functions, array $values)`
`73`	`70`	`switch ($this->attributes['type']) {`
`74`	`71`	`case self::PROPERTY_CALL:`
`75`	`72`	`$obj = $this->nodes['node']->evaluate($functions, $values);`
`76`		`- if (null === $obj && ($this->nodes['attribute']->isNullSafe \|\| $this->isNullCoalesce)) {`
`77`		`- $this->isShortCircuited = true;`
	`73`	`+ if (null === $obj && ($this->nodes['attribute']->isNullSafe \|\| $this->attributes['is_null_coalesce'])) {`
	`74`	`+ $this->attributes['is_short_circuited'] = true;`
`78`	`75`
`79`	`76`	`return null;`
`80`	`77`	`}`
`@@ -88,7 +85,7 @@ public function evaluate(array $functions, array $values)`
`88`	`85`
`89`	`86`	`$property = $this->nodes['attribute']->attributes['value'];`
`90`	`87`
`91`		`- if ($this->isNullCoalesce) {`
	`88`	`+ if ($this->attributes['is_null_coalesce']) {`
`92`	`89`	`return $obj->$property ?? null;`
`93`	`90`	`}`
`94`	`91`
`@@ -98,7 +95,7 @@ public function evaluate(array $functions, array $values)`
`98`	`95`	`$obj = $this->nodes['node']->evaluate($functions, $values);`
`99`	`96`
`100`	`97`	`if (null === $obj && $this->nodes['attribute']->isNullSafe) {`
`101`		`- $this->isShortCircuited = true;`
	`98`	`+ $this->attributes['is_short_circuited'] = true;`
`102`	`99`
`103`	`100`	`return null;`
`104`	`101`	`}`
`@@ -122,11 +119,11 @@ public function evaluate(array $functions, array $values)`
`122`	`119`	`return null;`
`123`	`120`	`}`
`124`	`121`
`125`		`- if (!\is_array($array) && !$array instanceof \ArrayAccess && !(null === $array && $this->isNullCoalesce)) {`
	`122`	`+ if (!\is_array($array) && !$array instanceof \ArrayAccess && !(null === $array && $this->attributes['is_null_coalesce'])) {`
`126`	`123`	`throw new \RuntimeException(sprintf('Unable to get an item of non-array "%s".', $this->nodes['node']->dump()));`
`127`	`124`	`}`
`128`	`125`
`129`		`- if ($this->isNullCoalesce) {`
	`126`	`+ if ($this->attributes['is_null_coalesce']) {`
`130`	`127`	`return $array[$this->nodes['attribute']->evaluate($functions, $values)] ?? null;`
`131`	`128`	`}`
`132`	`129`
`@@ -136,9 +133,7 @@ public function evaluate(array $functions, array $values)`
`136`	`133`
`137`	`134`	`private function isShortCircuited(): bool`
`138`	`135`	`{`
`139`		`- return $this->isShortCircuited`
`140`		`- \|\| ($this->nodes['node'] instanceof self && $this->nodes['node']->isShortCircuited())`
`141`		`- ;`
	`136`	`+ return $this->attributes['is_short_circuited'] \|\| ($this->nodes['node'] instanceof self && $this->nodes['node']->isShortCircuited());`
`142`	`137`	`}`
`143`	`138`
`144`	`139`	`public function toArray()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function compile(Compiler $compiler)`
`39`	`39`	`public function evaluate(array $functions, array $values)`
`40`	`40`	`{`
`41`	`41`	`if ($this->nodes['expr1'] instanceof GetAttrNode) {`
`42`		`- $this->nodes['expr1']->isNullCoalesce = true;`
	`42`	`+ $this->nodes['expr1']->attributes['is_null_coalesce'] = true;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return $this->nodes['expr1']->evaluate($functions, $values) ?? $this->nodes['expr2']->evaluate($functions, $values);`