Merge pull request #13 from jqhph/analysis-QMeLPm

Apply fixes from StyleCI

src/Controllers/PermissionController.php

@@ -299,7 +299,7 @@ class PermissionController extends Controller
             $form->select('parent_id', trans('admin.parent_id'))
                 ->options($permissionModel::selectOptions())
                 ->saving(function ($v) {
-                   return (int) $v;
+                    return (int) $v;
                 });
 
             $form->text('slug', trans('admin.slug'))

src/Grid/Column.php

@@ -7,13 +7,13 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Grid\Displayers\AbstractDisplayer;
 use Dcat\Admin\Traits\HasBuilderEvents;
 use Dcat\Admin\Traits\HasDefinitions;
-use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Fluent;
 use Illuminate\Support\Str;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * @method $this switch(string $color = '')

src/Grid/Concerns/HasTree.php

@@ -34,7 +34,7 @@ trait HasTree
     protected $treeIgnoreQueryNames = [];
 
     /**
-     * 开启树形表格功能
+     * 开启树形表格功能.
      *
      * @param bool $showAll
      * @param bool $sortable
@@ -72,7 +72,7 @@ trait HasTree
     }
 
     /**
-     * 禁止树形表格查询
+     * 禁止树形表格查询.
      *
      * @return $this
      */
@@ -94,7 +94,7 @@ trait HasTree
     }
 
     /**
-     * 设置子节点查询链接需要忽略的字段
+     * 设置子节点查询链接需要忽略的字段.
      *
      * @param string|array $keys
      *
@@ -210,7 +210,6 @@ HTML
         return $this->getChildrenQueryNamePrefix().$this->levelQueryName;
     }
 
-
     /**
      * @return int
      */

src/Grid/Displayers/Orderable.php

@@ -3,8 +3,6 @@
 namespace Dcat\Admin\Grid\Displayers;
 
 use Dcat\Admin\Admin;
-use Dcat\Admin\Grid;
-use Dcat\Admin\Grid\Column;
 
 class Orderable extends AbstractDisplayer
 {

src/Grid/Row.php

@@ -4,7 +4,6 @@ namespace Dcat\Admin\Grid;
 
 use Closure;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Support\Helper;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Jsonable;

src/Models/Menu.php

@@ -5,7 +5,6 @@ namespace Dcat\Admin\Models;
 use Dcat\Admin\Traits\ModelTree;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Support\Facades\DB;
 
 /**
  * Class Menu.

src/Repositories/EloquentRepository.php

@@ -175,7 +175,7 @@ class EloquentRepository extends Repository implements TreeRepository
      */
     protected function setSort(Grid\Model $model)
     {
-        list($column, $type) = $model->getSort();
+        [$column, $type] = $model->getSort();
 
         if (empty($column) || empty($type)) {
             return;
@@ -217,7 +217,6 @@ class EloquentRepository extends Repository implements TreeRepository
         }
     }
 
-
     /**
      * Set the grid paginate.
      *
@@ -414,6 +413,7 @@ class EloquentRepository extends Repository implements TreeRepository
                 )
             );
         }
+
         return $model->moveOrderUp() ? true : false;
     }
 

src/Support/Helper.php

@@ -154,7 +154,6 @@ class Helper
         return $url.'?'.http_build_query(array_merge($originalQuery, $query));
     }
 
-
     /**
      * @param string                 $url
      * @param string|array|Arrayable $keys
@@ -186,7 +185,6 @@ class Helper
             : $baseUrl;
     }
 
-
     /**
      * Get full url without query strings.
      *

src/Traits/ModelTree.php

@@ -108,7 +108,6 @@ trait ModelTree
         $this->orderColumn = $column;
     }
 
-
     /**
      * Set query callback to model.
      *
@@ -228,6 +227,7 @@ trait ModelTree
             $this->$orderColumnName = $this->$orderColumnName + 1;
 
             $this->save();
+
             return $this;
         }
 

tests/Feature/TranslationTest.php

@@ -54,10 +54,9 @@ class TranslationTest extends TestCase
         $this->assertEquals(admin_trans_label('Create'), 'Create');
     }
 
-
     protected function registerTranslator()
     {
-        $loader = new FileLoader(app('files'), __DIR__ . '/../resources/lang');
+        $loader = new FileLoader(app('files'), __DIR__.'/../resources/lang');
 
         $translator = new Translator($loader, 'en');
 

tests/Repositories/User.php

@@ -2,8 +2,8 @@
 
 namespace Dcat\Admin\Tests\Repositories;
 
-use Dcat\Admin\Tests\Models\User as Model;
 use Dcat\Admin\Repositories\EloquentRepository;
+use Dcat\Admin\Tests\Models\User as Model;
 
 class User extends EloquentRepository
 {

tests/TestCase.php

@@ -3,11 +3,11 @@
 namespace Dcat\Admin\Tests;
 
 use Dcat\Admin\Models\Administrator;
-use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
+use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
 
 class TestCase extends BaseTestCase
 {
@@ -42,9 +42,9 @@ class TestCase extends BaseTestCase
 
         require __DIR__.'/routes.php';
 
-        require __DIR__ . '/resources/seeds/factory.php';
+        require __DIR__.'/resources/seeds/factory.php';
 
-        view()->addNamespace('admin-tests', __DIR__ . '/resources/views');
+        view()->addNamespace('admin-tests', __DIR__.'/resources/views');
 
         if ($this->login) {
             $this->be($this->getUser(), 'admin');
@@ -53,7 +53,7 @@ class TestCase extends BaseTestCase
 
     protected function config()
     {
-        $adminConfig = require __DIR__ . '/resources/config/admin.php';
+        $adminConfig = require __DIR__.'/resources/config/admin.php';
 
         $config = $this->app['config'];
 
@@ -63,7 +63,7 @@ class TestCase extends BaseTestCase
         $config->set('database.connections.mysql.username', env('MYSQL_USER', 'root'));
         $config->set('database.connections.mysql.password', env('MYSQL_PASSWORD', ''));
         $config->set('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF');
-        $config->set('filesystems', require __DIR__ . '/resources/config/filesystems.php');
+        $config->set('filesystems', require __DIR__.'/resources/config/filesystems.php');
         $config->set('admin', $adminConfig);
         $config->set('app.debug', true);
 
@@ -105,7 +105,7 @@ class TestCase extends BaseTestCase
     {
         $fileSystem = new Filesystem();
 
-        $fileSystem->requireOnce(__DIR__ . '/resources/migrations/2016_11_22_093148_create_test_tables.php');
+        $fileSystem->requireOnce(__DIR__.'/resources/migrations/2016_11_22_093148_create_test_tables.php');
 
         (new \CreateTestTables())->up();
     }