diff --git a/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php b/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php index 19aa2b7d705..08924680f1f 100644 --- a/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php +++ b/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php @@ -11,7 +11,6 @@ use Doctrine\ORM\Query; use Doctrine\ORM\UnitOfWork; -use function array_walk; use function assert; /** diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php index fd4ff78f29e..61b96a2e93a 100644 --- a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php +++ b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php @@ -18,7 +18,6 @@ use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\ORM\UnitOfWork; -use function array_key_exists; use function array_map; use function array_shift; use function array_unshift; diff --git a/lib/Doctrine/ORM/Cache/Exception/CacheException.php b/lib/Doctrine/ORM/Cache/Exception/CacheException.php index c01d4a44866..cae1bde5237 100644 --- a/lib/Doctrine/ORM/Cache/Exception/CacheException.php +++ b/lib/Doctrine/ORM/Cache/Exception/CacheException.php @@ -6,8 +6,6 @@ use Doctrine\ORM\Cache\CacheException as BaseCacheException; -use function sprintf; - /** * Exception for cache. */ diff --git a/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyCollection.php b/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyCollection.php index 2a5205d7713..ad6a21daa7c 100644 --- a/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyCollection.php +++ b/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyCollection.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Cache\Exception; -use LogicException; - use function sprintf; class CannotUpdateReadOnlyCollection extends CacheException diff --git a/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyEntity.php b/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyEntity.php index bf00b29b8ad..b9455140941 100644 --- a/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyEntity.php +++ b/lib/Doctrine/ORM/Cache/Exception/CannotUpdateReadOnlyEntity.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Cache\Exception; -use LogicException; - use function sprintf; class CannotUpdateReadOnlyEntity extends CacheException diff --git a/lib/Doctrine/ORM/Cache/Exception/FeatureNotImplemented.php b/lib/Doctrine/ORM/Cache/Exception/FeatureNotImplemented.php index d91e03efb17..7bae90b775d 100644 --- a/lib/Doctrine/ORM/Cache/Exception/FeatureNotImplemented.php +++ b/lib/Doctrine/ORM/Cache/Exception/FeatureNotImplemented.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Cache\Exception; -use LogicException; - class FeatureNotImplemented extends CacheException { public static function scalarResults(): self diff --git a/lib/Doctrine/ORM/Cache/Exception/MetadataCacheNotConfigured.php b/lib/Doctrine/ORM/Cache/Exception/MetadataCacheNotConfigured.php index c0103959df5..724c2e457b0 100644 --- a/lib/Doctrine/ORM/Cache/Exception/MetadataCacheNotConfigured.php +++ b/lib/Doctrine/ORM/Cache/Exception/MetadataCacheNotConfigured.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Cache\Exception; -use LogicException; - final class MetadataCacheNotConfigured extends CacheException { public static function create(): self diff --git a/lib/Doctrine/ORM/Cache/Exception/MetadataCacheUsesNonPersistentCache.php b/lib/Doctrine/ORM/Cache/Exception/MetadataCacheUsesNonPersistentCache.php index 8e610bcc9e0..60f01eb5a51 100644 --- a/lib/Doctrine/ORM/Cache/Exception/MetadataCacheUsesNonPersistentCache.php +++ b/lib/Doctrine/ORM/Cache/Exception/MetadataCacheUsesNonPersistentCache.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Cache\Exception; use Doctrine\Common\Cache\Cache; -use LogicException; use function get_class; diff --git a/lib/Doctrine/ORM/Cache/Exception/NonCacheableEntity.php b/lib/Doctrine/ORM/Cache/Exception/NonCacheableEntity.php index 491d2ef5d02..29e39473ef1 100644 --- a/lib/Doctrine/ORM/Cache/Exception/NonCacheableEntity.php +++ b/lib/Doctrine/ORM/Cache/Exception/NonCacheableEntity.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Cache\Exception; -use LogicException; - use function sprintf; class NonCacheableEntity extends CacheException diff --git a/lib/Doctrine/ORM/Cache/Exception/QueryCacheNotConfigured.php b/lib/Doctrine/ORM/Cache/Exception/QueryCacheNotConfigured.php index 493a9a27715..3761debcfca 100644 --- a/lib/Doctrine/ORM/Cache/Exception/QueryCacheNotConfigured.php +++ b/lib/Doctrine/ORM/Cache/Exception/QueryCacheNotConfigured.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Cache\Exception; -use LogicException; - final class QueryCacheNotConfigured extends CacheException { public static function create(): self diff --git a/lib/Doctrine/ORM/Cache/Exception/QueryCacheUsesNonPersistentCache.php b/lib/Doctrine/ORM/Cache/Exception/QueryCacheUsesNonPersistentCache.php index 58390a99f21..393591d759b 100644 --- a/lib/Doctrine/ORM/Cache/Exception/QueryCacheUsesNonPersistentCache.php +++ b/lib/Doctrine/ORM/Cache/Exception/QueryCacheUsesNonPersistentCache.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Cache\Exception; use Doctrine\Common\Cache\Cache; -use LogicException; use function get_class; diff --git a/lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php b/lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php index 830e19c9ff4..d3b2bd463c1 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Cache\Persister\Collection; use Doctrine\Common\Util\ClassUtils; -use Doctrine\ORM\Cache\CacheException; use Doctrine\ORM\Cache\Exception\CannotUpdateReadOnlyCollection; use Doctrine\ORM\PersistentCollection; diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php index 3b821544168..a30c7050813 100644 --- a/lib/Doctrine/ORM/EntityRepository.php +++ b/lib/Doctrine/ORM/EntityRepository.php @@ -14,7 +14,6 @@ use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query\ResultSetMappingBuilder; use Doctrine\ORM\Repository\Exception\InvalidMagicMethodCall; -use Doctrine\ORM\Repository\InvalidFindByCall; use Doctrine\Persistence\ObjectRepository; use function array_slice; diff --git a/lib/Doctrine/ORM/Exception/EntityManagerClosed.php b/lib/Doctrine/ORM/Exception/EntityManagerClosed.php index 478bbe7185b..403205f5319 100644 --- a/lib/Doctrine/ORM/Exception/EntityManagerClosed.php +++ b/lib/Doctrine/ORM/Exception/EntityManagerClosed.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use RuntimeException; - final class EntityManagerClosed extends ORMException implements ManagerException { public static function create(): self diff --git a/lib/Doctrine/ORM/Exception/InvalidEntityRepository.php b/lib/Doctrine/ORM/Exception/InvalidEntityRepository.php index 069cd6b9e36..b7d27734a5a 100644 --- a/lib/Doctrine/ORM/Exception/InvalidEntityRepository.php +++ b/lib/Doctrine/ORM/Exception/InvalidEntityRepository.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Exception; use Doctrine\Persistence\ObjectRepository; -use LogicException; final class InvalidEntityRepository extends ORMException implements ConfigurationException { diff --git a/lib/Doctrine/ORM/Exception/MissingIdentifierField.php b/lib/Doctrine/ORM/Exception/MissingIdentifierField.php index b9f6ebef652..61c238a4ec5 100644 --- a/lib/Doctrine/ORM/Exception/MissingIdentifierField.php +++ b/lib/Doctrine/ORM/Exception/MissingIdentifierField.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use LogicException; - use function sprintf; final class MissingIdentifierField extends ORMException implements ManagerException diff --git a/lib/Doctrine/ORM/Exception/MissingMappingDriverImplementation.php b/lib/Doctrine/ORM/Exception/MissingMappingDriverImplementation.php index 5af25286be7..7791c34ab48 100644 --- a/lib/Doctrine/ORM/Exception/MissingMappingDriverImplementation.php +++ b/lib/Doctrine/ORM/Exception/MissingMappingDriverImplementation.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use LogicException; - final class MissingMappingDriverImplementation extends ORMException implements ManagerException { public static function create(): self diff --git a/lib/Doctrine/ORM/Exception/NamedQueryNotFound.php b/lib/Doctrine/ORM/Exception/NamedQueryNotFound.php index af5d9fdc9d9..e16ca952df8 100644 --- a/lib/Doctrine/ORM/Exception/NamedQueryNotFound.php +++ b/lib/Doctrine/ORM/Exception/NamedQueryNotFound.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use LogicException; - use function sprintf; final class NamedQueryNotFound extends ORMException implements ConfigurationException diff --git a/lib/Doctrine/ORM/Exception/ProxyClassesAlwaysRegenerating.php b/lib/Doctrine/ORM/Exception/ProxyClassesAlwaysRegenerating.php index 1e25a34754d..ef717dd4241 100644 --- a/lib/Doctrine/ORM/Exception/ProxyClassesAlwaysRegenerating.php +++ b/lib/Doctrine/ORM/Exception/ProxyClassesAlwaysRegenerating.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use LogicException; - final class ProxyClassesAlwaysRegenerating extends ORMException implements ConfigurationException { public static function create(): self diff --git a/lib/Doctrine/ORM/Exception/UnknownEntityNamespace.php b/lib/Doctrine/ORM/Exception/UnknownEntityNamespace.php index 972d3c9ad64..b41d3c8bdf4 100644 --- a/lib/Doctrine/ORM/Exception/UnknownEntityNamespace.php +++ b/lib/Doctrine/ORM/Exception/UnknownEntityNamespace.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use LogicException; - use function sprintf; final class UnknownEntityNamespace extends ORMException implements ConfigurationException diff --git a/lib/Doctrine/ORM/Exception/UnrecognizedIdentifierFields.php b/lib/Doctrine/ORM/Exception/UnrecognizedIdentifierFields.php index 828f0899766..f1064eebe9a 100644 --- a/lib/Doctrine/ORM/Exception/UnrecognizedIdentifierFields.php +++ b/lib/Doctrine/ORM/Exception/UnrecognizedIdentifierFields.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Exception; -use LogicException; - use function implode; use function sprintf; diff --git a/lib/Doctrine/ORM/Mapping/AttributeOverride.php b/lib/Doctrine/ORM/Mapping/AttributeOverride.php index 5480cfbee13..df5a7849162 100644 --- a/lib/Doctrine/ORM/Mapping/AttributeOverride.php +++ b/lib/Doctrine/ORM/Mapping/AttributeOverride.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Mapping; -use Attribute; - /** * This annotation is used to override the mapping of a entity property. * diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 808b913ff1b..15c3b0c58c6 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -20,7 +20,6 @@ use Doctrine\ORM\Id\UuidGenerator; use Doctrine\ORM\Mapping\Exception\CannotGenerateIds; use Doctrine\ORM\Mapping\Exception\InvalidCustomGenerator; -use Doctrine\ORM\Mapping\Exception\TableGeneratorNotImplementedYet; use Doctrine\ORM\Mapping\Exception\UnknownGeneratorType; use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory; use Doctrine\Persistence\Mapping\ClassMetadata as ClassMetadataInterface; diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 442de0ae98c..18e777d09f0 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -14,7 +14,6 @@ use Doctrine\Deprecations\Deprecation; use Doctrine\Instantiator\Instantiator; use Doctrine\Instantiator\InstantiatorInterface; -use Doctrine\ORM\Cache\Exception\CacheException; use Doctrine\ORM\Cache\Exception\NonCacheableEntityAssociation; use Doctrine\ORM\Id\AbstractIdGenerator; use Doctrine\Persistence\Mapping\ClassMetadata; diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index 2ddd85027ef..832f3901382 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -5,12 +5,7 @@ namespace Doctrine\ORM\Mapping\Driver; use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\Common\Annotations\Reader; -use Doctrine\DBAL\Types\Type; -use Doctrine\ORM\Annotation; -use Doctrine\ORM\Cache\Exception\CacheException; use Doctrine\ORM\Events; -use Doctrine\ORM\Id\TableGenerator; use Doctrine\ORM\Mapping; use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder; use Doctrine\ORM\Mapping\MappingException; diff --git a/lib/Doctrine/ORM/Mapping/Exception/CannotGenerateIds.php b/lib/Doctrine/ORM/Mapping/Exception/CannotGenerateIds.php index 63a845e12b8..408b45b5da3 100644 --- a/lib/Doctrine/ORM/Mapping/Exception/CannotGenerateIds.php +++ b/lib/Doctrine/ORM/Mapping/Exception/CannotGenerateIds.php @@ -6,7 +6,6 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\ORM\Exception\ORMException; -use LogicException; use function get_class; use function sprintf; diff --git a/lib/Doctrine/ORM/Mapping/Exception/InvalidCustomGenerator.php b/lib/Doctrine/ORM/Mapping/Exception/InvalidCustomGenerator.php index 162ee239bef..7e26e4fad8e 100644 --- a/lib/Doctrine/ORM/Mapping/Exception/InvalidCustomGenerator.php +++ b/lib/Doctrine/ORM/Mapping/Exception/InvalidCustomGenerator.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Mapping\Exception; use Doctrine\ORM\Exception\ORMException; -use LogicException; use function sprintf; use function var_export; diff --git a/lib/Doctrine/ORM/Mapping/Exception/UnknownGeneratorType.php b/lib/Doctrine/ORM/Mapping/Exception/UnknownGeneratorType.php index 87bb205c103..eb6402631f6 100644 --- a/lib/Doctrine/ORM/Mapping/Exception/UnknownGeneratorType.php +++ b/lib/Doctrine/ORM/Mapping/Exception/UnknownGeneratorType.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Mapping\Exception; use Doctrine\ORM\Exception\ORMException; -use LogicException; final class UnknownGeneratorType extends ORMException { diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php index 11a8cbf0af4..1338f39d6ae 100644 --- a/lib/Doctrine/ORM/Mapping/MappingException.php +++ b/lib/Doctrine/ORM/Mapping/MappingException.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Mapping; use Doctrine\ORM\Exception\ORMException; -use LogicException; use ReflectionException; use function array_keys; diff --git a/lib/Doctrine/ORM/OptimisticLockException.php b/lib/Doctrine/ORM/OptimisticLockException.php index 8ab74d262eb..c945c3bdec2 100644 --- a/lib/Doctrine/ORM/OptimisticLockException.php +++ b/lib/Doctrine/ORM/OptimisticLockException.php @@ -6,7 +6,6 @@ use DateTimeInterface; use Doctrine\ORM\Exception\ORMException; -use RuntimeException; /** * An OptimisticLockException is thrown when a version check on an object diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php index 7b4e33d9021..5ac43b0b7cd 100644 --- a/lib/Doctrine/ORM/PersistentCollection.php +++ b/lib/Doctrine/ORM/PersistentCollection.php @@ -15,7 +15,6 @@ use function array_combine; use function array_diff_key; use function array_map; -use function array_udiff_assoc; use function array_values; use function array_walk; use function get_class; diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index 8ce4c03ce11..0860ec75d10 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -14,7 +14,6 @@ use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\EntityManagerInterface; -use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\MappingException; use Doctrine\ORM\Mapping\QuoteStrategy; diff --git a/lib/Doctrine/ORM/Persisters/Exception/CantUseInOperatorOnCompositeKeys.php b/lib/Doctrine/ORM/Persisters/Exception/CantUseInOperatorOnCompositeKeys.php index 8e02a2dd6ce..5c91312cf27 100644 --- a/lib/Doctrine/ORM/Persisters/Exception/CantUseInOperatorOnCompositeKeys.php +++ b/lib/Doctrine/ORM/Persisters/Exception/CantUseInOperatorOnCompositeKeys.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Persisters\Exception; use Doctrine\ORM\Exception\PersisterException; -use LogicException; class CantUseInOperatorOnCompositeKeys extends PersisterException { diff --git a/lib/Doctrine/ORM/Persisters/Exception/InvalidOrientation.php b/lib/Doctrine/ORM/Persisters/Exception/InvalidOrientation.php index b9027d45ca2..7532800e0d2 100644 --- a/lib/Doctrine/ORM/Persisters/Exception/InvalidOrientation.php +++ b/lib/Doctrine/ORM/Persisters/Exception/InvalidOrientation.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Persisters\Exception; use Doctrine\ORM\Exception\PersisterException; -use LogicException; class InvalidOrientation extends PersisterException { diff --git a/lib/Doctrine/ORM/Persisters/Exception/UnrecognizedField.php b/lib/Doctrine/ORM/Persisters/Exception/UnrecognizedField.php index 8141959f312..dd89fde1a4b 100644 --- a/lib/Doctrine/ORM/Persisters/Exception/UnrecognizedField.php +++ b/lib/Doctrine/ORM/Persisters/Exception/UnrecognizedField.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Persisters\Exception; use Doctrine\ORM\Exception\PersisterException; -use LogicException; use function sprintf; diff --git a/lib/Doctrine/ORM/Persisters/MatchingAssociationFieldRequiresObject.php b/lib/Doctrine/ORM/Persisters/MatchingAssociationFieldRequiresObject.php index c9431876a24..210ff425b1d 100644 --- a/lib/Doctrine/ORM/Persisters/MatchingAssociationFieldRequiresObject.php +++ b/lib/Doctrine/ORM/Persisters/MatchingAssociationFieldRequiresObject.php @@ -5,8 +5,6 @@ namespace Doctrine\ORM\Persisters; use Doctrine\ORM\Exception\PersisterException; -use Doctrine\ORM\ORMException; -use LogicException; use function sprintf; diff --git a/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php index fc9d2eda38d..f48da7536f1 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php @@ -9,8 +9,6 @@ use Doctrine\ORM\Query\Parser; use Doctrine\ORM\Query\SqlWalker; -use function call_user_func_array; - /** * "CONCAT" "(" StringPrimary "," StringPrimary {"," StringPrimary }* ")" * diff --git a/lib/Doctrine/ORM/Query/AST/GroupByClause.php b/lib/Doctrine/ORM/Query/AST/GroupByClause.php index c53f3eb7eb2..8a8252e23b4 100644 --- a/lib/Doctrine/ORM/Query/AST/GroupByClause.php +++ b/lib/Doctrine/ORM/Query/AST/GroupByClause.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Query\AST; -use Doctrine\ORM\Query\Expr\GroupBy; - class GroupByClause extends Node { /** @var mixed[] */ diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php index 9049a4d10f7..f5a2e53772b 100644 --- a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php +++ b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Query\ParameterTypeInferer; use Doctrine\ORM\Query\SqlWalker; use Doctrine\ORM\Utility\PersisterHelper; -use Throwable; use function array_merge; use function array_reverse; diff --git a/lib/Doctrine/ORM/Query/Filter/SQLFilter.php b/lib/Doctrine/ORM/Query/Filter/SQLFilter.php index 7ebc2169d41..583984f6c5c 100644 --- a/lib/Doctrine/ORM/Query/Filter/SQLFilter.php +++ b/lib/Doctrine/ORM/Query/Filter/SQLFilter.php @@ -5,17 +5,14 @@ namespace Doctrine\ORM\Query\Filter; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Types\Type; use Doctrine\DBAL\Types\Types; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query\ParameterTypeInferer; use InvalidArgumentException; -use RuntimeException; use function array_map; use function implode; -use function is_array; use function ksort; use function serialize; diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 294cda48c1d..3e5bcf4d1b5 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Query; use Doctrine\Deprecations\Deprecation; -use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Query; diff --git a/lib/Doctrine/ORM/Query/QueryException.php b/lib/Doctrine/ORM/Query/QueryException.php index fa4b083a244..9164d1dc178 100644 --- a/lib/Doctrine/ORM/Query/QueryException.php +++ b/lib/Doctrine/ORM/Query/QueryException.php @@ -5,10 +5,8 @@ namespace Doctrine\ORM\Query; use Doctrine\ORM\Exception\ORMException; -use Doctrine\ORM\Mapping\AssociationMetadata; use Doctrine\ORM\Query\AST\PathExpression; use Exception; -use LogicException; /** * Description of QueryException. diff --git a/lib/Doctrine/ORM/Repository/Exception/InvalidFindByCall.php b/lib/Doctrine/ORM/Repository/Exception/InvalidFindByCall.php index 83f271ff75b..df00ecdf8d4 100644 --- a/lib/Doctrine/ORM/Repository/Exception/InvalidFindByCall.php +++ b/lib/Doctrine/ORM/Repository/Exception/InvalidFindByCall.php @@ -4,7 +4,6 @@ namespace Doctrine\ORM\Repository\Exception; -use BadMethodCallException; use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Exception\RepositoryException; diff --git a/lib/Doctrine/ORM/Repository/Exception/InvalidMagicMethodCall.php b/lib/Doctrine/ORM/Repository/Exception/InvalidMagicMethodCall.php index fb1064ad01f..01e29c98c9e 100644 --- a/lib/Doctrine/ORM/Repository/Exception/InvalidMagicMethodCall.php +++ b/lib/Doctrine/ORM/Repository/Exception/InvalidMagicMethodCall.php @@ -4,7 +4,6 @@ namespace Doctrine\ORM\Repository\Exception; -use BadMethodCallException; use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Exception\RepositoryException; diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php index 498924d17ea..25a76eadf1b 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/MetadataCommand.php @@ -4,8 +4,6 @@ namespace Doctrine\ORM\Tools\Console\Command\ClearCache; -use Doctrine\Common\Cache\ApcCache; -use Doctrine\Common\Cache\XcacheCache; use Doctrine\ORM\Tools\Console\Command\AbstractEntityManagerCommand; use InvalidArgumentException; use Symfony\Component\Console\Input\InputInterface; @@ -13,9 +11,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -use function get_class; -use function sprintf; - /** * Command to clear the metadata cache of the various cache drivers. * diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php index 279efce1a37..ae4d0fb0f90 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/AbstractCommand.php @@ -4,7 +4,6 @@ namespace Doctrine\ORM\Tools\Console\Command\SchemaTool; -use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\Console\Command\AbstractEntityManagerCommand; use Doctrine\ORM\Tools\SchemaTool; use Symfony\Component\Console\Input\InputInterface; diff --git a/lib/Doctrine/ORM/Tools/Exception/MissingColumnException.php b/lib/Doctrine/ORM/Tools/Exception/MissingColumnException.php index 5bb4531b3f8..a1b58a2f5e5 100644 --- a/lib/Doctrine/ORM/Tools/Exception/MissingColumnException.php +++ b/lib/Doctrine/ORM/Tools/Exception/MissingColumnException.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Tools\Exception; use Doctrine\ORM\Exception\ORMException; -use LogicException; use function sprintf; diff --git a/lib/Doctrine/ORM/Tools/Pagination/Exception/RowNumberOverFunctionNotEnabled.php b/lib/Doctrine/ORM/Tools/Pagination/Exception/RowNumberOverFunctionNotEnabled.php index 8e203e4612a..8f8c79a4604 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/Exception/RowNumberOverFunctionNotEnabled.php +++ b/lib/Doctrine/ORM/Tools/Pagination/Exception/RowNumberOverFunctionNotEnabled.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Tools\Pagination\Exception; use Doctrine\ORM\Exception\ORMException; -use LogicException; final class RowNumberOverFunctionNotEnabled extends ORMException { diff --git a/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php b/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php index b145631c913..2d38e3f551f 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php +++ b/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php @@ -4,7 +4,6 @@ namespace Doctrine\ORM\Tools\Pagination; -use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Query\AST\Functions\FunctionNode; use Doctrine\ORM\Query\AST\OrderByClause; use Doctrine\ORM\Query\Parser; diff --git a/lib/Doctrine/ORM/Tools/ToolsException.php b/lib/Doctrine/ORM/Tools/ToolsException.php index b92853fa204..da4db1d0829 100644 --- a/lib/Doctrine/ORM/Tools/ToolsException.php +++ b/lib/Doctrine/ORM/Tools/ToolsException.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM\Tools; use Doctrine\ORM\Exception\ORMException; -use RuntimeException; use Throwable; use function sprintf; diff --git a/lib/Doctrine/ORM/TransactionRequiredException.php b/lib/Doctrine/ORM/TransactionRequiredException.php index 4d0b93311b3..9277da5a7a3 100644 --- a/lib/Doctrine/ORM/TransactionRequiredException.php +++ b/lib/Doctrine/ORM/TransactionRequiredException.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM; use Doctrine\ORM\Exception\ORMException; -use LogicException; /** * Is thrown when a transaction is required for the current operation, but there is none open. diff --git a/lib/Doctrine/ORM/UnexpectedResultException.php b/lib/Doctrine/ORM/UnexpectedResultException.php index 7b813c6a89f..e0b724d32b0 100644 --- a/lib/Doctrine/ORM/UnexpectedResultException.php +++ b/lib/Doctrine/ORM/UnexpectedResultException.php @@ -5,7 +5,6 @@ namespace Doctrine\ORM; use Doctrine\ORM\Exception\ORMException; -use RuntimeException; /** * Exception for a unexpected query result. diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 31665c0a396..2f957d58abc 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -26,13 +26,6 @@ - - - - - - - diff --git a/tests/Doctrine/Tests/DoctrineTestCase.php b/tests/Doctrine/Tests/DoctrineTestCase.php index a829ea09c28..3c286b7e6bd 100644 --- a/tests/Doctrine/Tests/DoctrineTestCase.php +++ b/tests/Doctrine/Tests/DoctrineTestCase.php @@ -7,7 +7,6 @@ use BadMethodCallException; use PHPUnit\Framework\TestCase; -use function get_called_class; use function sprintf; /** diff --git a/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php b/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php index 32388e3a3ba..45f22a756a4 100644 --- a/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/SchemaManagerMock.php @@ -4,7 +4,6 @@ namespace Doctrine\Tests\Mocks; -use Doctrine\DBAL\Connection; use Doctrine\DBAL\Schema\AbstractSchemaManager; use Exception; diff --git a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php index 63c836dee63..d795725c127 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php @@ -86,7 +86,8 @@ class CmsAddress /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')] public $id; diff --git a/tests/Doctrine/Tests/Models/CMS/CmsEmail.php b/tests/Doctrine/Tests/Models/CMS/CmsEmail.php index 72a888bd44f..8d30291802b 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsEmail.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsEmail.php @@ -22,7 +22,8 @@ class CmsEmail /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/CMS/CmsGroup.php b/tests/Doctrine/Tests/Models/CMS/CmsGroup.php index aedb5a8fdef..fda1d9aefee 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsGroup.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsGroup.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\Table; use IteratorAggregate; -use Traversable; /** * Description of CmsGroup diff --git a/tests/Doctrine/Tests/Models/CMS/CmsUser.php b/tests/Doctrine/Tests/Models/CMS/CmsUser.php index 2f030037f8d..549f6983000 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsUser.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsUser.php @@ -23,7 +23,6 @@ use Doctrine\ORM\Mapping\NamedQuery; use Doctrine\ORM\Mapping\OneToMany; use Doctrine\ORM\Mapping\OneToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\SqlResultSetMapping; use Doctrine\ORM\Mapping\SqlResultSetMappings; use Doctrine\ORM\Mapping\Table; diff --git a/tests/Doctrine/Tests/Models/Company/CompanyAuction.php b/tests/Doctrine/Tests/Models/Company/CompanyAuction.php index f9869d7bee3..76b6da128f2 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyAuction.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyAuction.php @@ -8,7 +8,10 @@ use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="company_auctions") */ +/** + * @Entity + * @Table(name="company_auctions") + */ class CompanyAuction extends CompanyEvent { /** diff --git a/tests/Doctrine/Tests/Models/Company/CompanyCar.php b/tests/Doctrine/Tests/Models/Company/CompanyCar.php index e03bf271f57..2fb0f1e7b57 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyCar.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyCar.php @@ -18,7 +18,8 @@ class CompanyCar { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; diff --git a/tests/Doctrine/Tests/Models/Company/CompanyContract.php b/tests/Doctrine/Tests/Models/Company/CompanyContract.php index 6eda3e2bf80..e7081f3a925 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyContract.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyContract.php @@ -26,7 +26,6 @@ use Doctrine\ORM\Mapping\ManyToOne; use Doctrine\ORM\Mapping\NamedNativeQueries; use Doctrine\ORM\Mapping\NamedNativeQuery; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\SqlResultSetMapping; use Doctrine\ORM\Mapping\SqlResultSetMappings; use Doctrine\ORM\Mapping\Table; diff --git a/tests/Doctrine/Tests/Models/Company/CompanyEvent.php b/tests/Doctrine/Tests/Models/Company/CompanyEvent.php index 9decd1713b4..f7bc15fad61 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyEvent.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyEvent.php @@ -16,7 +16,8 @@ use Doctrine\ORM\Mapping\Table; /** - * @Entity @Table(name="company_events") + * @Entity + * @Table(name="company_events") * @InheritanceType("JOINED") * @DiscriminatorColumn(name="event_type", type="string") * @DiscriminatorMap({"auction"="CompanyAuction", "raffle"="CompanyRaffle"}) diff --git a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php index 384bb4c433a..61bb7e1ab5e 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyFlexContract.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\NamedNativeQueries; use Doctrine\ORM\Mapping\NamedNativeQuery; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\SqlResultSetMapping; use Doctrine\ORM\Mapping\SqlResultSetMappings; diff --git a/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php b/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php index 1f15df835e5..610326fac7f 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyOrganization.php @@ -14,7 +14,10 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="company_organizations") */ +/** + * @Entity + * @Table(name="company_organizations") + */ class CompanyOrganization { /** diff --git a/tests/Doctrine/Tests/Models/Company/CompanyRaffle.php b/tests/Doctrine/Tests/Models/Company/CompanyRaffle.php index caa10554ac9..105f841cc12 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyRaffle.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyRaffle.php @@ -8,7 +8,10 @@ use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="company_raffles") */ +/** + * @Entity + * @Table(name="company_raffles") + */ class CompanyRaffle extends CompanyEvent { /** diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php index df46e5a8af4..0d2cf0aa50b 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php @@ -18,7 +18,8 @@ class CustomIdObjectTypeChild { /** - * @Id @Column(type="CustomIdObject") + * @Id + * @Column(type="CustomIdObject") * @var CustomIdObject */ public $id; diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php index ab1b1b15411..ad27facef41 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php @@ -20,7 +20,8 @@ class CustomIdObjectTypeParent { /** - * @Id @Column(type="CustomIdObject") + * @Id + * @Column(type="CustomIdObject") * @var CustomIdObject */ public $id; diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomTypeChild.php b/tests/Doctrine/Tests/Models/CustomType/CustomTypeChild.php index 9aac6fe94a0..4844f57e7cf 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomTypeChild.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomTypeChild.php @@ -18,7 +18,8 @@ class CustomTypeChild { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomTypeParent.php b/tests/Doctrine/Tests/Models/CustomType/CustomTypeParent.php index 0aae5d815c7..debd5230dca 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomTypeParent.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomTypeParent.php @@ -14,7 +14,6 @@ use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\OneToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** @@ -25,7 +24,8 @@ class CustomTypeParent { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomTypeUpperCase.php b/tests/Doctrine/Tests/Models/CustomType/CustomTypeUpperCase.php index d859060ff7b..6ba9d6b3e70 100644 --- a/tests/Doctrine/Tests/Models/CustomType/CustomTypeUpperCase.php +++ b/tests/Doctrine/Tests/Models/CustomType/CustomTypeUpperCase.php @@ -18,7 +18,8 @@ class CustomTypeUpperCase { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php index 06bde0b8650..64751b08e41 100644 --- a/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php +++ b/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php @@ -20,7 +20,9 @@ class DDC117Article { /** * @var int - * @Id @Column(type="integer", name="article_id") @GeneratedValue + * @Id + * @Column(type="integer", name="article_id") + * @GeneratedValue */ private $id; diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php index 1f12610c202..d7249428d99 100644 --- a/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php +++ b/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php @@ -29,7 +29,8 @@ class DDC117Translation /** * @var string - * @Id @Column(type="string") + * @Id + * @Column(type="string") */ private $language; diff --git a/tests/Doctrine/Tests/Models/DDC2372/DDC2372Address.php b/tests/Doctrine/Tests/Models/DDC2372/DDC2372Address.php index 98189f80601..2b7515bcbdd 100644 --- a/tests/Doctrine/Tests/Models/DDC2372/DDC2372Address.php +++ b/tests/Doctrine/Tests/Models/DDC2372/DDC2372Address.php @@ -11,12 +11,16 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="addresses") */ +/** + * @Entity + * @Table(name="addresses") + */ class DDC2372Address { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; diff --git a/tests/Doctrine/Tests/Models/DDC2372/DDC2372Admin.php b/tests/Doctrine/Tests/Models/DDC2372/DDC2372Admin.php index 3360bbaf766..404c373d239 100644 --- a/tests/Doctrine/Tests/Models/DDC2372/DDC2372Admin.php +++ b/tests/Doctrine/Tests/Models/DDC2372/DDC2372Admin.php @@ -7,7 +7,10 @@ use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="admins") */ +/** + * @Entity + * @Table(name="admins") + */ class DDC2372Admin extends DDC2372User { } diff --git a/tests/Doctrine/Tests/Models/DDC2372/DDC2372User.php b/tests/Doctrine/Tests/Models/DDC2372/DDC2372User.php index 9a3438db090..c2ec10e6a47 100644 --- a/tests/Doctrine/Tests/Models/DDC2372/DDC2372User.php +++ b/tests/Doctrine/Tests/Models/DDC2372/DDC2372User.php @@ -11,14 +11,18 @@ use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\Models\DDC2372\Traits\DDC2372AddressAndAccessors; -/** @Entity @Table(name="users") */ +/** + * @Entity + * @Table(name="users") + */ class DDC2372User { use DDC2372AddressAndAccessors; /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php index 9efd2ff96ab..c11df9837fb 100644 --- a/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php +++ b/tests/Doctrine/Tests/Models/DDC2504/DDC2504OtherClass.php @@ -20,7 +20,8 @@ class DDC2504OtherClass /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php index de9abb571c7..f55125f8564 100644 --- a/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php +++ b/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php @@ -27,7 +27,8 @@ class DDC2504RootClass /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php b/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php index 3f7eb69833e..687cf494da9 100644 --- a/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php +++ b/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php @@ -11,7 +11,10 @@ use Doctrine\ORM\Mapping\Id; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="explicit_table", schema="explicit_schema") */ +/** + * @Entity + * @Table(name="explicit_table", schema="explicit_schema") + */ #[ORM\Entity, ORM\Table(name: 'explicit_table', schema: 'explicit_schema')] class ExplicitSchemaAndTable { diff --git a/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php b/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php index d3bbb73c071..a30693d85e6 100644 --- a/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php +++ b/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php @@ -15,7 +15,8 @@ * Quoted column name to check that sequence names are * correctly handled * - * @Entity @Table(name="implicit_schema.implicit_table") + * @Entity + * @Table(name="implicit_schema.implicit_table") */ #[ORM\Entity, ORM\Table(name: 'implicit_schema.implicit_table')] class SchemaAndTableInTableName diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php index 096b07cfad9..6b85bff3b9a 100644 --- a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php +++ b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php @@ -20,7 +20,8 @@ class DDC3346Author { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php index 5451c96902c..5f5bf866bfe 100644 --- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php +++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php @@ -21,7 +21,8 @@ class DDC3579Group /** * @var int * @GeneratedValue - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") */ #[Id, GeneratedValue, Column(type: 'integer')] private $id; diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php index 6c0c62191eb..8fea8f8edee 100644 --- a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php +++ b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php @@ -12,7 +12,10 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\ORM\Mapping\Table; -/** @Entity @Table(name="ddc3699_child") */ +/** + * @Entity + * @Table(name="ddc3699_child") + */ class DDC3699Child extends DDC3699Parent { /** diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php index d5ef38bbdae..e0faf5079e4 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php @@ -17,7 +17,8 @@ class DDC964Address /** * @var int * @GeneratedValue - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") */ private $id; diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php index 81d7756601f..154d834a5d1 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php @@ -19,7 +19,8 @@ class DDC964Group /** * @var int * @GeneratedValue - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") */ private $id; diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php index 627abb1aa10..9c2eb2ed48d 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964User.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964User.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\ManyToOne; use Doctrine\ORM\Mapping\MappedSuperclass; -use Doctrine\ORM\Mapping\OrderBy; /** * @MappedSuperclass diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php index ac366740734..2e328770e05 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php @@ -14,7 +14,6 @@ use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\OneToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php index dd6c32c5ac2..9bbaa68ea52 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php @@ -27,7 +27,8 @@ class ECommerceCategory { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php index a762dd00c73..e0bfb5be76e 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\OneToMany; use Doctrine\ORM\Mapping\OneToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php index 770808e5617..122daf5f477 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php @@ -21,7 +21,8 @@ class ECommerceShipping { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ private $id; diff --git a/tests/Doctrine/Tests/Models/Forum/ForumUser.php b/tests/Doctrine/Tests/Models/Forum/ForumUser.php index 28c494af98d..dfb5756c569 100644 --- a/tests/Doctrine/Tests/Models/Forum/ForumUser.php +++ b/tests/Doctrine/Tests/Models/Forum/ForumUser.php @@ -21,7 +21,8 @@ class ForumUser /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/Generic/BooleanModel.php b/tests/Doctrine/Tests/Models/Generic/BooleanModel.php index 06733e756d9..f859de27299 100644 --- a/tests/Doctrine/Tests/Models/Generic/BooleanModel.php +++ b/tests/Doctrine/Tests/Models/Generic/BooleanModel.php @@ -18,7 +18,8 @@ class BooleanModel { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php index 32dc5376286..9a27b48f730 100644 --- a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php +++ b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php @@ -18,7 +18,8 @@ class DateTimeModel { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/Generic/DecimalModel.php b/tests/Doctrine/Tests/Models/Generic/DecimalModel.php index e2f8a1c8b42..94dae1fad3e 100644 --- a/tests/Doctrine/Tests/Models/Generic/DecimalModel.php +++ b/tests/Doctrine/Tests/Models/Generic/DecimalModel.php @@ -18,7 +18,8 @@ class DecimalModel { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/Generic/SerializationModel.php b/tests/Doctrine/Tests/Models/Generic/SerializationModel.php index bf79f1bb0b5..ab61dcff606 100644 --- a/tests/Doctrine/Tests/Models/Generic/SerializationModel.php +++ b/tests/Doctrine/Tests/Models/Generic/SerializationModel.php @@ -18,7 +18,8 @@ class SerializationModel { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php b/tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php index fc7ed93e35a..944a06c1fea 100644 --- a/tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php +++ b/tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php @@ -9,7 +9,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/JoinedInheritanceType/RootClass.php b/tests/Doctrine/Tests/Models/JoinedInheritanceType/RootClass.php index c7327a6656d..8615d440fbd 100644 --- a/tests/Doctrine/Tests/Models/JoinedInheritanceType/RootClass.php +++ b/tests/Doctrine/Tests/Models/JoinedInheritanceType/RootClass.php @@ -19,7 +19,8 @@ class RootClass /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ public $id; } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php index f6842c5c5df..c965b135be9 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -14,7 +14,6 @@ use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\OneToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/ManyToManyPersister/ChildClass.php b/tests/Doctrine/Tests/Models/ManyToManyPersister/ChildClass.php index 880daaf63f5..f8d9a560a0f 100644 --- a/tests/Doctrine/Tests/Models/ManyToManyPersister/ChildClass.php +++ b/tests/Doctrine/Tests/Models/ManyToManyPersister/ChildClass.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\ManyToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/Navigation/NavPointOfInterest.php b/tests/Doctrine/Tests/Models/Navigation/NavPointOfInterest.php index 57e71d03de0..4a39e41d1ee 100644 --- a/tests/Doctrine/Tests/Models/Navigation/NavPointOfInterest.php +++ b/tests/Doctrine/Tests/Models/Navigation/NavPointOfInterest.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\ManyToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/Navigation/NavTour.php b/tests/Doctrine/Tests/Models/Navigation/NavTour.php index eda36a624bb..bad57d82a8a 100644 --- a/tests/Doctrine/Tests/Models/Navigation/NavTour.php +++ b/tests/Doctrine/Tests/Models/Navigation/NavTour.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php index 1d89586b761..a808127260f 100644 --- a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php +++ b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php @@ -10,7 +10,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/Pagination/Company.php b/tests/Doctrine/Tests/Models/Pagination/Company.php index 7f972fcb1f8..80b1996322e 100644 --- a/tests/Doctrine/Tests/Models/Pagination/Company.php +++ b/tests/Doctrine/Tests/Models/Pagination/Company.php @@ -23,7 +23,8 @@ class Company { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/Pagination/Department.php b/tests/Doctrine/Tests/Models/Pagination/Department.php index da9b5309ceb..5fb4caaf766 100644 --- a/tests/Doctrine/Tests/Models/Pagination/Department.php +++ b/tests/Doctrine/Tests/Models/Pagination/Department.php @@ -21,7 +21,8 @@ class Department { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/Pagination/Logo.php b/tests/Doctrine/Tests/Models/Pagination/Logo.php index b58047d3ea6..a0b83b665f9 100644 --- a/tests/Doctrine/Tests/Models/Pagination/Logo.php +++ b/tests/Doctrine/Tests/Models/Pagination/Logo.php @@ -22,7 +22,8 @@ class Logo { /** * @var int - * @Column(type="integer") @Id + * @Column(type="integer") + * @Id * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/Models/Pagination/User.php b/tests/Doctrine/Tests/Models/Pagination/User.php index 7c18ae25170..dd0691d8d95 100644 --- a/tests/Doctrine/Tests/Models/Pagination/User.php +++ b/tests/Doctrine/Tests/Models/Pagination/User.php @@ -24,7 +24,8 @@ abstract class User { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ private $id; diff --git a/tests/Doctrine/Tests/Models/Routing/RoutingLeg.php b/tests/Doctrine/Tests/Models/Routing/RoutingLeg.php index 86c998ef4ad..70fdee64325 100644 --- a/tests/Doctrine/Tests/Models/Routing/RoutingLeg.php +++ b/tests/Doctrine/Tests/Models/Routing/RoutingLeg.php @@ -18,7 +18,8 @@ class RoutingLeg { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/Models/Routing/RoutingLocation.php b/tests/Doctrine/Tests/Models/Routing/RoutingLocation.php index ae521671997..16926465334 100644 --- a/tests/Doctrine/Tests/Models/Routing/RoutingLocation.php +++ b/tests/Doctrine/Tests/Models/Routing/RoutingLocation.php @@ -16,7 +16,8 @@ class RoutingLocation { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/Models/StockExchange/Bond.php b/tests/Doctrine/Tests/Models/StockExchange/Bond.php index 3bc1e64a643..b9137d67fdc 100644 --- a/tests/Doctrine/Tests/Models/StockExchange/Bond.php +++ b/tests/Doctrine/Tests/Models/StockExchange/Bond.php @@ -22,7 +22,9 @@ class Bond { /** - * @Id @GeneratedValue @Column(type="integer") + * @Id + * @GeneratedValue + * @Column(type="integer") * @var int */ private $id; diff --git a/tests/Doctrine/Tests/Models/StockExchange/Market.php b/tests/Doctrine/Tests/Models/StockExchange/Market.php index 22774b4a703..b7d9b42dd11 100644 --- a/tests/Doctrine/Tests/Models/StockExchange/Market.php +++ b/tests/Doctrine/Tests/Models/StockExchange/Market.php @@ -19,7 +19,9 @@ class Market { /** - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue * @var int */ private $id; diff --git a/tests/Doctrine/Tests/Models/StockExchange/Stock.php b/tests/Doctrine/Tests/Models/StockExchange/Stock.php index 79e9ec8d59d..a87727c1a12 100644 --- a/tests/Doctrine/Tests/Models/StockExchange/Stock.php +++ b/tests/Doctrine/Tests/Models/StockExchange/Stock.php @@ -18,7 +18,9 @@ class Stock { /** - * @Id @GeneratedValue @Column(type="integer") + * @Id + * @GeneratedValue + * @Column(type="integer") * @var int */ private $id; diff --git a/tests/Doctrine/Tests/Models/TypedProperties/UserTyped.php b/tests/Doctrine/Tests/Models/TypedProperties/UserTyped.php index d26aae85466..2a4defddb31 100644 --- a/tests/Doctrine/Tests/Models/TypedProperties/UserTyped.php +++ b/tests/Doctrine/Tests/Models/TypedProperties/UserTyped.php @@ -28,7 +28,8 @@ class UserTyped { /** - * @Id @Column + * @Id + * @Column * @GeneratedValue */ #[ORM\Id, ORM\Column, ORM\GeneratedValue] diff --git a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdEntity.php b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdEntity.php index 2f6b358193f..4166c640cb0 100644 --- a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdEntity.php +++ b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdEntity.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdForeignKeyEntity.php b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdForeignKeyEntity.php index ddbc0d4aff8..55699863866 100644 --- a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdForeignKeyEntity.php +++ b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyCompositeIdForeignKeyEntity.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyEntity.php b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyEntity.php index 2e4e3bcb6a2..5cbaa04d1c3 100644 --- a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyEntity.php +++ b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyEntity.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyExtraLazyEntity.php b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyExtraLazyEntity.php index 347052f1e4c..5869d02cdf5 100644 --- a/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyExtraLazyEntity.php +++ b/tests/Doctrine/Tests/Models/ValueConversionType/OwningManyToManyExtraLazyEntity.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; /** diff --git a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php index 2cac33f74ad..7ee858308a2 100644 --- a/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/FileLockRegionTest.php @@ -17,7 +17,6 @@ use ReflectionMethod; use ReflectionProperty; -use function file_get_contents; use function file_put_contents; use function is_dir; use function restore_error_handler; diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index 42d5e62e76f..ad0099c28b6 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -19,13 +19,10 @@ use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Exception\ProxyClassesAlwaysRegenerating; use Doctrine\ORM\Mapping as AnnotationNamespace; -use Doctrine\ORM\Mapping\ClassMetadataFactory; -use Doctrine\ORM\Mapping\DefaultEntityListenerResolver; use Doctrine\ORM\Mapping\EntityListenerResolver; use Doctrine\ORM\Mapping\NamingStrategy; use Doctrine\ORM\Mapping\PrePersist; use Doctrine\ORM\Mapping\QuoteStrategy; -use Doctrine\ORM\Proxy\Factory\StaticProxyFactory; use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\Persistence\Mapping\Driver\MappingDriver; use Doctrine\Tests\DoctrineTestCase; diff --git a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php index 1105d204d6e..400dbfe42fb 100644 --- a/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php +++ b/tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php @@ -7,7 +7,6 @@ use Doctrine\ORM\Decorator\EntityManagerDecorator; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Query\ResultSetMapping; -use Doctrine\Tests\VerifyDeprecations; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use ReflectionClass; diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index f06d8c4eb29..0162f7d7d70 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Exception\EntityManagerClosed; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\NativeQuery; -use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMInvalidArgumentException; use Doctrine\ORM\Proxy\ProxyFactory; use Doctrine\ORM\Query; diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php index 56b211c7d57..518968e23da 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php @@ -15,7 +15,6 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\ManyToOne; use Doctrine\ORM\Mapping\OneToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\IterableTester; diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index e3e647c59a0..3d446de879e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -22,7 +22,6 @@ use InvalidArgumentException; use function get_class; -use function in_array; class BasicFunctionalTest extends OrmFunctionalTestCase { diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index 536fa656484..c0bfde7c745 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php @@ -92,7 +92,8 @@ class CascadeRemoveOrderEntityO { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ private $id; @@ -155,7 +156,8 @@ class CascadeRemoveOrderEntityG { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ private $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceSecondTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceSecondTest.php index 1bf30b98862..fbfb37ec042 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceSecondTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceSecondTest.php @@ -97,7 +97,8 @@ public function testManyToManyToCTIHierarchy(): void } /** - * @Entity @Table(name="cti_parents") + * @Entity + * @Table(name="cti_parents") * @InheritanceType("JOINED") * @DiscriminatorColumn(name="type", type="string") * @DiscriminatorMap({"parent" = "CTIParent", "child" = "CTIChild"}) @@ -106,7 +107,8 @@ class CTIParent { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; @@ -135,7 +137,8 @@ public function setRelated(CTIRelated $related): void } /** - * @Entity @Table(name="cti_children") + * @Entity + * @Table(name="cti_children") */ class CTIChild extends CTIParent { @@ -161,7 +164,8 @@ class CTIRelated { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 0c73d260747..98a922e94ba 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -18,9 +18,7 @@ use Doctrine\Tests\Models\Company\CompanyRaffle; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function get_class; -use function is_numeric; use function sprintf; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php index f750239fc03..7a5f35bf5ce 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php @@ -15,8 +15,6 @@ use Doctrine\Tests\Models\Navigation\NavUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class CompositePrimaryKeyTest extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php index ce4e4ce7829..f4027d7dc83 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php @@ -13,8 +13,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - require_once __DIR__ . '/../../TestInit.php'; class CustomFunctionsTest extends OrmFunctionalTestCase diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php index 29889d90c27..54a72c8daa7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; use function get_class; @@ -102,13 +101,15 @@ public function testGetPartialReferenceWithDefaultValueNotEvaluatedInFlush(): vo /** - * @Entity @Table(name="defaultvalueuser") + * @Entity + * @Table(name="defaultvalueuser") */ class DefaultValueUser { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; @@ -137,14 +138,16 @@ public function getId(): int /** * CmsAddress * - * @Entity @Table(name="defaultvalueaddresses") + * @Entity + * @Table(name="defaultvalueaddresses") */ class DefaultValueAddress { /** * @var int * @Column(type="integer") - * @Id @GeneratedValue(strategy="AUTO") + * @Id + * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php index 4df08ae4948..9a271dd2526 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php @@ -12,8 +12,6 @@ use Doctrine\Tests\Models\Tweet\User; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index 39662e7972a..ea67489373c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -33,8 +33,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use function array_pop; -use function count; -use function in_array; use function reset; class EntityRepositoryTest extends OrmFunctionalTestCase diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php index 2c1f63eb0be..145a7c05418 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php @@ -15,7 +15,6 @@ use function array_shift; use function assert; -use function count; /** * Description of ExtraLazyCollectionTest diff --git a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php index b5334a93e01..94a632baf75 100644 --- a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php @@ -10,7 +10,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function get_class; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php index ab6897faaaf..f8675486e0e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php @@ -10,7 +10,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use function assert; -use function count; /** * @group DDC-250 diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 404012295fe..b518b344835 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -29,7 +29,6 @@ use Doctrine\ORM\Mapping\Table; use Doctrine\ORM\Query; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; use function count; use function current; @@ -434,7 +433,10 @@ public function testLifecycleCallbackEventArgs(): void } } -/** @Entity @HasLifecycleCallbacks */ +/** + * @Entity + * @HasLifecycleCallbacks + */ class LifecycleCallbackTestUser { /** @@ -577,7 +579,8 @@ public function doStuffOnPreFlush(): void } /** - * @Entity @HasLifecycleCallbacks + * @Entity + * @HasLifecycleCallbacks * @Table(name="lc_cb_test_cascade") */ class LifecycleCallbackCascader @@ -621,7 +624,10 @@ public function getId(): int } } -/** @MappedSuperclass @HasLifecycleCallbacks */ +/** + * @MappedSuperclass + * @HasLifecycleCallbacks + */ class LifecycleCallbackParentEntity { /** @PrePersist */ @@ -630,7 +636,10 @@ public function doStuff(): void } } -/** @Entity @Table(name="lc_cb_childentity") */ +/** + * @Entity + * @Table(name="lc_cb_childentity") + */ class LifecycleCallbackChildEntity extends LifecycleCallbackParentEntity { /** @@ -650,12 +659,17 @@ public function preUpdate(PreUpdateEventArgs $eventArgs): void } } -/** @Entity @HasLifecycleCallbacks */ +/** + * @Entity + * @HasLifecycleCallbacks + */ class LifecycleCallbackEventArgEntity { /** * @var int - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php index 4ee1304a97a..d804cdb59e1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php @@ -18,7 +18,6 @@ use Doctrine\ORM\Mapping\Version; use Doctrine\ORM\OptimisticLockException; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; use function date; use function strtotime; @@ -317,7 +316,8 @@ class OptimisticJoinedParent { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; @@ -358,7 +358,8 @@ class OptimisticStandard { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; @@ -390,7 +391,8 @@ class OptimisticTimestamp { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index e7ef7b83927..64cc29d7bd6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -14,7 +14,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use function assert; -use function count; use function get_class; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php index b606d69217e..b1d4abc0884 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php @@ -7,8 +7,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCategory; use Doctrine\Tests\Models\ECommerce\ECommerceProduct; -use function count; - /** * Tests a bidirectional many-to-many association mapping (without inheritance). * Owning side is ECommerceProduct, inverse side is ECommerceCategory. diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php index 3a52e75dcf4..9af5d6f4f56 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php @@ -7,8 +7,6 @@ use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\Models\ECommerce\ECommerceProduct; -use function count; - /** * Tests a self referential many-to-many association mapping (from a model to the same model, without inheritance). * For simplicity the relation duplicates entries in the association table diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php index cdf9f995c5d..2cba6c02a71 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php @@ -16,9 +16,6 @@ use Doctrine\Persistence\NotifyPropertyChanged; use Doctrine\Persistence\PropertyChangedListener; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; - -use function count; /** * NativeQueryTest @@ -120,7 +117,10 @@ protected function onPropertyChanged($propName, $oldValue, $newValue): void } } -/** @Entity @ChangeTrackingPolicy("NOTIFY") */ +/** + * @Entity + * @ChangeTrackingPolicy("NOTIFY") + */ class NotifyUser extends NotifyBaseEntity { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index c2b0c3fa36f..3faa6d2607b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -11,8 +11,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * Tests a bidirectional one-to-one association mapping (without inheritance). */ diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php index 02f5d62a890..a3ee90a6b74 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php @@ -8,8 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * Tests a bidirectional one-to-many association mapping with orphan removal. */ diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php index f2eae574ae0..dec20df94c9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php @@ -8,7 +8,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCategory; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function strstr; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php index d88aaed4207..f0713f09b6b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php @@ -11,8 +11,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; - /** * Tests a bidirectional one-to-one association mapping (without inheritance). */ diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php index d6b6eb6baca..96ea60f797b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php @@ -9,8 +9,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * Tests a bidirectional one-to-one association mapping with orphan removal. */ diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php index 8abe8a78553..f82d81a596b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php @@ -14,7 +14,6 @@ use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\ECommerce\ECommerceCustomer; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; use function get_class; diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php index 9c9fd7b105c..5172a163736 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php @@ -11,8 +11,6 @@ use Doctrine\Tests\Models\Routing\RoutingRouteBooking; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class OrderedCollectionTest extends OrmFunctionalTestCase { /** @psalm-var array */ diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php index b9e14e0ff6b..71755a21648 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php @@ -18,9 +18,6 @@ use Doctrine\ORM\Mapping\OneToMany; use Doctrine\ORM\Mapping\OrderBy; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; - -use function count; /** * Functional tests for the Single Table Inheritance mapping strategy. diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php index 82da5a0f2e5..999b6aeae9b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php @@ -112,7 +112,9 @@ public function testMatchingDoesNotModifyTheGivenCriteria(): void class PersistentCollectionHolder extends PersistentObject { /** - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue * @var int */ protected $id; @@ -156,7 +158,9 @@ public function getRawCollection(): Collection class PersistentCollectionContent extends PersistentObject { /** - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue * @var int */ protected $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php index 7892603be37..37063374cef 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php @@ -100,7 +100,9 @@ public function testSetAssociation(): void class PersistentEntity extends PersistentObject { /** - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue * @var int */ protected $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php index 42a6a8b67ab..316d47d8656 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php @@ -10,7 +10,6 @@ use Doctrine\Tests\Models\Company\CompanyManager; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function round; use function sprintf; diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index c25fab0996a..0b140478240 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -21,7 +21,6 @@ use function array_values; use function count; -use function is_array; use function iterator_to_array; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php index 5743e40f61e..8dd8b91846e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php @@ -153,7 +153,9 @@ public function testNotReadOnlyIfObjectWasKnownBefore(): void class ReadOnlyEntity { /** - * @Id @GeneratedValue @Column(type="integer") + * @Id + * @GeneratedValue + * @Column(type="integer") * @var int */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php index 7daecff5b2a..735687ed038 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php @@ -8,8 +8,6 @@ use Doctrine\Tests\Models\Company\CompanyManager; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * Functional tests for the Class Table Inheritance mapping strategy. */ diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php index 85bcec8fd22..ee65d185284 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php @@ -12,7 +12,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use function array_filter; -use function count; use function strpos; class DBAL483Test extends OrmFunctionalTestCase diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php index bb673e2adb4..a7b0b6eb1f5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php @@ -12,7 +12,6 @@ use Exception; use function array_filter; -use function count; use function implode; use function method_exists; use function strpos; diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php index c61cae87b15..436f7978d5b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheCompositePrimaryKeyWithAssociationsTest.php @@ -10,8 +10,6 @@ use Doctrine\Tests\Models\GeoNames\Country; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class SecondLevelCacheCompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase { /** @var Cache */ diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php index 2edd1eea2e9..3ac949c12c6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php @@ -11,9 +11,6 @@ use Doctrine\ORM\Mapping\Id; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; - -use function is_numeric; class SequenceEmulatedIdentityStrategyTest extends OrmFunctionalTestCase { @@ -59,7 +56,10 @@ public function testPreSavePostSaveCallbacksAreInvoked(): void } } -/** @Entity @Table(name="seq_identity") */ +/** + * @Entity + * @Table(name="seq_identity") + */ class SequenceEmulatedIdentityEntity { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php index 1f43539981a..61357a4c6fe 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php @@ -7,7 +7,6 @@ use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Persisters\MatchingAssociationFieldRequiresObject; -use Doctrine\ORM\Persisters\PersisterException; use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\Company\CompanyContract; use Doctrine\Tests\Models\Company\CompanyEmployee; @@ -17,7 +16,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use function array_map; -use function count; use function get_class; use function sort; diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php index 04af8516664..5e53c763632 100644 --- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php @@ -11,8 +11,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * Tests capabilities of the persister. */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php index 81bd50a8a15..0a7da98d5d0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php @@ -17,8 +17,6 @@ use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-1080 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php index 411a3b671b1..95cd565a0ba 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php @@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsArticle; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-1129 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php index 87b536d32be..62e1fa65340 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php @@ -11,7 +11,6 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function get_class; class DDC1193Test extends OrmFunctionalTestCase @@ -69,7 +68,8 @@ class DDC1193Company { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; @@ -86,7 +86,8 @@ class DDC1193Person { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; @@ -103,7 +104,8 @@ class DDC1193Account { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php index 1fba181b2a3..5d5df56df4d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -82,7 +82,8 @@ class DDC1209One /** * @var int * @Id - * @GeneratedValue @Column(type="integer") + * @GeneratedValue + * @Column(type="integer") */ private $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php index 8ef5af902e4..0912bf28e9e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\ManyToOne; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use PDOException; use function strtolower; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php index 010e3ba4e23..4c2e02601cc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php @@ -90,7 +90,9 @@ public function testRefresh(): void class DDC1228User { /** - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue * @var int */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php index cf31db6c7d5..368dba40a3d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php @@ -11,7 +11,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\OneToOne; use Doctrine\Tests\OrmFunctionalTestCase; -use PDOException; /** * @group DDC-1250 @@ -54,7 +53,9 @@ class DDC1250ClientHistory { /** * @var int - * @Id @GeneratedValue @Column(type="integer") + * @Id + * @GeneratedValue + * @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php index 15e2c975824..731eecd6212 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php @@ -14,8 +14,6 @@ use Doctrine\ORM\Mapping\OneToMany; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-1300 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php index fc3062d261d..1d378b29b7c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -8,8 +8,6 @@ use Doctrine\Tests\Models; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group non-cacheable * @group DDC-1301 diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php index 3944b40835b..38764356e36 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php @@ -16,8 +16,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; - /** * @group DDC-1335 */ @@ -168,7 +166,8 @@ class DDC1335User { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php index e78e0f20d04..ad3f247aa56 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php @@ -42,7 +42,8 @@ public function testSchemaDoubleQuotedCreate(): void } /** - * @Entity @Table(name="`user`.`user`") + * @Entity + * @Table(name="`user`.`user`") */ class DDC1360DoubleQuote { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php index 74c77a351f1..90c24e6b341 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php @@ -14,8 +14,6 @@ use Doctrine\ORM\Mapping\NamedQuery; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-1404 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php index cf1b49a50b5..5e8248619a0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php @@ -16,8 +16,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; - /** * @group DDC-1430 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index b21bc406fc9..a9832db5f38 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -54,7 +54,9 @@ public function testIssue(): void class DDC144FlowElement { /** - * @Id @Column(type="integer") @GeneratedValue + * @Id + * @Column(type="integer") + * @GeneratedValue * @var int */ public $id; @@ -71,7 +73,10 @@ abstract class DDC144Expression extends DDC144FlowElement abstract public function method(): void; } -/** @Entity @Table(name="ddc144_operands") */ +/** + * @Entity + * @Table(name="ddc144_operands") + */ class DDC144Operand extends DDC144Expression { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php index ddee8ea3d9d..00249e6e755 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1515Test.php @@ -51,7 +51,8 @@ class DDC1515Foo { /** * @var DDC1515Bar - * @OneToOne(targetEntity="DDC1515Bar", inversedBy="foo") @Id + * @OneToOne(targetEntity="DDC1515Bar", inversedBy="foo") + * @Id */ public $bar; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php index 79aa61f7f4e..ebb0405deb0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1548Test.php @@ -79,7 +79,8 @@ class DDC1548Rel { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php index e45e629a7cd..2b94720169c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; @@ -95,7 +94,8 @@ public function testIssue(): void abstract class DDC1595BaseInheritance { /** - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") * @var int */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php index 3eea9de6627..b20e03a7ef0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php @@ -8,7 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function get_class; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php index 594a85cf72a..02d734d613f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1654Test.php @@ -12,8 +12,6 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-1654 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php index 99ac24d9c60..e8c763c26f5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1685Test.php @@ -10,8 +10,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use RuntimeException; -use function count; - /** * @group DDC-1685 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php index 5a38169d7fa..5a3bceb3c91 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php @@ -14,7 +14,6 @@ use Doctrine\Persistence\NotifyPropertyChanged; use Doctrine\Persistence\PropertyChangedListener; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; use function count; use function in_array; @@ -103,7 +102,10 @@ protected function onPropertyChanged($propName, $oldValue, $newValue): void } } -/** @Entity @ChangeTrackingPolicy("NOTIFY") */ +/** + * @Entity + * @ChangeTrackingPolicy("NOTIFY") + */ class DDC1690Parent extends NotifyBaseEntity { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php index 3ac8760d40b..b63e0e1807b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1918Test.php @@ -9,7 +9,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function iterator_to_array; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php index c9872a69c7c..85dda67e718 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php index 3e655fdf935..9e1fda26b19 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1998Test.php @@ -12,8 +12,6 @@ use Doctrine\ORM\Mapping\Id; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-1998 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php index 4fbee517a8a..de7d3c19c7e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php @@ -18,8 +18,6 @@ use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class DDC199Test extends OrmFunctionalTestCase { protected function setUp(): void @@ -68,7 +66,8 @@ public function testPolymorphicLoading(): void /** - * @Entity @Table(name="ddc199_entities") + * @Entity + * @Table(name="ddc199_entities") * @InheritanceType("SINGLE_TABLE") * @DiscriminatorColumn(name="discr", type="string") * @DiscriminatorMap({"parent" = "DDC199ParentClass", "child" = "DDC199ChildClass"}) @@ -77,7 +76,8 @@ class DDC199ParentClass { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; @@ -106,7 +106,10 @@ class DDC199ChildClass extends DDC199ParentClass public $childData; } -/** @Entity @Table(name="ddc199_relatedclass") */ +/** + * @Entity + * @Table(name="ddc199_relatedclass") + */ class DDC199RelatedClass { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php index cd81e5603d1..d5deaea3ad2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php @@ -10,8 +10,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-2074 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php index 50f8c3c390e..b2a32e1cbe7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php index d1037adee2b..92163f4a518 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php @@ -54,7 +54,10 @@ public function testInjectObjectManagerInProxyIfInitializedInUow(): void } -/** @Entity @Table(name="ddc2231_y") */ +/** + * @Entity + * @Table(name="ddc2231_y") + */ class DDC2231EntityY implements ObjectManagerAware { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php index 7a93e1dad8a..c5bf344c670 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2350Test.php @@ -13,8 +13,6 @@ use Doctrine\ORM\Mapping\OneToMany; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-2350 * @group non-cacheable diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php index d11ed2d0b42..d68112a5898 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php @@ -76,7 +76,8 @@ public function testUninitializedProxyIsInitializedOnFetchJoin(): void /** - * @Entity @Table(name="ddc237_x") + * @Entity + * @Table(name="ddc237_x") */ class DDC237EntityX { @@ -101,7 +102,10 @@ class DDC237EntityX } -/** @Entity @Table(name="ddc237_y") */ +/** + * @Entity + * @Table(name="ddc237_y") + */ class DDC237EntityY { /** @@ -118,7 +122,10 @@ class DDC237EntityY public $data; } -/** @Entity @Table(name="ddc237_z") */ +/** + * @Entity + * @Table(name="ddc237_z") + */ class DDC237EntityZ { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php index ec337cf190b..dc82c4d2ba9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php @@ -94,7 +94,8 @@ abstract class DDC258Super { /** * @var int - * @Id @Column(name="id", type="integer") + * @Id + * @Column(name="id", type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2602Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2602Test.php index 15c37916fa8..c2415710dec 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2602Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2602Test.php @@ -182,7 +182,8 @@ public function postLoad(LifecycleEventArgs $event): void class DDC2602User { /** - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") * @var int */ @@ -212,7 +213,8 @@ class DDC2602User class DDC2602Biography { /** - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") * @var int */ @@ -244,7 +246,8 @@ class DDC2602Biography class DDC2602BiographyField { /** - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") * @var int */ @@ -284,7 +287,8 @@ public function __construct() class DDC2602BiographyFieldChoice { /** - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") * @var int */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php index fd7a162fd01..81af824af5f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2660Test.php @@ -88,7 +88,8 @@ public function testIssueWithoutExtraColumn(): void } } /** - * @Entity @Table(name="ddc_2660_product") + * @Entity + * @Table(name="ddc_2660_product") */ class DDC2660Product { @@ -101,7 +102,10 @@ class DDC2660Product public $id; } -/** @Entity @Table(name="ddc_2660_customer") */ +/** + * @Entity + * @Table(name="ddc_2660_customer") + */ class DDC2660Customer { /** @@ -113,7 +117,10 @@ class DDC2660Customer public $id; } -/** @Entity @Table(name="ddc_2660_customer_order") */ +/** + * @Entity + * @Table(name="ddc_2660_customer_order") + */ class DDC2660CustomerOrder { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php index 75a2a8526a0..018eb97c6db 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php @@ -55,7 +55,8 @@ public function testIsListenerCalledOnlyOnceOnPreFlush(): void } } /** - * @Entity @Table(name="ddc_2692_foo") + * @Entity + * @Table(name="ddc_2692_foo") */ class DDC2692Foo { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php index 9582cd6c10f..e4ad9f7861d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2759Test.php @@ -76,7 +76,10 @@ public function testCorrectNumberOfAssociationsIsReturned(): void } } -/** @Entity @Table(name="ddc_2759_qualification") */ +/** + * @Entity + * @Table(name="ddc_2759_qualification") + */ class DDC2759Qualification { /** @@ -94,7 +97,10 @@ class DDC2759Qualification public $metadata; } -/** @Entity @Table(name="ddc_2759_category") */ +/** + * @Entity + * @Table(name="ddc_2759_category") + */ class DDC2759Category { /** @@ -112,7 +118,10 @@ class DDC2759Category public $metadataCategories; } -/** @Entity @Table(name="ddc_2759_qualification_metadata") */ +/** + * @Entity + * @Table(name="ddc_2759_qualification_metadata") + */ class DDC2759QualificationMetadata { /** @@ -141,7 +150,10 @@ public function __construct(DDC2759Qualification $content) } } -/** @Entity @Table(name="ddc_2759_metadata_category") */ +/** + * @Entity + * @Table(name="ddc_2759_metadata_category") + */ class DDC2759MetadataCategory { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php index edfd6bb0dfd..8093f331e1b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php @@ -68,7 +68,8 @@ public function testIssueCascadeRemove(): void } /** - * @Entity @Table(name="ddc2775_role") + * @Entity + * @Table(name="ddc2775_role") * @InheritanceType("JOINED") * @DiscriminatorColumn(name="role_type", type="string") * @DiscriminatorMap({"admin"="AdminRole"}) @@ -77,7 +78,8 @@ abstract class Role { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; @@ -101,19 +103,24 @@ public function addAuthorization(Authorization $authorization): void } } -/** @Entity @Table(name="ddc2775_admin_role") */ +/** + * @Entity + * @Table(name="ddc2775_admin_role") + */ class AdminRole extends Role { } /** - * @Entity @Table(name="ddc2775_authorizations") + * @Entity + * @Table(name="ddc2775_authorizations") */ class Authorization { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; @@ -132,13 +139,15 @@ class Authorization } /** - * @Entity @Table(name="ddc2775_users") + * @Entity + * @Table(name="ddc2775_users") */ class User { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php index 3ae191d19f4..56b44c6cc12 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php @@ -15,8 +15,6 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class DDC279Test extends OrmFunctionalTestCase { protected function setUp(): void @@ -116,7 +114,8 @@ class DDC279EntityY { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(name="id", type="integer") */ public $id; @@ -142,7 +141,8 @@ class DDC279EntityZ { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(name="id", type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php index e1b1f079630..e36f7d56906 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2825Test.php @@ -104,7 +104,8 @@ public function getTestedClasses(): array class DDC2825ClassWithImplicitlyDefinedSchemaAndQuotedTableName { /** - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") * @var int */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php index 517dabfc565..855611b1f68 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2984Test.php @@ -70,11 +70,15 @@ public function testIssue(): void } } -/** @Entity @Table(name="users") */ +/** + * @Entity + * @Table(name="users") + */ class DDC2984User { /** - * @Id @Column(type="ddc2984_domain_user_id") + * @Id + * @Column(type="ddc2984_domain_user_id") * @GeneratedValue(strategy="NONE") * @var DDC2984DomainUserId */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php index 2b4029b8cec..60f808833a0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2996Test.php @@ -69,7 +69,8 @@ class DDC2996User } /** - * @Entity @HasLifecycleCallbacks + * @Entity + * @HasLifecycleCallbacks */ class DDC2996UserPreference { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php index be272389fe2..b646e7fcf1a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3033Test.php @@ -15,7 +15,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\PostUpdate; use Doctrine\ORM\Mapping\PreUpdate; use Doctrine\ORM\Mapping\Table; @@ -71,7 +70,8 @@ public function testIssue(): void /** * @Table - * @Entity @HasLifecycleCallbacks + * @Entity + * @HasLifecycleCallbacks */ class DDC3033Product { @@ -135,7 +135,8 @@ public function postUpdate(LifecycleEventArgs $eventArgs): void /** * @Table - * @Entity @HasLifecycleCallbacks + * @Entity + * @HasLifecycleCallbacks */ class DDC3033User { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php index 4445f53547e..26c0f72f402 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3223Test.php @@ -54,13 +54,17 @@ public function testIssueGetId(): void } } -/** @Entity @Table(name="ddc3223_journalist") */ +/** + * @Entity + * @Table(name="ddc3223_journalist") + */ class Journalist extends Participant { } /** - * @Entity @Table(name="ddc3223_participant") + * @Entity + * @Table(name="ddc3223_participant") * @InheritanceType("JOINED") * @DiscriminatorColumn(name="discr", type="string") * @DiscriminatorMap({ @@ -86,7 +90,8 @@ class Participant } /** - * @Entity @Table(name="ddc3223_status") + * @Entity + * @Table(name="ddc3223_status") * @InheritanceType("SINGLE_TABLE") * @DiscriminatorColumn(name="discr", type="string") * @DiscriminatorMap({ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php index 6020b9f6e95..ff70572f41a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3330Test.php @@ -15,7 +15,6 @@ use Doctrine\ORM\Tools\Pagination\Paginator; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; use function iterator_to_array; /** @@ -75,13 +74,15 @@ private function createBuildingAndHalls(): void } /** - * @Entity @Table(name="ddc3330_building") + * @Entity + * @Table(name="ddc3330_building") */ class DDC3330Building { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; @@ -100,13 +101,15 @@ public function addHall(DDC3330Hall $hall): void } /** - * @Entity @Table(name="ddc3330_hall") + * @Entity + * @Table(name="ddc3330_hall") */ class DDC3330Hall { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php index 274831a5a02..dbdaf48cefd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php @@ -17,8 +17,6 @@ use Doctrine\ORM\Query; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - /** * @group DDC-371 */ @@ -83,7 +81,8 @@ class DDC371Child public $data; /** * @var DDC371Parent - * @ManyToOne(targetEntity="DDC371Parent", inversedBy="children") @JoinColumn(name="parentId") + * @ManyToOne(targetEntity="DDC371Parent", inversedBy="children") + * @JoinColumn(name="parentId") */ public $parent; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php index 281e5504255..851c3771627 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; use Exception; @@ -128,7 +127,8 @@ class DDC3785Attribute { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php index 2ae0a07154a..ae37694dfa1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\OrmFunctionalTestCase; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php index 2b1a5916a55..5125961f5e0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php @@ -43,7 +43,8 @@ class DDC425Entity { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php index 89d1d02ac40..42e20642a1d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php @@ -17,7 +17,6 @@ use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; class DDC440Test extends OrmFunctionalTestCase { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php index b53c9ada9c3..cbea214cfa3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php @@ -67,14 +67,16 @@ public function testExplicitPolicy(): void /** - * @Entity @Table(name="ddc444") + * @Entity + * @Table(name="ddc444") * @ChangeTrackingPolicy("DEFERRED_EXPLICIT") */ class DDC444User { /** * @var int - * @Id @Column(name="id", type="integer") + * @Id + * @Column(name="id", type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php index 40919d40ee8..637a7ea865a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php @@ -15,8 +15,6 @@ use Doctrine\ORM\Mapping\OneToOne; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class DDC512Test extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php index fda2b067515..ea1eed00bc0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php @@ -16,8 +16,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; - /** * @group DDC-618 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php index 6733de1b73e..504edfa261f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php @@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\ORM\Annotation as ORM; use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\DiscriminatorColumn; @@ -115,7 +114,10 @@ abstract class DDC6303BaseClass public $id; } -/** @Entity @Table */ +/** + * @Entity + * @Table + */ class DDC6303ChildA extends DDC6303BaseClass { /** @@ -134,7 +136,10 @@ public function __construct(string $id, $originalData) } } -/** @Entity @Table */ +/** + * @Entity + * @Table + */ class DDC6303ChildB extends DDC6303BaseClass { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php index e2994018c29..e998244c36d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php @@ -9,8 +9,6 @@ use Doctrine\Tests\Models\Generic\DateTimeModel; use Doctrine\Tests\OrmFunctionalTestCase; -use function is_array; - /** * @group DDC-657 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php index e8eba85a6dc..6b8ebb44b54 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php @@ -12,7 +12,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; use Exception; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php index bc12043a0c9..c50910ed926 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\MappedSuperclass; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php index fbcde6d35e5..02ffb33da8c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php @@ -15,8 +15,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; - class DDC735Test extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php index dedcf6ed68e..b331cd4d0f3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\ORM\PersistentCollection; use Doctrine\Tests\OrmFunctionalTestCase; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php index 335d50dd365..102cace4b4b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php @@ -14,8 +14,6 @@ use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class DDC809Test extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php index fa9a6ac5dfc..6aceb9fa7f0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php @@ -8,8 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class DDC849Test extends OrmFunctionalTestCase { /** @var CmsUser */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php index 7da68ae2836..5105cf2bdbc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php @@ -19,8 +19,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; - class DDC881Test extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php index dc115c40f2b..053dda766dc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php @@ -17,11 +17,9 @@ use Doctrine\ORM\Mapping\ManyToMany; use Doctrine\ORM\Mapping\ManyToOne; use Doctrine\ORM\Mapping\OneToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\Tests\OrmFunctionalTestCase; use Exception; -use function count; use function get_class; /** @@ -165,17 +163,17 @@ public function getRoleID(): int /** * @psalm-var Collection - * @ManyToMany (targetEntity="DDC992Role", mappedBy="extends") + * @ManyToMany(targetEntity="DDC992Role", mappedBy="extends") */ public $extendedBy; /** * @psalm-var Collection * @ManyToMany (targetEntity="DDC992Role", inversedBy="extendedBy") - * @JoinTable (name="RoleRelations", - * joinColumns={@JoinColumn(name="roleID", referencedColumnName="roleID")}, - * inverseJoinColumns={@JoinColumn(name="extendsRoleID", referencedColumnName="roleID")} - * ) + * @JoinTable(name="RoleRelations", + * joinColumns={@JoinColumn(name="roleID", referencedColumnName="roleID")}, + * inverseJoinColumns={@JoinColumn(name="extendsRoleID", referencedColumnName="roleID")}, + * ) */ public $extends; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php index 22c189deb7f..f803f3643ab 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6217Test.php @@ -60,7 +60,10 @@ public function testLoadingOfSecondLevelCacheOnEagerAssociations(): void } } -/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */ +/** + * @Entity + * @Cache(usage="NONSTRICT_READ_WRITE") + */ class GH6217AssociatedEntity { /** @@ -77,7 +80,10 @@ public function __construct() } } -/** @Entity @Cache(usage="NONSTRICT_READ_WRITE") */ +/** + * @Entity + * @Cache(usage="NONSTRICT_READ_WRITE") + */ class GH6217FetchedEntity { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php index b822e4a04a4..5647c676874 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php @@ -5,7 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\DBAL\Result; use Doctrine\ORM\Internal\Hydration\ObjectHydrator; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\DiscriminatorColumn; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6531Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6531Test.php index 87d5483c36b..9f418c2ea9b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6531Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6531Test.php @@ -233,7 +233,8 @@ class GH6531OrderItem /** * @var GH6531Product - * @Id @ManyToOne(targetEntity=GH6531Product::class) + * @Id + * @ManyToOne(targetEntity=GH6531Product::class) */ public $product; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7079Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7079Test.php index 5f5af547547..4ba986adf65 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7079Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7079Test.php @@ -99,7 +99,8 @@ class GH7079CmsUser { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue */ public $id; @@ -120,7 +121,8 @@ class GH7079CmsAddress /** * @var int * @Column(type="integer") - * @Id @GeneratedValue + * @Id + * @GeneratedValue */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7735Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7735Test.php index 088b6650784..82d1282b974 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7735Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7735Test.php @@ -52,7 +52,8 @@ public function findByReturnsCachedEntity(): void } /** - * @Entity @Cache(usage="READ_ONLY") + * @Entity + * @Cache(usage="READ_ONLY") */ class GH7735Car { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7737Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7737Test.php index be0198db180..527a91da901 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7737Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7737Test.php @@ -13,7 +13,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\Tests\OrmFunctionalTestCase; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7761Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7761Test.php index f93f0519e6c..e6a603c041c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7761Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH7761Test.php @@ -14,7 +14,6 @@ use Doctrine\ORM\Mapping\JoinColumn; use Doctrine\ORM\Mapping\JoinTable; use Doctrine\ORM\Mapping\ManyToMany; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\Tests\OrmFunctionalTestCase; use function assert; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8055Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8055Test.php index 3afa7191a1b..890ad295059 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8055Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8055Test.php @@ -58,7 +58,8 @@ class GH8055BaseClass { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(type="integer") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8443Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8443Test.php index 1a2b3a69842..328e7b68ddd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8443Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8443Test.php @@ -20,7 +20,6 @@ use Doctrine\Tests\OrmFunctionalTestCase; use function assert; -use function count; final class GH8443Test extends OrmFunctionalTestCase { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8499Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8499Test.php index cd9e87cd554..c63837d5038 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8499Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8499Test.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\Version; use Doctrine\ORM\OptimisticLockException; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; use function date; use function strtotime; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8914Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8914Test.php index 3e6b4559f08..c57b493dbb9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8914Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8914Test.php @@ -14,9 +14,6 @@ use Doctrine\ORM\Mapping\MappedSuperclass; use Doctrine\Tests\OrmTestCase; -use function assert; -use function count; - final class GH8914Test extends OrmTestCase { /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php index e99d9bb7985..025fb03881b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php @@ -10,7 +10,6 @@ use Doctrine\ORM\Mapping\Id; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmFunctionalTestCase; -use Exception; class Ticket2481Test extends OrmFunctionalTestCase { @@ -43,7 +42,8 @@ class Ticket2481Product { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php index 2e32839faeb..a88b794ff8d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php @@ -12,8 +12,6 @@ use Doctrine\Tests\Models\CustomType\CustomTypeUpperCase; use Doctrine\Tests\OrmFunctionalTestCase; -use function count; - class TypeValueSqlTest extends OrmFunctionalTestCase { protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php index 78845c1f9db..e185853c97f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php @@ -436,7 +436,8 @@ abstract class DDC93Vehicle /** * @var int * @Id - * @GeneratedValue(strategy = "AUTO") @Column(type = "integer") + * @GeneratedValue(strategy = "AUTO") + * @Column(type = "integer") */ public $id; @@ -524,7 +525,8 @@ class DDC93Customer /** * @var int * @Id - * @GeneratedValue @Column(type="integer") + * @GeneratedValue + * @Column(type="integer") */ private $id; diff --git a/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php index 3ee79f473a6..9dfb444bfcc 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php @@ -6,7 +6,6 @@ use Doctrine\Common\EventManager; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Driver\Statement; use Doctrine\DBAL\Result; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Events; diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index 11b03b1a5c8..28aff5d8f5c 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -28,7 +28,6 @@ use Doctrine\Tests\Models\Hydration\SimpleEntity; use function count; -use function is_array; class ObjectHydratorTest extends HydrationTestCase { diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index 00a9c6b127e..051f4e42cb6 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Mapping; -use Doctrine\Common\Annotations\AnnotationException; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\ORM\Cache\Exception\CacheException; use Doctrine\ORM\Mapping; diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index b4e5aac7a0a..943961af818 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -322,7 +322,10 @@ class MappedSuperclassBaseIndex private $mapped2; } -/** @Entity @Table(uniqueConstraints={@UniqueConstraint(name="IDX_NAME_INDEX",columns={"name"})}) */ +/** + * @Entity + * @Table(uniqueConstraints={@UniqueConstraint(name="IDX_NAME_INDEX",columns={"name"})}) + */ class EntityIndexSubClass extends MappedSuperclassBaseIndex { /** @@ -352,7 +355,9 @@ class EntityIndexSubClass extends MappedSuperclassBaseIndex abstract class HierarchyBase { /** - * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE") + * @Column(type="integer") + * @Id + * @GeneratedValue(strategy="SEQUENCE") * @SequenceGenerator(sequenceName="foo", initialValue=10) * @var int */ diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php index c3b3ec43bd9..d029e53a221 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php @@ -50,7 +50,8 @@ class LoadEventTestEntity { /** * @var int - * @Id @Column(type="integer") + * @Id + * @Column(type="integer") * @GeneratedValue(strategy="AUTO") */ private $id; diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index 4514b19bcc5..96e0deaf63d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -25,7 +25,6 @@ use function array_filter; use function array_map; use function assert; -use function count; use function glob; use function in_array; use function is_array; diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php index e0a6b20be2b..75dbb9b3486 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterCompositeTypeSqlTest.php @@ -6,8 +6,6 @@ use Doctrine\Common\Collections\Expr\Comparison; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\EntityManagerInterface; -use Doctrine\ORM\Mapping\OneToOneAssociationMetadata; use Doctrine\ORM\Persisters\Entity\BasicEntityPersister; use Doctrine\ORM\Persisters\Exception\CantUseInOperatorOnCompositeKeys; use Doctrine\Tests\Models\GeoNames\Admin1AlternateName; diff --git a/tests/Doctrine/Tests/ORM/Persisters/ManyToManyPersisterTest.php b/tests/Doctrine/Tests/ORM/Persisters/ManyToManyPersisterTest.php index e992ef1ead9..7c9591c93d8 100644 --- a/tests/Doctrine/Tests/ORM/Persisters/ManyToManyPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Persisters/ManyToManyPersisterTest.php @@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Persisters; -use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\Persisters\Collection\ManyToManyPersister; use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Models\ManyToManyPersister\ChildClass; diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 88ec87968a5..fbdf1252a28 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -21,7 +21,6 @@ use InvalidArgumentException; use function array_filter; -use function count; use function get_class; /** diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 9c243210a9e..7f9ca70f7ec 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -9,7 +9,6 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataInfo; -use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Driver\AnnotationDriver; use Doctrine\ORM\Tools\EntityGenerator; use Doctrine\Persistence\Mapping\RuntimeReflectionService; diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 6375ae209b3..07e5ded4bc5 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -27,7 +27,6 @@ use function count; use function current; -use function file_exists; use function file_get_contents; use function glob; use function is_array; diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php index 8108b536dd9..f0b4d365ab5 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php @@ -37,7 +37,8 @@ class User /** * @var int * @Id - * @Column(type="integer") @GeneratedValue(strategy="AUTO") + * @Column(type="integer") + * @GeneratedValue(strategy="AUTO") */ public $id; diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php index 4da1c77ea04..05c48f58083 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginationTestCase.php @@ -16,7 +16,6 @@ use Doctrine\ORM\Mapping\ManyToOne; use Doctrine\ORM\Mapping\MappedSuperclass; use Doctrine\ORM\Mapping\OneToOne; -use Doctrine\ORM\Mapping\OrderBy; use Doctrine\ORM\Mapping\Table; use Doctrine\Tests\OrmTestCase; @@ -180,7 +179,10 @@ class Category } -/** @Entity @Table(name="groups") */ +/** + * @Entity + * @Table(name="groups") + */ class Group { /** diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index 58c5aca7f76..97aa29f3fc5 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Tools; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\DiscriminatorMap; @@ -320,7 +321,8 @@ class DDC1587ValidEntity1 { /** * @var int - * @Id @GeneratedValue + * @Id + * @GeneratedValue * @Column(name="pk", type="integer") */ private $pk; diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index f04068d3a35..31e616e0d93 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -42,7 +42,6 @@ use function count; use function gc_collect_cycles; use function get_class; -use function is_numeric; use function random_int; use function uniqid; @@ -978,7 +977,8 @@ class VersionedAssignedIdentifierEntity class EntityWithStringIdentifier { /** - * @Id @Column(type="string") + * @Id + * @Column(type="string") * @var string|null */ public $id; @@ -988,7 +988,8 @@ class EntityWithStringIdentifier class EntityWithBooleanIdentifier { /** - * @Id @Column(type="boolean") + * @Id + * @Column(type="boolean") * @var bool|null */ public $id; @@ -998,13 +999,15 @@ class EntityWithBooleanIdentifier class EntityWithCompositeStringIdentifier { /** - * @Id @Column(type="string") + * @Id + * @Column(type="string") * @var string|null */ public $id1; /** - * @Id @Column(type="string") + * @Id + * @Column(type="string") * @var string|null */ public $id2; diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index 1b1bdd818d1..a63afcfee59 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -20,7 +20,6 @@ use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\ArrayAdapter; -use function class_exists; use function is_array; use function realpath;