Fix CS issues

Author: mpdude

src/Persisters/Collection/ManyToManyPersister.php

@@ -13,10 +13,10 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Persisters\SqlValueVisitor;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\Query\ParameterTypeInferer;
 use Doctrine\ORM\Utility\PersisterHelper;
 
 use function array_fill;
+use function array_merge;
 use function array_pop;
 use function count;
 use function get_class;
@@ -265,6 +265,7 @@ public function loadCriteria(PersistentCollection $collection, Criteria $criteri
                 } else {
                     $whereClauses[] = sprintf('te.%s %s ?', $field, $operator);
                 }
+
                 $params     = array_merge($params, PersisterHelper::convertToParameterValue($value, $this->em));
                 $paramTypes = array_merge($paramTypes, PersisterHelper::inferParameterTypes($name, $value, $targetClass, $this->em));
             }

src/Persisters/Entity/BasicEntityPersister.php

@@ -4,7 +4,6 @@
 
 namespace Doctrine\ORM\Persisters\Entity;
 
-use BackedEnum;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Expr\Comparison;
 use Doctrine\DBAL\Connection;
@@ -26,9 +25,7 @@
 use Doctrine\ORM\Persisters\Exception\UnrecognizedField;
 use Doctrine\ORM\Persisters\SqlExpressionVisitor;
 use Doctrine\ORM\Persisters\SqlValueVisitor;
-use Doctrine\ORM\Proxy\DefaultProxyClassNameResolver;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\Repository\Exception\InvalidFindByCall;
 use Doctrine\ORM\UnitOfWork;
 use Doctrine\ORM\Utility\IdentifierFlattener;
@@ -47,7 +44,6 @@
 use function count;
 use function implode;
 use function is_array;
-use function is_object;
 use function reset;
 use function spl_object_id;
 use function sprintf;

src/Utility/PersisterHelper.php

@@ -13,6 +13,10 @@
 use Doctrine\ORM\Query\QueryException;
 use RuntimeException;
 
+use function array_map;
+use function array_merge;
+use function is_array;
+use function is_object;
 use function sprintf;
 
 /**
@@ -151,7 +155,7 @@ public static function inferParameterTypes(string $field, $value, ClassMetadata
                     : $assoc['sourceToTargetKeyColumns'];
 
                 foreach ($columns as $column) {
-                    $types[] = PersisterHelper::getTypeOfColumn($column, $class, $em);
+                    $types[] = self::getTypeOfColumn($column, $class, $em);
                 }
 
                 break;

tests/Tests/Models/Enums/BookCategory.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;

tests/Tests/Models/Enums/BookGenre.php

@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\Tests\Models\Enums;
 
 enum BookGenre: string
 {
-    case FICTION = 'fiction';
+    case FICTION     = 'fiction';
     case NON_FICTION = 'non fiction';
 }

tests/Tests/Models/Enums/BookWithGenre.php

@@ -10,10 +10,8 @@
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
-use Doctrine\ORM\Mapping\JoinColumn;
 use Doctrine\ORM\Mapping\ManyToMany;
 use Doctrine\ORM\Mapping\ManyToOne;
-use Doctrine\ORM\Mapping\Table;
 
 #[Entity]
 class BookWithGenre
@@ -34,7 +32,7 @@ class BookWithGenre
 
     public function __construct(BookGenre $genre)
     {
-        $this->genre = $genre;
+        $this->genre      = $genre;
         $this->categories = new ArrayCollection();
     }
 }

tests/Tests/Models/Enums/Library.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\GeneratedValue;

tests/Tests/ORM/Functional/EnumTest.php

@@ -14,9 +14,9 @@
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Tests\Models\DataTransferObjects\DtoWithArrayOfEnums;
 use Doctrine\Tests\Models\DataTransferObjects\DtoWithEnum;
-use Doctrine\Tests\Models\Enums\BookWithGenre;
 use Doctrine\Tests\Models\Enums\BookCategory;
 use Doctrine\Tests\Models\Enums\BookGenre;
+use Doctrine\Tests\Models\Enums\BookWithGenre;
 use Doctrine\Tests\Models\Enums\Card;
 use Doctrine\Tests\Models\Enums\CardWithDefault;
 use Doctrine\Tests\Models\Enums\CardWithNullable;
@@ -28,6 +28,7 @@
 use Doctrine\Tests\Models\Enums\TypedCard;
 use Doctrine\Tests\Models\Enums\Unit;
 use Doctrine\Tests\OrmFunctionalTestCase;
+use Generator;
 
 use function dirname;
 use function sprintf;
@@ -540,10 +541,10 @@ public function testEnumCollectionMatchingOnOneToMany(Comparison $comparison): v
 
         $library = new Library();
 
-        $fictionBook = new BookWithGenre(BookGenre::FICTION);
+        $fictionBook          = new BookWithGenre(BookGenre::FICTION);
         $fictionBook->library = $library;
 
-        $nonfictionBook = new BookWithGenre(BookGenre::NON_FICTION);
+        $nonfictionBook          = new BookWithGenre(BookGenre::NON_FICTION);
         $nonfictionBook->library = $library;
 
         $this->_em->persist($library);
@@ -593,7 +594,7 @@ public function testEnumCollectionMatchingOnManyToMany(Comparison $comparison):
         self::assertSame($nonfictionBook->id, $result[0]->id);
     }
 
-    public function provideGenreMatchingExpressions(): \Generator
+    public function provideGenreMatchingExpressions(): Generator
     {
         yield [Criteria::expr()->eq('genre', BookGenre::NON_FICTION)];
         yield [Criteria::expr()->in('genre', [BookGenre::NON_FICTION])];

tests/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php

@@ -589,7 +589,7 @@ public function testMatchingWithInCondition(): void
         self::assertFalse($user->groups->isInitialized(), 'Pre-condition: lazy collection');
 
         $criteria = Criteria::create()->where(Criteria::expr()->in('name', ['Developers_1']));
-        $result = $groups->matching($criteria);
+        $result   = $groups->matching($criteria);
 
         self::assertCount(1, $result);
         self::assertEquals('Developers_1', $result[0]->name);