Skip to content

Commit ed8e9dd

Browse files
turegjorupturegjorup
committed
3879: Renamed enums to singular
1 parent 616227b commit ed8e9dd

15 files changed

+87
-86
lines changed

‎psalm-baseline.xml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,78 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
2+
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
33
<file src="src/Api/State/AbstractProvider.php">
44
<InternalMethod>
5-
<code>getFilters</code>
5+
<code><![CDATA[getFilters]]></code>
66
</InternalMethod>
77
</file>
88
<file src="src/Api/State/DailyOccurrenceRepresentationProvider.php">
99
<InvalidReturnStatement>
10-
<code><![CDATA[[$this->index->get(IndexNames::DailyOccurrences->value, $uriVariables['id'])['_source']]]]></code>
10+
<code><![CDATA[[$this->index->get(IndexName::DailyOccurrences->value, $uriVariables['id'])['_source']]]]></code>
1111
</InvalidReturnStatement>
1212
<MissingTemplateParam>
13-
<code>ProviderInterface</code>
13+
<code><![CDATA[ProviderInterface]]></code>
1414
</MissingTemplateParam>
1515
<PossiblyNullArrayAccess>
16-
<code><![CDATA[$this->index->get(IndexNames::DailyOccurrences->value, $uriVariables['id'])['_source']]]></code>
16+
<code><![CDATA[$this->index->get(IndexName::DailyOccurrences->value, $uriVariables['id'])['_source']]]></code>
1717
</PossiblyNullArrayAccess>
1818
</file>
1919
<file src="src/Api/State/EventRepresentationProvider.php">
2020
<InvalidReturnStatement>
21-
<code><![CDATA[[$this->index->get(IndexNames::Events->value, $uriVariables['id'])['_source']]]]></code>
21+
<code><![CDATA[[$this->index->get(IndexName::Events->value, $uriVariables['id'])['_source']]]]></code>
2222
</InvalidReturnStatement>
2323
<MissingTemplateParam>
24-
<code>ProviderInterface</code>
24+
<code><![CDATA[ProviderInterface]]></code>
2525
</MissingTemplateParam>
2626
<PossiblyNullArrayAccess>
27-
<code><![CDATA[$this->index->get(IndexNames::Events->value, $uriVariables['id'])['_source']]]></code>
27+
<code><![CDATA[$this->index->get(IndexName::Events->value, $uriVariables['id'])['_source']]]></code>
2828
</PossiblyNullArrayAccess>
2929
</file>
3030
<file src="src/Api/State/LocationRepresentationProvider.php">
3131
<InvalidReturnStatement>
32-
<code><![CDATA[[$this->index->get(IndexNames::Locations->value, $uriVariables['id'])['_source']]]]></code>
32+
<code><![CDATA[[$this->index->get(IndexName::Locations->value, $uriVariables['id'])['_source']]]]></code>
3333
</InvalidReturnStatement>
3434
<MissingTemplateParam>
35-
<code>ProviderInterface</code>
35+
<code><![CDATA[ProviderInterface]]></code>
3636
</MissingTemplateParam>
3737
<PossiblyNullArrayAccess>
38-
<code><![CDATA[$this->index->get(IndexNames::Locations->value, $uriVariables['id'])['_source']]]></code>
38+
<code><![CDATA[$this->index->get(IndexName::Locations->value, $uriVariables['id'])['_source']]]></code>
3939
</PossiblyNullArrayAccess>
4040
</file>
4141
<file src="src/Api/State/OccurrenceRepresentationProvider.php">
4242
<InvalidReturnStatement>
43-
<code><![CDATA[[$this->index->get(IndexNames::Occurrences->value, $uriVariables['id'])['_source']]]]></code>
43+
<code><![CDATA[[$this->index->get(IndexName::Occurrences->value, $uriVariables['id'])['_source']]]]></code>
4444
</InvalidReturnStatement>
4545
<MissingTemplateParam>
46-
<code>ProviderInterface</code>
46+
<code><![CDATA[ProviderInterface]]></code>
4747
</MissingTemplateParam>
4848
<PossiblyNullArrayAccess>
49-
<code><![CDATA[$this->index->get(IndexNames::Occurrences->value, $uriVariables['id'])['_source']]]></code>
49+
<code><![CDATA[$this->index->get(IndexName::Occurrences->value, $uriVariables['id'])['_source']]]></code>
5050
</PossiblyNullArrayAccess>
5151
</file>
5252
<file src="src/Api/State/OrganizationRepresentationProvider.php">
5353
<InvalidReturnStatement>
54-
<code><![CDATA[[$this->index->get(IndexNames::Organizations->value, $uriVariables['id'])['_source']]]]></code>
54+
<code><![CDATA[[$this->index->get(IndexName::Organizations->value, $uriVariables['id'])['_source']]]]></code>
5555
</InvalidReturnStatement>
5656
<MissingTemplateParam>
57-
<code>ProviderInterface</code>
57+
<code><![CDATA[ProviderInterface]]></code>
5858
</MissingTemplateParam>
5959
<PossiblyNullArrayAccess>
60-
<code><![CDATA[$this->index->get(IndexNames::Organizations->value, $uriVariables['id'])['_source']]]></code>
60+
<code><![CDATA[$this->index->get(IndexName::Organizations->value, $uriVariables['id'])['_source']]]></code>
6161
</PossiblyNullArrayAccess>
6262
</file>
6363
<file src="src/Api/State/TagRepresentationProvider.php">
6464
<MissingTemplateParam>
65-
<code>ProviderInterface</code>
65+
<code><![CDATA[ProviderInterface]]></code>
6666
</MissingTemplateParam>
6767
</file>
6868
<file src="src/Api/State/VocabularyRepresentationProvider.php">
6969
<MissingTemplateParam>
70-
<code>ProviderInterface</code>
70+
<code><![CDATA[ProviderInterface]]></code>
7171
</MissingTemplateParam>
7272
</file>
7373
<file src="src/Command/FixturesLoadCommand.php">
7474
<UndefinedDocblockClass>
75-
<code>\HttpException</code>
75+
<code><![CDATA[\HttpException]]></code>
7676
</UndefinedDocblockClass>
7777
</file>
7878
<file src="src/Fixtures/FixtureLoader.php">
@@ -88,30 +88,30 @@
8888
]]]></code>
8989
</InvalidArgument>
9090
<PossiblyUndefinedMethod>
91-
<code>getStatusCode</code>
92-
<code>getStatusCode</code>
91+
<code><![CDATA[getStatusCode]]></code>
92+
<code><![CDATA[getStatusCode]]></code>
9393
</PossiblyUndefinedMethod>
9494
<UndefinedClass>
95-
<code>\HttpException</code>
95+
<code><![CDATA[\HttpException]]></code>
9696
</UndefinedClass>
9797
<UndefinedDocblockClass>
98-
<code>\HttpException</code>
99-
<code>\HttpException</code>
98+
<code><![CDATA[\HttpException]]></code>
99+
<code><![CDATA[\HttpException]]></code>
100100
</UndefinedDocblockClass>
101101
</file>
102102
<file src="src/Service/ElasticSearch/ElasticSearchIndex.php">
103103
<ArgumentTypeCoercion>
104-
<code>$params</code>
104+
<code><![CDATA[$params]]></code>
105105
</ArgumentTypeCoercion>
106106
<InvalidArgument>
107-
<code>$params</code>
107+
<code><![CDATA[$params]]></code>
108108
<code><![CDATA[['name' => $indexName]]]></code>
109109
</InvalidArgument>
110110
</file>
111111
<file src="src/Service/ElasticSearch/ElasticSearchPaginator.php">
112112
<MissingTemplateParam>
113-
<code>PaginatorInterface</code>
114-
<code>\IteratorAggregate</code>
113+
<code><![CDATA[PaginatorInterface]]></code>
114+
<code><![CDATA[\IteratorAggregate]]></code>
115115
</MissingTemplateParam>
116116
</file>
117117
</files>

