Merge pull request #3108 from yajra/analysis-b06GGa

Apply fixes from StyleCI
yajra · Dec 27, 2023 · 45dbcfd · 45dbcfd
2 parents d110a78 + 33429b0
commit 45dbcfd
Show file tree

Hide file tree

Showing 17 changed files with 202 additions and 202 deletions.
diff --git a/src/DataTableAbstract.php b/src/DataTableAbstract.php
@@ -103,10 +103,10 @@ abstract class DataTableAbstract implements DataTable
      * @var array
      */
     protected array $templates = [
-        'DT_RowId'    => '',
+        'DT_RowId' => '',
         'DT_RowClass' => '',
-        'DT_RowData'  => [],
-        'DT_RowAttr'  => [],
+        'DT_RowData' => [],
+        'DT_RowAttr' => [],
     ];
 
     /**
@@ -920,10 +920,10 @@ protected function processResults($results, $object = false): array
     protected function render(array $data): JsonResponse
     {
         $output = $this->attachAppends([
-            'draw'            => $this->request->draw(),
-            'recordsTotal'    => $this->totalRecords,
+            'draw' => $this->request->draw(),
+            'recordsTotal' => $this->totalRecords,
             'recordsFiltered' => $this->filteredRecords ?? 0,
-            'data'            => $data,
+            'data' => $data,
         ]);
 
         if ($this->config->isDebugging()) {
@@ -987,11 +987,11 @@ protected function errorResponse(\Exception $exception)
         $this->getLogger()->error($exception);
 
         return new JsonResponse([
-            'draw'            => $this->request->draw(),
-            'recordsTotal'    => $this->totalRecords,
+            'draw' => $this->request->draw(),
+            'recordsTotal' => $this->totalRecords,
             'recordsFiltered' => 0,
-            'data'            => [],
-            'error'           => $error ? __($error) : "Exception Message:\n\n".$exception->getMessage(),
+            'data' => [],
+            'error' => $error ? __($error) : "Exception Message:\n\n".$exception->getMessage(),
         ]);
     }
 

diff --git a/src/config/datatables.php b/src/config/datatables.php
@@ -4,17 +4,17 @@
     /*
      * DataTables search options.
      */
-    'search'         => [
+    'search' => [
         /*
          * Smart search will enclose search keyword with wildcard string "%keyword%".
          * SQL: column LIKE "%keyword%"
          */
-        'smart'            => true,
+        'smart' => true,
 
         /*
          * Multi-term search will explode search keyword using spaces resulting into multiple term search.
          */
-        'multi_term'       => true,
+        'multi_term' => true,
 
         /*
          * Case insensitive will search the keyword in lower case format.
@@ -26,27 +26,27 @@
          * Wild card will add "%" in between every characters of the keyword.
          * SQL: column LIKE "%k%e%y%w%o%r%d%"
          */
-        'use_wildcards'    => false,
+        'use_wildcards' => false,
 
         /*
          * Perform a search which starts with the given keyword.
          * SQL: column LIKE "keyword%"
          */
-        'starts_with'      => false,
+        'starts_with' => false,
     ],
 
     /*
      * DataTables internal index id response column name.
      */
-    'index_column'   => 'DT_RowIndex',
+    'index_column' => 'DT_RowIndex',
 
     /*
      * List of available builders for DataTables.
      * This is where you can register your custom dataTables builder.
      */
-    'engines'        => [
-        'eloquent'   => Yajra\DataTables\EloquentDataTable::class,
-        'query'      => Yajra\DataTables\QueryDataTable::class,
+    'engines' => [
+        'eloquent' => Yajra\DataTables\EloquentDataTable::class,
+        'query' => Yajra\DataTables\QueryDataTable::class,
         'collection' => Yajra\DataTables\CollectionDataTable::class,
         'resource' => Yajra\DataTables\ApiResourceDataTable::class,
     ],
@@ -56,7 +56,7 @@
      * This is where you can override which engine a builder should use
      * Note, only change this if you know what you are doing!
      */
-    'builders'       => [
+    'builders' => [
         //Illuminate\Database\Eloquent\Relations\Relation::class => 'eloquent',
         //Illuminate\Database\Eloquent\Builder::class            => 'eloquent',
         //Illuminate\Database\Query\Builder::class               => 'query',
@@ -76,28 +76,28 @@
      * 'throw'          - Throws a \Yajra\DataTables\Exceptions\Exception. Use your custom error handler if needed.
      * 'custom message' - Any friendly message to be displayed to the user. You can also use translation key.
      */
-    'error'          => env('DATATABLES_ERROR', null),
+    'error' => env('DATATABLES_ERROR', null),
 
     /*
      * Default columns definition of dataTable utility functions.
      */
-    'columns'        => [
+    'columns' => [
         /*
          * List of columns hidden/removed on json response.
          */
-        'excess'    => ['rn', 'row_num'],
+        'excess' => ['rn', 'row_num'],
 
         /*
          * List of columns to be escaped. If set to *, all columns are escape.
          * Note: You can set the value to empty array to disable XSS protection.
          */
-        'escape'    => '*',
+        'escape' => '*',
 
         /*
          * List of columns that are allowed to display html content.
          * Note: Adding columns to list will make us available to XSS attacks.
          */
-        'raw'       => ['action'],
+        'raw' => ['action'],
 
         /*
          * List of columns are forbidden from being searched/sorted.
@@ -114,8 +114,8 @@
     /*
      * JsonResponse header and options config.
      */
-    'json'           => [
-        'header'  => [],
+    'json' => [
+        'header' => [],
         'options' => 0,
     ],
 

diff --git a/tests/Http/Resources/UserResource.php b/tests/Http/Resources/UserResource.php
@@ -18,7 +18,7 @@ public function toArray($request)
         return [
             // 'id' => $this->id,
             'email' => $this->email,
-            'name'  => $this->name,
+            'name' => $this->name,
         ];
     }
 }
diff --git a/tests/Integration/BelongsToManyRelationTest.php b/tests/Integration/BelongsToManyRelationTest.php
@@ -16,8 +16,8 @@ public function it_returns_all_records_with_the_relation_when_called_without_par
     {
         $response = $this->call('GET', '/relations/belongsToMany');
         $response->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 20,
+            'draw' => 0,
+            'recordsTotal' => 20,
             'recordsFiltered' => 20,
         ]);
 
@@ -33,8 +33,8 @@ public function it_can_perform_global_search_on_the_relation()
         ]);
 
         $response->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 20,
+            'draw' => 0,
+            'recordsTotal' => 20,
             'recordsFiltered' => 10,
         ]);
 
