Merge pull request #414 from top-think/analysis-q5kY3W

Apply fixes from StyleCI
This commit is contained in:
ThinkPHP
2016-12-24 21:49:06 +08:00
committed by GitHub
31 changed files with 1548 additions and 1557 deletions

View File

@@ -192,7 +192,7 @@ class Session
self::delete($name, $prefix);
return $result;
} else {
return null;
return;
}
}

View File

@@ -102,7 +102,6 @@ class Bootstrap extends Paginator
return $html;
}
/**
* 渲染分页html
* @return mixed
@@ -127,7 +126,6 @@ class Bootstrap extends Paginator
}
}
/**
* 生成一个可点击的按钮
*

View File

@@ -53,7 +53,6 @@ abstract class Pipes
*/
abstract public function areOpen();
/**
* {@inheritdoc}
*/

View File

@@ -16,7 +16,6 @@
namespace tests\thinkphp\library\think;
use ReflectionClass;
use think\App;
use think\Config;
use think\Request;

View File

@@ -16,7 +16,7 @@
namespace tests\thinkphp\library\think;
use \think\Db;
use think\Db;
class dbTest extends \PHPUnit_Framework_TestCase
{
@@ -349,5 +349,4 @@ EOF;
$this->assertNotEquals($cache, $updateCache);
}
}

View File

@@ -11,7 +11,6 @@
namespace tests\thinkphp\library\think;
use think\paginator\driver\Bootstrap;
class paginateTest extends \PHPUnit_Framework_TestCase
@@ -38,7 +37,4 @@ class paginateTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($render, $p->render());
}
}

View File

@@ -19,7 +19,7 @@ namespace tests\thinkphp\library\think\tempplate\taglib;
use think\Template;
use think\template\taglib\Cx;
class templateTest extends \PHPUnit_Framework_TestCase
class cxTest extends \PHPUnit_Framework_TestCase
{
public function testPhp()
{