‎src/Api/State/AbstractProvider.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
use ApiPlatform\Elasticsearch\Filter\SortFilterInterface;
77
use ApiPlatform\Metadata\Operation;
88
use ApiPlatform\State\Pagination\PaginationOptions;
9-
use App\Model\FilterTypes;
10-
use App\Model\IndexNames;
9+
use App\Model\FilterType;
10+
use App\Model\IndexName;
1111
use App\Service\IndexInterface;
1212
use Psr\Container\ContainerInterface;
1313

@@ -43,22 +43,22 @@ protected function getFilters(Operation $operation, array $context = []): array
4343
{
4444
$resourceFilters = $operation->getFilters();
4545
$outputFilters = [
46-
FilterTypes::Filters->value => [],
47-
FilterTypes::Sort->value => [],
46+
FilterType::Filters->value => [],
47+
FilterType::Sort->value => [],
4848
];
4949

5050
if (!is_null($resourceFilters)) {
5151
foreach ($resourceFilters as $filterId) {
5252
$filter = $this->getFilterById($filterId);
5353

5454
if ($filter instanceof FilterInterface) {
55-
$data = $filter->apply([], IndexNames::Events->value, $operation, $context);
55+
$data = $filter->apply([], IndexName::Events->value, $operation, $context);
5656

5757
if (!empty($data)) {
5858
if ($filter instanceof SortFilterInterface) {
59-
$outputFilters[FilterTypes::Sort->value][] = $data;
59+
$outputFilters[FilterType::Sort->value][] = $data;
6060
} else {
61-
$outputFilters[FilterTypes::Filters->value][] = $data;
61+
$outputFilters[FilterType::Filters->value][] = $data;
6262
}
6363
}
6464
}

‎src/Api/State/DailyOccurrenceRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use ApiPlatform\Metadata\Operation;
77
use ApiPlatform\State\ProviderInterface;
88
use App\Exception\IndexException;
9-
use App\Model\IndexNames;
9+
use App\Model\IndexName;
1010
use App\Service\ElasticSearch\ElasticSearchPaginator;
1111
use Psr\Container\ContainerExceptionInterface;
1212
use Psr\Container\NotFoundExceptionInterface;
@@ -24,13 +24,13 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2424
$filters = $this->getFilters($operation, $context);
2525
$offset = $this->calculatePageOffset($context);
2626
$limit = $this->getItemsPerPage($context);
27-
$results = $this->index->getAll(IndexNames::DailyOccurrences->value, $filters, $offset, $limit);
27+
$results = $this->index->getAll(IndexName::DailyOccurrences->value, $filters, $offset, $limit);
2828

2929
return new ElasticSearchPaginator($results, $limit, $offset);
3030
}
3131

3232
try {
33-
return [$this->index->get(IndexNames::DailyOccurrences->value, $uriVariables['id'])['_source']];
33+
return [$this->index->get(IndexName::DailyOccurrences->value, $uriVariables['id'])['_source']];
3434
} catch (IndexException $e) {
3535
if (404 === $e->getCode()) {
3636
return null;

‎src/Api/State/EventRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use ApiPlatform\Metadata\Operation;
77
use ApiPlatform\State\ProviderInterface;
88
use App\Exception\IndexException;
9-
use App\Model\IndexNames;
9+
use App\Model\IndexName;
1010
use App\Service\ElasticSearch\ElasticSearchPaginator;
1111
use Psr\Container\ContainerExceptionInterface;
1212
use Psr\Container\NotFoundExceptionInterface;
@@ -24,13 +24,13 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2424
$filters = $this->getFilters($operation, $context);
2525
$offset = $this->calculatePageOffset($context);
2626
$limit = $this->getItemsPerPage($context);
27-
$results = $this->index->getAll(IndexNames::Events->value, $filters, $offset, $limit);
27+
$results = $this->index->getAll(IndexName::Events->value, $filters, $offset, $limit);
2828

2929
return new ElasticSearchPaginator($results, $limit, $offset);
3030
}
3131

3232
try {
33-
return [$this->index->get(IndexNames::Events->value, $uriVariables['id'])['_source']];
33+
return [$this->index->get(IndexName::Events->value, $uriVariables['id'])['_source']];
3434
} catch (IndexException $e) {
3535
if (404 === $e->getCode()) {
3636
return null;

‎src/Api/State/LocationRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use ApiPlatform\Metadata\Operation;
77
use ApiPlatform\State\ProviderInterface;
88
use App\Exception\IndexException;
9-
use App\Model\IndexNames;
9+
use App\Model\IndexName;
1010
use App\Service\ElasticSearch\ElasticSearchPaginator;
1111
use Psr\Container\ContainerExceptionInterface;
1212
use Psr\Container\NotFoundExceptionInterface;
@@ -24,13 +24,13 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2424
$filters = $this->getFilters($operation, $context);
2525
$offset = $this->calculatePageOffset($context);
2626
$limit = $this->getItemsPerPage($context);
27-
$results = $this->index->getAll(IndexNames::Locations->value, $filters, $offset, $limit);
27+
$results = $this->index->getAll(IndexName::Locations->value, $filters, $offset, $limit);
2828

2929
return new ElasticSearchPaginator($results, $limit, $offset);
3030
}
3131

3232
try {
33-
return [$this->index->get(IndexNames::Locations->value, $uriVariables['id'])['_source']];
33+
return [$this->index->get(IndexName::Locations->value, $uriVariables['id'])['_source']];
3434
} catch (IndexException $e) {
3535
if (404 === $e->getCode()) {
3636
return null;

‎src/Api/State/OccurrenceRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use ApiPlatform\Metadata\Operation;
77
use ApiPlatform\State\ProviderInterface;
88
use App\Exception\IndexException;
9-
use App\Model\IndexNames;
9+
use App\Model\IndexName;
1010
use App\Service\ElasticSearch\ElasticSearchPaginator;
1111
use Psr\Container\ContainerExceptionInterface;
1212
use Psr\Container\NotFoundExceptionInterface;
@@ -24,13 +24,13 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2424
$filters = $this->getFilters($operation, $context);
2525
$offset = $this->calculatePageOffset($context);
2626
$limit = $this->getItemsPerPage($context);
27-
$results = $this->index->getAll(IndexNames::Occurrences->value, $filters, $offset, $limit);
27+
$results = $this->index->getAll(IndexName::Occurrences->value, $filters, $offset, $limit);
2828

2929
return new ElasticSearchPaginator($results, $limit, $offset);
3030
}
3131

3232
try {
33-
return [$this->index->get(IndexNames::Occurrences->value, $uriVariables['id'])['_source']];
33+
return [$this->index->get(IndexName::Occurrences->value, $uriVariables['id'])['_source']];
3434
} catch (IndexException $e) {
3535
if (404 === $e->getCode()) {
3636
return null;

‎src/Api/State/OrganizationRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use ApiPlatform\Metadata\Operation;
77
use ApiPlatform\State\ProviderInterface;
88
use App\Exception\IndexException;
9-
use App\Model\IndexNames;
9+
use App\Model\IndexName;
1010
use App\Service\ElasticSearch\ElasticSearchPaginator;
1111
use Psr\Container\ContainerExceptionInterface;
1212
use Psr\Container\NotFoundExceptionInterface;
@@ -24,13 +24,13 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2424
$filters = $this->getFilters($operation, $context);
2525
$offset = $this->calculatePageOffset($context);
2626
$limit = $this->getItemsPerPage($context);
27-
$results = $this->index->getAll(IndexNames::Organizations->value, $filters, $offset, $limit);
27+
$results = $this->index->getAll(IndexName::Organizations->value, $filters, $offset, $limit);
2828

2929
return new ElasticSearchPaginator($results, $limit, $offset);
3030
}
3131

3232
try {
33-
return [$this->index->get(IndexNames::Organizations->value, $uriVariables['id'])['_source']];
33+
return [$this->index->get(IndexName::Organizations->value, $uriVariables['id'])['_source']];
3434
} catch (IndexException $e) {
3535
if (404 === $e->getCode()) {
3636
return null;

‎src/Api/State/TagRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use ApiPlatform\State\ProviderInterface;
88
use App\Api\Dto\Tag;
99
use App\Exception\IndexException;
10-
use App\Model\IndexNames;
10+
use App\Model\IndexName;
1111
use App\Model\SearchResults;
1212
use App\Service\ElasticSearch\ElasticSearchPaginator;
1313
use Psr\Container\ContainerExceptionInterface;
@@ -26,7 +26,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2626
$filters = $this->getFilters($operation, $context);
2727
$offset = $this->calculatePageOffset($context);
2828
$limit = $this->getItemsPerPage($context);
29-
$results = $this->index->getAll(IndexNames::Tags->value, $filters, $offset, $limit);
29+
$results = $this->index->getAll(IndexName::Tags->value, $filters, $offset, $limit);
3030

3131
$tags = [];
3232
foreach ($results->hits as $hit) {
@@ -39,7 +39,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
3939
}
4040

4141
try {
42-
$data = $this->index->get(IndexNames::Tags->value, $uriVariables['slug'], 'slug');
42+
$data = $this->index->get(IndexName::Tags->value, $uriVariables['slug'], 'slug');
4343
$hit = $data['_source'] ?? null;
4444
} catch (IndexException $e) {
4545
if (404 === $e->getCode()) {

‎src/Api/State/VocabularyRepresentationProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use ApiPlatform\State\ProviderInterface;
88
use App\Api\Dto\Vocabulary;
99
use App\Exception\IndexException;
10-
use App\Model\IndexNames;
10+
use App\Model\IndexName;
1111
use App\Model\SearchResults;
1212
use App\Service\ElasticSearch\ElasticSearchPaginator;
1313
use Psr\Container\ContainerExceptionInterface;
@@ -26,7 +26,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
2626
$filters = $this->getFilters($operation, $context);
2727
$offset = $this->calculatePageOffset($context);
2828
$limit = $this->getItemsPerPage($context);
29-
$results = $this->index->getAll(IndexNames::Vocabularies->value, $filters, $offset, $limit);
29+
$results = $this->index->getAll(IndexName::Vocabularies->value, $filters, $offset, $limit);
3030

3131
$vocabularies = [];
3232
foreach ($results->hits as $hit) {
@@ -39,7 +39,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
3939
}
4040

4141
try {
42-
$data = $this->index->get(IndexNames::Vocabularies->value, $uriVariables['slug'], 'slug');
42+
$data = $this->index->get(IndexName::Vocabularies->value, $uriVariables['slug'], 'slug');
4343
$hit = $data['_source'] ?? null;
4444
} catch (IndexException $e) {
4545
if (404 === $e->getCode()) {

‎src/Command/FixturesLoadCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Command;
44

55
use App\Fixtures\FixtureLoader;
6-
use App\Model\IndexNames;
6+
use App\Model\IndexName;
77
use Elastic\Elasticsearch\Exception\ClientResponseException;
88
use Elastic\Elasticsearch\Exception\MissingParameterException;
99
use Elastic\Elasticsearch\Exception\ServerResponseException;
@@ -38,10 +38,10 @@ protected function configure(): void
3838
$this->addArgument(
3939
'index',
4040
InputArgument::REQUIRED,
41-
sprintf('Index to populate with fixture data (one of %s)', implode(', ', IndexNames::values())),
41+
sprintf('Index to populate with fixture data (one of %s)', implode(', ', IndexName::values())),
4242
null,
4343
function (CompletionInput $input): array {
44-
return array_filter(IndexNames::values(), fn ($item) => str_starts_with($item, $input->getCompletionValue()));
44+
return array_filter(IndexName::values(), fn ($item) => str_starts_with($item, $input->getCompletionValue()));
4545
}
4646
)
4747
->addOption('url', null, InputOption::VALUE_OPTIONAL, 'Remote url to read fixture data from', 'https://raw.githubusercontent.com/itk-dev/event-database-imports/develop/src/DataFixtures/indexes/[index].json');
@@ -70,7 +70,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7070
return Command::FAILURE;
7171
}
7272

73-
if (!in_array($indexName, IndexNames::values())) {
73+
if (!in_array($indexName, IndexName::values())) {
7474
$io->error(sprintf('Index %s does not exist', $indexName));
7575

7676
return Command::FAILURE;

0 commit comments

Comments
 (0)