@@ -61,17 +61,17 @@ public function it_can_sort_using_the_relation_with_pagination()
             'order' => [
                 [
                     'column' => 2,
-                    'dir'    => 'desc',
+                    'dir' => 'desc',
                 ],
             ],
             'length' => 10,
-            'start'  => 0,
-            'draw'   => 1,
+            'start' => 0,
+            'draw' => 1,
         ]);
 
         $response->assertJson([
-            'draw'            => 1,
-            'recordsTotal'    => 20,
+            'draw' => 1,
+            'recordsTotal' => 20,
             'recordsFiltered' => 20,
         ]);
 

diff --git a/tests/Integration/BelongsToRelationTest.php b/tests/Integration/BelongsToRelationTest.php
@@ -16,8 +16,8 @@ public function it_returns_all_records_with_the_relation_when_called_without_par
     {
         $response = $this->call('GET', '/relations/belongsTo');
         $response->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 60,
+            'draw' => 0,
+            'recordsTotal' => 60,
             'recordsFiltered' => 60,
         ]);
 
@@ -33,8 +33,8 @@ public function it_can_perform_global_search_on_the_relation()
         ]);
 
         $response->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 60,
+            'draw' => 0,
+            'recordsTotal' => 60,
             'recordsFiltered' => 3,
         ]);
 
@@ -61,17 +61,17 @@ public function it_can_sort_using_the_relation_with_pagination()
             'order' => [
                 [
                     'column' => 1,
-                    'dir'    => 'desc',
+                    'dir' => 'desc',
                 ],
             ],
             'length' => 10,
-            'start'  => 0,
-            'draw'   => 1,
+            'start' => 0,
+            'draw' => 1,
         ]);
 
         $response->assertJson([
-            'draw'            => 1,
-            'recordsTotal'    => 60,
+            'draw' => 1,
+            'recordsTotal' => 60,
             'recordsFiltered' => 60,
         ]);
 

diff --git a/tests/Integration/CollectionDataTableTest.php b/tests/Integration/CollectionDataTableTest.php
@@ -19,8 +19,8 @@ public function it_returns_all_records_when_no_parameters_is_passed()
     {
         $crawler = $this->call('GET', '/collection/users');
         $crawler->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 20,
+            'draw' => 0,
+            'recordsTotal' => 20,
             'recordsFiltered' => 20,
         ]);
     }
