Skip to content

Updated php endpoints + ran php-cs-fixer #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Updated php endpoints + ran php-cs-fixer #18

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c1b562
Updated php endpoints + ran php-cs-fixer
sebprt Jun 19, 2024
6e1efe3
Fixed the way how writer are managed
sebprt Jun 24, 2024
d580df1
[rector] Rector fixes
actions-user Jun 24, 2024
6879f44
Added missing package + ran php-cs-fixer
sebprt Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions src/Builder/Excel/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@

final class Loader implements StepBuilderInterface
{
private ?Node\Expr $persistent = null;
private ?Node\Expr $logger = null;

public function __construct(
private readonly Node\Expr $filePath,
private Node\Expr $sheetName
private readonly Node\Expr $sheetName
) {
}

Expand All @@ -34,9 +35,9 @@ public function withState(Node\Expr $state): self
return $this;
}

public function withSheet(Node\Expr $sheet): self
public function withWriter(Node\Expr $persistent): self
{
$this->sheetName = $sheet;
$this->persistent = $persistent;

return $this;
}
Expand All @@ -45,24 +46,9 @@ public function getNode(): Node
{
$arguments = [
new Node\Arg(
value: new Node\Expr\MethodCall(
new Node\Expr\StaticCall(
class: new Node\Name\FullyQualified(\Box\Spout\Writer\Common\Creator\WriterEntityFactory::class),
name: 'createXLSXWriter'
),
name: 'openToFile',
args: [
new Node\Arg(
value: $this->filePath,
),
]
),
value: $this->persistent,
name: new Node\Identifier('writer'),
),
new Node\Arg(
value: $this->sheetName,
name: new Node\Identifier('sheetName'),
),
new Node\Arg(
value: $this->logger ?? new Node\Expr\New_(new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)),
name: new Node\Identifier('logger'),
Expand Down
25 changes: 9 additions & 16 deletions src/Builder/Excel/MultipleFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

final class MultipleFileLoader implements StepBuilderInterface
{
private ?Node\Expr $persistent = null;
private ?Node\Expr $logger = null;

public function __construct(
Expand Down Expand Up @@ -57,28 +58,20 @@ public function withSafeMode(): self
return $this;
}

public function withWriter(Node\Expr $persistent): self
{
$this->persistent = $persistent;

return $this;
}

public function getNode(): Node
{
$arguments = [
new Node\Arg(
value: new Node\Expr\MethodCall(
new Node\Expr\StaticCall(
class: new Node\Name\FullyQualified(\Box\Spout\Writer\Common\Creator\WriterEntityFactory::class),
name: 'createXLSXWriter'
),
name: 'openToFile',
args: [
new Node\Arg(
value: $this->filePath
),
]
),
value: $this->persistent,
name: new Node\Identifier('writer'),
),
new Node\Arg(
value: $this->sheetName,
name: new Node\Identifier('sheetName'),
),
new Node\Arg(
value: $this->logger ?? new Node\Expr\New_(new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)),
name: new Node\Identifier('logger'),
Expand Down
25 changes: 9 additions & 16 deletions src/Builder/OpenDocument/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

final class Loader implements StepBuilderInterface
{
private ?Node\Expr $writer = null;
private ?Node\Expr $logger = null;

public function __construct(
Expand Down Expand Up @@ -41,28 +42,20 @@ public function withSheet(Node\Expr $sheet): self
return $this;
}

public function withWriter(Node\Expr $writer): self
{
$this->writer = $writer;

return $this;
}

public function getNode(): Node
{
$arguments = [
new Node\Arg(
value: new Node\Expr\MethodCall(
new Node\Expr\StaticCall(
class: new Node\Name\FullyQualified(\Box\Spout\Writer\Common\Creator\WriterEntityFactory::class),
name: 'createODSWriter'
),
name: 'openToFile',
args: [
new Node\Arg(
value: $this->filePath
),
]
),
value: $this->writer,
name: new Node\Identifier('writer'),
),
new Node\Arg(
value: $this->sheetName,
name: new Node\Identifier('sheetName'),
),
new Node\Arg(
value: $this->logger ?? new Node\Expr\New_(new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)),
name: new Node\Identifier('logger'),
Expand Down
25 changes: 9 additions & 16 deletions src/Builder/OpenDocument/MultipleFileLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

final class MultipleFileLoader implements StepBuilderInterface
{
private ?Node\Expr $writer = null;
private ?Node\Expr $logger = null;

public function __construct(
Expand Down Expand Up @@ -57,28 +58,20 @@ public function withSafeMode(): self
return $this;
}

public function withWriter(Node\Expr $writer): self
{
$this->writer = $writer;

return $this;
}

public function getNode(): Node
{
$arguments = [
new Node\Arg(
value: new Node\Expr\MethodCall(
new Node\Expr\StaticCall(
class: new Node\Name\FullyQualified(\Box\Spout\Writer\Common\Creator\WriterEntityFactory::class),
name: 'createODSWriter'
),
name: 'openToFile',
args: [
new Node\Arg(
value: $this->filePath
),
]
),
value: $this->writer,
name: new Node\Identifier('writer'),
),
new Node\Arg(
value: $this->sheetName,
name: new Node\Identifier('sheetName'),
),
new Node\Arg(
value: $this->logger ?? new Node\Expr\New_(new Node\Name\FullyQualified(\Psr\Log\NullLogger::class)),
name: new Node\Identifier('logger'),
Expand Down
3 changes: 3 additions & 0 deletions src/Configuration/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ public function getConfigTreeBuilder(): TreeBuilder
->then(asExpression())
->end()
->end()
->booleanNode('persistent')
->defaultFalse()
->end()
->arrayNode('excel')
->children()
->scalarNode('sheet')
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/Extractor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function normalize(array $config): array
try {
return $this->processor->processConfiguration($this->configuration, $config);
} catch (Symfony\InvalidTypeException|Symfony\InvalidConfigurationException $exception) {
throw new Configurator\InvalidConfigurationException($exception->getMessage(), 0, $exception);
throw new InvalidConfigurationException($exception->getMessage(), 0, $exception);
}
}

Expand Down
Loading