Added support for foreach with list statement (PHP 5.5)

Author: digilist

src/main/php/PDepend/Source/Language/PHP/AbstractPHPParser.php

@@ -3409,13 +3409,22 @@ private function parseForeachStatement()
         if ($this->tokenizer->peek() === Tokens::T_BITWISE_AND) {
             $foreach->addChild($this->parseVariableOrMemberByReference());
         } else {
-            $foreach->addChild($this->parseVariableOrConstantOrPrimaryPrefix());
+            if ($this->tokenizer->peek() == Tokens::T_LIST) {
+                $foreach->addChild($this->parseListExpression());
+            } else {
+                $foreach->addChild($this->parseVariableOrConstantOrPrimaryPrefix());
 
-            if ($this->tokenizer->peek() === Tokens::T_DOUBLE_ARROW) {
-                $this->consumeToken(Tokens::T_DOUBLE_ARROW);
-                $foreach->addChild(
-                    $this->parseVariableOrMemberOptionalByReference()
-                );
+                if ($this->tokenizer->peek() === Tokens::T_DOUBLE_ARROW) {
+                    $this->consumeToken(Tokens::T_DOUBLE_ARROW);
+
+                    if ($this->tokenizer->peek() == Tokens::T_LIST) {
+                        $foreach->addChild($this->parseListExpression());
+                    } else {
+                        $foreach->addChild(
+                            $this->parseVariableOrMemberOptionalByReference()
+                        );
+                    }
+                }
             }
         }
 

src/test/php/PDepend/Source/AST/ASTForeachStatementTest.php

@@ -295,6 +295,28 @@ public function testForeachStatementTerminatedByPhpCloseTag()
         $this->assertEquals(9, $stmt->getEndColumn());
     }
 
+    /**
+     * testForeachStatementWithList
+     *
+     * @return void
+     */
+    public function testForeachStatementWithList()
+    {
+        $stmt = $this->_getFirstForeachStatementInFunction(__METHOD__);
+        $this->assertInstanceOf('PDepend\\Source\\AST\\ASTListExpression', $stmt->getChild(1));
+    }
+
+    /**
+     * testForeachStatementWithKeyAndList
+     *
+     * @return void
+     */
+    public function testForeachStatementWithKeyAndList()
+    {
+        $stmt = $this->_getFirstForeachStatementInFunction(__METHOD__);
+        $this->assertInstanceOf('PDepend\\Source\\AST\\ASTListExpression', $stmt->getChild(2));
+    }
+
     /**
      * Returns a node instance for the currently executed test case.
      *

src/test/resources/files/Source/AST/ASTForeachStatement/testForeachStatementWithKeyAndList.php

@@ -0,0 +1,5 @@
+<?php
+function testForeachStatementWithKeyAndList()
+{
+    foreach ($expr as $key => list($a, $b)) {}
+}

src/test/resources/files/Source/AST/ASTForeachStatement/testForeachStatementWithList.php

@@ -0,0 +1,5 @@
+<?php
+function testForeachStatementWithList()
+{
+    foreach ($expr as list($a, $b)) {}
+}