Merge pull request phalcon#4 from C-K-Y/master

Phalcon · Phalcon · commit 3091b941144b · 2013-08-27T07:50:21.000-07:00
Declaration of ConcatOperator::compile() should be compatible with Logic...
diff --git a/Library/Operators/Other/ConcatOperator.php b/Library/Operators/Other/ConcatOperator.php
@@ -20,7 +20,7 @@
 class ConcatOperator extends LogicalBaseOperator
 {
 
-	public function compile($expression, $compilationContext)
+	public function compile($expression, CompilationContext $compilationContext)
 	{
 
 		if (!isset($expression['left'])) {
@@ -60,4 +60,4 @@ public function compile($expression, $compilationContext)
 		return new CompiledExpression('null', null, $expression);
 	}
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`class ConcatOperator extends LogicalBaseOperator`
`21`	`21`	`{`
`22`	`22`
`23`		`- public function compile($expression, $compilationContext)`
	`23`	`+ public function compile($expression, CompilationContext $compilationContext)`
`24`	`24`	`{`
`25`	`25`
`26`	`26`	`if (!isset($expression['left'])) {`
`@@ -60,4 +60,4 @@ public function compile($expression, $compilationContext)`
`60`	`60`	`return new CompiledExpression('null', null, $expression);`
`61`	`61`	`}`
`62`	`62`
`63`		`-}`
	`63`	`+}`