Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 116d5c9fa475 · 2023-02-16T11:14:28.000+01:00
* 6.2:
  CS fix
  Fix test provider
diff --git a/ExpressionLanguage.php b/ExpressionLanguage.php
@@ -110,11 +110,11 @@ public function lint(Expression|string $expression, ?array $names): void
      * @param callable $compiler  A callable able to compile the function
      * @param callable $evaluator A callable able to evaluate the function
      *
+     * @return void
+     *
      * @throws \LogicException when registering a function after calling evaluate(), compile() or parse()
      *
      * @see ExpressionFunction
-     *
-     * @return void
      */
     public function register(string $name, callable $compiler, callable $evaluator)
     {
diff --git a/Node/GetAttrNode.php b/Node/GetAttrNode.php
@@ -154,7 +154,7 @@ public function toArray(): array
     }
 
     /**
-     * Provides BC with instances serialized before v6.2
+     * Provides BC with instances serialized before v6.2.
      */
     public function __unserialize(array $data): void
     {

Original file line number	Diff line number	Diff line change
`@@ -110,11 +110,11 @@ public function lint(Expression\|string $expression, ?array $names): void`
`110`	`110`	`* @param callable $compiler A callable able to compile the function`
`111`	`111`	`* @param callable $evaluator A callable able to evaluate the function`
`112`	`112`	`*`
	`113`	`+ * @return void`
	`114`	`+ *`
`113`	`115`	`* @throws \LogicException when registering a function after calling evaluate(), compile() or parse()`
`114`	`116`	`*`
`115`	`117`	`* @see ExpressionFunction`
`116`		`- *`
`117`		`- * @return void`
`118`	`118`	`*/`
`119`	`119`	`public function register(string $name, callable $compiler, callable $evaluator)`
`120`	`120`	`{`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function toArray(): array`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
`157`		`- * Provides BC with instances serialized before v6.2`
	`157`	`+ * Provides BC with instances serialized before v6.2.`
`158`	`158`	`*/`
`159`	`159`	`public function __unserialize(array $data): void`
`160`	`160`	`{`