Merge branch 'master' of github.com:xp-framework/ast

Author: thekid

src/main/php/lang/ast/Tokens.class.php

@@ -16,8 +16,8 @@ class Tokens {
     '>' => ['>>=', '>=', '>>'],
     '=' => ['===', '=>', '=='],
     '!' => ['!==', '!='],
-    '&' => ['&&', '&='],
-    '|' => ['||', '|='],
+    '&' => ['&&=', '&&', '&='],
+    '|' => ['||=', '||', '|='],
     '^' => ['^='],
     '+' => ['+=', '++'],
     '-' => ['-=', '--', '->'],

src/main/php/lang/ast/syntax/PHP.class.php

@@ -236,6 +236,8 @@ public function __construct() {
     $this->assignment('>>=');
     $this->assignment('<<=');
     $this->assignment('??=');
+    $this->assignment('&&=');
+    $this->assignment('||=');
 
     // This is ambiguous:
     //

src/test/php/lang/ast/unittest/parse/OperatorTest.class.php

@@ -63,7 +63,7 @@ public function prefix($operator) {
     );
   }
 
-  #[Test, Values(['=', '+=', '-=', '*=', '/=', '.=', '**=', '&=', '|=', '^=', '>>=', '<<='])]
+  #[Test, Values(['=', '+=', '-=', '*=', '/=', '.=', '**=', '&=', '|=', '^=', '>>=', '<<=', '??=', '&&=', '||='])]
   public function assignment($operator) {
     $this->assertParsed(
       [new Assignment(new Variable('a', self::LINE), $operator, new Variable('b', self::LINE), self::LINE)],