Skip to content

Commit dc7e24b

Browse files
committed
Remove deprecated annotation loader in tests, not required
1 parent d448abc commit dc7e24b

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

src/Filter/OrSearchFilter.php

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,14 @@ final class OrSearchFilter extends AbstractFilter implements SearchFilterInterfa
3939

4040
public const DOCTRINE_INTEGER_TYPE = Types::INTEGER;
4141

42-
public function __construct(ManagerRegistry $managerRegistry, IriConverterInterface $iriConverter, PropertyAccessorInterface $propertyAccessor = null, LoggerInterface $logger = null, array $properties = null, NameConverterInterface $nameConverter = null)
43-
{
42+
public function __construct(
43+
ManagerRegistry $managerRegistry,
44+
IriConverterInterface $iriConverter,
45+
PropertyAccessorInterface $propertyAccessor = null,
46+
LoggerInterface $logger = null,
47+
array $properties = null,
48+
NameConverterInterface $nameConverter = null
49+
) {
4450
parent::__construct($managerRegistry, $logger, $properties, $nameConverter);
4551

4652
$this->iriConverter = $iriConverter;
@@ -52,29 +58,15 @@ public function __construct(ManagerRegistry $managerRegistry, IriConverterInterf
5258
*/
5359
protected function getType(string $doctrineType): string
5460
{
55-
switch ($doctrineType) {
56-
case Types::ARRAY:
57-
return 'array';
58-
case Types::BIGINT:
59-
case Types::INTEGER:
60-
case Types::SMALLINT:
61-
return 'int';
62-
case Types::BOOLEAN:
63-
return 'bool';
64-
case Types::DATE_MUTABLE:
65-
case Types::TIME_MUTABLE:
66-
case Types::DATETIME_MUTABLE:
67-
case Types::DATETIMETZ_MUTABLE:
68-
case Types::DATE_IMMUTABLE:
69-
case Types::TIME_IMMUTABLE:
70-
case Types::DATETIME_IMMUTABLE:
71-
case Types::DATETIMETZ_IMMUTABLE:
72-
return \DateTimeInterface::class;
73-
case Types::FLOAT:
74-
return 'float';
75-
}
76-
77-
return 'string';
61+
return match ($doctrineType) {
62+
Types::ARRAY => 'array',
63+
Types::JSON => 'json',
64+
Types::BIGINT, Types::INTEGER, Types::SMALLINT => 'int',
65+
Types::BOOLEAN => 'bool',
66+
Types::DATE_MUTABLE, Types::TIME_MUTABLE, Types::DATETIME_MUTABLE, Types::DATETIMETZ_MUTABLE, Types::DATE_IMMUTABLE, Types::TIME_IMMUTABLE, Types::DATETIME_IMMUTABLE, Types::DATETIMETZ_IMMUTABLE => \DateTimeInterface::class,
67+
Types::FLOAT => 'float',
68+
default => 'string',
69+
};
7870
}
7971

8072
protected function getIriConverter(): IriConverterInterface

tests/Functional/app/bootstrap.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111

1212
declare(strict_types=1);
1313

14-
use Doctrine\Common\Annotations\AnnotationRegistry;
15-
1614
date_default_timezone_set('UTC');
1715

1816
$loader = require __DIR__ . '/../../../vendor/autoload.php';
1917
require __DIR__ . '/AppKernel.php';
2018

21-
AnnotationRegistry::registerLoader('class_exists');
22-
2319
return $loader;

0 commit comments

Comments
 (0)