Skip to content

Commit bf701d7

Browse files
hlecorchehlecorche
committed
Fix CS and "Check license year"
1 parent fff7786 commit bf701d7

File tree

8 files changed

+20
-34
lines changed

8 files changed

+20
-34
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
155155
- name: Check license year
156156
if: matrix.coding-standards
157-
run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%G`"
157+
run: cat LICENSE |grep -E "\(c\) ([0-9]+\-)*`date +%Y`"
158158

159159
- name: Run ESLint
160160
if: matrix.coding-standards

‎src/Twig/CrudExtension.php‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -581,18 +581,16 @@ public function searchFormReset(Environment $environment, Crud $crud, array $opt
581581
]);
582582
$resolver->setAllowedTypes('ajax_options', ['array']);
583583
$resolver->setAllowedTypes('button_attr', ['array']);
584-
$resolver->addNormalizer('button_attr', function (Options $options, mixed $value) use ($crud): array {
585-
return array_merge(
586-
[
587-
'data-ec-crud-toggle' => 'search-reset',
588-
'data-crud-search-id' => $crud->getDivIdSearch(),
589-
'data-crud-list-id' => $crud->getDivIdList(),
590-
'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
591-
],
592-
$value,
593-
$this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
594-
);
595-
});
584+
$resolver->addNormalizer('button_attr', fn (Options $options, mixed $value): array => array_merge(
585+
[
586+
'data-ec-crud-toggle' => 'search-reset',
587+
'data-crud-search-id' => $crud->getDivIdSearch(),
588+
'data-crud-list-id' => $crud->getDivIdList(),
589+
'data-ec-crud-ajax-url' => $crud->getSearchUrl(['reset' => 1]),
590+
],
591+
$value,
592+
$this->getAjaxAttributes($this->validateAjaxOptions($options['ajax_options'])),
593+
));
596594
$options = $resolver->resolve($this->buildOptions('crud_search_form_reset', $options, $crud));
597595

598596
if ($options['render']) {

‎tests/Crud/CrudColumnTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testMissingIdOption(): void
3232
public function testIdTooLongOption(): void
3333
{
3434
$options = $this->createValidConfig();
35-
$options['id'] = str_pad('', 101, 'a');
35+
$options['id'] = mb_str_pad('', 101, 'a');
3636

3737
$this->expectException(ValidationFailedException::class);
3838
$this->expectExceptionMessageMatches('/The column id ".+" is too long. It should have 100 character or less/');

‎tests/Crud/CrudTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getTestCrudWithInvalidSessionNameProvider(): array
5151
['', InvalidOptionsException::class, '/The option "session_name" with value ".*" is invalid/'],
5252
['aa#bb', ValidationFailedException::class, '/Invalid session_name format/'],
5353
['aa bb', ValidationFailedException::class, '/Invalid session_name format/'],
54-
[str_pad('', 101, 'a'), ValidationFailedException::class, '/Invalid session_name format/'],
54+
[mb_str_pad('', 101, 'a'), ValidationFailedException::class, '/Invalid session_name format/'],
5555
[1, InvalidOptionsException::class, '/The option "session_name" with value 1 is expected to be of type "string", but is of type "int"/'],
5656
];
5757
}

‎tests/Form/Filter/AbstractFilterTest.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,10 @@ protected function setUp(): void
8282
$this->crudFactory = $this->getMockBuilder(CrudFactory::class)
8383
->disableOriginalConstructor()
8484
->getMock();
85-
$this->crudFactory->method('create')->willReturnCallback(function (array $options) use ($container) {
86-
return $this->getMockBuilder(Crud::class)
85+
$this->crudFactory->method('create')->willReturnCallback(fn (array $options) => $this->getMockBuilder(Crud::class)
8786
->setConstructorArgs([$options, $container])
8887
->onlyMethods(['save', 'buildSearchForm']) // buildSearchForm: Disable search form creation
89-
->getMock();
90-
});
88+
->getMock());
9189
}
9290

9391
protected function tearDown(): void

‎tests/Form/Filter/EntityAjaxFilterTest.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,9 @@ public function getTestSubmitInvalidProvider(): array
154154
public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
155155
{
156156
if ($queryBuilderIsClosure) {
157-
$queryBuilder = function (EntityRepository $entityRepository) {
158-
return $entityRepository->createQueryBuilder('t')
157+
$queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
159158
->select('t')
160159
->andWhere('t.id > 2');
161-
};
162160
} else {
163161
$queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
164162
->select('t')
@@ -213,11 +211,9 @@ public function getTestViewWithQueryBuilderProvider(): array
213211
public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
214212
{
215213
if ($queryBuilderIsClosure) {
216-
$queryBuilder = function (EntityRepository $entityRepository) {
217-
return $entityRepository->createQueryBuilder('t')
214+
$queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
218215
->select('t')
219216
->andWhere('t.id > 2');
220-
};
221217
} else {
222218
$queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
223219
->select('t')

‎tests/Form/Filter/EntityFilterTest.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,9 @@ public function testSubmitInvalidMaxCount(): void
165165
public function testViewWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $modelData, $expectedViewData, array $expectedIdsFound): void
166166
{
167167
if ($queryBuilderIsClosure) {
168-
$queryBuilder = function (EntityRepository $entityRepository) {
169-
return $entityRepository->createQueryBuilder('t')
168+
$queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
170169
->select('t')
171170
->andWhere('t.id > 2');
172-
};
173171
} else {
174172
$queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
175173
->select('t')
@@ -223,11 +221,9 @@ public function getTestViewWithQueryBuilderProvider(): array
223221
public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedViewData): void
224222
{
225223
if ($queryBuilderIsClosure) {
226-
$queryBuilder = function (EntityRepository $entityRepository) {
227-
return $entityRepository->createQueryBuilder('t')
224+
$queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
228225
->select('t')
229226
->andWhere('t.id > 2');
230-
};
231227
} else {
232228
$queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
233229
->select('t')

‎tests/Form/Type/EntityAjaxTypeTest.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,9 @@ public function getTestSubmitInvalidProvider(): array
174174
public function testSubmitWithQueryBuilder(bool $queryBuilderIsClosure, bool $multiple, $submittedData, $expectedValid, $expectedModelData, $expectedDataBuilderName, $expectedViewData): void
175175
{
176176
if ($queryBuilderIsClosure) {
177-
$queryBuilder = function (EntityRepository $entityRepository) {
178-
return $entityRepository->createQueryBuilder('t')
177+
$queryBuilder = fn (EntityRepository $entityRepository) => $entityRepository->createQueryBuilder('t')
179178
->select('t')
180179
->andWhere('t.id > 2');
181-
};
182180
} else {
183181
$queryBuilder = $this->em->getRepository(Tag::class)->createQueryBuilder('t')
184182
->select('t')

0 commit comments

Comments
 (0)