minor #33196 [ExpressionLanguage] Add more parameter types (derrabus)

nicolas-grekas · nicolas-grekas · commit 63b27f6a8d3a · 2019-08-16T07:51:44.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [ExpressionLanguage] Add more parameter types | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32179 | License | MIT | Doc PR | N/A Commits ------- e378a7a [ExpressionLanguage] Add more parameter types.
diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
@@ -28,7 +28,7 @@ public function __construct(array $functions)
         $this->functions = $functions;
     }
 
-    public function getFunction($name)
+    public function getFunction(string $name)
     {
         return $this->functions[$name];
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
@@ -46,7 +46,7 @@ public function compile(Compiler $compiler)
         $compiler->raw(']');
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         $result = [];
         foreach ($this->getKeyValuePairs() as $pair) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -84,7 +84,7 @@ public function compile(Compiler $compiler)
         ;
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         $operator = $this->attributes['operator'];
         $left = $this->nodes['left']->evaluate($functions, $values);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
@@ -40,7 +40,7 @@ public function compile(Compiler $compiler)
         ;
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         if ($this->nodes['expr1']->evaluate($functions, $values)) {
             return $this->nodes['expr2']->evaluate($functions, $values);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
@@ -36,7 +36,7 @@ public function compile(Compiler $compiler)
         $compiler->repr($this->attributes['value']);
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         return $this->attributes['value'];
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -40,7 +40,7 @@ public function compile(Compiler $compiler)
         $compiler->raw($function['compiler'](...$arguments));
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         $arguments = [$values];
         foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -64,7 +64,7 @@ public function compile(Compiler $compiler)
         }
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
@@ -33,7 +33,7 @@ public function compile(Compiler $compiler)
         $compiler->raw('$'.$this->attributes['name']);
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         return $values[$this->attributes['name']];
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -64,7 +64,7 @@ public function compile(Compiler $compiler)
         }
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         $results = [];
         foreach ($this->nodes as $node) {
@@ -90,7 +90,7 @@ public function dump()
         return $dump;
     }
 
-    protected function dumpString($value)
+    protected function dumpString(string $value)
     {
         return sprintf('"%s"', addcslashes($value, "\0\t\"\\"));
     }
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
@@ -45,7 +45,7 @@ public function compile(Compiler $compiler)
         ;
     }
 
-    public function evaluate($functions, $values)
+    public function evaluate(array $functions, array $values)
     {
         $value = $this->nodes['node']->evaluate($functions, $values);
         switch ($this->attributes['operator']) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -146,7 +146,7 @@ protected function getPrimary()
         return $this->parsePrimaryExpression();
     }
 
-    protected function parseConditionalExpression($expr)
+    protected function parseConditionalExpression(Node\Node $expr)
     {
         while ($this->stream->current->test(Token::PUNCTUATION_TYPE, '?')) {
             $this->stream->next();
@@ -299,7 +299,7 @@ public function parseHashExpression()
         return $node;
     }
 
-    public function parsePostfixExpression($node)
+    public function parsePostfixExpression(Node\Node $node)
     {
         $token = $this->stream->current;
         while (Token::PUNCTUATION_TYPE == $token->type) {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(array $functions)`
`28`	`28`	`$this->functions = $functions;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function getFunction($name)`
	`31`	`+ public function getFunction(string $name)`
`32`	`32`	`{`
`33`	`33`	`return $this->functions[$name];`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function compile(Compiler $compiler)`
`46`	`46`	`$compiler->raw(']');`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function evaluate($functions, $values)`
	`49`	`+ public function evaluate(array $functions, array $values)`
`50`	`50`	`{`
`51`	`51`	`$result = [];`
`52`	`52`	`foreach ($this->getKeyValuePairs() as $pair) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function compile(Compiler $compiler)`
`84`	`84`	`;`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function evaluate($functions, $values)`
	`87`	`+ public function evaluate(array $functions, array $values)`
`88`	`88`	`{`
`89`	`89`	`$operator = $this->attributes['operator'];`
`90`	`90`	`$left = $this->nodes['left']->evaluate($functions, $values);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function compile(Compiler $compiler)`
`40`	`40`	`;`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function evaluate($functions, $values)`
	`43`	`+ public function evaluate(array $functions, array $values)`
`44`	`44`	`{`
`45`	`45`	`if ($this->nodes['expr1']->evaluate($functions, $values)) {`
`46`	`46`	`return $this->nodes['expr2']->evaluate($functions, $values);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function compile(Compiler $compiler)`
`36`	`36`	`$compiler->repr($this->attributes['value']);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function evaluate($functions, $values)`
	`39`	`+ public function evaluate(array $functions, array $values)`
`40`	`40`	`{`
`41`	`41`	`return $this->attributes['value'];`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function compile(Compiler $compiler)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- public function evaluate($functions, $values)`
	`67`	`+ public function evaluate(array $functions, array $values)`
`68`	`68`	`{`
`69`	`69`	`switch ($this->attributes['type']) {`
`70`	`70`	`case self::PROPERTY_CALL:`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function compile(Compiler $compiler)`
`33`	`33`	`$compiler->raw('$'.$this->attributes['name']);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function evaluate($functions, $values)`
	`36`	`+ public function evaluate(array $functions, array $values)`
`37`	`37`	`{`
`38`	`38`	`return $values[$this->attributes['name']];`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function compile(Compiler $compiler)`
`45`	`45`	`;`
`46`	`46`	`}`
`47`	`47`
`48`		`- public function evaluate($functions, $values)`
	`48`	`+ public function evaluate(array $functions, array $values)`
`49`	`49`	`{`
`50`	`50`	`$value = $this->nodes['node']->evaluate($functions, $values);`
`51`	`51`	`switch ($this->attributes['operator']) {`