Skip to content

Commit 2b226d2

Browse files
authored
Merge pull request #137 from yajra/analysis-64rk9P
Apply fixes from StyleCI
2 parents a5c3dea + a49576d commit 2b226d2

File tree

9 files changed

+51
-49
lines changed

9 files changed

+51
-49
lines changed

src/Contracts/DataTableHtmlBuilder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ interface DataTableHtmlBuilder
88
* Handle building of dataTables html.
99
*
1010
* @return \Yajra\DataTables\Html\Builder
11+
*
1112
* @throws \Exception
1213
*/
1314
public function handle();

src/Contracts/DataTableScope.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface DataTableScope
77
/**
88
* Apply a query scope.
99
*
10-
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder $query
10+
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder $query
1111
* @return mixed
1212
*/
1313
public function apply($query);

src/Exports/DataTablesCollectionExport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ abstract class DataTablesCollectionExport implements FromCollection, WithHeading
1717
protected $collection;
1818

1919
/**
20-
* @param Collection $collection
20+
* @param Collection $collection
2121
*/
2222
public function __construct(Collection $collection)
2323
{

src/Generators/DataTablesHtmlCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DataTablesHtmlCommand extends DataTablesMakeCommand
3636
/**
3737
* Build the class with the given name.
3838
*
39-
* @param string $name
39+
* @param string $name
4040
* @return string
4141
*/
4242
protected function buildClass($name)
@@ -71,7 +71,7 @@ protected function getStub()
7171
/**
7272
* Parse the name and format according to the root namespace.
7373
*
74-
* @param string $name
74+
* @param string $name
7575
* @return string
7676
*/
7777
protected function qualifyClass($name)

src/Generators/DataTablesMakeCommand.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function handle()
6565
/**
6666
* Build the class with the given name.
6767
*
68-
* @param string $name
68+
* @param string $name
6969
* @return string
7070
*/
7171
protected function buildClass($name)
@@ -88,7 +88,7 @@ protected function buildClass($name)
8888
/**
8989
* Replace the filename.
9090
*
91-
* @param string $stub
91+
* @param string $stub
9292
* @return $this
9393
*/
9494
protected function replaceFilename(&$stub)
@@ -103,7 +103,7 @@ protected function replaceFilename(&$stub)
103103
/**
104104
* Replace the action.
105105
*
106-
* @param string $stub
106+
* @param string $stub
107107
* @return \Yajra\DataTables\Generators\DataTablesMakeCommand
108108
*/
109109
protected function replaceAction(&$stub)
@@ -128,7 +128,7 @@ protected function getAction()
128128
/**
129129
* Replace columns.
130130
*
131-
* @param string $stub
131+
* @param string $stub
132132
* @return $this
133133
*/
134134
protected function replaceTableId(&$stub)
@@ -143,7 +143,7 @@ protected function replaceTableId(&$stub)
143143
/**
144144
* Replace dom.
145145
*
146-
* @param string $stub
146+
* @param string $stub
147147
* @return $this
148148
*/
149149
protected function replaceDOM(&$stub)
@@ -160,7 +160,7 @@ protected function replaceDOM(&$stub)
160160
/**
161161
* Replace buttons.
162162
*
163-
* @param string $stub
163+
* @param string $stub
164164
* @return $this
165165
*/
166166
protected function replaceButtons(&$stub)
@@ -194,8 +194,8 @@ protected function getButtons()
194194
/**
195195
* Parse array from definition.
196196
*
197-
* @param string $definition
198-
* @param int $indentation
197+
* @param string $definition
198+
* @param int $indentation
199199
* @return string
200200
*/
201201
protected function parseButtons($definition, $indentation = 24)
@@ -223,7 +223,7 @@ protected function parseButtons($definition, $indentation = 24)
223223
/**
224224
* Replace columns.
225225
*
226-
* @param string $stub
226+
* @param string $stub
227227
* @return $this
228228
*/
229229
protected function replaceColumns(&$stub)
@@ -261,8 +261,8 @@ protected function getColumns()
261261
/**
262262
* Parse array from definition.
263263
*
264-
* @param string $definition
265-
* @param int $indentation
264+
* @param string $definition
265+
* @param int $indentation
266266
* @return string
267267
*/
268268
protected function parseColumns($definition, $indentation = 12)
@@ -283,7 +283,7 @@ protected function parseColumns($definition, $indentation = 12)
283283
/**
284284
* Replace builder name.
285285
*
286-
* @param string $stub
286+
* @param string $stub
287287
* @return \Yajra\DataTables\Generators\DataTablesMakeCommand
288288
*/
289289
protected function replaceBuilder(&$stub)
@@ -299,7 +299,7 @@ protected function replaceBuilder(&$stub)
299299
/**
300300
* Parse the name and format according to the root namespace.
301301
*
302-
* @param string $name
302+
* @param string $name
303303
* @return string
304304
*/
305305
protected function qualifyClass($name)
@@ -324,7 +324,7 @@ protected function qualifyClass($name)
324324
/**
325325
* Get the default namespace for the class.
326326
*
327-
* @param string $rootNamespace
327+
* @param string $rootNamespace
328328
* @return string
329329
*/
330330
protected function getDefaultNamespace($rootNamespace)
@@ -335,7 +335,7 @@ protected function getDefaultNamespace($rootNamespace)
335335
/**
336336
* Replace model name.
337337
*
338-
* @param string $stub
338+
* @param string $stub
339339
* @return \Yajra\DataTables\Generators\DataTablesMakeCommand
340340
*/
341341
protected function replaceModel(&$stub)
@@ -374,7 +374,7 @@ protected function getModel()
374374
/**
375375
* Replace model import.
376376
*
377-
* @param string $stub
377+
* @param string $stub
378378
* @return $this
379379
*/
380380
protected function replaceModelImport(&$stub)

src/Generators/DataTablesScopeCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DataTablesScopeCommand extends GeneratorCommand
3030
/**
3131
* Get the default namespace for the class.
3232
*
33-
* @param string $rootNamespace
33+
* @param string $rootNamespace
3434
* @return string
3535
*/
3636
protected function getDefaultNamespace($rootNamespace)

src/Html/DataTableHtml.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ public static function make()
2828
}
2929

