chore: fix deprecated and typos

Author: JulesEfrei

composer.json

@@ -39,7 +39,7 @@
     "scripts": {
         "typesenseServer": [
           "Composer\\Config::disableProcessTimeout",
-          "docker run -i -p 8108:8108 -v/tmp/typesense-server-data-1c/:/data typesense/typesense:27.1 --data-dir /data --api-key=123 --listen-port 8108 --enable-cors"
+          "docker run -i -p 8108:8108 -v/tmp/typesense-server-data-1c/:/data typesense/typesense:29.0 --data-dir /data --api-key=123 --listen-port 8108 --enable-cors"
         ]
     },
     "config": {

src/EventListener/TypesenseIndexer.php

@@ -7,7 +7,6 @@
 use ACSEO\TypesenseBundle\Manager\CollectionManager;
 use ACSEO\TypesenseBundle\Manager\DocumentManager;
 use ACSEO\TypesenseBundle\Transformer\DoctrineToTypesenseTransformer;
-use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Persistence\Event\LifecycleEventArgs;
 
 class TypesenseIndexer
@@ -140,26 +139,28 @@ private function resetDocuments()
 
     private function entityIsNotManaged($entity)
     {
-        $entityClassname = ClassUtils::getClass($entity);
+        $entityClassname = get_class($entity);
 
         return !in_array($entityClassname, array_values($this->managedClassNames), true);
     }
 
     private function getCollectionName($entity)
     {
-        $entityClassname = ClassUtils::getClass($entity);
+        $entityClassname = get_class($entity);
 
         return array_search($entityClassname, $this->managedClassNames, true);
     }
 
     private function getCollectionKey($entity)
     {
-        $entityClassname = ClassUtils::getClass($entity);
+        $entityClassname = get_class($entity);
 
         foreach ($this->collectionManager->getCollectionDefinitions() as $key => $def) {
             if ($def['entity'] === $entityClassname) {
                 return $key;
             }
         }
+
+        return null;
     }
 }

src/Finder/TypesenseQuery.php

@@ -8,7 +8,7 @@ class TypesenseQuery
 {
     private $searchParameters;
 
-    public function __construct(string $q = null, string $queryBy = null)
+    public function __construct(?string $q = null, ?string $queryBy = null)
     {
         $this->searchParameters = [];
         if ($q !== null) {

src/Transformer/DoctrineToTypesenseTransformer.php

@@ -4,10 +4,7 @@
 
 namespace ACSEO\TypesenseBundle\Transformer;
 
-use App\Doctrine\Entity\Site\Site;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Util\ClassUtils;
-use Doctrine\ORM\PersistentCollection;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\PropertyAccess\Exception\RuntimeException;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
@@ -33,7 +30,7 @@ public function __construct(array $collectionDefinitions, PropertyAccessorInterf
 
     public function convert($entity): array
     {
-        $entityClass = ClassUtils::getClass($entity);
+        $entityClass = get_class($entity);
 
         // See : https://github.com/acseo/TypesenseBundle/pull/91
         // Allow subclasses to be recognized as a parent class

tests/Functional/TypesenseInteractionsTest.php

@@ -20,7 +20,7 @@
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\Persistence\Event\LifecycleEventArgs;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -33,8 +33,8 @@
  */
 class TypesenseInteractionsTest extends KernelTestCase
 {
-    public const NB_BOOKS    = 5;
-    public const BOOK_TITLES = [
+    public const int NB_BOOKS    = 5;
+    public const array BOOK_TITLES = [
         'Total Khéops',
         'Chourmo',
         'Solea',
@@ -95,7 +95,7 @@ public function testImportCommand($nbBooks, $maxPerPage = null, $firstPage = nul
         );
     }
 
-    public function importCommandProvider()
+    public function importCommandProvider(): array
     {
         return [
             "insert 10 books one by one" => [
@@ -105,7 +105,7 @@ public function importCommandProvider()
                 42, 10
             ],
             "insert 130 books 100 per 100" => [
-                130, null //100 is by defaut
+                130, null //100 is by default
             ],
             "insert 498 books 50 per 50, from page 8 to 10 and expect 148 inserted" => [
                 498, 50, 8, 10, 148
@@ -129,12 +129,12 @@ public function testSearchByAuthor($nbBooks)
         $bookFinder = new CollectionFinder($collectionClient, $em, $bookDefinition);
         $query = new TypesenseQuery('Nicolas', 'author');
 
-        $query->maxHits($nbBooks < 250 ? $nbBooks : 250);
-        $query->perPage($nbBooks < 250 ? $nbBooks : 250);
+        $query->maxHits(min($nbBooks, 250));
+        $query->perPage(min($nbBooks, 250));
 
         $results    = $bookFinder->rawQuery($query)->getResults();
 
-        self::assertCount(($nbBooks < 250 ? $nbBooks : 250), $results, "result doesn't contains ".$nbBooks.' elements');
+        self::assertCount((min($nbBooks, 250)), $results, "result doesn't contains ".$nbBooks.' elements');
         self::assertArrayHasKey('document', $results[0], "First item does not have the key 'document'");
         self::assertArrayHasKey('highlights', $results[0], "First item does not have the key 'highlights'");
         self::assertArrayHasKey('text_match', $results[0], "First item does not have the key 'text_match'");
@@ -284,7 +284,7 @@ private function importCommandTester($options): CommandTester
         return new CommandTester($application->find('typesense:import'));
     }
 
-    private function getCollectionDefinitions($entityClass)
+    private function getCollectionDefinitions($entityClass): array
     {
         return [
             'books' => [
@@ -343,7 +343,7 @@ private function getCollectionDefinitions($entityClass)
         ];
     }
 
-    private function getMockedBooks($options)
+    private function getMockedBooks($options): array
     {
         $author = new Author('Nicolas Potier', 'France');
         $books  = [];

tests/Unit/Finder/TypesenseQueryTest.php

@@ -21,7 +21,7 @@ public function testSimpleQuery()
 
     public function testComplexQuery()
     {
-        $query = (new TypesenseQuery('search term', 'search field'))
+        $query = new TypesenseQuery('search term', 'search field')
             ->prefix(false)
             ->filterBy('filter term')
             ->sortBy('sort term')