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

Apply fixes from StyleCI

library/think/Debug.php

@@ -174,7 +174,7 @@ class Debug
             $output = '<pre>' . $label . $output . '</pre>';
         }
         if ($echo) {
-            echo ($output);
+            echo($output);
             return;
         } else {
             return $output;

library/think/Session.php

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

library/think/Url.php

@@ -248,7 +248,7 @@ class Url
                                     $domain .= $rootDomain;
                                 }
                                 break;
-                            } else if (false !== strpos($key, '*')) {
+                            } elseif (false !== strpos($key, '*')) {
                                 if (!empty($rootDomain)) {
                                     $domain .= $rootDomain;
                                 }

library/think/paginator/driver/Bootstrap.php

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

library/think/process/pipes/Pipes.php

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

tests/thinkphp/library/think/appTest.php

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

tests/thinkphp/library/think/behavior/One.php

@@ -3,12 +3,12 @@ namespace tests\thinkphp\library\think\behavior;
 
 class One
 {
-    public function run(&$data){
+    public function run(&$data) {
         $data['id'] = 1;
         return true;
     }
 
-    public function test(&$data){
+    public function test(&$data) {
         $data['name'] = 'test';
         return false;
     }

tests/thinkphp/library/think/behavior/Three.php

@@ -3,7 +3,7 @@ namespace tests\thinkphp\library\think\behavior;
 
 class Three
 {
-    public function run(&$data){
+    public function run(&$data) {
         $data['id'] = 3;
     }
 }

tests/thinkphp/library/think/behavior/Two.php

@@ -3,7 +3,7 @@ namespace tests\thinkphp\library\think\behavior;
 
 class Two
 {
-    public function run(&$data){
+    public function run(&$data) {
         $data['id'] = 2;
     }
 }

tests/thinkphp/library/think/dbTest.php

@@ -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);
     }
 
-
 }

tests/thinkphp/library/think/debugTest.php

@@ -170,7 +170,7 @@ class debugTest extends \PHPUnit_Framework_TestCase
         $array      = explode("array", json_encode($output));
         if (IS_WIN) {
             $this->assertEquals("(1) {\\n  [\\\"key\\\"] => string(3) \\\"val\\\"\\n}\\n\\r\\n\"", end($array));
-        } else if (strstr(PHP_OS, 'Darwin')) {
+        } elseif (strstr(PHP_OS, 'Darwin')) {
             $this->assertEquals("(1) {\\n  [\\\"key\\\"] => string(3) \\\"val\\\"\\n}\\n\\n\"", end($array));
         } else {
             $this->assertEquals("(1) {\\n  'key' =>\\n  string(3) \\\"val\\\"\\n}\\n\\n\"", end($array));

tests/thinkphp/library/think/paginateTest.php

@@ -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());
     }
 
-
-
-
 }

tests/thinkphp/library/think/template/taglib/cxTest.php

@@ -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()
     {