Merge pull request #2383 from yajra/analysis-0gWpVL

yajra · web-flow · commit 2d15fb2ce521 · 2020-04-30T20:03:16.000+08:00
Apply fixes from StyleCI
diff --git a/src/ApiResourceDataTable.php b/src/ApiResourceDataTable.php
@@ -2,9 +2,9 @@
 
 namespace Yajra\DataTables;
 
-use Illuminate\Support\Collection;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 
 class ApiResourceDataTable extends CollectionDataTable
 {
diff --git a/src/CollectionDataTable.php b/src/CollectionDataTable.php
@@ -2,10 +2,10 @@
 
 namespace Yajra\DataTables;
 
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
-use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Str;
 
 class CollectionDataTable extends DataTableAbstract
 {
diff --git a/src/DataTableAbstract.php b/src/DataTableAbstract.php
@@ -2,17 +2,17 @@
 
 namespace Yajra\DataTables;
 
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Psr\Log\LoggerInterface;
-use Illuminate\Http\JsonResponse;
-use Yajra\DataTables\Utilities\Helper;
 use Illuminate\Support\Traits\Macroable;
+use Psr\Log\LoggerInterface;
 use Yajra\DataTables\Contracts\DataTable;
-use Illuminate\Contracts\Support\Jsonable;
 use Yajra\DataTables\Exceptions\Exception;
-use Illuminate\Contracts\Support\Arrayable;
 use Yajra\DataTables\Processors\DataProcessor;
+use Yajra\DataTables\Utilities\Helper;
 
 /**
  * @method DataTableAbstract setTransformer($transformer)
diff --git a/src/QueryDataTable.php b/src/QueryDataTable.php
@@ -2,11 +2,11 @@
 
 namespace Yajra\DataTables;
 
-use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\Builder;
-use Yajra\DataTables\Utilities\Helper;
 use Illuminate\Database\Query\Expression;
-use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Support\Str;
+use Yajra\DataTables\Utilities\Helper;
 
 class QueryDataTable extends DataTableAbstract
 {
diff --git a/src/Utilities/Helper.php b/src/Utilities/Helper.php
@@ -3,9 +3,9 @@
 namespace Yajra\DataTables\Utilities;
 
 use DateTime;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use Illuminate\Contracts\Support\Arrayable;
 
 class Helper
 {
diff --git a/tests/Integration/ApiResourceEngineTest.php b/tests/Integration/ApiResourceEngineTest.php
@@ -2,14 +2,14 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
-use Yajra\DataTables\DataTables;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Http\JsonResponse;
-use Yajra\DataTables\Tests\TestCase;
-use Yajra\DataTables\Tests\Models\User;
 use Yajra\DataTables\ApiResourceDataTable;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Yajra\DataTables\Tests\Http\Resources\UserResource;
+use Yajra\DataTables\DataTables;
 use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
+use Yajra\DataTables\Tests\Http\Resources\UserResource;
+use Yajra\DataTables\Tests\Models\User;
+use Yajra\DataTables\Tests\TestCase;
 
 class ApiResourceEngineTest extends TestCase
 {
@@ -93,10 +93,10 @@ public function it_returns_only_paginated_records()
     {
         $crawler = $this->call('GET', '/resource/users_p');
         $crawler->assertJson([
-             'draw'            => 0,
-             'recordsTotal'    => 10,
-             'recordsFiltered' => 10,
-         ]);
+            'draw'            => 0,
+            'recordsTotal'    => 10,
+            'recordsFiltered' => 10,
+        ]);
     }
 
     protected function setUp(): void
diff --git a/tests/Integration/BelongsToManyRelationTest.php b/tests/Integration/BelongsToManyRelationTest.php
@@ -2,10 +2,10 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Yajra\DataTables\DataTables;
-use Yajra\DataTables\Tests\TestCase;
 use Yajra\DataTables\Tests\Models\User;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\Tests\TestCase;
 
 class BelongsToManyRelationTest extends TestCase
 {
diff --git a/tests/Integration/BelongsToRelationTest.php b/tests/Integration/BelongsToRelationTest.php
@@ -2,10 +2,10 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Yajra\DataTables\DataTables;
-use Yajra\DataTables\Tests\TestCase;
 use Yajra\DataTables\Tests\Models\Post;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\Tests\TestCase;
 
 class BelongsToRelationTest extends TestCase
 {
diff --git a/tests/Integration/CollectionDataTableTest.php b/tests/Integration/CollectionDataTableTest.php
@@ -2,13 +2,13 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
-use Yajra\DataTables\DataTables;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Http\JsonResponse;
-use Yajra\DataTables\Tests\TestCase;
-use Yajra\DataTables\Tests\Models\User;
 use Yajra\DataTables\CollectionDataTable;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\DataTables;
 use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
+use Yajra\DataTables\Tests\Models\User;
+use Yajra\DataTables\Tests\TestCase;
 
 class CollectionDataTableTest extends TestCase
 {
diff --git a/tests/Integration/EloquentDataTableTest.php b/tests/Integration/EloquentDataTableTest.php
@@ -2,14 +2,14 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
-use Yajra\DataTables\DataTables;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Http\JsonResponse;
-use Yajra\DataTables\Tests\TestCase;
+use Yajra\DataTables\DataTables;
 use Yajra\DataTables\EloquentDataTable;
+use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
 use Yajra\DataTables\Tests\Models\Post;
 use Yajra\DataTables\Tests\Models\User;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
+use Yajra\DataTables\Tests\TestCase;
 
 class EloquentDataTableTest extends TestCase
 {
diff --git a/tests/Integration/EloquentJoinTest.php b/tests/Integration/EloquentJoinTest.php
@@ -2,10 +2,10 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Yajra\DataTables\DataTables;
-use Yajra\DataTables\Tests\TestCase;
 use Yajra\DataTables\Tests\Models\Post;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\Tests\TestCase;
 
 class EloquentJoinTest extends TestCase
 {
diff --git a/tests/Integration/HasManyRelationTest.php b/tests/Integration/HasManyRelationTest.php
@@ -2,11 +2,11 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Yajra\DataTables\DataTables;
-use Yajra\DataTables\Tests\TestCase;
 use Yajra\DataTables\Tests\Models\Post;
 use Yajra\DataTables\Tests\Models\User;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\Tests\TestCase;
 
 class HasManyRelationTest extends TestCase
 {
diff --git a/tests/Integration/HasOneRelationTest.php b/tests/Integration/HasOneRelationTest.php
@@ -2,11 +2,11 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Yajra\DataTables\DataTables;
-use Yajra\DataTables\Tests\TestCase;
-use Yajra\DataTables\Tests\Models\User;
 use Yajra\DataTables\Tests\Models\Heart;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Yajra\DataTables\Tests\Models\User;
+use Yajra\DataTables\Tests\TestCase;
 
 class HasOneRelationTest extends TestCase
 {
diff --git a/tests/Integration/QueryDataTableTest.php b/tests/Integration/QueryDataTableTest.php
@@ -2,14 +2,14 @@
 
 namespace Yajra\DataTables\Tests\Integration;
 
-use Yajra\DataTables\DataTables;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
+use Yajra\DataTables\DataTables;
+use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
 use Yajra\DataTables\QueryDataTable;
 use Yajra\DataTables\Tests\TestCase;
-use Illuminate\Database\Query\Builder;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Yajra\DataTables\Facades\DataTables as DatatablesFacade;
 
 class QueryDataTableTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,14 +2,14 @@
 
 namespace Yajra\DataTables\Tests;
 
-use Yajra\DataTables\Tests\Models\Role;
-use Yajra\DataTables\Tests\Models\User;
 use Illuminate\Database\Schema\Blueprint;
 use Orchestra\Testbench\TestCase as BaseTestCase;
+use Yajra\DataTables\Tests\Models\Role;
+use Yajra\DataTables\Tests\Models\User;
 
 abstract class TestCase extends BaseTestCase
 {
-    protected function setUp() : void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Unit/HelperTest.php b/tests/Unit/HelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Yajra\DataTables\Tests\Unit;
 
-use stdClass;
 use Carbon\Carbon;
+use stdClass;
 use Yajra\DataTables\Tests\TestCase;
 use Yajra\DataTables\Utilities\Helper;
 

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Yajra\DataTables;`
`4`	`4`
`5`		`-use Illuminate\Support\Collection;`
`6`		`-use Illuminate\Pagination\LengthAwarePaginator;`
`7`	`5`	`use Illuminate\Http\Resources\Json\AnonymousResourceCollection;`
	`6`	`+use Illuminate\Pagination\LengthAwarePaginator;`
	`7`	`+use Illuminate\Support\Collection;`
`8`	`8`
`9`	`9`	`class ApiResourceDataTable extends CollectionDataTable`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@`
`3`	`3`	`namespace Yajra\DataTables\Utilities;`
`4`	`4`
`5`	`5`	`use DateTime;`
	`6`	`+use Illuminate\Contracts\Support\Arrayable;`
`6`	`7`	`use Illuminate\Support\Arr;`
`7`	`8`	`use Illuminate\Support\Str;`
`8`		`-use Illuminate\Contracts\Support\Arrayable;`
`9`	`9`
`10`	`10`	`class Helper`
`11`	`11`	`{`