3030
/**
31-
* @param string $name
32-
* @param mixed $arguments
31+
* @param string $name
32+
* @param mixed $arguments
3333
* @return mixed
34+
*
3435
* @throws \Exception
3536
*/
3637
public function __call($name, $arguments)
@@ -55,7 +56,7 @@ protected function getHtmlBuilder()
5556
}
5657

5758
/**
58-
* @param mixed $builder
59+
* @param mixed $builder
5960
* @return static
6061
*/
6162
public function setHtmlBuilder($builder)

src/Services/DataTable.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ abstract class DataTable implements DataTableButtons
166166
/**
167167
* Process dataTables needed render output.
168168
*
169-
* @param string $view
170-
* @param array $data
171-
* @param array $mergeData
169+
* @param string $view
170+
* @param array $data
171+
* @param array $mergeData
172172
* @return mixed
173173
*/
174174
public function render($view, $data = [], $mergeData = [])
@@ -322,8 +322,8 @@ public function builder()
322322
/**
323323
* Map ajax response to columns definition.
324324
*
325-
* @param mixed $columns
326-
* @param string $type
325+
* @param mixed $columns
326+
* @param string $type
327327
* @return array
328328
*/
329329
protected function mapResponseToColumns($columns, $type)
@@ -369,7 +369,7 @@ protected function getHtmlBuilder()
369369
/**
370370
* Add html builder callback hook.
371371
*
372-
* @param callable $callback
372+
* @param callable $callback
373373
* @return $this
374374
*/
375375
public function withHtml(callable $callback)
@@ -382,7 +382,7 @@ public function withHtml(callable $callback)
382382
/**
383383
* Add callback before sending the response.
384384
*
385-
* @param callable $callback
385+
* @param callable $callback
386386
* @return $this
387387
*/
388388
public function before(callable $callback)
@@ -395,7 +395,7 @@ public function before(callable $callback)
395395
/**
396396
* Add callback after the response was processed.
397397
*
398-
* @param callable $callback
398+
* @param callable $callback
399399
* @return $this
400400
*/
401401
public function response(callable $callback)
@@ -457,7 +457,7 @@ public function getFilename()
457457
/**
458458
* Set export filename.
459459
*
460-
* @param string $filename
460+
* @param string $filename
461461
* @return DataTable
462462
*/
463463
public function setFilename($filename)
@@ -502,7 +502,7 @@ protected function exportColumns()
502502
/**
503503
* Convert array to collection of Column class.
504504
*
505-
* @param array $columns
505+
* @param array $columns
506506
* @return Collection
507507
*/
508508
private function toColumnsCollection(array $columns)
@@ -573,7 +573,7 @@ public function snappyPdf()
573573
/**
574574
* Add basic array query scopes.
575575
*
576-
* @param \Yajra\DataTables\Contracts\DataTableScope $scope
576+
* @param \Yajra\DataTables\Contracts\DataTableScope $scope
577577
* @return $this
578578
*/
579579
public function addScope(DataTableScope $scope)
@@ -586,7 +586,7 @@ public function addScope(DataTableScope $scope)
586586
/**
587587
* Push multiples scopes to array query scopes.
588588
*
589-
* @param array $scopes
589+
* @param array $scopes
590590
* @return $this
591591
*/
592592
public function addScopes(array $scopes)
@@ -599,8 +599,8 @@ public function addScopes(array $scopes)
599599
/**
600600
* Set a custom class attribute.
601601
*
602-
* @param mixed $key
603-
* @param mixed|null $value
602+
* @param mixed $key
603+
* @param mixed|null $value
604604
* @return $this
605605
*/
606606
public function with($key, $value = null)
@@ -617,7 +617,7 @@ public function with($key, $value = null)
617617
/**
618618
* Dynamically retrieve the value of an attribute.
619619
*
620-
* @param string $key
620+
* @param string $key
621621
* @return mixed|null
622622
*/
623623
public function __get($key)
@@ -630,7 +630,7 @@ public function __get($key)
630630
/**
631631
* Apply query scopes.
632632
*
633-
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder $query
633+
* @param \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder $query
634634
* @return mixed
635635
*/
636636
protected function applyScopes($query)
@@ -645,8 +645,8 @@ protected function applyScopes($query)
645645
/**
646646
* Determine if the DataTable has scopes.
647647
*
648-
* @param array $scopes
649-
* @param bool $validateAll
648+
* @param array $scopes
649+
* @param bool $validateAll
650650
* @return bool
651651
*/
652652
protected function hasScopes(array $scopes, $validateAll = false)

src/Transformers/DataArrayTransformer.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class DataArrayTransformer
1010
/**
1111
* Transform row data by columns definition.
1212
*
13-
* @param array $row
14-
* @param mixed $columns
15-
* @param string $type
13+
* @param array $row
14+
* @param mixed $columns
15+
* @param string $type
1616
* @return array
1717
*/
1818
public function transform(array $row, $columns, $type = 'printable')
@@ -27,9 +27,9 @@ public function transform(array $row, $columns, $type = 'printable')
2727
/**
2828
* Transform row column by collection.
2929
*
30-
* @param array $row
31-
* @param \Illuminate\Support\Collection $columns
32-
* @param string $type
30+
* @param array $row
31+
* @param \Illuminate\Support\Collection $columns
32+
* @param string $type
3333
* @return array
3434
*/
3535
protected function buildColumnByCollection(array $row, Collection $columns, $type = 'printable')
@@ -56,7 +56,7 @@ protected function buildColumnByCollection(array $row, Collection $columns, $typ
5656
/**
5757
* Decode content to a readable text value.
5858
*
59-
* @param string $data
59+
* @param string $data
6060
* @return string
6161
*/
6262
protected function decodeContent($data)

0 commit comments

Comments
 (0)