Skip to content

Commit 464227b

Browse files
rodrigopedrarodrigopedra
committed
code format and Laravel 6.x support
1 parent 3f83f70 commit 464227b

16 files changed

+168
-170
lines changed

‎composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"require": {
1717
"php": ">=7.0",
1818
"psr/log": "^1.0",
19-
"rodrigopedra/record-processor": "^0.8",
20-
"illuminate/support": "^5.4|^5.5|^5.6",
21-
"illuminate/contracts": "^5.4|^5.5|^5.6",
22-
"illuminate/database": "^5.4|^5.5|^5.6",
23-
"illuminate/http": "^5.4|^5.5|^5.6"
19+
"rodrigopedra/record-processor": "^0.9",
20+
"illuminate/support": "^5.4|^6.0",
21+
"illuminate/contracts": "^5.4|^6.0",
22+
"illuminate/database": "^5.4|^6.0",
23+
"illuminate/http": "^5.4|^6.0"
2424
},
2525
"autoload": {
2626
"psr-4": {
@@ -29,8 +29,8 @@
2929
}
3030
},
3131
"require-dev": {
32-
"symfony/console": "^3.3",
33-
"symfony/var-dumper": "^3.3"
32+
"symfony/console": "^3.3|~4.0|~4.1|~4.2|~4.3",
33+
"symfony/var-dumper": "^3.3|~4.0|~4.1|~4.2|~4.3"
3434
},
3535
"extra": {
3636
"laravel": {

‎console

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
require __DIR__ . '/vendor/autoload.php';
55

6-
use RodrigoPedra\LaravelRecordProcessor\Examples\ExamplesCommand;
7-
use RodrigoPedra\RecordProcessor\Examples\DownloadCommand;
86
use Symfony\Component\Console\Application;
7+
use RodrigoPedra\RecordProcessor\Examples\DownloadCommand;
8+
use RodrigoPedra\LaravelRecordProcessor\Examples\ExamplesCommand;
99

1010
$application = new Application();
1111

12-
$application->add( new ExamplesCommand );
13-
$application->add( new DownloadCommand );
12+
$application->add(new ExamplesCommand);
13+
$application->add(new DownloadCommand);
1414

1515
$application->run();

‎examples/ExampleLaravelBuilderFormatter.php

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,38 @@
33
namespace RodrigoPedra\LaravelRecordProcessor\Examples;
44

55
use RodrigoPedra\RecordProcessor\Contracts\Record;
6-
use RodrigoPedra\RecordProcessor\Contracts\RecordFormatter;
76
use RodrigoPedra\RecordProcessor\Contracts\Writer;
7+
use RodrigoPedra\RecordProcessor\Contracts\RecordFormatter;
88
use RodrigoPedra\RecordProcessor\Records\RecordKeyAggregate;
99

1010
class ExampleLaravelBuilderFormatter implements RecordFormatter
1111
{
1212
/**
1313
* Encode Record objects content to writer format
1414
*
15-
* @param Writer $writer
16-
* @param Record $record
17-
*
15+
* @param Writer $writer
16+
* @param Record $record
1817
* @return bool
1918
*/
20-
public function formatRecord( Writer $writer, Record $record )
19+
public function formatRecord(Writer $writer, Record $record)
2120
{
22-
if (!$record->valid()) {
21+
if (! $record->valid()) {
2322
return false;
2423
}
2524

2625
$data = $record->toArray();
2726

2827
if ($record instanceof RecordKeyAggregate) {
2928
$data = [
30-
'name' => $record->getKey(),
31-
'email' => implode( ', ', array_map(
32-
function ( Record $record ) {
33-
return $record->get( 'email' );
34-
}, $record->getRecords() ) ),
29+
'name' => $record->getKey(),
30+
'email' => implode(', ', array_map(
31+
function (Record $record) {
32+
return $record->get('email');
33+
}, $record->getRecords())),
3534
];
3635
}
3736

38-
$writer->append( new UserEloquentModel( $data ) );
37+
$writer->append(new UserEloquentModel($data));
3938

4039
return true;
4140
}

‎examples/ExampleLaravelBuilderParser.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ class ExampleLaravelBuilderParser implements RecordParser
1212
/**
1313
* Generates Record objects from raw data
1414
*
15-
* @param Reader $reader
15+
* @param Reader $reader
1616
* @param mixed $rawContent
17-
*
1817
* @return Record
1918
*/
20-
public function parseRecord( Reader $reader, $rawContent )
19+
public function parseRecord(Reader $reader, $rawContent)
2120
{
22-
return new ExampleRecord( [
23-
'name' => $rawContent->name,
21+
return new ExampleRecord([
22+
'name' => $rawContent->name,
2423
'email' => $rawContent->email,
25-
] );
24+
]);
2625
}
2726
}

‎examples/ExamplesCommand.php

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use Illuminate\Database\Capsule\Manager as Capsule;
66
use RodrigoPedra\LaravelRecordProcessor\ProcessorBuilder;
7-
use RodrigoPedra\RecordProcessor\Examples\ExamplesCommand as BaseExamplesCommand;
87
use RodrigoPedra\RecordProcessor\Helpers\Writers\WriterConfigurator;
8+
use RodrigoPedra\RecordProcessor\Examples\ExamplesCommand as BaseExamplesCommand;
99

1010
class ExamplesCommand extends BaseExamplesCommand
1111
{
@@ -25,62 +25,60 @@ protected function makeBuilder()
2525
}
2626

2727
/**
28-
* @param ProcessorBuilder $builder
29-
* @param string $reader
30-
*
28+
* @param ProcessorBuilder $builder
29+
* @param string $reader
3130
* @return mixed
3231
*/
33-
protected function readFrom( $builder, $reader )
32+
protected function readFrom($builder, $reader)
3433
{
3534
if ($reader === 'eloquent') {
36-
$builder->usingParser( new ExampleLaravelBuilderParser );
35+
$builder->usingParser(new ExampleLaravelBuilderParser);
3736

3837
$eloquentBuilder = $this->makeEloquentBuilder();
39-
$eloquentBuilder->take( 10 );
38+
$eloquentBuilder->take(10);
4039

41-
return $builder->readFromEloquent( $eloquentBuilder );
40+
return $builder->readFromEloquent($eloquentBuilder);
4241
}
4342

4443
if ($reader === 'query-builder') {
45-
$builder->usingParser( new ExampleLaravelBuilderParser );
44+
$builder->usingParser(new ExampleLaravelBuilderParser);
4645

4746
$eloquentBuilder = $this->makeEloquentBuilder();
48-
$eloquentBuilder->take( 10 );
49-
$eloquentBuilder->select( [ 'name', 'email' ] );
47+
$eloquentBuilder->take(10);
48+
$eloquentBuilder->select(['name', 'email']);
5049

51-
return $builder->readFromQueryBuilder( $eloquentBuilder->getQuery() );
50+
return $builder->readFromQueryBuilder($eloquentBuilder->getQuery());
5251
}
5352

54-
return parent::readFrom( $builder, $reader );
53+
return parent::readFrom($builder, $reader);
5554
}
5655

5756
/**
58-
* @param ProcessorBuilder $builder
59-
* @param string $writer
60-
*
57+
* @param ProcessorBuilder $builder
58+
* @param string $writer
6159
* @return mixed
6260
*/
63-
protected function writeTo( $builder, $writer )
61+
protected function writeTo($builder, $writer)
6462
{
6563
if ($writer === 'eloquent') {
6664
$eloquentBuilder = $this->makeEloquentBuilder();
6765

68-
return $builder->writeToEloquent( $eloquentBuilder, function ( WriterConfigurator $configurator ) {
69-
$configurator->outputModels( true );
70-
$configurator->setRecordFormatter( new ExampleLaravelBuilderFormatter );
71-
} );
66+
return $builder->writeToEloquent($eloquentBuilder, function (WriterConfigurator $configurator) {
67+
$configurator->outputModels(true);
68+
$configurator->setRecordFormatter(new ExampleLaravelBuilderFormatter);
69+
});
7270
}
7371

7472
if ($writer === 'query-builder') {
7573
$eloquentBuilder = $this->makeEloquentBuilder();
7674

77-
return $builder->writeToQueryBuilder( $eloquentBuilder->getQuery() );
75+
return $builder->writeToQueryBuilder($eloquentBuilder->getQuery());
7876
}
7977

80-
return parent::writeTo( $builder, $writer );
78+
return parent::writeTo($builder, $writer);
8179
}
8280

83-
protected function storagePath( $file )
81+
protected function storagePath($file)
8482
{
8583
return __DIR__ . '/../storage/' . $file;
8684
}
@@ -91,11 +89,11 @@ protected function startLaravelConnection()
9189

9290
$capsule = new Capsule;
9391

94-
$capsule->addConnection( [
95-
'driver' => 'sqlite',
96-
'database' => $this->storagePath( 'database.sqlite' ),
97-
'prefix' => '',
98-
] );
92+
$capsule->addConnection([
93+
'driver' => 'sqlite',
94+
'database' => $this->storagePath('database.sqlite'),
95+
'prefix' => '',
96+
]);
9997

10098
$capsule->setAsGlobal();
10199

‎examples/UserEloquentModel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class UserEloquentModel extends Model
88
{
99
public $timestamps = false;
1010

11-
protected $table = 'users';
11+
protected $table = 'users';
1212
protected $primaryKey = 'rowid';
1313

1414
protected $fillable = [
@@ -17,5 +17,5 @@ class UserEloquentModel extends Model
1717
'email',
1818
];
1919

20-
protected $hidden = [ 'rowid' ];
20+
protected $hidden = ['rowid'];
2121
}

‎src/LaravelRecordProcessor/LaravelRecordProcessorServiceProvider.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,21 @@ class LaravelRecordProcessorServiceProvider extends ServiceProvider
99
{
1010
protected $defer = true;
1111

12-
public function boot() { }
12+
public function boot()
13+
{
14+
}
1315

1416
public function register()
1517
{
16-
$this->app->bind( ProcessorBuilder::class, function () {
18+
$this->app->bind(ProcessorBuilder::class, function () {
1719
$processor = new ProcessorBuilder;
1820

19-
$processor->setLogger( $this->app->get( 'log' ) );
21+
$processor->setLogger($this->app->get('log'));
2022

2123
return $processor;
22-
} );
24+
});
2325

24-
$this->app->alias( ProcessorBuilder::class, BaseProcessorBuilder::class );
26+
$this->app->alias(ProcessorBuilder::class, BaseProcessorBuilder::class);
2527
}
2628

2729
public function provides()

‎src/LaravelRecordProcessor/ProcessorBuilder.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,75 +5,75 @@
55
use Illuminate\Database\Eloquent\Builder;
66
use Illuminate\Database\Query\Builder as QueryBuilder;
77
use RodrigoPedra\LaravelRecordProcessor\Readers\EloquentReader;
8-
use RodrigoPedra\LaravelRecordProcessor\Readers\QueryBuilderReader;
9-
use RodrigoPedra\LaravelRecordProcessor\Records\Formatter\EloquentRecordFormatter;
10-
use RodrigoPedra\LaravelRecordProcessor\Records\Parsers\EloquentRecordParser;
11-
use RodrigoPedra\LaravelRecordProcessor\Stages\DownloadFileResponse;
128
use RodrigoPedra\LaravelRecordProcessor\Writers\EloquentWriter;
9+
use RodrigoPedra\LaravelRecordProcessor\Readers\QueryBuilderReader;
1310
use RodrigoPedra\LaravelRecordProcessor\Writers\QueryBuilderWriter;
14-
use RodrigoPedra\RecordProcessor\ProcessorBuilder as BaseBaseProcessorBuilder;
15-
use RodrigoPedra\RecordProcessor\Records\Formatter\ArrayRecordFormatter;
1611
use RodrigoPedra\RecordProcessor\Records\Parsers\ArrayRecordParser;
12+
use RodrigoPedra\LaravelRecordProcessor\Stages\DownloadFileResponse;
13+
use RodrigoPedra\RecordProcessor\Records\Formatter\ArrayRecordFormatter;
14+
use RodrigoPedra\LaravelRecordProcessor\Records\Parsers\EloquentRecordParser;
15+
use RodrigoPedra\RecordProcessor\ProcessorBuilder as BaseBaseProcessorBuilder;
16+
use RodrigoPedra\LaravelRecordProcessor\Records\Formatter\EloquentRecordFormatter;
1717

1818
class ProcessorBuilder extends BaseBaseProcessorBuilder
1919
{
20-
public function readFromEloquent( Builder $eloquentBuilder, callable $configurator = null )
20+
public function readFromEloquent(Builder $eloquentBuilder, callable $configurator = null)
2121
{
22-
$this->reader = new EloquentReader( $eloquentBuilder );
22+
$this->reader = new EloquentReader($eloquentBuilder);
2323

24-
if (is_null( $this->recordParser )) {
25-
$this->usingParser( new EloquentRecordParser );
24+
if (is_null($this->recordParser)) {
25+
$this->usingParser(new EloquentRecordParser);
2626
}
2727

28-
$this->configureReader( $this->reader, $configurator );
28+
$this->configureReader($this->reader, $configurator);
2929

3030
return $this;
3131
}
3232

33-
public function readFromQueryBuilder( QueryBuilder $queryBuilder, callable $configurator = null )
33+
public function readFromQueryBuilder(QueryBuilder $queryBuilder, callable $configurator = null)
3434
{
35-
$this->reader = new QueryBuilderReader( $queryBuilder );
35+
$this->reader = new QueryBuilderReader($queryBuilder);
3636

37-
if (is_null( $this->recordParser )) {
38-
$this->usingParser( new ArrayRecordParser );
37+
if (is_null($this->recordParser)) {
38+
$this->usingParser(new ArrayRecordParser);
3939
}
4040

41-
$this->configureReader( $this->reader, $configurator );
41+
$this->configureReader($this->reader, $configurator);
4242

4343
return $this;
4444
}
4545

46-
public function writeToEloquent( Builder $eloquentBuilder, callable $configurator = null )
46+
public function writeToEloquent(Builder $eloquentBuilder, callable $configurator = null)
4747
{
48-
$writer = new EloquentWriter( $eloquentBuilder );
48+
$writer = new EloquentWriter($eloquentBuilder);
4949

50-
if (is_null( $this->recordFormatter )) {
50+
if (is_null($this->recordFormatter)) {
5151
$model = $eloquentBuilder->getModel();
5252

53-
$this->usingFormatter( new EloquentRecordFormatter( $model ) );
53+
$this->usingFormatter(new EloquentRecordFormatter($model));
5454
}
5555

56-
$this->addCompiler( $writer, $this->configureWriter( $writer, $configurator ) );
56+
$this->addCompiler($writer, $this->configureWriter($writer, $configurator));
5757

5858
return $this;
5959
}
6060

61-
public function writeToQueryBuilder( QueryBuilder $queryBuilder, callable $configurator = null )
61+
public function writeToQueryBuilder(QueryBuilder $queryBuilder, callable $configurator = null)
6262
{
63-
$writer = new QueryBuilderWriter( $queryBuilder );
63+
$writer = new QueryBuilderWriter($queryBuilder);
6464

65-
if (is_null( $this->recordFormatter )) {
66-
$this->usingFormatter( new ArrayRecordFormatter );
65+
if (is_null($this->recordFormatter)) {
66+
$this->usingFormatter(new ArrayRecordFormatter);
6767
}
6868

69-
$this->addCompiler( $writer, $this->configureWriter( $writer, $configurator ) );
69+
$this->addCompiler($writer, $this->configureWriter($writer, $configurator));
7070

7171
return $this;
7272
}
7373

74-
public function downloadFileResponse( $outputFilename = '', $deleteFileAfterDownload = false )
74+
public function downloadFileResponse($outputFilename = '', $deleteFileAfterDownload = false)
7575
{
76-
$this->addStage( new DownloadFileResponse( $outputFilename, $deleteFileAfterDownload ) );
76+
$this->addStage(new DownloadFileResponse($outputFilename, $deleteFileAfterDownload));
7777

7878
return $this;
7979
}

0 commit comments

Comments
 (0)