Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-29 01:55:01 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix Cs (and problably signature of FormatterInterface)

Browse Source
This commit is contained in:
Julien Fastré
2025-04-24 22:00:46 +02:00
parent a74118e5d4
commit 65b7ed0755
107 changed files with 122 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillMainBundle/Export/FilterInterface.php
View File

@@ -81,7 +81,6 @@ interface FilterInterface extends ModifierInterface
* Example: `array('my string with %parameter%', ['%parameter%' => 'good news'], 'mydomain', 'mylocale')`
*
* @param D $data
* @param ExportGenerationContext $context
*
* @return array|string|TranslatableInterface a string with the data or, if translatable, an array where first element is string, second elements is an array of arguments
*/

4
src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Export\Formatter;
use Chill\MainBundle\Export\ExportGenerationContext;
use Chill\MainBundle\Export\ExportManagerAwareInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -111,8 +112,8 @@ class CSVListFormatter implements FormatterInterface, ExportManagerAwareInterfac
* @param mixed[] $result The result, as given by the ExportInterface
* @param mixed[] $formatterData collected from the current form
* @param string $exportAlias the id of the current export
* @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
* @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
* @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
*
* @return Response The response to be shown
*/
@@ -123,6 +124,7 @@ class CSVListFormatter implements FormatterInterface, ExportManagerAwareInterfac
array $exportData,
array $filtersData,
array $aggregatorsData,
ExportGenerationContext $context,
) {
$this->result = $result;
$this->exportAlias = $exportAlias;

4
src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Export\Formatter;
use Chill\MainBundle\Export\ExportGenerationContext;
use Chill\MainBundle\Export\ExportManagerAwareInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -108,8 +109,8 @@ class CSVPivotedListFormatter implements FormatterInterface, ExportManagerAwareI
* @param mixed[] $result The result, as given by the ExportInterface
* @param mixed[] $formatterData collected from the current form
* @param string $exportAlias the id of the current export
* @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
* @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
* @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
*
* @return Response The response to be shown
*/
@@ -120,6 +121,7 @@ class CSVPivotedListFormatter implements FormatterInterface, ExportManagerAwareI
array $exportData,
array $filtersData,
array $aggregatorsData,
ExportGenerationContext $context,
) {
$this->result = $result;
$this->exportAlias = $exportAlias;

12
src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Export\Formatter;
use Chill\MainBundle\Export\ExportGenerationContext;
use Chill\MainBundle\Export\ExportManagerAwareInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -184,6 +185,7 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
array $exportData,
array $filtersData,
array $aggregatorsData,
ExportGenerationContext $context,
): Response {
// store all data when the process is initiated
$this->result = $result;
@@ -204,7 +206,7 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
);
$this->tempfile = \tempnam(\sys_get_temp_dir(), '');
$this->generateContent();
$this->generateContent($context);
$f = \fopen($this->tempfile, 'rb');
$response->setContent(\stream_get_contents($f));
@@ -243,13 +245,13 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
*
* @return int the line number after the last description
*/
protected function addFiltersDescription(Worksheet &$worksheet)
protected function addFiltersDescription(Worksheet &$worksheet, ExportGenerationContext $context)
{
$line = 3;
foreach ($this->filtersData as $alias => $data) {
$filter = $this->getExportManager()->getFilter($alias);
$description = $filter->describeAction($data);
$description = $filter->describeAction($data, $context);
if (\is_array($description)) {
$description = $this->translator
->trans(
@@ -336,12 +338,12 @@ class SpreadSheetFormatter implements FormatterInterface, ExportManagerAwareInte
/**
* Generate the content and write it to php://temp.
*/
protected function generateContent()
protected function generateContent(ExportGenerationContext $context)
{
[$spreadsheet, $worksheet] = $this->createSpreadsheet();
$this->addTitleToWorkSheet($worksheet);
$line = $this->addFiltersDescription($worksheet);
$line = $this->addFiltersDescription($worksheet, $context);
// at this point, we are going to sort retsults for an easier manipulation
[$sortedResult, $exportKeys, $aggregatorKeys, $globalKeys] =

4
src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
View File

@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Chill\MainBundle\Export\Formatter;
use Chill\MainBundle\Export\ExportGenerationContext;
use Chill\MainBundle\Export\ExportManagerAwareInterface;
use Chill\MainBundle\Export\FormatterInterface;
use Chill\MainBundle\Export\Helper\ExportManagerAwareTrait;
@@ -118,8 +119,8 @@ class SpreadsheetListFormatter implements FormatterInterface, ExportManagerAware
* @param mixed[] $result The result, as given by the ExportInterface
* @param mixed[] $formatterData collected from the current form
* @param string $exportAlias the id of the current export
* @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
* @param array $aggregatorsData an array containing the aggregators data. The key are the filters id, and the value are the data
* @param array $filtersData an array containing the filters data. The key are the filters id, and the value are the data
*
* @return Response The response to be shown
*/
@@ -130,6 +131,7 @@ class SpreadsheetListFormatter implements FormatterInterface, ExportManagerAware
array $exportData,
array $filtersData,
array $aggregatorsData,
ExportGenerationContext $context,
) {
$this->result = $result;
$this->exportAlias = $exportAlias;

6
src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php
View File

@@ -401,7 +401,7 @@ class DummyFilterWithApplying implements FilterInterface
return $this->role;
}
public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void {}
public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void {}
public function applyOn(): string
{
@@ -466,7 +466,7 @@ class DummyExport implements ExportInterface
return [];
}
public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
public function getResult($query, $data, ExportGenerationContext $context): array
{
return [];
}
@@ -476,7 +476,7 @@ class DummyExport implements ExportInterface
return 'dummy';
}
public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): QueryBuilder
public function initiateQuery(array $requiredModifiers, array $acl, array $data, ExportGenerationContext $context): QueryBuilder
{
throw new \RuntimeException('not implemented');
}

4
src/Bundle/ChillMainBundle/Tests/Export/SortExportElementTest.php
View File

@@ -167,7 +167,7 @@ class SortExportElementTest extends KernelTestCase
return null;
}
public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void {}
public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void {}
public function applyOn(): string
{
@@ -218,7 +218,7 @@ class SortExportElementTest extends KernelTestCase
return null;
}
public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void {}
public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void {}
public function applyOn(): string
{