diff --git a/src/Doctrine/EntitySearchUtil.php b/src/Doctrine/EntitySearchUtil.php
index 4787de0..6f9c1e6 100644
--- a/src/Doctrine/EntitySearchUtil.php
+++ b/src/Doctrine/EntitySearchUtil.php
@@ -99,9 +99,9 @@ public function addSearchClause(QueryBuilder $queryBuilder, string $query, strin
 
             // this complex condition is needed to avoid issues on PostgreSQL databases
             if (
-                ($isSmallIntegerProperty && $isSmallIntegerQuery) ||
-                ($isIntegerProperty && $isIntegerQuery) ||
-                ($isNumericProperty && $isNumericQuery)
+                ($isSmallIntegerProperty && $isSmallIntegerQuery)
+                || ($isIntegerProperty && $isIntegerQuery)
+                || ($isNumericProperty && $isNumericQuery)
             ) {
                 $expressions[] = $queryBuilder->expr()->eq(sprintf('%s.%s', $entityName, $propertyName), ':query_for_numbers');
                 $queryBuilder->setParameter('query_for_numbers', $dqlParameters['numeric_query']);
diff --git a/src/Form/ParentEntityAutocompleteType.php b/src/Form/ParentEntityAutocompleteType.php
index f4a7be1..799e5c4 100644
--- a/src/Form/ParentEntityAutocompleteType.php
+++ b/src/Form/ParentEntityAutocompleteType.php
@@ -34,15 +34,15 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $formType = $builder->getType()->getInnerType();
-        $attribute = AsEntityAutocompleteField::getInstance(\get_class($formType));
+        $attribute = AsEntityAutocompleteField::getInstance($formType::class);
 
         if (!$attribute && empty($options['autocomplete_url'])) {
-            throw new \LogicException(sprintf('You must either provide your own autocomplete_url, or add #[AsEntityAutocompleteField] attribute to %s.', \get_class($formType)));
+            throw new \LogicException(sprintf('You must either provide your own autocomplete_url, or add #[AsEntityAutocompleteField] attribute to %s.', $formType::class));
         }
 
         // Use the provided URL, or auto-generate from the provided alias
         $autocompleteUrl = $options['autocomplete_url'] ?? $this->urlGenerator->generate($attribute->getRoute(), [
-            'alias' => $attribute->getAlias() ?: AsEntityAutocompleteField::shortName(\get_class($formType)),
+            'alias' => $attribute->getAlias() ?: AsEntityAutocompleteField::shortName($formType::class),
         ]);
 
         $builder