From 1f6cde00eb257d22c97262e6caf2922d8067579c Mon Sep 17 00:00:00 2001
From: yunwuxin <448901948@qq.com>
Date: Sun, 8 May 2016 19:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=A0=87=E7=AD=BE=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                             |  2 ++
 .../thinkphp/library/think/template/taglib/cxTest.php  | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 723ef36f..17a3431d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+/composer.lock
+/vendor
 .idea
\ No newline at end of file
diff --git a/tests/thinkphp/library/think/template/taglib/cxTest.php b/tests/thinkphp/library/think/template/taglib/cxTest.php
index e40d3de4..34f296a6 100644
--- a/tests/thinkphp/library/think/template/taglib/cxTest.php
+++ b/tests/thinkphp/library/think/template/taglib/cxTest.php
@@ -47,7 +47,7 @@ EOF;
 {/volist}
 EOF;
         $data = <<<EOF
-<?php if(is_array(\$list)): \$key = 0; \$__LIST__ = \$list;if( count(\$__LIST__)==0 ) : echo "" ;else: foreach(\$__LIST__ as \$key=>\$vo): \$mod = (\$key % 2 );++\$key;?>
+<?php if(is_array(\$list) || \$list instanceof \\think\\Collection): \$key = 0; \$__LIST__ = \$list;if( count(\$__LIST__)==0 ) : echo "" ;else: foreach(\$__LIST__ as \$key=>\$vo): \$mod = (\$key % 2 );++\$key;?>
 
 <?php endforeach; endif; else: echo "" ;endif; ?>
 EOF;
@@ -88,9 +88,9 @@ EOF;
 {/foreach}
 EOF;
         $data = <<<EOF
-<?php if(is_array(\$list)): foreach(\$list as \$key=>\$val): ?>
+<?php if(is_array(\$list) || \$list instanceof \\think\\Collection): if( count(\$list)==0 ) : echo "empty" ;else: foreach(\$list as \$key=>\$val): ?>
 
-<?php endforeach; endif; ?><?php if(empty(\$list)): echo '"empty'; endif; ?>
+<?php endforeach; endif; else: echo "empty" ;endif; ?>
 EOF;
         $cx->parseTag($content);
         $this->assertEquals($content, $data);
@@ -389,7 +389,7 @@ default
 {/empty}
 EOF;
         $data = <<<EOF
-<?php if(empty(\$var)): ?>
+<?php if(empty(\$var) || (\$var instanceof \\think\\Collection && \$var->isEmpty())): ?>
 default
 <?php endif; ?>
 EOF;
@@ -402,7 +402,7 @@ default
 {/notempty}
 EOF;
         $data = <<<EOF
-<?php if(!empty(\$var)): ?>
+<?php if(!(empty(\$var) || (\$var instanceof \\think\\Collection && \$var->isEmpty()))): ?>
 default
 <?php endif; ?>
 EOF;