Merge branch '3.x' into 4.x

* 3.x:
  Fix CS
  Use [] instead of array() to represent a constant value in compiled code
  Add more coding standard rules

doc/coding_standards.rst

@@ -88,21 +88,34 @@ standards:
     [1, 2, 3]
     {'name': 'Fabien'}
 
-* Use snake case for all variable names (provided by the application and
-  created in templates):
+* Do not put any spaces before and after ``=`` in macro argument declarations:
 
   .. code-block:: twig
 
-    {% set name = 'Fabien' %}
-    {% set first_name = 'Fabien' %}
+    {% macro html_input(class="input") %}
 
-* Use snake case for all function/filter/test names:
+* Put exactly one space after the ``:`` sign in macro argument declarations:
 
   .. code-block:: twig
 
+    {% macro html_input(class: "input") %}
+
+* Use snake case for all variable names (provided by the application and
+  created in templates), function/filter/test names, argument names and named
+  arguments:
+
+  .. code-block:: twig
+
+    {% set name = 'Fabien' %}
+    {% set first_name = 'Fabien' %}
+
     {{ 'Fabien Potencier'|to_lower_case }}
     {{ generate_random_number() }}
 
+    {% macro html_input(class_name) %}
+
+    {{ html_input(class_name: 'pwd') }}
+
 * Indent your code inside tags (use the same indentation as the one used for
   the target language of the rendered template):
 

src/Compiler.php

@@ -171,7 +171,7 @@ public function repr($value)
         } elseif (\is_bool($value)) {
             $this->raw($value ? 'true' : 'false');
         } elseif (\is_array($value)) {
-            $this->raw('array(');
+            $this->raw('[');
             $first = true;
             foreach ($value as $key => $v) {
                 if (!$first) {
@@ -182,7 +182,7 @@ public function repr($value)
                 $this->raw(' => ');
                 $this->repr($v);
             }
-            $this->raw(')');
+            $this->raw(']');
         } else {
             $this->string($value);
         }

src/ExpressionParser.php

@@ -145,7 +145,7 @@ private function triggerPrecedenceDeprecations(AbstractExpression $expr): void
             /** @var AbstractExpression $node */
             $node = $expr->getNode('node');
             foreach ($this->precedenceChanges as $operatorName => $changes) {
-                if (!in_array($unaryOp, $changes)) {
+                if (!\in_array($unaryOp, $changes)) {
                     continue;
                 }
                 if ($node->hasAttribute('operator') && $operatorName === $node->getAttribute('operator')) {

src/Extension/CoreExtension.php

@@ -1476,11 +1476,11 @@ public static function enumCases(string $enum): array
     public static function enum(string $enum): \UnitEnum
     {
         if (!enum_exists($enum)) {
-            throw new RuntimeError(sprintf('"%s" is not an enum.', $enum));
+            throw new RuntimeError(\sprintf('"%s" is not an enum.', $enum));
         }
 
         if (!$cases = $enum::cases()) {
-            throw new RuntimeError(sprintf('"%s" is an empty enum.', $enum));
+            throw new RuntimeError(\sprintf('"%s" is an empty enum.', $enum));
         }
 
         return $cases[0];

src/TokenParser/GuardTokenParser.php

@@ -26,7 +26,7 @@ public function parse(Token $token): Node
     {
         $stream = $this->parser->getStream();
         $typeToken = $stream->expect(Token::NAME_TYPE);
-        if (!in_array($typeToken->getValue(), ['function', 'filter', 'test'])) {
+        if (!\in_array($typeToken->getValue(), ['function', 'filter', 'test'])) {
             throw new SyntaxError(\sprintf('Supported guard types are function, filter and test, "%s" given.', $typeToken->getValue()), $typeToken->getLine(), $stream->getSourceContext());
         }
         $method = 'get'.$typeToken->getValue();

src/TokenParser/MacroTokenParser.php

@@ -75,7 +75,7 @@ private function parseDefinition(): ArrayExpression
         $stream = $this->parser->getStream();
         $stream->expect(Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
         while (!$stream->test(Token::PUNCTUATION_TYPE, ')')) {
-            if (count($arguments)) {
+            if (\count($arguments)) {
                 $stream->expect(Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma');
 
                 // if the comma above was a trailing comma, early exit the argument parse loop