Support multi-line arrays within chained calls

UnionOfRAD · Jan 1, 2014 · aeba35f · aeba35f
1 parent 4ba6d80
commit aeba35f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/test/rules/HasCorrectTabIndention.php b/test/rules/HasCorrectTabIndention.php
@@ -140,6 +140,17 @@ protected function _getPredictedIndent($lineIndex, $testable) {
 			$expectedTab += 1;
 		}
 
+		if ($inArray) {
+			$grandParent = $parent['parent'] > -1 ? $tokens[$parent['parent']] : null;
+			if ($grandParent !== null) {
+				$grandParentLine = trim($lines[$grandParent['line'] - 1]);
+
+				if (preg_match('/^->/', $grandParentLine)) {
+					$expectedTab += 1;
+				}
+			}
+		}
+
 		return array(
 			'minSpace' => $minExpectedSpace,
 			'tab' => $expectedTab

diff --git a/tests/cases/test/rules/HasCorrectTabIndentionTest.php b/tests/cases/test/rules/HasCorrectTabIndentionTest.php
@@ -477,6 +477,18 @@ public function testMultiLineChaining() {
 		$this->assertRulePass($code, $this->rule);
 	}
 
+	public function testMultiLineChainingWithArrays() {
+		$code = <<<EOD
+\$result = \$chain->called('method1')
+	->called('method2')
+	->with('first', array(
+		'id' => 100
+	))
+	->success();
+EOD;
+		$this->assertRulePass($code, $this->rule);
+	}
+
 	public function testMutlilineAssignment() {
 		$code = <<<EOD
 return true ||