Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@
"symfony/validator": "^6.0|^7.0"
},
"require-dev": {
"roave/security-advisories": "dev-latest",
"friendsofphp/php-cs-fixer": "^3.49",
"kubawerlos/php-cs-fixer-custom-fixers": "^3.11",
"symfony/maker-bundle": "^1.48",
"symfony/security-core": "^6.2|^7.0",
"phpoffice/phpspreadsheet": "^1.28",
"doctrine/orm": "^2.15",
"doctrine/doctrine-bundle": "^2.9",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.4",
"dg/bypass-finals": "dev-master",
"phpoffice/phpspreadsheet": "^1.28|^2.0|^3.0|^4.0|^5.0",
"doctrine/orm": "^2.15|^3.0",
"doctrine/doctrine-bundle": "^2.9|^3.0",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^10.4|^11.0|^12.0|^13.0",
"dg/bypass-finals": "^1.9",
"openspout/openspout": "^4.23",
"symfony/http-foundation": "^6.0|^7.0"
},
Expand Down
4 changes: 4 additions & 0 deletions phpstan.dist.neon
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
parameters:
level: 5
treatPhpDocTypesAsCertain: false
ignoreErrors:
-
identifier: trait.unused
paths:
- src
- tests
Expand Down
2 changes: 1 addition & 1 deletion src/Action/Type/ButtonActionType.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

final class ButtonActionType extends AbstractActionType
{
public function getParent(): ?string
public function getParent(): string
{
return LinkActionType::class;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function configureOptions(OptionsResolver $resolver): void
;
}

public function getParent(): ?string
public function getParent(): string
{
return HtmlExporterType::class;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Column/Type/ActionsColumnType.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function buildValueView(ColumnValueView $view, ColumnInterface $column, a
$actions[$name] = $action->createView($view);
}

$view->vars['actions'] = array_filter($actions);
$view->vars['actions'] = $actions;
}

public function configureOptions(OptionsResolver $resolver): void
Expand Down
5 changes: 1 addition & 4 deletions src/DataTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -802,10 +802,7 @@ public function createExportFormBuilder(?DataTableView $view = null): FormBuilde
}

$data = $this->config->getDefaultExportData() ?? ExportData::fromDataTable($this);

if (null !== $data) {
$data->filename ??= $this->getName();
}
$data->filename ??= $this->getName();

return $formFactory->createNamedBuilder(
name: $this->config->getExportParameterName(),
Expand Down
6 changes: 2 additions & 4 deletions src/Type/ResolvedDataTableType.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,11 @@ public function buildView(DataTableView $view, DataTableInterface $dataTable, ar

public function buildExportView(DataTableView $view, DataTableInterface $dataTable, array $options): void
{
if ($this->parent && method_exists($this->parent, 'buildExportView')) {
if ($this->parent) {
$this->parent->buildExportView($view, $dataTable, $options);
}

if (method_exists($this->innerType, 'buildExportView')) {
$this->innerType->buildExportView($view, $dataTable, $options);
}
$this->innerType->buildExportView($view, $dataTable, $options);
}

public function getOptionsResolver(): OptionsResolver
Expand Down
Loading