From bbfc33f334fb4a069b8ee6cbb4f1c06312054bec Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 20 Jan 2017 13:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../library/think/template/taglib/cxTest.php         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/thinkphp/library/think/template/taglib/cxTest.php b/tests/thinkphp/library/think/template/taglib/cxTest.php
index c1c67413..8aee392f 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) || \$list instanceof \\think\\Collection): \$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 || \$list instanceof \\think\\Paginator): \$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,7 +88,7 @@ EOF;
 {/foreach}
 EOF;
         $data = <<<EOF
-<?php if(is_array(\$list) || \$list instanceof \\think\\Collection): if( count(\$list)==0 ) : echo "empty" ;else: foreach(\$list as \$key=>\$val): ?>
+<?php if(is_array(\$list) || \$list instanceof \\think\\Collection || \$list instanceof \\think\\Paginator): if( count(\$list)==0 ) : echo "empty" ;else: foreach(\$list as \$key=>\$val): ?>
 
 <?php endforeach; endif; else: echo "empty" ;endif; ?>
 EOF;
@@ -389,7 +389,7 @@ default
 {/empty}
 EOF;
         $data = <<<EOF
-<?php if(empty(\$var) || (\$var instanceof \\think\\Collection && \$var->isEmpty())): ?>
+<?php if(empty(\$var) || ((\$var instanceof \\think\\Collection || \$var instanceof \\think\\Paginator ) && \$var->isEmpty())): ?>
 default
 <?php endif; ?>
 EOF;
@@ -402,7 +402,7 @@ default
 {/notempty}
 EOF;
         $data = <<<EOF
-<?php if(!(empty(\$var) || (\$var instanceof \\think\\Collection && \$var->isEmpty()))): ?>
+<?php if(!(empty(\$var) || ((\$var instanceof \\think\\Collection || \$var instanceof \\think\\Paginator ) && \$var->isEmpty()))): ?>
 default
 <?php endif; ?>
 EOF;
@@ -538,13 +538,13 @@ EOF;
     public function testUrl()
     {
         $template = new template();
-        $content = <<<EOF
+        $content  = <<<EOF
 {url link="Index/index"  /}
 EOF;
         $template->display($content);
         $this->expectOutputString(\think\Url::build('Index/index'));
     }
-    
+
     public function testFunction()
     {
         $template = new template();