@@ -33,7 +33,7 @@ public function it_returns_zero_filtered_records_on_empty_collection()
             'data' => [],
             'draw' => 0,
             'input' => [],
-            'recordsTotal'    => 0,
+            'recordsTotal' => 0,
             'recordsFiltered' => 0,
         ]);
     }
@@ -50,8 +50,8 @@ public function it_can_perform_global_search()
         ]);
 
         $crawler->assertJson([
-            'draw'            => 0,
-            'recordsTotal'    => 20,
+            'draw' => 0,
+            'recordsTotal' => 20,
             'recordsFiltered' => 1,
         ]);
     }
@@ -109,10 +109,10 @@ public function it_can_sort_case_insensitive_strings()
             'columns' => [
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'order'  => [['column' => 0, 'dir' => 'asc']],
-            'start'  => 0,
+            'order' => [['column' => 0, 'dir' => 'asc']],
+            'start' => 0,
             'length' => 10,
-            'draw'   => 1,
+            'draw' => 1,
         ]);
 
         $collection = collect([
@@ -129,10 +129,10 @@ public function it_can_sort_case_insensitive_strings()
         $response = $dataTable->toJson();
 
         $this->assertEquals([
-            'draw'            => 1,
-            'recordsTotal'    => 6,
+            'draw' => 1,
+            'recordsTotal' => 6,
             'recordsFiltered' => 6,
-            'data'            => [
+            'data' => [
                 ['name' => 'aaa'],
                 ['name' => 'ABC'],
                 ['name' => 'bbb'],
@@ -151,10 +151,10 @@ public function it_can_sort_numeric_strings()
             'columns' => [
                 ['data' => 'amount', 'name' => 'amount', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'order'  => [['column' => 0, 'dir' => 'asc']],
-            'start'  => 0,
+            'order' => [['column' => 0, 'dir' => 'asc']],
+            'start' => 0,
             'length' => 10,
-            'draw'   => 1,
+            'draw' => 1,
         ]);
 
         $collection = collect([
@@ -171,10 +171,10 @@ public function it_can_sort_numeric_strings()
         $response = $dataTable->toJson();
 
         $this->assertEquals([
-            'draw'            => 1,
-            'recordsTotal'    => 6,
+            'draw' => 1,
+            'recordsTotal' => 6,
             'recordsFiltered' => 6,
-            'data'            => [
+            'data' => [
                 ['amount' => '-8'],
                 ['amount' => '-3'],
                 ['amount' => '0'],
@@ -203,13 +203,13 @@ public function it_can_search_on_added_columns()
                 ['data' => 'name', 'name' => 'name', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'foo',  'name' => 'foo', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'order'  => [['column' => 0, 'dir' => 'asc']],
-            'start'  => 0,
+            'order' => [['column' => 0, 'dir' => 'asc']],
+            'start' => 0,
             'search' => [
                 'value' => 'bar aaa',
             ],
             'length' => 10,
-            'draw'   => 1,
+            'draw' => 1,
         ]);
 
         $collection = collect([
@@ -226,10 +226,10 @@ public function it_can_search_on_added_columns()
         $response = $dataTable->addColumn('foo', 'bar {{$name}}')->toJson();
 
         $this->assertEquals([
-            'draw'            => 1,
-            'recordsTotal'    => 6,
+            'draw' => 1,
+            'recordsTotal' => 6,
             'recordsFiltered' => 1,
-            'data'            => [
+            'data' => [
                 ['name' => 'aaa', 'foo' => 'bar aaa'],
             ],
         ], $response->getData(true));

diff --git a/tests/Integration/CustomOrderTest.php b/tests/Integration/CustomOrderTest.php
@@ -18,7 +18,7 @@ public function it_can_order_with_custom_order()
             'order' => [
                 [
                     'column' => 0,
-                    'dir'    => 'asc',
+                    'dir' => 'asc',
                 ],
             ],
         ]);
@@ -36,9 +36,9 @@ protected function getJsonResponse(array $params = [])
                 ['data' => 'user.id', 'name' => 'user.id', 'searchable' => 'true', 'orderable' => 'true'],
                 ['data' => 'title', 'name' => 'posts.title', 'searchable' => 'true', 'orderable' => 'true'],
             ],
-            'length'  => 10,
-            'start'   => 0,
-            'draw'    => 1,
+            'length' => 10,
+            'start' => 0,
+            'draw' => 1,
         ];
 
         return $this->call(