From 9a13e103a222f6a5e6709abf17ea5a794add8a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Tue, 25 Nov 2025 12:25:00 +0100 Subject: [PATCH 1/6] Move attribute classes from Mapping\Annotations to Mapping\Attribute namespace --- UPGRADE-2.16.md | 23 +++++++++++++++++++ phpstan-baseline.neon | 10 ++++---- src/Mapping/Annotations/AbstractDocument.php | 9 -------- src/Mapping/Annotations/Annotation.php | 9 -------- src/Mapping/Attribute/AbstractDocument.php | 14 +++++++++++ .../AbstractField.php | 7 +++++- .../AbstractIndex.php | 7 +++++- .../{Annotations => Attribute}/AlsoLoad.php | 7 +++++- src/Mapping/Attribute/Annotation.php | 14 +++++++++++ .../ChangeTrackingPolicy.php | 7 +++++- .../DefaultDiscriminatorValue.php | 7 +++++- .../DiscriminatorField.php | 7 +++++- .../DiscriminatorMap.php | 7 +++++- .../DiscriminatorValue.php | 7 +++++- .../{Annotations => Attribute}/Document.php | 7 +++++- .../{Annotations => Attribute}/EmbedMany.php | 7 +++++- .../{Annotations => Attribute}/EmbedOne.php | 7 +++++- .../EmbeddedDocument.php | 7 +++++- .../{Annotations => Attribute}/Encrypt.php | 7 +++++- .../EncryptQuery.php | 7 +++++- .../{Annotations => Attribute}/Field.php | 7 +++++- .../{Annotations => Attribute}/File.php | 7 +++++- .../File/ChunkSize.php | 9 ++++++-- .../File/Filename.php | 9 ++++++-- .../File/Length.php | 9 ++++++-- .../File/Metadata.php | 9 ++++++-- .../File/UploadDate.php | 9 ++++++-- .../HasLifecycleCallbacks.php | 7 +++++- src/Mapping/{Annotations => Attribute}/Id.php | 7 +++++- .../{Annotations => Attribute}/Index.php | 7 +++++- .../{Annotations => Attribute}/Indexes.php | 7 +++++- .../InheritanceType.php | 7 +++++- .../{Annotations => Attribute}/Lock.php | 7 +++++- .../MappedSuperclass.php | 7 +++++- .../{Annotations => Attribute}/PostLoad.php | 7 +++++- .../PostPersist.php | 7 +++++- .../{Annotations => Attribute}/PostRemove.php | 7 +++++- .../{Annotations => Attribute}/PostUpdate.php | 7 +++++- .../{Annotations => Attribute}/PreFlush.php | 7 +++++- .../{Annotations => Attribute}/PreLoad.php | 7 +++++- .../{Annotations => Attribute}/PrePersist.php | 7 +++++- .../{Annotations => Attribute}/PreRemove.php | 7 +++++- .../{Annotations => Attribute}/PreUpdate.php | 7 +++++- .../QueryResultDocument.php | 7 +++++- .../ReadPreference.php | 7 +++++- .../ReferenceMany.php | 7 +++++- .../ReferenceOne.php | 7 +++++- .../SearchIndex.php | 7 +++++- .../{Annotations => Attribute}/ShardKey.php | 7 +++++- .../{Annotations => Attribute}/TimeSeries.php | 7 +++++- .../UniqueIndex.php | 7 +++++- .../{Annotations => Attribute}/Validation.php | 7 +++++- .../VectorSearchIndex.php | 7 +++++- .../{Annotations => Attribute}/Version.php | 7 +++++- .../{Annotations => Attribute}/View.php | 7 +++++- src/Mapping/ClassMetadata.php | 4 ++-- src/Mapping/Driver/AttributeDriver.php | 8 +++---- src/Mapping/Driver/AttributeReader.php | 2 +- src/Mapping/Driver/XmlDriver.php | 4 ++-- src/Mapping/MappingException.php | 2 +- tests/Documentation/BlendingOrm/Product.php | 6 ++--- tests/Documentation/CustomMapping/Thing.php | 6 ++--- tests/Documentation/Introduction/Address.php | 2 +- .../Introduction/BaseEmployee.php | 2 +- tests/Documentation/Introduction/Employee.php | 2 +- tests/Documentation/Introduction/Manager.php | 2 +- tests/Documentation/Introduction/Project.php | 2 +- tests/Documentation/LookupRelations/Item.php | 6 ++--- tests/Documentation/LookupRelations/Order.php | 10 ++++---- .../LookupRelations/OrderResult.php | 10 ++++---- tests/Documentation/LookupRelations/User.php | 6 ++--- .../LookupRelations/UserOrderResult.php | 8 +++---- .../LookupRelations/UserResult.php | 8 +++---- .../MappingOrmAndOdm/BlogPost.php | 2 +- .../ResolveTargetDocument/Customer.php | 2 +- .../CustomerModule/Customer.php | 6 ++--- .../InvoiceModule/Invoice.php | 6 ++--- tests/Documentation/Validation/Customer.php | 6 ++--- tests/Documentation/Validation/Order.php | 12 +++++----- tests/Documentation/Validation/OrderLine.php | 6 ++--- .../Validation/SchemaValidated.php | 2 +- tests/Documents/Account.php | 2 +- tests/Documents/Address.php | 2 +- tests/Documents/Agent.php | 2 +- tests/Documents/Album.php | 2 +- tests/Documents/Article.php | 2 +- tests/Documents/Bars/Bar.php | 2 +- tests/Documents/Bars/Location.php | 2 +- tests/Documents/BaseCategory.php | 2 +- tests/Documents/BaseDocument.php | 2 +- tests/Documents/BaseEmployee.php | 2 +- tests/Documents/BlogPost.php | 2 +- tests/Documents/BlogTagAggregation.php | 2 +- tests/Documents/Book.php | 2 +- tests/Documents/BrowseNode.php | 2 +- tests/Documents/Card.php | 2 +- tests/Documents/Cart.php | 2 +- tests/Documents/Category.php | 2 +- tests/Documents/Chapter.php | 2 +- tests/Documents/CmsAddress.php | 2 +- tests/Documents/CmsArticle.php | 2 +- tests/Documents/CmsComment.php | 4 ++-- tests/Documents/CmsContent.php | 2 +- tests/Documents/CmsGroup.php | 2 +- tests/Documents/CmsPage.php | 4 ++-- tests/Documents/CmsPhonenumber.php | 2 +- tests/Documents/CmsProduct.php | 2 +- tests/Documents/CmsUser.php | 2 +- tests/Documents/Comment.php | 2 +- tests/Documents/CustomRepository/Document.php | 2 +- tests/Documents/CustomUser.php | 2 +- tests/Documents/Customer.php | 2 +- tests/Documents/Developer.php | 2 +- .../DocumentWithUnmappedProperties.php | 2 +- tests/Documents/Ecommerce/Basket.php | 2 +- .../Ecommerce/ConfigurableProduct.php | 2 +- tests/Documents/Ecommerce/Currency.php | 2 +- tests/Documents/Ecommerce/Money.php | 2 +- tests/Documents/Ecommerce/Option.php | 2 +- tests/Documents/Ecommerce/Order.php | 2 +- tests/Documents/Ecommerce/StockItem.php | 2 +- tests/Documents/Employee.php | 2 +- tests/Documents/Encryption/Client.php | 2 +- tests/Documents/Encryption/ClientCard.php | 2 +- .../Encryption/InvalidRootEncrypt.php | 6 ++--- tests/Documents/Encryption/Patient.php | 2 +- tests/Documents/Encryption/PatientBilling.php | 2 +- tests/Documents/Encryption/PatientRecord.php | 2 +- tests/Documents/Encryption/RangeTypes.php | 10 ++++---- tests/Documents/Event.php | 2 +- tests/Documents/Feature.php | 2 +- tests/Documents/File.php | 2 +- tests/Documents/FileMetadata.php | 2 +- tests/Documents/FileWithoutChunkSize.php | 2 +- tests/Documents/FileWithoutMetadata.php | 2 +- tests/Documents/ForumAvatar.php | 2 +- tests/Documents/ForumStar.php | 2 +- tests/Documents/ForumUser.php | 2 +- tests/Documents/FriendUser.php | 2 +- tests/Documents/Functional/EmbedNamed.php | 2 +- tests/Documents/Functional/Embedded.php | 2 +- .../Functional/EmbeddedTestLevel0.php | 2 +- .../Functional/EmbeddedTestLevel0b.php | 2 +- .../Functional/EmbeddedTestLevel1.php | 2 +- .../Functional/EmbeddedTestLevel2.php | 2 +- .../Functional/EmbeddedWhichReferences.php | 2 +- tests/Documents/Functional/FavoritesUser.php | 2 +- .../Functional/NotAnnotatedDocument.php | 2 +- tests/Documents/Functional/NotSaved.php | 2 +- .../Documents/Functional/NotSavedEmbedded.php | 2 +- .../Documents/Functional/NullFieldValues.php | 2 +- .../Functional/PreUpdateTestProduct.php | 2 +- .../Functional/PreUpdateTestSellable.php | 2 +- .../Functional/PreUpdateTestSeller.php | 2 +- tests/Documents/Functional/Reference.php | 2 +- .../Documents/Functional/SameCollection1.php | 2 +- .../Documents/Functional/SameCollection2.php | 2 +- .../Documents/Functional/SameCollection3.php | 2 +- .../Functional/SimpleEmbedAndReference.php | 2 +- .../Ticket/GH683/AbstractEmbedded.php | 2 +- .../Ticket/GH683/EmbeddedSubDocument1.php | 2 +- .../Ticket/GH683/EmbeddedSubDocument2.php | 2 +- .../Ticket/GH683/ParentDocument.php | 2 +- .../EmbedManyInArrayCollectionLevel0.php | 2 +- .../EmbedManyInArrayCollectionLevel1.php | 2 +- .../Ticket/MODM160/EmbedManyInArrayLevel0.php | 2 +- .../Ticket/MODM160/EmbedManyInArrayLevel1.php | 2 +- .../Ticket/MODM160/EmbedOneLevel0.php | 2 +- .../Ticket/MODM160/EmbedOneLevel1.php | 2 +- .../Ticket/MODM160/MODM160Level2.php | 2 +- tests/Documents/Functional/VirtualHost.php | 2 +- .../Functional/VirtualHostDirective.php | 2 +- tests/Documents/GH2310Container.php | 2 +- tests/Documents/GraphLookup/Airport.php | 2 +- tests/Documents/GraphLookup/Employee.php | 2 +- .../GraphLookup/ReportingHierarchy.php | 2 +- tests/Documents/GraphLookup/Traveller.php | 2 +- tests/Documents/Group.php | 2 +- tests/Documents/GuestServer.php | 2 +- tests/Documents/IdentifiedChapter.php | 2 +- tests/Documents/IndirectlyReferencedUser.php | 2 +- tests/Documents/Issue.php | 2 +- tests/Documents/Manager.php | 2 +- tests/Documents/Message.php | 2 +- tests/Documents/OtherSubProject.php | 2 +- tests/Documents/Page.php | 2 +- tests/Documents/Phonebook.php | 2 +- tests/Documents/Phonenumber.php | 2 +- tests/Documents/Place.php | 2 +- tests/Documents/Product.php | 2 +- tests/Documents/Profile.php | 2 +- tests/Documents/ProfileNotify.php | 2 +- tests/Documents/Project.php | 2 +- tests/Documents/ReferenceUser.php | 2 +- tests/Documents/SchemaValidated.php | 2 +- tests/Documents/Server.php | 2 +- tests/Documents/Sharded/ShardedByUser.php | 2 +- tests/Documents/Sharded/ShardedOne.php | 2 +- .../Sharded/ShardedOneWithDifferentKey.php | 2 +- tests/Documents/Sharded/ShardedUser.php | 2 +- tests/Documents/SimpleReferenceUser.php | 2 +- tests/Documents/Song.php | 2 +- tests/Documents/SpecialUser.php | 2 +- tests/Documents/Strategy.php | 2 +- tests/Documents/SubCategory.php | 2 +- tests/Documents/SubProject.php | 2 +- tests/Documents/Tag.php | 2 +- tests/Documents/Task.php | 2 +- .../TimeSeries/TimeSeriesDocument.php | 2 +- tests/Documents/Tournament/Participant.php | 2 +- .../Documents/Tournament/ParticipantSolo.php | 2 +- .../Documents/Tournament/ParticipantTeam.php | 2 +- tests/Documents/Tournament/Tournament.php | 2 +- .../Tournament/TournamentFootball.php | 2 +- .../Documents/Tournament/TournamentTennis.php | 2 +- tests/Documents/TypedDocument.php | 2 +- tests/Documents/TypedEmbeddedDocument.php | 2 +- tests/Documents/User.php | 2 +- tests/Documents/UserName.php | 2 +- tests/Documents/UserTyped.php | 2 +- tests/Documents/UserUpsert.php | 2 +- tests/Documents/UserUpsertChild.php | 2 +- tests/Documents/UserUpsertIdStrategyNone.php | 2 +- tests/Documents/VectorEmbedding.php | 8 +++---- tests/Documents/VersionedDocument.php | 2 +- tests/Documents/VersionedUser.php | 2 +- tests/Documents/ViewReference.php | 2 +- .../PropertyHooks/MappingVirtualProperty.php | 6 ++--- tests/Documents84/PropertyHooks/User.php | 6 ++--- tests/Tests/DocumentManagerTest.php | 2 +- tests/Tests/Events/LifecycleCallbacksTest.php | 2 +- tests/Tests/Events/LifecycleListenersTest.php | 2 +- .../TransactionalLifecycleEventsTest.php | 2 +- tests/Tests/Functional/AlsoLoadTest.php | 2 +- tests/Tests/Functional/AtomicSetTest.php | 2 +- tests/Tests/Functional/BinDataTest.php | 2 +- .../Functional/CollectionPersisterTest.php | 2 +- tests/Tests/Functional/CollectionsTest.php | 2 +- .../Functional/CustomCollectionsTest.php | 2 +- .../Tests/Functional/CustomFieldNameTest.php | 2 +- tests/Tests/Functional/CustomTypeTest.php | 2 +- tests/Tests/Functional/DatabasesTest.php | 2 +- .../DiscriminatorsDefaultValueTest.php | 2 +- .../Functional/DocumentPersisterTest.php | 2 +- tests/Tests/Functional/EmbeddedIdTest.php | 2 +- .../Functional/EmbeddedReferenceTest.php | 2 +- tests/Tests/Functional/EmbeddedTest.php | 2 +- tests/Tests/Functional/FunctionalTest.php | 2 +- .../Functional/HasLifecycleCallbacksTest.php | 2 +- tests/Tests/Functional/IdTest.php | 4 ++-- tests/Tests/Functional/IndexesTest.php | 2 +- tests/Tests/Functional/LifecycleTest.php | 2 +- tests/Tests/Functional/LockTest.php | 2 +- .../Tests/Functional/MappedSuperclassTest.php | 2 +- .../Functional/NestedCollectionsTest.php | 2 +- .../Tests/Functional/NestedDocumentsTest.php | 2 +- .../Functional/OrphanRemovalEmbedTest.php | 2 +- tests/Tests/Functional/OrphanRemovalTest.php | 2 +- tests/Tests/Functional/PrePersistTest.php | 2 +- tests/Tests/Functional/RawTypeTest.php | 2 +- .../Tests/Functional/ReadOnlyDocumentTest.php | 2 +- .../Functional/ReadOnlyPropertiesTest.php | 8 +++---- tests/Tests/Functional/ReadPreferenceTest.php | 2 +- .../ReferenceDiscriminatorsTest.php | 2 +- tests/Tests/Functional/ReferencesTest.php | 2 +- .../SplObjectHashCollisionsTest.php | 2 +- tests/Tests/Functional/TargetDocumentTest.php | 2 +- tests/Tests/Functional/Ticket/GH1011Test.php | 2 +- tests/Tests/Functional/Ticket/GH1017Test.php | 2 +- tests/Tests/Functional/Ticket/GH1058Test.php | 2 +- tests/Tests/Functional/Ticket/GH1107Test.php | 2 +- tests/Tests/Functional/Ticket/GH1117Test.php | 2 +- tests/Tests/Functional/Ticket/GH1138Test.php | 2 +- tests/Tests/Functional/Ticket/GH1152Test.php | 2 +- tests/Tests/Functional/Ticket/GH1225Test.php | 2 +- tests/Tests/Functional/Ticket/GH1229Test.php | 2 +- tests/Tests/Functional/Ticket/GH1232Test.php | 2 +- tests/Tests/Functional/Ticket/GH1275Test.php | 2 +- tests/Tests/Functional/Ticket/GH1294Test.php | 2 +- tests/Tests/Functional/Ticket/GH1344Test.php | 2 +- tests/Tests/Functional/Ticket/GH1346Test.php | 2 +- tests/Tests/Functional/Ticket/GH1418Test.php | 2 +- tests/Tests/Functional/Ticket/GH1428Test.php | 2 +- tests/Tests/Functional/Ticket/GH1435Test.php | 2 +- tests/Tests/Functional/Ticket/GH1525Test.php | 2 +- tests/Tests/Functional/Ticket/GH1572Test.php | 2 +- tests/Tests/Functional/Ticket/GH1674Test.php | 2 +- tests/Tests/Functional/Ticket/GH1775Test.php | 2 +- tests/Tests/Functional/Ticket/GH1962Test.php | 2 +- tests/Tests/Functional/Ticket/GH1964Test.php | 2 +- tests/Tests/Functional/Ticket/GH1990Test.php | 2 +- tests/Tests/Functional/Ticket/GH2002Test.php | 2 +- tests/Tests/Functional/Ticket/GH2157Test.php | 2 +- tests/Tests/Functional/Ticket/GH2158Test.php | 2 +- tests/Tests/Functional/Ticket/GH232Test.php | 2 +- tests/Tests/Functional/Ticket/GH245Test.php | 2 +- tests/Tests/Functional/Ticket/GH267Test.php | 2 +- tests/Tests/Functional/Ticket/GH2730Test.php | 2 +- tests/Tests/Functional/Ticket/GH2789Test.php | 2 +- tests/Tests/Functional/Ticket/GH2825Test.php | 2 +- tests/Tests/Functional/Ticket/GH2910Test.php | 2 +- tests/Tests/Functional/Ticket/GH389Test.php | 2 +- tests/Tests/Functional/Ticket/GH426Test.php | 2 +- tests/Tests/Functional/Ticket/GH435Test.php | 2 +- tests/Tests/Functional/Ticket/GH453Test.php | 2 +- tests/Tests/Functional/Ticket/GH467Test.php | 2 +- tests/Tests/Functional/Ticket/GH499Test.php | 2 +- tests/Tests/Functional/Ticket/GH520Test.php | 2 +- tests/Tests/Functional/Ticket/GH529Test.php | 2 +- tests/Tests/Functional/Ticket/GH560Test.php | 2 +- tests/Tests/Functional/Ticket/GH561Test.php | 2 +- tests/Tests/Functional/Ticket/GH566Test.php | 2 +- tests/Tests/Functional/Ticket/GH580Test.php | 2 +- tests/Tests/Functional/Ticket/GH593Test.php | 2 +- tests/Tests/Functional/Ticket/GH596Test.php | 2 +- tests/Tests/Functional/Ticket/GH597Test.php | 2 +- tests/Tests/Functional/Ticket/GH602Test.php | 2 +- tests/Tests/Functional/Ticket/GH611Test.php | 2 +- tests/Tests/Functional/Ticket/GH628Test.php | 2 +- tests/Tests/Functional/Ticket/GH665Test.php | 2 +- tests/Tests/Functional/Ticket/GH788Test.php | 2 +- tests/Tests/Functional/Ticket/GH816Test.php | 2 +- tests/Tests/Functional/Ticket/GH850Test.php | 2 +- tests/Tests/Functional/Ticket/GH852Test.php | 2 +- tests/Tests/Functional/Ticket/GH878Test.php | 2 +- tests/Tests/Functional/Ticket/GH880Test.php | 2 +- tests/Tests/Functional/Ticket/GH897Test.php | 2 +- tests/Tests/Functional/Ticket/GH921Test.php | 2 +- tests/Tests/Functional/Ticket/GH927Test.php | 2 +- tests/Tests/Functional/Ticket/GH928Test.php | 2 +- tests/Tests/Functional/Ticket/GH936Test.php | 2 +- tests/Tests/Functional/Ticket/GH942Test.php | 2 +- tests/Tests/Functional/Ticket/GH944Test.php | 2 +- tests/Tests/Functional/Ticket/GH971Test.php | 2 +- tests/Tests/Functional/Ticket/GH977Test.php | 2 +- tests/Tests/Functional/Ticket/GH999Test.php | 2 +- tests/Tests/Functional/Ticket/MODM116Test.php | 2 +- tests/Tests/Functional/Ticket/MODM140Test.php | 2 +- tests/Tests/Functional/Ticket/MODM29Test.php | 2 +- tests/Tests/Functional/Ticket/MODM43Test.php | 2 +- tests/Tests/Functional/Ticket/MODM45Test.php | 2 +- tests/Tests/Functional/Ticket/MODM46Test.php | 2 +- tests/Tests/Functional/Ticket/MODM47Test.php | 2 +- tests/Tests/Functional/Ticket/MODM48Test.php | 2 +- tests/Tests/Functional/Ticket/MODM52Test.php | 2 +- tests/Tests/Functional/Ticket/MODM56Test.php | 2 +- tests/Tests/Functional/Ticket/MODM62Test.php | 2 +- tests/Tests/Functional/Ticket/MODM65Test.php | 2 +- tests/Tests/Functional/Ticket/MODM66Test.php | 2 +- tests/Tests/Functional/Ticket/MODM67Test.php | 2 +- tests/Tests/Functional/Ticket/MODM70Test.php | 2 +- tests/Tests/Functional/Ticket/MODM72Test.php | 2 +- tests/Tests/Functional/Ticket/MODM76Test.php | 2 +- tests/Tests/Functional/Ticket/MODM81Test.php | 2 +- tests/Tests/Functional/Ticket/MODM83Test.php | 2 +- tests/Tests/Functional/Ticket/MODM90Test.php | 2 +- tests/Tests/Functional/Ticket/MODM91Test.php | 2 +- tests/Tests/Functional/Ticket/MODM92Test.php | 2 +- tests/Tests/Functional/Ticket/MODM95Test.php | 2 +- tests/Tests/Functional/UpsertTest.php | 2 +- tests/Tests/Functional/UuidMappingTest.php | 2 +- tests/Tests/Functional/ValidationTest.php | 2 +- tests/Tests/Functional/VersionTest.php | 2 +- tests/Tests/HydratorTest.php | 2 +- .../AbstractAnnotationDriverTestCase.php | 2 +- .../Mapping/AbstractMappingDriverTestCase.php | 2 +- tests/Tests/Mapping/AnnotationDriverTest.php | 4 ++-- .../Mapping/BasicInheritanceMappingTest.php | 2 +- .../Mapping/ClassMetadataLoadEventTest.php | 2 +- tests/Tests/Mapping/ClassMetadataTest.php | 2 +- .../Documents/GlobalNamespaceDocument.php | 2 +- .../Mapping/Driver/AbstractDriverTestCase.php | 2 +- .../Mapping/LegacyReflectionFieldsTest.php | 6 ++--- .../ShardKeyInheritanceMappingTest.php | 2 +- .../DocumentPersisterGetShardKeyQueryTest.php | 2 +- tests/Tests/Query/BuilderTest.php | 2 +- tests/Tests/QueryTest.php | 2 +- tests/Tests/Tools/GH1299/BaseUser.php | 2 +- tests/Tests/Tools/GH1299/GH1299User.php | 2 +- tests/Tests/Tools/GH297/Address.php | 2 +- tests/Tests/Tools/GH297/AddressTrait.php | 2 +- tests/Tests/Tools/GH297/Admin.php | 2 +- tests/Tests/Tools/GH297/User.php | 2 +- .../ResolveTargetDocumentListenerTest.php | 2 +- tests/Tests/UnitOfWorkTest.php | 2 +- 385 files changed, 747 insertions(+), 469 deletions(-) delete mode 100644 src/Mapping/Annotations/AbstractDocument.php delete mode 100644 src/Mapping/Annotations/Annotation.php create mode 100644 src/Mapping/Attribute/AbstractDocument.php rename src/Mapping/{Annotations => Attribute}/AbstractField.php (80%) rename src/Mapping/{Annotations => Attribute}/AbstractIndex.php (87%) rename src/Mapping/{Annotations => Attribute}/AlsoLoad.php (70%) create mode 100644 src/Mapping/Attribute/Annotation.php rename src/Mapping/{Annotations => Attribute}/ChangeTrackingPolicy.php (67%) rename src/Mapping/{Annotations => Attribute}/DefaultDiscriminatorValue.php (70%) rename src/Mapping/{Annotations => Attribute}/DiscriminatorField.php (67%) rename src/Mapping/{Annotations => Attribute}/DiscriminatorMap.php (71%) rename src/Mapping/{Annotations => Attribute}/DiscriminatorValue.php (67%) rename src/Mapping/{Annotations => Attribute}/Document.php (87%) rename src/Mapping/{Annotations => Attribute}/EmbedMany.php (90%) rename src/Mapping/{Annotations => Attribute}/EmbedOne.php (87%) rename src/Mapping/{Annotations => Attribute}/EmbeddedDocument.php (71%) rename src/Mapping/{Annotations => Attribute}/Encrypt.php (88%) rename src/Mapping/{Annotations => Attribute}/EncryptQuery.php (50%) rename src/Mapping/{Annotations => Attribute}/Field.php (82%) rename src/Mapping/{Annotations => Attribute}/File.php (88%) rename src/Mapping/{Annotations => Attribute}/File/ChunkSize.php (58%) rename src/Mapping/{Annotations => Attribute}/File/Filename.php (58%) rename src/Mapping/{Annotations => Attribute}/File/Length.php (58%) rename src/Mapping/{Annotations => Attribute}/File/Metadata.php (83%) rename src/Mapping/{Annotations => Attribute}/File/UploadDate.php (58%) rename src/Mapping/{Annotations => Attribute}/HasLifecycleCallbacks.php (56%) rename src/Mapping/{Annotations => Attribute}/Id.php (78%) rename src/Mapping/{Annotations => Attribute}/Index.php (63%) rename src/Mapping/{Annotations => Attribute}/Indexes.php (72%) rename src/Mapping/{Annotations => Attribute}/InheritanceType.php (68%) rename src/Mapping/{Annotations => Attribute}/Lock.php (52%) rename src/Mapping/{Annotations => Attribute}/MappedSuperclass.php (75%) rename src/Mapping/{Annotations => Attribute}/PostLoad.php (60%) rename src/Mapping/{Annotations => Attribute}/PostPersist.php (60%) rename src/Mapping/{Annotations => Attribute}/PostRemove.php (60%) rename src/Mapping/{Annotations => Attribute}/PostUpdate.php (60%) rename src/Mapping/{Annotations => Attribute}/PreFlush.php (60%) rename src/Mapping/{Annotations => Attribute}/PreLoad.php (60%) rename src/Mapping/{Annotations => Attribute}/PrePersist.php (60%) rename src/Mapping/{Annotations => Attribute}/PreRemove.php (60%) rename src/Mapping/{Annotations => Attribute}/PreUpdate.php (60%) rename src/Mapping/{Annotations => Attribute}/QueryResultDocument.php (54%) rename src/Mapping/{Annotations => Attribute}/ReadPreference.php (71%) rename src/Mapping/{Annotations => Attribute}/ReferenceMany.php (94%) rename src/Mapping/{Annotations => Attribute}/ReferenceOne.php (93%) rename src/Mapping/{Annotations => Attribute}/SearchIndex.php (85%) rename src/Mapping/{Annotations => Attribute}/ShardKey.php (77%) rename src/Mapping/{Annotations => Attribute}/TimeSeries.php (78%) rename src/Mapping/{Annotations => Attribute}/UniqueIndex.php (81%) rename src/Mapping/{Annotations => Attribute}/Validation.php (83%) rename src/Mapping/{Annotations => Attribute}/VectorSearchIndex.php (76%) rename src/Mapping/{Annotations => Attribute}/Version.php (51%) rename src/Mapping/{Annotations => Attribute}/View.php (80%) diff --git a/UPGRADE-2.16.md b/UPGRADE-2.16.md index e2cd841772..b3a4cf4999 100644 --- a/UPGRADE-2.16.md +++ b/UPGRADE-2.16.md @@ -1,5 +1,28 @@ # UPGRADE FROM 2.15 to 2.16 +## Attribute namespaces + +Doctrine annotations are already deprecated in favor of PHP attributes. +As of MongoDB ODM 2.16, the attribute namespaces have been changed from +`Doctrine\ODM\MongoDB\Mapping\Annotations` to `Doctrine\ODM\MongoDB\Mapping\Attribute`. +The old annotation namespaces continue to work for the time being, but they are +deprecated and will be removed in 3.0. + +```diff +- use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; ++ use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; + + #[ODM\Document] + class User + { + #[ODM\Id] + private string $id; + + #[ODM\Field] + public string $name; + } +``` + ## Package `doctrine/cache` no longer required If you use `Doctrine\ODM\MongoDB\Configuration::getMetadataCacheImpl()`, diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 2c136844ca..0835031f7a 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -373,10 +373,10 @@ parameters: path: src/Iterator/IterableResult.php - - message: '#^Method Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\SearchIndex\:\:__construct\(\) has parameter \$fields with no value type specified in iterable type array\.$#' + message: '#^Method Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\SearchIndex\:\:__construct\(\) has parameter \$fields with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue count: 1 - path: src/Mapping/Annotations/SearchIndex.php + path: src/Mapping/Attribute/SearchIndex.php - message: '#^Method Doctrine\\ODM\\MongoDB\\Mapping\\ClassMetadata\:\:addInheritedAssociationMapping\(\) has Doctrine\\ODM\\MongoDB\\Mapping\\MappingException in PHPDoc @throws tag but it''s not thrown\.$#' @@ -475,7 +475,7 @@ parameters: path: src/Mapping/Driver/XmlDriver.php - - message: '#^Parameter \#2 \$mapping of method Doctrine\\ODM\\MongoDB\\Mapping\\Driver\\XmlDriver\:\:addFieldMapping\(\) expects array\{type\?\: string, fieldName\?\: string, name\?\: string, strategy\?\: string, association\?\: int, id\?\: bool, isOwningSide\?\: bool, collectionClass\?\: class\-string, \.\.\.\}, array\, Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\EncryptQuery\|float\|int\|MongoDB\\BSON\\Decimal128\|MongoDB\\BSON\\Int64\|MongoDB\\BSON\\UTCDateTime\|string\|null\>\|bool\|string\> given\.$#' + message: '#^Parameter \#2 \$mapping of method Doctrine\\ODM\\MongoDB\\Mapping\\Driver\\XmlDriver\:\:addFieldMapping\(\) expects array\{type\?\: string, fieldName\?\: string, name\?\: string, strategy\?\: string, association\?\: int, id\?\: bool, isOwningSide\?\: bool, collectionClass\?\: class\-string, \.\.\.\}, array\, Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\EncryptQuery\|float\|int\|MongoDB\\BSON\\Decimal128\|MongoDB\\BSON\\Int64\|MongoDB\\BSON\\UTCDateTime\|string\|null\>\|bool\|string\> given\.$#' identifier: argument.type count: 1 path: src/Mapping/Driver/XmlDriver.php @@ -1069,13 +1069,13 @@ parameters: path: tests/Tests/Functional/QueryableEncryptionTest.php - - message: '#^Parameter \$discriminatorMap of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\ReferenceOne constructor expects array\\|null, array\ given\.$#' + message: '#^Parameter \$discriminatorMap of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\ReferenceOne constructor expects array\\|null, array\ given\.$#' identifier: argument.type count: 1 path: tests/Tests/Functional/TargetDocumentTest.php - - message: '#^Parameter \$targetDocument of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\ReferenceOne constructor expects class\-string\|null, string given\.$#' + message: '#^Parameter \$targetDocument of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\ReferenceOne constructor expects class\-string\|null, string given\.$#' identifier: argument.type count: 1 path: tests/Tests/Functional/TargetDocumentTest.php diff --git a/src/Mapping/Annotations/AbstractDocument.php b/src/Mapping/Annotations/AbstractDocument.php deleted file mode 100644 index 8307a02e54..0000000000 --- a/src/Mapping/Annotations/AbstractDocument.php +++ /dev/null @@ -1,9 +0,0 @@ -notSaved = $notSaved; } } + +// @phpstan-ignore class.notFound +class_alias(AbstractField::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractField::class); diff --git a/src/Mapping/Annotations/AbstractIndex.php b/src/Mapping/Attribute/AbstractIndex.php similarity index 87% rename from src/Mapping/Annotations/AbstractIndex.php rename to src/Mapping/Attribute/AbstractIndex.php index 8d3db18668..191d56dc97 100644 --- a/src/Mapping/Annotations/AbstractIndex.php +++ b/src/Mapping/Attribute/AbstractIndex.php @@ -2,7 +2,9 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; + +use function class_alias; abstract class AbstractIndex implements Annotation { @@ -57,3 +59,6 @@ public function __construct( $this->partialFilterExpression = $partialFilterExpression; } } + +// @phpstan-ignore class.notFound +class_alias(AbstractIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractIndex::class); diff --git a/src/Mapping/Annotations/AlsoLoad.php b/src/Mapping/Attribute/AlsoLoad.php similarity index 70% rename from src/Mapping/Annotations/AlsoLoad.php rename to src/Mapping/Attribute/AlsoLoad.php index e847775cf7..e8ce76bbe1 100644 --- a/src/Mapping/Annotations/AlsoLoad.php +++ b/src/Mapping/Attribute/AlsoLoad.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Loads data from a different field if the original field is not set * @@ -21,3 +23,6 @@ public function __construct(public $value, public ?string $name = null) { } } + +// @phpstan-ignore class.notFound +class_alias(AlsoLoad::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\AlsoLoad::class); diff --git a/src/Mapping/Attribute/Annotation.php b/src/Mapping/Attribute/Annotation.php new file mode 100644 index 0000000000..3d66460249 --- /dev/null +++ b/src/Mapping/Attribute/Annotation.php @@ -0,0 +1,14 @@ +value = $value; } } + +// @phpstan-ignore class.notFound +class_alias(ChangeTrackingPolicy::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ChangeTrackingPolicy::class); diff --git a/src/Mapping/Annotations/DefaultDiscriminatorValue.php b/src/Mapping/Attribute/DefaultDiscriminatorValue.php similarity index 70% rename from src/Mapping/Annotations/DefaultDiscriminatorValue.php rename to src/Mapping/Attribute/DefaultDiscriminatorValue.php index 45faeea0e6..e086676c64 100644 --- a/src/Mapping/Annotations/DefaultDiscriminatorValue.php +++ b/src/Mapping/Attribute/DefaultDiscriminatorValue.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specifies a default discriminator value to be used when the discriminator * field is not set in a document @@ -25,3 +27,6 @@ public function __construct(string $value) $this->value = $value; } } + +// @phpstan-ignore class.notFound +class_alias(DefaultDiscriminatorValue::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DefaultDiscriminatorValue::class); diff --git a/src/Mapping/Annotations/DiscriminatorField.php b/src/Mapping/Attribute/DiscriminatorField.php similarity index 67% rename from src/Mapping/Annotations/DiscriminatorField.php rename to src/Mapping/Attribute/DiscriminatorField.php index ae57be43fe..0e5403aff8 100644 --- a/src/Mapping/Annotations/DiscriminatorField.php +++ b/src/Mapping/Attribute/DiscriminatorField.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specify a field name to store a discriminator value * @@ -24,3 +26,6 @@ public function __construct(string $value) $this->value = $value; } } + +// @phpstan-ignore class.notFound +class_alias(DiscriminatorField::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DiscriminatorField::class); diff --git a/src/Mapping/Annotations/DiscriminatorMap.php b/src/Mapping/Attribute/DiscriminatorMap.php similarity index 71% rename from src/Mapping/Annotations/DiscriminatorMap.php rename to src/Mapping/Attribute/DiscriminatorMap.php index 644e244432..7b2cece734 100644 --- a/src/Mapping/Annotations/DiscriminatorMap.php +++ b/src/Mapping/Attribute/DiscriminatorMap.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specify a map of discriminator values and classes * @@ -25,3 +27,6 @@ public function __construct(array $value) $this->value = $value; } } + +// @phpstan-ignore class.notFound +class_alias(DiscriminatorMap::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DiscriminatorMap::class); diff --git a/src/Mapping/Annotations/DiscriminatorValue.php b/src/Mapping/Attribute/DiscriminatorValue.php similarity index 67% rename from src/Mapping/Annotations/DiscriminatorValue.php rename to src/Mapping/Attribute/DiscriminatorValue.php index 069e0cffe6..e67a443e25 100644 --- a/src/Mapping/Annotations/DiscriminatorValue.php +++ b/src/Mapping/Attribute/DiscriminatorValue.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Use the specified discriminator for this class * @@ -24,3 +26,6 @@ public function __construct(string $value) $this->value = $value; } } + +// @phpstan-ignore class.notFound +class_alias(DiscriminatorValue::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DiscriminatorValue::class); diff --git a/src/Mapping/Annotations/Document.php b/src/Mapping/Attribute/Document.php similarity index 87% rename from src/Mapping/Annotations/Document.php rename to src/Mapping/Attribute/Document.php index c9754ce291..d78c2f79ef 100644 --- a/src/Mapping/Annotations/Document.php +++ b/src/Mapping/Attribute/Document.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Identifies a class as a document that can be stored in the database * @@ -52,3 +54,6 @@ public function __construct( $this->shardKey = $shardKey; } } + +// @phpstan-ignore class.notFound +class_alias(Document::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Document::class); diff --git a/src/Mapping/Annotations/EmbedMany.php b/src/Mapping/Attribute/EmbedMany.php similarity index 90% rename from src/Mapping/Annotations/EmbedMany.php rename to src/Mapping/Attribute/EmbedMany.php index e693929c9a..11020988c2 100644 --- a/src/Mapping/Annotations/EmbedMany.php +++ b/src/Mapping/Attribute/EmbedMany.php @@ -2,13 +2,15 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Utility\CollectionHelper; +use function class_alias; + /** * Embeds multiple documents * @@ -63,3 +65,6 @@ public function __construct( $this->storeEmptyArray = $storeEmptyArray; } } + +// @phpstan-ignore class.notFound +class_alias(EmbedMany::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany::class); diff --git a/src/Mapping/Annotations/EmbedOne.php b/src/Mapping/Attribute/EmbedOne.php similarity index 87% rename from src/Mapping/Annotations/EmbedOne.php rename to src/Mapping/Attribute/EmbedOne.php index 6a260ec0e2..10365be32a 100644 --- a/src/Mapping/Annotations/EmbedOne.php +++ b/src/Mapping/Attribute/EmbedOne.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use function class_alias; + /** * Embeds a single document * @@ -52,3 +54,6 @@ public function __construct( $this->defaultDiscriminatorValue = $defaultDiscriminatorValue; } } + +// @phpstan-ignore class.notFound +class_alias(EmbedOne::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne::class); diff --git a/src/Mapping/Annotations/EmbeddedDocument.php b/src/Mapping/Attribute/EmbeddedDocument.php similarity index 71% rename from src/Mapping/Annotations/EmbeddedDocument.php rename to src/Mapping/Attribute/EmbeddedDocument.php index 5b68f7a5a6..2daab3efa9 100644 --- a/src/Mapping/Annotations/EmbeddedDocument.php +++ b/src/Mapping/Attribute/EmbeddedDocument.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Identifies a class as a document that can be embedded but not stored by itself * @@ -25,3 +27,6 @@ public function __construct(array $indexes = []) $this->indexes = $indexes; } } + +// @phpstan-ignore class.notFound +class_alias(EmbeddedDocument::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument::class); diff --git a/src/Mapping/Annotations/Encrypt.php b/src/Mapping/Attribute/Encrypt.php similarity index 88% rename from src/Mapping/Annotations/Encrypt.php rename to src/Mapping/Attribute/Encrypt.php index 1f7fbc90e4..b7fca098fc 100644 --- a/src/Mapping/Annotations/Encrypt.php +++ b/src/Mapping/Attribute/Encrypt.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use DateTimeInterface; @@ -11,6 +11,8 @@ use MongoDB\BSON\Int64; use MongoDB\BSON\UTCDateTime; +use function class_alias; + /** * Defines an encrypted field mapping. * @@ -45,3 +47,6 @@ public function __construct( $this->max = $max instanceof DateTimeInterface ? new UTCDateTime($max) : $max; } } + +// @phpstan-ignore class.notFound +class_alias(Encrypt::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt::class); diff --git a/src/Mapping/Annotations/EncryptQuery.php b/src/Mapping/Attribute/EncryptQuery.php similarity index 50% rename from src/Mapping/Annotations/EncryptQuery.php rename to src/Mapping/Attribute/EncryptQuery.php index 71b5ea6d04..fc5e329ddf 100644 --- a/src/Mapping/Annotations/EncryptQuery.php +++ b/src/Mapping/Attribute/EncryptQuery.php @@ -2,12 +2,17 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use MongoDB\Driver\ClientEncryption; +use function class_alias; + enum EncryptQuery: string { case Equality = ClientEncryption::QUERY_TYPE_EQUALITY; case Range = ClientEncryption::QUERY_TYPE_RANGE; } + +// @phpstan-ignore class.notFound +class_alias(EncryptQuery::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery::class); diff --git a/src/Mapping/Annotations/Field.php b/src/Mapping/Attribute/Field.php similarity index 82% rename from src/Mapping/Annotations/Field.php rename to src/Mapping/Attribute/Field.php index 39c22362b7..69a3b5bdfa 100644 --- a/src/Mapping/Annotations/Field.php +++ b/src/Mapping/Attribute/Field.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use BackedEnum; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specifies a generic field mapping * @@ -38,3 +40,6 @@ public function __construct( $this->enumType = $enumType; } } + +// @phpstan-ignore class.notFound +class_alias(Field::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Field::class); diff --git a/src/Mapping/Annotations/File.php b/src/Mapping/Attribute/File.php similarity index 88% rename from src/Mapping/Annotations/File.php rename to src/Mapping/Attribute/File.php index 2421cfe53a..92939959c1 100644 --- a/src/Mapping/Annotations/File.php +++ b/src/Mapping/Attribute/File.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Identifies a class as a GridFS file that can be stored in the database * @@ -60,3 +62,6 @@ public function __construct( $this->chunkSizeBytes = $chunkSizeBytes; } } + +// @phpstan-ignore class.notFound +class_alias(File::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File::class); diff --git a/src/Mapping/Annotations/File/ChunkSize.php b/src/Mapping/Attribute/File/ChunkSize.php similarity index 58% rename from src/Mapping/Annotations/File/ChunkSize.php rename to src/Mapping/Attribute/File/ChunkSize.php index 0043be358a..7f8d0e9f32 100644 --- a/src/Mapping/Annotations/File/ChunkSize.php +++ b/src/Mapping/Attribute/File/ChunkSize.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; + +use function class_alias; /** * @Annotation @@ -20,3 +22,6 @@ public function __construct() parent::__construct('chunkSize', 'int', false, [], null, true); } } + +// @phpstan-ignore class.notFound +class_alias(ChunkSize::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\ChunkSize::class); diff --git a/src/Mapping/Annotations/File/Filename.php b/src/Mapping/Attribute/File/Filename.php similarity index 58% rename from src/Mapping/Annotations/File/Filename.php rename to src/Mapping/Attribute/File/Filename.php index 260a78afd3..34ecab8b43 100644 --- a/src/Mapping/Annotations/File/Filename.php +++ b/src/Mapping/Attribute/File/Filename.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; + +use function class_alias; /** * @Annotation @@ -20,3 +22,6 @@ public function __construct() parent::__construct('filename', 'string', false, [], null, true); } } + +// @phpstan-ignore class.notFound +class_alias(Filename::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\Filename::class); diff --git a/src/Mapping/Annotations/File/Length.php b/src/Mapping/Attribute/File/Length.php similarity index 58% rename from src/Mapping/Annotations/File/Length.php rename to src/Mapping/Attribute/File/Length.php index b960ae29bc..ce73e70e34 100644 --- a/src/Mapping/Annotations/File/Length.php +++ b/src/Mapping/Attribute/File/Length.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; + +use function class_alias; /** * @Annotation @@ -20,3 +22,6 @@ public function __construct() parent::__construct('length', 'int', false, [], null, true); } } + +// @phpstan-ignore class.notFound +class_alias(Length::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\Length::class); diff --git a/src/Mapping/Annotations/File/Metadata.php b/src/Mapping/Attribute/File/Metadata.php similarity index 83% rename from src/Mapping/Annotations/File/Metadata.php rename to src/Mapping/Attribute/File/Metadata.php index 16c06265ce..3fdddbc8fa 100644 --- a/src/Mapping/Annotations/File/Metadata.php +++ b/src/Mapping/Attribute/File/Metadata.php @@ -2,13 +2,15 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use function class_alias; + /** * @Annotation * @NamedArgumentConstructor @@ -50,3 +52,6 @@ public function __construct( $this->defaultDiscriminatorValue = $defaultDiscriminatorValue; } } + +// @phpstan-ignore class.notFound +class_alias(Metadata::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\Metadata::class); diff --git a/src/Mapping/Annotations/File/UploadDate.php b/src/Mapping/Attribute/File/UploadDate.php similarity index 58% rename from src/Mapping/Annotations/File/UploadDate.php rename to src/Mapping/Attribute/File/UploadDate.php index 1454fe993d..6c5f9b766a 100644 --- a/src/Mapping/Annotations/File/UploadDate.php +++ b/src/Mapping/Attribute/File/UploadDate.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; + +use function class_alias; /** * @Annotation @@ -20,3 +22,6 @@ public function __construct() parent::__construct('uploadDate', 'date', false, [], null, true); } } + +// @phpstan-ignore class.notFound +class_alias(UploadDate::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\UploadDate::class); diff --git a/src/Mapping/Annotations/HasLifecycleCallbacks.php b/src/Mapping/Attribute/HasLifecycleCallbacks.php similarity index 56% rename from src/Mapping/Annotations/HasLifecycleCallbacks.php rename to src/Mapping/Attribute/HasLifecycleCallbacks.php index aaa8dd6e31..99e927935f 100644 --- a/src/Mapping/Annotations/HasLifecycleCallbacks.php +++ b/src/Mapping/Attribute/HasLifecycleCallbacks.php @@ -2,10 +2,12 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; +use function class_alias; + /** * Must be set on a document class to instruct Doctrine to check for lifecycle * callback annotations on public methods. @@ -16,3 +18,6 @@ final class HasLifecycleCallbacks implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(HasLifecycleCallbacks::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\HasLifecycleCallbacks::class); diff --git a/src/Mapping/Annotations/Id.php b/src/Mapping/Attribute/Id.php similarity index 78% rename from src/Mapping/Annotations/Id.php rename to src/Mapping/Attribute/Id.php index ab48d9d8b2..92048786e2 100644 --- a/src/Mapping/Annotations/Id.php +++ b/src/Mapping/Attribute/Id.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Special field mapping to map document identifiers * @@ -30,3 +32,6 @@ public function __construct( parent::__construct($name, $type, $nullable, $options, $strategy, $notSaved); } } + +// @phpstan-ignore class.notFound +class_alias(Id::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Id::class); diff --git a/src/Mapping/Annotations/Index.php b/src/Mapping/Attribute/Index.php similarity index 63% rename from src/Mapping/Annotations/Index.php rename to src/Mapping/Attribute/Index.php index 378a67a3fc..b279517c27 100644 --- a/src/Mapping/Annotations/Index.php +++ b/src/Mapping/Attribute/Index.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Defines an index on a field * @@ -17,3 +19,6 @@ final class Index extends AbstractIndex { } + +// @phpstan-ignore class.notFound +class_alias(Index::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Index::class); diff --git a/src/Mapping/Annotations/Indexes.php b/src/Mapping/Attribute/Indexes.php similarity index 72% rename from src/Mapping/Annotations/Indexes.php rename to src/Mapping/Attribute/Indexes.php index 91c67b8e18..4de1fb19a6 100644 --- a/src/Mapping/Annotations/Indexes.php +++ b/src/Mapping/Attribute/Indexes.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation as BaseAnnotation; +use function class_alias; + /** * Specifies a list of indexes for a document * @@ -20,3 +22,6 @@ final class Indexes extends BaseAnnotation implements Annotation /** @var AbstractIndex[]|AbstractIndex */ public $value = []; } + +// @phpstan-ignore class.notFound +class_alias(Indexes::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Indexes::class); diff --git a/src/Mapping/Annotations/InheritanceType.php b/src/Mapping/Attribute/InheritanceType.php similarity index 68% rename from src/Mapping/Annotations/InheritanceType.php rename to src/Mapping/Attribute/InheritanceType.php index 45c14f1460..d2fc3c3afb 100644 --- a/src/Mapping/Annotations/InheritanceType.php +++ b/src/Mapping/Attribute/InheritanceType.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specifies which inheritance type to use for a document * @@ -24,3 +26,6 @@ public function __construct(string $value) $this->value = $value; } } + +// @phpstan-ignore class.notFound +class_alias(InheritanceType::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\InheritanceType::class); diff --git a/src/Mapping/Annotations/Lock.php b/src/Mapping/Attribute/Lock.php similarity index 52% rename from src/Mapping/Annotations/Lock.php rename to src/Mapping/Attribute/Lock.php index ac5bd5ee48..97a292545c 100644 --- a/src/Mapping/Annotations/Lock.php +++ b/src/Mapping/Attribute/Lock.php @@ -2,10 +2,12 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; +use function class_alias; + /** * Specifies a field to use for pessimistic locking * @@ -15,3 +17,6 @@ final class Lock implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(Lock::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Lock::class); diff --git a/src/Mapping/Annotations/MappedSuperclass.php b/src/Mapping/Attribute/MappedSuperclass.php similarity index 75% rename from src/Mapping/Annotations/MappedSuperclass.php rename to src/Mapping/Attribute/MappedSuperclass.php index 012db54ba7..908dab30e5 100644 --- a/src/Mapping/Annotations/MappedSuperclass.php +++ b/src/Mapping/Attribute/MappedSuperclass.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specifies a parent class that other documents may extend to inherit mapping * information @@ -29,3 +31,6 @@ public function __construct(?string $repositoryClass = null, ?string $collection $this->collection = $collection; } } + +// @phpstan-ignore class.notFound +class_alias(MappedSuperclass::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\MappedSuperclass::class); diff --git a/src/Mapping/Annotations/PostLoad.php b/src/Mapping/Attribute/PostLoad.php similarity index 60% rename from src/Mapping/Annotations/PostLoad.php rename to src/Mapping/Attribute/PostLoad.php index fe09676f82..a306461b56 100644 --- a/src/Mapping/Annotations/PostLoad.php +++ b/src/Mapping/Attribute/PostLoad.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a postLoad lifecycle callback * @@ -17,3 +19,6 @@ final class PostLoad implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PostLoad::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PostLoad::class); diff --git a/src/Mapping/Annotations/PostPersist.php b/src/Mapping/Attribute/PostPersist.php similarity index 60% rename from src/Mapping/Annotations/PostPersist.php rename to src/Mapping/Attribute/PostPersist.php index c0436d1279..73ea18a491 100644 --- a/src/Mapping/Annotations/PostPersist.php +++ b/src/Mapping/Attribute/PostPersist.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a postPersist lifecycle callback * @@ -17,3 +19,6 @@ final class PostPersist implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PostPersist::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PostPersist::class); diff --git a/src/Mapping/Annotations/PostRemove.php b/src/Mapping/Attribute/PostRemove.php similarity index 60% rename from src/Mapping/Annotations/PostRemove.php rename to src/Mapping/Attribute/PostRemove.php index dbdb6ee11a..72f0b8ac55 100644 --- a/src/Mapping/Annotations/PostRemove.php +++ b/src/Mapping/Attribute/PostRemove.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a postRemove lifecycle callback * @@ -17,3 +19,6 @@ final class PostRemove implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PostRemove::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PostRemove::class); diff --git a/src/Mapping/Annotations/PostUpdate.php b/src/Mapping/Attribute/PostUpdate.php similarity index 60% rename from src/Mapping/Annotations/PostUpdate.php rename to src/Mapping/Attribute/PostUpdate.php index d4180be0d2..5c8b2e7434 100644 --- a/src/Mapping/Annotations/PostUpdate.php +++ b/src/Mapping/Attribute/PostUpdate.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a postUpdate lifecycle callback * @@ -17,3 +19,6 @@ final class PostUpdate implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PostUpdate::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PostUpdate::class); diff --git a/src/Mapping/Annotations/PreFlush.php b/src/Mapping/Attribute/PreFlush.php similarity index 60% rename from src/Mapping/Annotations/PreFlush.php rename to src/Mapping/Attribute/PreFlush.php index 671d0ad3a5..65f28dced4 100644 --- a/src/Mapping/Annotations/PreFlush.php +++ b/src/Mapping/Attribute/PreFlush.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a preFlush lifecycle callback * @@ -17,3 +19,6 @@ final class PreFlush implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PreFlush::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PreFlush::class); diff --git a/src/Mapping/Annotations/PreLoad.php b/src/Mapping/Attribute/PreLoad.php similarity index 60% rename from src/Mapping/Annotations/PreLoad.php rename to src/Mapping/Attribute/PreLoad.php index 301ae03185..00ef011388 100644 --- a/src/Mapping/Annotations/PreLoad.php +++ b/src/Mapping/Attribute/PreLoad.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a preLoad lifecycle callback * @@ -17,3 +19,6 @@ final class PreLoad implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PreLoad::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PreLoad::class); diff --git a/src/Mapping/Annotations/PrePersist.php b/src/Mapping/Attribute/PrePersist.php similarity index 60% rename from src/Mapping/Annotations/PrePersist.php rename to src/Mapping/Attribute/PrePersist.php index a83245f37f..680e9011a5 100644 --- a/src/Mapping/Annotations/PrePersist.php +++ b/src/Mapping/Attribute/PrePersist.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a prePersist lifecycle callback * @@ -17,3 +19,6 @@ final class PrePersist implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PrePersist::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PrePersist::class); diff --git a/src/Mapping/Annotations/PreRemove.php b/src/Mapping/Attribute/PreRemove.php similarity index 60% rename from src/Mapping/Annotations/PreRemove.php rename to src/Mapping/Attribute/PreRemove.php index de11425c9a..f77bc5a1a8 100644 --- a/src/Mapping/Annotations/PreRemove.php +++ b/src/Mapping/Attribute/PreRemove.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a preRemove lifecycle callback * @@ -17,3 +19,6 @@ final class PreRemove implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PreRemove::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PreRemove::class); diff --git a/src/Mapping/Annotations/PreUpdate.php b/src/Mapping/Attribute/PreUpdate.php similarity index 60% rename from src/Mapping/Annotations/PreUpdate.php rename to src/Mapping/Attribute/PreUpdate.php index 1b75ac781d..35a5678fb4 100644 --- a/src/Mapping/Annotations/PreUpdate.php +++ b/src/Mapping/Attribute/PreUpdate.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Marks a method as a preUpdate lifecycle callback * @@ -17,3 +19,6 @@ final class PreUpdate implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(PreUpdate::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\PreUpdate::class); diff --git a/src/Mapping/Annotations/QueryResultDocument.php b/src/Mapping/Attribute/QueryResultDocument.php similarity index 54% rename from src/Mapping/Annotations/QueryResultDocument.php rename to src/Mapping/Attribute/QueryResultDocument.php index 7039daf809..0936b0821d 100644 --- a/src/Mapping/Annotations/QueryResultDocument.php +++ b/src/Mapping/Attribute/QueryResultDocument.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * @Annotation * @NamedArgumentConstructor @@ -15,3 +17,6 @@ final class QueryResultDocument extends AbstractDocument { } + +// @phpstan-ignore class.notFound +class_alias(QueryResultDocument::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\QueryResultDocument::class); diff --git a/src/Mapping/Annotations/ReadPreference.php b/src/Mapping/Attribute/ReadPreference.php similarity index 71% rename from src/Mapping/Annotations/ReadPreference.php rename to src/Mapping/Attribute/ReadPreference.php index 536f292e8b..25b57d3d76 100644 --- a/src/Mapping/Annotations/ReadPreference.php +++ b/src/Mapping/Attribute/ReadPreference.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * @Annotation * @NamedArgumentConstructor @@ -27,3 +29,6 @@ public function __construct(string $value, ?array $tags = null) $this->tags = $tags; } } + +// @phpstan-ignore class.notFound +class_alias(ReadPreference::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ReadPreference::class); diff --git a/src/Mapping/Annotations/ReferenceMany.php b/src/Mapping/Attribute/ReferenceMany.php similarity index 94% rename from src/Mapping/Annotations/ReferenceMany.php rename to src/Mapping/Attribute/ReferenceMany.php index a4afe8c9ec..95fe5b28e6 100644 --- a/src/Mapping/Annotations/ReferenceMany.php +++ b/src/Mapping/Attribute/ReferenceMany.php @@ -2,13 +2,15 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Utility\CollectionHelper; +use function class_alias; + /** * Specifies a one-to-many relationship to a different document * @@ -120,3 +122,6 @@ public function __construct( $this->storeEmptyArray = $storeEmptyArray; } } + +// @phpstan-ignore class.notFound +class_alias(ReferenceMany::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany::class); diff --git a/src/Mapping/Annotations/ReferenceOne.php b/src/Mapping/Attribute/ReferenceOne.php similarity index 93% rename from src/Mapping/Annotations/ReferenceOne.php rename to src/Mapping/Attribute/ReferenceOne.php index 7e89191fe8..a77910cbdf 100644 --- a/src/Mapping/Annotations/ReferenceOne.php +++ b/src/Mapping/Attribute/ReferenceOne.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use function class_alias; + /** * Specifies a one-to-one relationship to a different document * @@ -104,3 +106,6 @@ public function __construct( $this->skip = $skip; } } + +// @phpstan-ignore class.notFound +class_alias(ReferenceOne::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne::class); diff --git a/src/Mapping/Annotations/SearchIndex.php b/src/Mapping/Attribute/SearchIndex.php similarity index 85% rename from src/Mapping/Annotations/SearchIndex.php rename to src/Mapping/Attribute/SearchIndex.php index 77b6fa47d6..ce0c2689eb 100644 --- a/src/Mapping/Annotations/SearchIndex.php +++ b/src/Mapping/Attribute/SearchIndex.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use function class_alias; + /** * Defines a search index on a class. * @@ -39,3 +41,6 @@ public function __construct( ) { } } + +// @phpstan-ignore class.notFound +class_alias(SearchIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\SearchIndex::class); diff --git a/src/Mapping/Annotations/ShardKey.php b/src/Mapping/Attribute/ShardKey.php similarity index 77% rename from src/Mapping/Annotations/ShardKey.php rename to src/Mapping/Attribute/ShardKey.php index 81ef9218ee..666a53c0d6 100644 --- a/src/Mapping/Annotations/ShardKey.php +++ b/src/Mapping/Attribute/ShardKey.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * @Annotation * @NamedArgumentConstructor @@ -31,3 +33,6 @@ public function __construct(array $keys = [], ?bool $unique = null, ?int $numIni $this->numInitialChunks = $numInitialChunks; } } + +// @phpstan-ignore class.notFound +class_alias(ShardKey::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ShardKey::class); diff --git a/src/Mapping/Annotations/TimeSeries.php b/src/Mapping/Attribute/TimeSeries.php similarity index 78% rename from src/Mapping/Annotations/TimeSeries.php rename to src/Mapping/Attribute/TimeSeries.php index e4fe593eb4..c64a2ecc1f 100644 --- a/src/Mapping/Annotations/TimeSeries.php +++ b/src/Mapping/Attribute/TimeSeries.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\TimeSeries\Granularity; +use function class_alias; + /** * Marks a document or superclass as a time series document * @@ -27,3 +29,6 @@ public function __construct( ) { } } + +// @phpstan-ignore class.notFound +class_alias(TimeSeries::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\TimeSeries::class); diff --git a/src/Mapping/Annotations/UniqueIndex.php b/src/Mapping/Attribute/UniqueIndex.php similarity index 81% rename from src/Mapping/Annotations/UniqueIndex.php rename to src/Mapping/Attribute/UniqueIndex.php index 371fe66e25..573d18a8ac 100644 --- a/src/Mapping/Annotations/UniqueIndex.php +++ b/src/Mapping/Attribute/UniqueIndex.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * Specifies a unique index on a field * @@ -39,3 +41,6 @@ public function __construct( ); } } + +// @phpstan-ignore class.notFound +class_alias(UniqueIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\UniqueIndex::class); diff --git a/src/Mapping/Annotations/Validation.php b/src/Mapping/Attribute/Validation.php similarity index 83% rename from src/Mapping/Annotations/Validation.php rename to src/Mapping/Attribute/Validation.php index c773264b89..22a7e5aa8e 100644 --- a/src/Mapping/Annotations/Validation.php +++ b/src/Mapping/Attribute/Validation.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use function class_alias; + /** * @Annotation * @NamedArgumentConstructor @@ -45,3 +47,6 @@ public function __construct(?string $validator = null, ?string $action = null, ? $this->level = $level; } } + +// @phpstan-ignore class.notFound +class_alias(Validation::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Validation::class); diff --git a/src/Mapping/Annotations/VectorSearchIndex.php b/src/Mapping/Attribute/VectorSearchIndex.php similarity index 76% rename from src/Mapping/Annotations/VectorSearchIndex.php rename to src/Mapping/Attribute/VectorSearchIndex.php index ed8f281504..97a64a4c15 100644 --- a/src/Mapping/Annotations/VectorSearchIndex.php +++ b/src/Mapping/Attribute/VectorSearchIndex.php @@ -2,12 +2,14 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use function class_alias; + /** * Defines a vector search index on a class. * @@ -27,3 +29,6 @@ public function __construct( ) { } } + +// @phpstan-ignore class.notFound +class_alias(VectorSearchIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\VectorSearchIndex::class); diff --git a/src/Mapping/Annotations/Version.php b/src/Mapping/Attribute/Version.php similarity index 51% rename from src/Mapping/Annotations/Version.php rename to src/Mapping/Attribute/Version.php index fe6da61a70..bb3a4d7d00 100644 --- a/src/Mapping/Annotations/Version.php +++ b/src/Mapping/Attribute/Version.php @@ -2,10 +2,12 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; +use function class_alias; + /** * Specifies a field to use for optimistic locking * @@ -15,3 +17,6 @@ final class Version implements Annotation { } + +// @phpstan-ignore class.notFound +class_alias(Version::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Version::class); diff --git a/src/Mapping/Annotations/View.php b/src/Mapping/Attribute/View.php similarity index 80% rename from src/Mapping/Annotations/View.php rename to src/Mapping/Attribute/View.php index adab26dc92..d1025b5d8d 100644 --- a/src/Mapping/Annotations/View.php +++ b/src/Mapping/Attribute/View.php @@ -2,11 +2,13 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use function class_alias; + /** * @Annotation * @NamedArgumentConstructor @@ -38,3 +40,6 @@ public function __construct( $this->repositoryClass = $repositoryClass; } } + +// @phpstan-ignore class.notFound +class_alias(View::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\View::class); diff --git a/src/Mapping/ClassMetadata.php b/src/Mapping/ClassMetadata.php index 64a77f2348..c3c3fd7b92 100644 --- a/src/Mapping/ClassMetadata.php +++ b/src/Mapping/ClassMetadata.php @@ -13,8 +13,8 @@ use Doctrine\Instantiator\InstantiatorInterface; use Doctrine\ODM\MongoDB\Id\IdGenerator; use Doctrine\ODM\MongoDB\LockException; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery; -use Doctrine\ODM\MongoDB\Mapping\Annotations\TimeSeries; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; +use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\EnumPropertyAccessor; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\PropertyAccessor; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\PropertyAccessorFactory; diff --git a/src/Mapping/Driver/AttributeDriver.php b/src/Mapping/Driver/AttributeDriver.php index 5db0d3f6ed..9f36d4397f 100644 --- a/src/Mapping/Driver/AttributeDriver.php +++ b/src/Mapping/Driver/AttributeDriver.php @@ -6,10 +6,10 @@ use Doctrine\Common\Annotations\Reader; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractIndex; -use Doctrine\ODM\MongoDB\Mapping\Annotations\ShardKey; -use Doctrine\ODM\MongoDB\Mapping\Annotations\TimeSeries; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey; +use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata; diff --git a/src/Mapping/Driver/AttributeReader.php b/src/Mapping/Driver/AttributeReader.php index 3dcb5fe9ee..04904b5f5e 100644 --- a/src/Mapping/Driver/AttributeReader.php +++ b/src/Mapping/Driver/AttributeReader.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Driver; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Annotation; use ReflectionAttribute; use ReflectionClass; use ReflectionMethod; diff --git a/src/Mapping/Driver/XmlDriver.php b/src/Mapping/Driver/XmlDriver.php index f0acbfc8b8..1e7f5cacc8 100644 --- a/src/Mapping/Driver/XmlDriver.php +++ b/src/Mapping/Driver/XmlDriver.php @@ -4,8 +4,8 @@ namespace Doctrine\ODM\MongoDB\Mapping\Driver; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery; -use Doctrine\ODM\MongoDB\Mapping\Annotations\TimeSeries; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; +use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Mapping\TimeSeries\Granularity; diff --git a/src/Mapping/MappingException.php b/src/Mapping/MappingException.php index d91b95e5b0..7fb906665e 100644 --- a/src/Mapping/MappingException.php +++ b/src/Mapping/MappingException.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Mapping; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations\AbstractDocument; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument; use Doctrine\Persistence\Mapping\MappingException as BaseMappingException; use ReflectionException; use ReflectionObject; diff --git a/tests/Documentation/BlendingOrm/Product.php b/tests/Documentation/BlendingOrm/Product.php index 1e82fe70f6..8b81b7590b 100644 --- a/tests/Documentation/BlendingOrm/Product.php +++ b/tests/Documentation/BlendingOrm/Product.php @@ -4,9 +4,9 @@ namespace Documentation\BlendingOrm; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] class Product diff --git a/tests/Documentation/CustomMapping/Thing.php b/tests/Documentation/CustomMapping/Thing.php index 982ac0396e..230a2bf9aa 100644 --- a/tests/Documentation/CustomMapping/Thing.php +++ b/tests/Documentation/CustomMapping/Thing.php @@ -5,9 +5,9 @@ namespace Documentation\CustomMapping; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] class Thing diff --git a/tests/Documentation/Introduction/Address.php b/tests/Documentation/Introduction/Address.php index 99573d3b09..e583fb6990 100644 --- a/tests/Documentation/Introduction/Address.php +++ b/tests/Documentation/Introduction/Address.php @@ -4,7 +4,7 @@ namespace Documentation\Introduction; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Address diff --git a/tests/Documentation/Introduction/BaseEmployee.php b/tests/Documentation/Introduction/BaseEmployee.php index e9b5b3a350..22dd19136a 100644 --- a/tests/Documentation/Introduction/BaseEmployee.php +++ b/tests/Documentation/Introduction/BaseEmployee.php @@ -5,7 +5,7 @@ namespace Documentation\Introduction; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\MappedSuperclass] abstract class BaseEmployee diff --git a/tests/Documentation/Introduction/Employee.php b/tests/Documentation/Introduction/Employee.php index 23ed65b98a..1e3b8ef5bb 100644 --- a/tests/Documentation/Introduction/Employee.php +++ b/tests/Documentation/Introduction/Employee.php @@ -4,7 +4,7 @@ namespace Documentation\Introduction; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Employee extends BaseEmployee diff --git a/tests/Documentation/Introduction/Manager.php b/tests/Documentation/Introduction/Manager.php index e6ec3c9cd4..211affe1cf 100644 --- a/tests/Documentation/Introduction/Manager.php +++ b/tests/Documentation/Introduction/Manager.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Manager extends BaseEmployee diff --git a/tests/Documentation/Introduction/Project.php b/tests/Documentation/Introduction/Project.php index c8f587c64b..077222d926 100644 --- a/tests/Documentation/Introduction/Project.php +++ b/tests/Documentation/Introduction/Project.php @@ -4,7 +4,7 @@ namespace Documentation\Introduction; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Project diff --git a/tests/Documentation/LookupRelations/Item.php b/tests/Documentation/LookupRelations/Item.php index a08706d13f..e855a3d39a 100644 --- a/tests/Documentation/LookupRelations/Item.php +++ b/tests/Documentation/LookupRelations/Item.php @@ -4,9 +4,9 @@ namespace Documentation\LookupRelations; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] class Item diff --git a/tests/Documentation/LookupRelations/Order.php b/tests/Documentation/LookupRelations/Order.php index d256677b05..0034d21fbb 100644 --- a/tests/Documentation/LookupRelations/Order.php +++ b/tests/Documentation/LookupRelations/Order.php @@ -7,11 +7,11 @@ use DateTimeImmutable; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany; -use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; #[Document] class Order diff --git a/tests/Documentation/LookupRelations/OrderResult.php b/tests/Documentation/LookupRelations/OrderResult.php index 174c99521c..8851906cca 100644 --- a/tests/Documentation/LookupRelations/OrderResult.php +++ b/tests/Documentation/LookupRelations/OrderResult.php @@ -6,11 +6,11 @@ use DateTimeImmutable; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\QueryResultDocument; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument; #[QueryResultDocument] class OrderResult diff --git a/tests/Documentation/LookupRelations/User.php b/tests/Documentation/LookupRelations/User.php index f84d960ad3..fcc2755121 100644 --- a/tests/Documentation/LookupRelations/User.php +++ b/tests/Documentation/LookupRelations/User.php @@ -4,9 +4,9 @@ namespace Documentation\LookupRelations; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] class User diff --git a/tests/Documentation/LookupRelations/UserOrderResult.php b/tests/Documentation/LookupRelations/UserOrderResult.php index b46fd6bec6..efddf8868a 100644 --- a/tests/Documentation/LookupRelations/UserOrderResult.php +++ b/tests/Documentation/LookupRelations/UserOrderResult.php @@ -6,10 +6,10 @@ use DateTimeImmutable; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\QueryResultDocument; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument; #[QueryResultDocument] class UserOrderResult diff --git a/tests/Documentation/LookupRelations/UserResult.php b/tests/Documentation/LookupRelations/UserResult.php index 312a7ed1e6..bc31da75e8 100644 --- a/tests/Documentation/LookupRelations/UserResult.php +++ b/tests/Documentation/LookupRelations/UserResult.php @@ -5,10 +5,10 @@ namespace Documentation\LookupRelations; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] class UserResult diff --git a/tests/Documentation/MappingOrmAndOdm/BlogPost.php b/tests/Documentation/MappingOrmAndOdm/BlogPost.php index 67d00ecff0..292efc5356 100644 --- a/tests/Documentation/MappingOrmAndOdm/BlogPost.php +++ b/tests/Documentation/MappingOrmAndOdm/BlogPost.php @@ -4,7 +4,7 @@ namespace Documentation\MappingOrmAndOdm; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ORM\Mapping as ORM; #[ORM\Entity(repositoryClass: OrmBlogPostRepository::class)] diff --git a/tests/Documentation/ResolveTargetDocument/Customer.php b/tests/Documentation/ResolveTargetDocument/Customer.php index 3d41a168a1..86075920ee 100644 --- a/tests/Documentation/ResolveTargetDocument/Customer.php +++ b/tests/Documentation/ResolveTargetDocument/Customer.php @@ -4,7 +4,7 @@ namespace Documentation\ResolveTargetDocument; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; use Documentation\ResolveTargetDocument\CustomerModule\Customer as BaseCustomer; use Documentation\ResolveTargetDocument\InvoiceModule\InvoiceSubjectInterface; diff --git a/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php b/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php index e2d8f64d38..1d73b38f82 100644 --- a/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php +++ b/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php @@ -4,9 +4,9 @@ namespace Documentation\ResolveTargetDocument\CustomerModule; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] abstract class Customer diff --git a/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php b/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php index 810f18fc72..c45808b113 100644 --- a/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php +++ b/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php @@ -4,9 +4,9 @@ namespace Documentation\ResolveTargetDocument\InvoiceModule; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; #[Document] class Invoice diff --git a/tests/Documentation/Validation/Customer.php b/tests/Documentation/Validation/Customer.php index 83a2335838..29aa15f951 100644 --- a/tests/Documentation/Validation/Customer.php +++ b/tests/Documentation/Validation/Customer.php @@ -4,9 +4,9 @@ namespace Documentation\Validation; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document] class Customer diff --git a/tests/Documentation/Validation/Order.php b/tests/Documentation/Validation/Order.php index 2defa3e115..db3644f69a 100644 --- a/tests/Documentation/Validation/Order.php +++ b/tests/Documentation/Validation/Order.php @@ -6,12 +6,12 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Annotations\HasLifecycleCallbacks; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\PreFlush; -use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; #[Document] #[HasLifecycleCallbacks] diff --git a/tests/Documentation/Validation/OrderLine.php b/tests/Documentation/Validation/OrderLine.php index c554d81669..4f9fbcb1ec 100644 --- a/tests/Documentation/Validation/OrderLine.php +++ b/tests/Documentation/Validation/OrderLine.php @@ -4,9 +4,9 @@ namespace Documentation\Validation; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[EmbeddedDocument] class OrderLine diff --git a/tests/Documentation/Validation/SchemaValidated.php b/tests/Documentation/Validation/SchemaValidated.php index 0640f91da5..e2c6a18165 100644 --- a/tests/Documentation/Validation/SchemaValidated.php +++ b/tests/Documentation/Validation/SchemaValidated.php @@ -4,7 +4,7 @@ namespace Documentation\Validation; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; #[ODM\Document] diff --git a/tests/Documents/Account.php b/tests/Documents/Account.php index 2d47b78fb4..0156fece35 100644 --- a/tests/Documents/Account.php +++ b/tests/Documents/Account.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Account diff --git a/tests/Documents/Address.php b/tests/Documents/Address.php index c3b46c8144..516d063da6 100644 --- a/tests/Documents/Address.php +++ b/tests/Documents/Address.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Address diff --git a/tests/Documents/Agent.php b/tests/Documents/Agent.php index 7dc8fb452a..9b3e386381 100644 --- a/tests/Documents/Agent.php +++ b/tests/Documents/Agent.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'agents')] class Agent diff --git a/tests/Documents/Album.php b/tests/Documents/Album.php index 76495a6df1..4264151f83 100644 --- a/tests/Documents/Album.php +++ b/tests/Documents/Album.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'albums')] class Album diff --git a/tests/Documents/Article.php b/tests/Documents/Article.php index 4560751234..d03957f04f 100644 --- a/tests/Documents/Article.php +++ b/tests/Documents/Article.php @@ -5,7 +5,7 @@ namespace Documents; use DateTimeInterface; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use MongoDB\BSON\UTCDateTime; use function array_search; diff --git a/tests/Documents/Bars/Bar.php b/tests/Documents/Bars/Bar.php index 68240e9e13..b6f92c371b 100644 --- a/tests/Documents/Bars/Bar.php +++ b/tests/Documents/Bars/Bar.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'bars')] class Bar diff --git a/tests/Documents/Bars/Location.php b/tests/Documents/Bars/Location.php index aecf83278b..ccd30d45f1 100644 --- a/tests/Documents/Bars/Location.php +++ b/tests/Documents/Bars/Location.php @@ -4,7 +4,7 @@ namespace Documents\Bars; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Location diff --git a/tests/Documents/BaseCategory.php b/tests/Documents/BaseCategory.php index c7706c3179..0ff70727a7 100644 --- a/tests/Documents/BaseCategory.php +++ b/tests/Documents/BaseCategory.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\MappedSuperclass(repositoryClass: 'Documents\BaseCategoryRepository')] abstract class BaseCategory diff --git a/tests/Documents/BaseDocument.php b/tests/Documents/BaseDocument.php index 0f9d335bf8..3c71c409ae 100644 --- a/tests/Documents/BaseDocument.php +++ b/tests/Documents/BaseDocument.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\MappedSuperclass] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/BaseEmployee.php b/tests/Documents/BaseEmployee.php index 7fdab418eb..9d471de54d 100644 --- a/tests/Documents/BaseEmployee.php +++ b/tests/Documents/BaseEmployee.php @@ -5,7 +5,7 @@ namespace Documents; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\MappedSuperclass] abstract class BaseEmployee diff --git a/tests/Documents/BlogPost.php b/tests/Documents/BlogPost.php index 77fa3655c1..450868dd5e 100644 --- a/tests/Documents/BlogPost.php +++ b/tests/Documents/BlogPost.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class BlogPost diff --git a/tests/Documents/BlogTagAggregation.php b/tests/Documents/BlogTagAggregation.php index 250f438c6e..e8b252f31b 100644 --- a/tests/Documents/BlogTagAggregation.php +++ b/tests/Documents/BlogTagAggregation.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\QueryResultDocument] class BlogTagAggregation diff --git a/tests/Documents/Book.php b/tests/Documents/Book.php index 5b30d2ddcc..5f6c2ff223 100644 --- a/tests/Documents/Book.php +++ b/tests/Documents/Book.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Book diff --git a/tests/Documents/BrowseNode.php b/tests/Documents/BrowseNode.php index c2a4bf0eb9..2d99ac1330 100644 --- a/tests/Documents/BrowseNode.php +++ b/tests/Documents/BrowseNode.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class BrowseNode diff --git a/tests/Documents/Card.php b/tests/Documents/Card.php index 6589303aaf..0e06ad3bd9 100644 --- a/tests/Documents/Card.php +++ b/tests/Documents/Card.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Documents/Cart.php b/tests/Documents/Cart.php index 3b72a9efb6..8787970767 100644 --- a/tests/Documents/Cart.php +++ b/tests/Documents/Cart.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Cart diff --git a/tests/Documents/Category.php b/tests/Documents/Category.php index cac07afaa0..8cc45500f4 100644 --- a/tests/Documents/Category.php +++ b/tests/Documents/Category.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Category extends BaseCategory diff --git a/tests/Documents/Chapter.php b/tests/Documents/Chapter.php index 05b59eefaf..373437a065 100644 --- a/tests/Documents/Chapter.php +++ b/tests/Documents/Chapter.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/CmsAddress.php b/tests/Documents/CmsAddress.php index f695d4d6bc..654a4821f2 100644 --- a/tests/Documents/CmsAddress.php +++ b/tests/Documents/CmsAddress.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Index(keys: ['country' => 'asc', 'zip' => 'asc', 'city' => 'asc'])] #[ODM\SearchIndex(dynamic: true)] diff --git a/tests/Documents/CmsArticle.php b/tests/Documents/CmsArticle.php index cd059c9543..8df826f407 100644 --- a/tests/Documents/CmsArticle.php +++ b/tests/Documents/CmsArticle.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Index(keys: ['topic' => 'asc'])] #[ODM\SearchIndex( diff --git a/tests/Documents/CmsComment.php b/tests/Documents/CmsComment.php index 1c96292047..b97ff20600 100644 --- a/tests/Documents/CmsComment.php +++ b/tests/Documents/CmsComment.php @@ -4,8 +4,8 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Index; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Index; #[Index(keys: ['topic' => 'asc'])] #[ODM\Document] diff --git a/tests/Documents/CmsContent.php b/tests/Documents/CmsContent.php index a6e129a0ff..985d1f5a9b 100644 --- a/tests/Documents/CmsContent.php +++ b/tests/Documents/CmsContent.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\MappedSuperclass] abstract class CmsContent extends CmsPage diff --git a/tests/Documents/CmsGroup.php b/tests/Documents/CmsGroup.php index a875465460..875cd499f4 100644 --- a/tests/Documents/CmsGroup.php +++ b/tests/Documents/CmsGroup.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class CmsGroup diff --git a/tests/Documents/CmsPage.php b/tests/Documents/CmsPage.php index ff74dba687..f7e28bd4dd 100644 --- a/tests/Documents/CmsPage.php +++ b/tests/Documents/CmsPage.php @@ -4,8 +4,8 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Index; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Index; #[Index(keys: ['slug' => 'asc'], options: ['unique' => 'true'])] #[ODM\MappedSuperclass] diff --git a/tests/Documents/CmsPhonenumber.php b/tests/Documents/CmsPhonenumber.php index 232b864719..3ea225fbca 100644 --- a/tests/Documents/CmsPhonenumber.php +++ b/tests/Documents/CmsPhonenumber.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class CmsPhonenumber diff --git a/tests/Documents/CmsProduct.php b/tests/Documents/CmsProduct.php index 2989ac2ad2..6bf5c0709d 100644 --- a/tests/Documents/CmsProduct.php +++ b/tests/Documents/CmsProduct.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class CmsProduct extends CmsContent diff --git a/tests/Documents/CmsUser.php b/tests/Documents/CmsUser.php index 17a8a38f4a..3edd4de285 100644 --- a/tests/Documents/CmsUser.php +++ b/tests/Documents/CmsUser.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Documents/Comment.php b/tests/Documents/Comment.php index 5d3c07e0a9..32a28d92ac 100644 --- a/tests/Documents/Comment.php +++ b/tests/Documents/Comment.php @@ -5,7 +5,7 @@ namespace Documents; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(repositoryClass: CommentRepository::class)] class Comment diff --git a/tests/Documents/CustomRepository/Document.php b/tests/Documents/CustomRepository/Document.php index 4376668cbb..94a414a019 100644 --- a/tests/Documents/CustomRepository/Document.php +++ b/tests/Documents/CustomRepository/Document.php @@ -4,7 +4,7 @@ namespace Documents\CustomRepository; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(repositoryClass: 'Documents\CustomRepository\Repository')] class Document diff --git a/tests/Documents/CustomUser.php b/tests/Documents/CustomUser.php index b1f08c8dae..b6a0cf3320 100644 --- a/tests/Documents/CustomUser.php +++ b/tests/Documents/CustomUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'custom_users')] class CustomUser diff --git a/tests/Documents/Customer.php b/tests/Documents/Customer.php index f7fc8e22cd..caa965864e 100644 --- a/tests/Documents/Customer.php +++ b/tests/Documents/Customer.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Customer diff --git a/tests/Documents/Developer.php b/tests/Documents/Developer.php index 4215f50889..7764eb6e3b 100644 --- a/tests/Documents/Developer.php +++ b/tests/Documents/Developer.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Developer diff --git a/tests/Documents/DocumentWithUnmappedProperties.php b/tests/Documents/DocumentWithUnmappedProperties.php index e338fc5117..42135ee0c0 100644 --- a/tests/Documents/DocumentWithUnmappedProperties.php +++ b/tests/Documents/DocumentWithUnmappedProperties.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class DocumentWithUnmappedProperties diff --git a/tests/Documents/Ecommerce/Basket.php b/tests/Documents/Ecommerce/Basket.php index b521d77284..1a0536163e 100644 --- a/tests/Documents/Ecommerce/Basket.php +++ b/tests/Documents/Ecommerce/Basket.php @@ -5,7 +5,7 @@ namespace Documents\Ecommerce; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Basket diff --git a/tests/Documents/Ecommerce/ConfigurableProduct.php b/tests/Documents/Ecommerce/ConfigurableProduct.php index 68b4e1f010..f4f5179bc1 100644 --- a/tests/Documents/Ecommerce/ConfigurableProduct.php +++ b/tests/Documents/Ecommerce/ConfigurableProduct.php @@ -5,7 +5,7 @@ namespace Documents\Ecommerce; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use InvalidArgumentException; use function array_map; diff --git a/tests/Documents/Ecommerce/Currency.php b/tests/Documents/Ecommerce/Currency.php index e87c07da7b..1c5c720f8a 100644 --- a/tests/Documents/Ecommerce/Currency.php +++ b/tests/Documents/Ecommerce/Currency.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use InvalidArgumentException; use function implode; diff --git a/tests/Documents/Ecommerce/Money.php b/tests/Documents/Ecommerce/Money.php index d5c4463edb..346819994d 100644 --- a/tests/Documents/Ecommerce/Money.php +++ b/tests/Documents/Ecommerce/Money.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use InvalidArgumentException; #[ODM\EmbeddedDocument] diff --git a/tests/Documents/Ecommerce/Option.php b/tests/Documents/Ecommerce/Option.php index 02dbc20a95..011db878be 100644 --- a/tests/Documents/Ecommerce/Option.php +++ b/tests/Documents/Ecommerce/Option.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use InvalidArgumentException; #[ODM\EmbeddedDocument] diff --git a/tests/Documents/Ecommerce/Order.php b/tests/Documents/Ecommerce/Order.php index ca26f47946..d132eb24df 100644 --- a/tests/Documents/Ecommerce/Order.php +++ b/tests/Documents/Ecommerce/Order.php @@ -5,7 +5,7 @@ namespace Documents\Ecommerce; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Order diff --git a/tests/Documents/Ecommerce/StockItem.php b/tests/Documents/Ecommerce/StockItem.php index bfe0bbfb24..f76d080dbf 100644 --- a/tests/Documents/Ecommerce/StockItem.php +++ b/tests/Documents/Ecommerce/StockItem.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class StockItem diff --git a/tests/Documents/Employee.php b/tests/Documents/Employee.php index a6ca9b4167..ace28af0ca 100644 --- a/tests/Documents/Employee.php +++ b/tests/Documents/Employee.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Employee extends BaseEmployee diff --git a/tests/Documents/Encryption/Client.php b/tests/Documents/Encryption/Client.php index 8c1be9eff9..0d29a8fa55 100644 --- a/tests/Documents/Encryption/Client.php +++ b/tests/Documents/Encryption/Client.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'client')] class Client diff --git a/tests/Documents/Encryption/ClientCard.php b/tests/Documents/Encryption/ClientCard.php index 6d993818db..e29306335c 100644 --- a/tests/Documents/Encryption/ClientCard.php +++ b/tests/Documents/Encryption/ClientCard.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] #[ODM\Encrypt] diff --git a/tests/Documents/Encryption/InvalidRootEncrypt.php b/tests/Documents/Encryption/InvalidRootEncrypt.php index a2f5b6669c..e50de621e9 100644 --- a/tests/Documents/Encryption/InvalidRootEncrypt.php +++ b/tests/Documents/Encryption/InvalidRootEncrypt.php @@ -4,9 +4,9 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt; /** Root document cannot be encrypted. */ #[Document] diff --git a/tests/Documents/Encryption/Patient.php b/tests/Documents/Encryption/Patient.php index 42872e188b..9519cd7e74 100644 --- a/tests/Documents/Encryption/Patient.php +++ b/tests/Documents/Encryption/Patient.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'patients')] class Patient diff --git a/tests/Documents/Encryption/PatientBilling.php b/tests/Documents/Encryption/PatientBilling.php index 9b9c117da4..87da4f7e83 100644 --- a/tests/Documents/Encryption/PatientBilling.php +++ b/tests/Documents/Encryption/PatientBilling.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class PatientBilling diff --git a/tests/Documents/Encryption/PatientRecord.php b/tests/Documents/Encryption/PatientRecord.php index 23582baf59..7df54e6ac8 100644 --- a/tests/Documents/Encryption/PatientRecord.php +++ b/tests/Documents/Encryption/PatientRecord.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class PatientRecord diff --git a/tests/Documents/Encryption/RangeTypes.php b/tests/Documents/Encryption/RangeTypes.php index 3011565832..8e79d65226 100644 --- a/tests/Documents/Encryption/RangeTypes.php +++ b/tests/Documents/Encryption/RangeTypes.php @@ -5,11 +5,11 @@ namespace Documents\Encryption; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; use Doctrine\ODM\MongoDB\Types\Type; use MongoDB\BSON\Decimal128; diff --git a/tests/Documents/Event.php b/tests/Documents/Event.php index a8f9682a5e..612e9ae240 100644 --- a/tests/Documents/Event.php +++ b/tests/Documents/Event.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Event diff --git a/tests/Documents/Feature.php b/tests/Documents/Feature.php index e6b291e6c1..8385f5f583 100644 --- a/tests/Documents/Feature.php +++ b/tests/Documents/Feature.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Feature diff --git a/tests/Documents/File.php b/tests/Documents/File.php index dd77eae1dd..9afdb2c937 100644 --- a/tests/Documents/File.php +++ b/tests/Documents/File.php @@ -6,7 +6,7 @@ use DateTime; use DateTimeInterface; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\File(chunkSizeBytes: 12345)] class File diff --git a/tests/Documents/FileMetadata.php b/tests/Documents/FileMetadata.php index a1e3a67fd2..45a8079027 100644 --- a/tests/Documents/FileMetadata.php +++ b/tests/Documents/FileMetadata.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Documents\Functional\Embedded; #[ODM\EmbeddedDocument] diff --git a/tests/Documents/FileWithoutChunkSize.php b/tests/Documents/FileWithoutChunkSize.php index 702bc52aab..13bbb6154d 100644 --- a/tests/Documents/FileWithoutChunkSize.php +++ b/tests/Documents/FileWithoutChunkSize.php @@ -6,7 +6,7 @@ use DateTime; use DateTimeInterface; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\File] class FileWithoutChunkSize diff --git a/tests/Documents/FileWithoutMetadata.php b/tests/Documents/FileWithoutMetadata.php index 806276b2bf..4f3dee82b0 100644 --- a/tests/Documents/FileWithoutMetadata.php +++ b/tests/Documents/FileWithoutMetadata.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\File] class FileWithoutMetadata diff --git a/tests/Documents/ForumAvatar.php b/tests/Documents/ForumAvatar.php index c0187a6c6b..5d534420a0 100644 --- a/tests/Documents/ForumAvatar.php +++ b/tests/Documents/ForumAvatar.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class ForumAvatar diff --git a/tests/Documents/ForumStar.php b/tests/Documents/ForumStar.php index df3fb2ad43..5ee8da420f 100644 --- a/tests/Documents/ForumStar.php +++ b/tests/Documents/ForumStar.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** * Special entity that only has the $id field. diff --git a/tests/Documents/ForumUser.php b/tests/Documents/ForumUser.php index aee26fa559..643cdd7f4b 100644 --- a/tests/Documents/ForumUser.php +++ b/tests/Documents/ForumUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use MongoDB\BSON\ObjectId; #[ODM\Document] diff --git a/tests/Documents/FriendUser.php b/tests/Documents/FriendUser.php index e11647ff75..deecabb23a 100644 --- a/tests/Documents/FriendUser.php +++ b/tests/Documents/FriendUser.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class FriendUser diff --git a/tests/Documents/Functional/EmbedNamed.php b/tests/Documents/Functional/EmbedNamed.php index bae46c6a95..f911e9f833 100644 --- a/tests/Documents/Functional/EmbedNamed.php +++ b/tests/Documents/Functional/EmbedNamed.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class EmbedNamed diff --git a/tests/Documents/Functional/Embedded.php b/tests/Documents/Functional/Embedded.php index d56647b894..8bff6f06ff 100644 --- a/tests/Documents/Functional/Embedded.php +++ b/tests/Documents/Functional/Embedded.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Embedded diff --git a/tests/Documents/Functional/EmbeddedTestLevel0.php b/tests/Documents/Functional/EmbeddedTestLevel0.php index 58316e5899..2c9c2862a7 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel0.php +++ b/tests/Documents/Functional/EmbeddedTestLevel0.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbeddedTestLevel0 diff --git a/tests/Documents/Functional/EmbeddedTestLevel0b.php b/tests/Documents/Functional/EmbeddedTestLevel0b.php index 1902706316..fbcc5ed3d0 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel0b.php +++ b/tests/Documents/Functional/EmbeddedTestLevel0b.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbeddedTestLevel0b diff --git a/tests/Documents/Functional/EmbeddedTestLevel1.php b/tests/Documents/Functional/EmbeddedTestLevel1.php index ae160d4f15..39a2c2e783 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel1.php +++ b/tests/Documents/Functional/EmbeddedTestLevel1.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/Functional/EmbeddedTestLevel2.php b/tests/Documents/Functional/EmbeddedTestLevel2.php index 650e67b92d..173fb6cf1e 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel2.php +++ b/tests/Documents/Functional/EmbeddedTestLevel2.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/Functional/EmbeddedWhichReferences.php b/tests/Documents/Functional/EmbeddedWhichReferences.php index 4d197f998a..794b2bd789 100644 --- a/tests/Documents/Functional/EmbeddedWhichReferences.php +++ b/tests/Documents/Functional/EmbeddedWhichReferences.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class EmbeddedWhichReferences diff --git a/tests/Documents/Functional/FavoritesUser.php b/tests/Documents/Functional/FavoritesUser.php index 4085f52650..0ef49333ad 100644 --- a/tests/Documents/Functional/FavoritesUser.php +++ b/tests/Documents/Functional/FavoritesUser.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Documents\Group; use Documents\Project; diff --git a/tests/Documents/Functional/NotAnnotatedDocument.php b/tests/Documents/Functional/NotAnnotatedDocument.php index 36e5556d6f..62ebd4b766 100644 --- a/tests/Documents/Functional/NotAnnotatedDocument.php +++ b/tests/Documents/Functional/NotAnnotatedDocument.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'functional_tests')] class NotAnnotatedDocument diff --git a/tests/Documents/Functional/NotSaved.php b/tests/Documents/Functional/NotSaved.php index e271bd139e..dae8b95046 100644 --- a/tests/Documents/Functional/NotSaved.php +++ b/tests/Documents/Functional/NotSaved.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'functional_tests')] class NotSaved diff --git a/tests/Documents/Functional/NotSavedEmbedded.php b/tests/Documents/Functional/NotSavedEmbedded.php index e89e872e9a..2975e18047 100644 --- a/tests/Documents/Functional/NotSavedEmbedded.php +++ b/tests/Documents/Functional/NotSavedEmbedded.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class NotSavedEmbedded diff --git a/tests/Documents/Functional/NullFieldValues.php b/tests/Documents/Functional/NullFieldValues.php index 2559089b21..207069ba86 100644 --- a/tests/Documents/Functional/NullFieldValues.php +++ b/tests/Documents/Functional/NullFieldValues.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'functional_tests')] class NullFieldValues diff --git a/tests/Documents/Functional/PreUpdateTestProduct.php b/tests/Documents/Functional/PreUpdateTestProduct.php index 59f3992a32..aa9e2c444d 100644 --- a/tests/Documents/Functional/PreUpdateTestProduct.php +++ b/tests/Documents/Functional/PreUpdateTestProduct.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'pre_update_test_product')] class PreUpdateTestProduct diff --git a/tests/Documents/Functional/PreUpdateTestSellable.php b/tests/Documents/Functional/PreUpdateTestSellable.php index 550959f869..c5907be4b4 100644 --- a/tests/Documents/Functional/PreUpdateTestSellable.php +++ b/tests/Documents/Functional/PreUpdateTestSellable.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class PreUpdateTestSellable diff --git a/tests/Documents/Functional/PreUpdateTestSeller.php b/tests/Documents/Functional/PreUpdateTestSeller.php index c6d5c9724d..87bb554c00 100644 --- a/tests/Documents/Functional/PreUpdateTestSeller.php +++ b/tests/Documents/Functional/PreUpdateTestSeller.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'pre_update_test_seller')] class PreUpdateTestSeller diff --git a/tests/Documents/Functional/Reference.php b/tests/Documents/Functional/Reference.php index dee52ac688..1f03031646 100644 --- a/tests/Documents/Functional/Reference.php +++ b/tests/Documents/Functional/Reference.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Reference diff --git a/tests/Documents/Functional/SameCollection1.php b/tests/Documents/Functional/SameCollection1.php index 6b9d642044..7956e53436 100644 --- a/tests/Documents/Functional/SameCollection1.php +++ b/tests/Documents/Functional/SameCollection1.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'same_collection')] #[ODM\DiscriminatorField('type')] diff --git a/tests/Documents/Functional/SameCollection2.php b/tests/Documents/Functional/SameCollection2.php index 9e857bf023..1a72299ca0 100644 --- a/tests/Documents/Functional/SameCollection2.php +++ b/tests/Documents/Functional/SameCollection2.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'same_collection')] #[ODM\DiscriminatorField('type')] diff --git a/tests/Documents/Functional/SameCollection3.php b/tests/Documents/Functional/SameCollection3.php index 80f63da40d..0ecb79ad9f 100644 --- a/tests/Documents/Functional/SameCollection3.php +++ b/tests/Documents/Functional/SameCollection3.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** * Sample document without discriminator field to test defaultDiscriminatorValue diff --git a/tests/Documents/Functional/SimpleEmbedAndReference.php b/tests/Documents/Functional/SimpleEmbedAndReference.php index 0f93fb9c45..12dee203f1 100644 --- a/tests/Documents/Functional/SimpleEmbedAndReference.php +++ b/tests/Documents/Functional/SimpleEmbedAndReference.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'functional_tests')] class SimpleEmbedAndReference diff --git a/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php b/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php index d99e886a21..d4483a5398 100644 --- a/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php +++ b/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\GH683; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] #[ODM\DiscriminatorField('type')] diff --git a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php index d5cb64085e..69f39f945f 100644 --- a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php +++ b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\GH683; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class EmbeddedSubDocument1 extends AbstractEmbedded diff --git a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php index 006e207330..b962dfc4b0 100644 --- a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php +++ b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\GH683; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class EmbeddedSubDocument2 extends AbstractEmbedded diff --git a/tests/Documents/Functional/Ticket/GH683/ParentDocument.php b/tests/Documents/Functional/Ticket/GH683/ParentDocument.php index de1e7e368c..498eb2ff3c 100644 --- a/tests/Documents/Functional/Ticket/GH683/ParentDocument.php +++ b/tests/Documents/Functional/Ticket/GH683/ParentDocument.php @@ -5,7 +5,7 @@ namespace Documents\Functional\Ticket\GH683; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'gh683_test')] class ParentDocument diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php index 269f88c615..a2c44f43af 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbedManyInArrayCollectionLevel0 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php index a00044b3c4..51c8c5b88f 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class EmbedManyInArrayCollectionLevel1 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php index 2bbf6780ad..1c849d6389 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php @@ -5,7 +5,7 @@ namespace Documents\Functional\Ticket\MODM160; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbedManyInArrayLevel0 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php index dfbaac222c..d78609cb44 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php @@ -5,7 +5,7 @@ namespace Documents\Functional\Ticket\MODM160; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class EmbedManyInArrayLevel1 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php index 510450e89a..a7557515c7 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\MODM160; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbedOneLevel0 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php index fd1aabaffb..3263999820 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\MODM160; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class EmbedOneLevel1 diff --git a/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php b/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php index 475f6aa23e..0ee004b3f4 100644 --- a/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php +++ b/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\MODM160; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class MODM160Level2 diff --git a/tests/Documents/Functional/VirtualHost.php b/tests/Documents/Functional/VirtualHost.php index 280b990bcf..0d0916f42b 100644 --- a/tests/Documents/Functional/VirtualHost.php +++ b/tests/Documents/Functional/VirtualHost.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'test_functional_virtual_host')] class VirtualHost diff --git a/tests/Documents/Functional/VirtualHostDirective.php b/tests/Documents/Functional/VirtualHostDirective.php index eb1b0dbbc9..a2a5a0a971 100644 --- a/tests/Documents/Functional/VirtualHostDirective.php +++ b/tests/Documents/Functional/VirtualHostDirective.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use function uniqid; diff --git a/tests/Documents/GH2310Container.php b/tests/Documents/GH2310Container.php index b0323a94a1..68e3d9d7dd 100644 --- a/tests/Documents/GH2310Container.php +++ b/tests/Documents/GH2310Container.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class GH2310Container diff --git a/tests/Documents/GraphLookup/Airport.php b/tests/Documents/GraphLookup/Airport.php index 5f31f15bc5..a8dbfdd230 100644 --- a/tests/Documents/GraphLookup/Airport.php +++ b/tests/Documents/GraphLookup/Airport.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Airport diff --git a/tests/Documents/GraphLookup/Employee.php b/tests/Documents/GraphLookup/Employee.php index 32f781191d..66d9d5ab3c 100644 --- a/tests/Documents/GraphLookup/Employee.php +++ b/tests/Documents/GraphLookup/Employee.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Employee diff --git a/tests/Documents/GraphLookup/ReportingHierarchy.php b/tests/Documents/GraphLookup/ReportingHierarchy.php index e17e6af770..b8e87574f7 100644 --- a/tests/Documents/GraphLookup/ReportingHierarchy.php +++ b/tests/Documents/GraphLookup/ReportingHierarchy.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\QueryResultDocument] class ReportingHierarchy diff --git a/tests/Documents/GraphLookup/Traveller.php b/tests/Documents/GraphLookup/Traveller.php index 6afbf14c7b..629a59dd55 100644 --- a/tests/Documents/GraphLookup/Traveller.php +++ b/tests/Documents/GraphLookup/Traveller.php @@ -4,7 +4,7 @@ namespace Documents\GraphLookup; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Traveller diff --git a/tests/Documents/Group.php b/tests/Documents/Group.php index f3fad5eedf..b8331913e8 100644 --- a/tests/Documents/Group.php +++ b/tests/Documents/Group.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Group diff --git a/tests/Documents/GuestServer.php b/tests/Documents/GuestServer.php index 7d98aa880a..e2175f8cb0 100644 --- a/tests/Documents/GuestServer.php +++ b/tests/Documents/GuestServer.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class GuestServer extends Server diff --git a/tests/Documents/IdentifiedChapter.php b/tests/Documents/IdentifiedChapter.php index 1a82989798..5de12c5522 100644 --- a/tests/Documents/IdentifiedChapter.php +++ b/tests/Documents/IdentifiedChapter.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class IdentifiedChapter diff --git a/tests/Documents/IndirectlyReferencedUser.php b/tests/Documents/IndirectlyReferencedUser.php index bce2025be9..a2858bcf80 100644 --- a/tests/Documents/IndirectlyReferencedUser.php +++ b/tests/Documents/IndirectlyReferencedUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class IndirectlyReferencedUser diff --git a/tests/Documents/Issue.php b/tests/Documents/Issue.php index 3414af613c..5d351475df 100644 --- a/tests/Documents/Issue.php +++ b/tests/Documents/Issue.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Issue diff --git a/tests/Documents/Manager.php b/tests/Documents/Manager.php index a0f80d071e..de6e2f4559 100644 --- a/tests/Documents/Manager.php +++ b/tests/Documents/Manager.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Manager extends BaseEmployee diff --git a/tests/Documents/Message.php b/tests/Documents/Message.php index 58a687a6e2..4f1bee22cd 100644 --- a/tests/Documents/Message.php +++ b/tests/Documents/Message.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Message diff --git a/tests/Documents/OtherSubProject.php b/tests/Documents/OtherSubProject.php index 2466a9ef79..56f089bf07 100644 --- a/tests/Documents/OtherSubProject.php +++ b/tests/Documents/OtherSubProject.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class OtherSubProject extends Project diff --git a/tests/Documents/Page.php b/tests/Documents/Page.php index dc01c46ec0..ed33afc899 100644 --- a/tests/Documents/Page.php +++ b/tests/Documents/Page.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Page diff --git a/tests/Documents/Phonebook.php b/tests/Documents/Phonebook.php index 207cd4c452..cabb389857 100644 --- a/tests/Documents/Phonebook.php +++ b/tests/Documents/Phonebook.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Phonebook diff --git a/tests/Documents/Phonenumber.php b/tests/Documents/Phonenumber.php index aacbd5162d..58f2ea1906 100644 --- a/tests/Documents/Phonenumber.php +++ b/tests/Documents/Phonenumber.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Phonenumber diff --git a/tests/Documents/Place.php b/tests/Documents/Place.php index 57e1a6a615..e21758ff8c 100644 --- a/tests/Documents/Place.php +++ b/tests/Documents/Place.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** For testing $geoNear and other geographic operators */ #[ODM\Document(collection: 'places')] diff --git a/tests/Documents/Product.php b/tests/Documents/Product.php index ac1b0f9bcf..bae062d07f 100644 --- a/tests/Documents/Product.php +++ b/tests/Documents/Product.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Product diff --git a/tests/Documents/Profile.php b/tests/Documents/Profile.php index 570ed3a4cd..e0690dbeb5 100644 --- a/tests/Documents/Profile.php +++ b/tests/Documents/Profile.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use MongoDB\BSON\ObjectId; #[ODM\Document] diff --git a/tests/Documents/ProfileNotify.php b/tests/Documents/ProfileNotify.php index 1453768d2e..a128af6dca 100644 --- a/tests/Documents/ProfileNotify.php +++ b/tests/Documents/ProfileNotify.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\Persistence\NotifyPropertyChanged; use Doctrine\Persistence\PropertyChangedListener; diff --git a/tests/Documents/Project.php b/tests/Documents/Project.php index 62dd3e78d8..4975c7e8db 100644 --- a/tests/Documents/Project.php +++ b/tests/Documents/Project.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/ReferenceUser.php b/tests/Documents/ReferenceUser.php index 24e33b867e..8c3c8c074d 100644 --- a/tests/Documents/ReferenceUser.php +++ b/tests/Documents/ReferenceUser.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** * A document to test the different "storeAs" values diff --git a/tests/Documents/SchemaValidated.php b/tests/Documents/SchemaValidated.php index b46600b429..116be2c927 100644 --- a/tests/Documents/SchemaValidated.php +++ b/tests/Documents/SchemaValidated.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; #[ODM\Document] diff --git a/tests/Documents/Server.php b/tests/Documents/Server.php index 1209463bab..d1470e471f 100644 --- a/tests/Documents/Server.php +++ b/tests/Documents/Server.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'servers')] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/Sharded/ShardedByUser.php b/tests/Documents/Sharded/ShardedByUser.php index 139e56f432..00793d250d 100644 --- a/tests/Documents/Sharded/ShardedByUser.php +++ b/tests/Documents/Sharded/ShardedByUser.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'sharded.users')] #[ODM\ShardKey(keys: ['user' => 'asc'])] diff --git a/tests/Documents/Sharded/ShardedOne.php b/tests/Documents/Sharded/ShardedOne.php index 2c55550074..e353b9b3a9 100644 --- a/tests/Documents/Sharded/ShardedOne.php +++ b/tests/Documents/Sharded/ShardedOne.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use MongoDB\BSON\ObjectId; #[ODM\Document(collection: 'sharded.one')] diff --git a/tests/Documents/Sharded/ShardedOneWithDifferentKey.php b/tests/Documents/Sharded/ShardedOneWithDifferentKey.php index 5f8eb597ab..c7bfa0e7b2 100644 --- a/tests/Documents/Sharded/ShardedOneWithDifferentKey.php +++ b/tests/Documents/Sharded/ShardedOneWithDifferentKey.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** * Note: this document intentially collides with ShardedOne to test shard key changes diff --git a/tests/Documents/Sharded/ShardedUser.php b/tests/Documents/Sharded/ShardedUser.php index c1b27be5d1..175acd6e0e 100644 --- a/tests/Documents/Sharded/ShardedUser.php +++ b/tests/Documents/Sharded/ShardedUser.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'sharded.users')] #[ODM\ShardKey(keys: ['_id' => 'hashed'])] diff --git a/tests/Documents/SimpleReferenceUser.php b/tests/Documents/SimpleReferenceUser.php index ea564ba4c9..a8ffe49605 100644 --- a/tests/Documents/SimpleReferenceUser.php +++ b/tests/Documents/SimpleReferenceUser.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class SimpleReferenceUser diff --git a/tests/Documents/Song.php b/tests/Documents/Song.php index 5c1c57464d..c99d58d011 100644 --- a/tests/Documents/Song.php +++ b/tests/Documents/Song.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class Song diff --git a/tests/Documents/SpecialUser.php b/tests/Documents/SpecialUser.php index 40a043bf36..0f2b1f8017 100644 --- a/tests/Documents/SpecialUser.php +++ b/tests/Documents/SpecialUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class SpecialUser extends User diff --git a/tests/Documents/Strategy.php b/tests/Documents/Strategy.php index a348a30184..5788f4d0d7 100644 --- a/tests/Documents/Strategy.php +++ b/tests/Documents/Strategy.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'strategy')] class Strategy diff --git a/tests/Documents/SubCategory.php b/tests/Documents/SubCategory.php index 0f23a01e54..470edf5f0d 100644 --- a/tests/Documents/SubCategory.php +++ b/tests/Documents/SubCategory.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class SubCategory extends BaseCategory diff --git a/tests/Documents/SubProject.php b/tests/Documents/SubProject.php index 5e21090f06..d289b4c01d 100644 --- a/tests/Documents/SubProject.php +++ b/tests/Documents/SubProject.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class SubProject extends Project diff --git a/tests/Documents/Tag.php b/tests/Documents/Tag.php index 70471bb678..36cc7c1f8e 100644 --- a/tests/Documents/Tag.php +++ b/tests/Documents/Tag.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class Tag diff --git a/tests/Documents/Task.php b/tests/Documents/Task.php index 36a67fa74b..e3430a98e7 100644 --- a/tests/Documents/Task.php +++ b/tests/Documents/Task.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'tasks')] class Task diff --git a/tests/Documents/TimeSeries/TimeSeriesDocument.php b/tests/Documents/TimeSeries/TimeSeriesDocument.php index 74426a4144..0d17d14e9a 100644 --- a/tests/Documents/TimeSeries/TimeSeriesDocument.php +++ b/tests/Documents/TimeSeries/TimeSeriesDocument.php @@ -5,7 +5,7 @@ namespace Documents\TimeSeries; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\TimeSeries\Granularity; #[ODM\Document] diff --git a/tests/Documents/Tournament/Participant.php b/tests/Documents/Tournament/Participant.php index 1f2e405433..c3c2d68314 100644 --- a/tests/Documents/Tournament/Participant.php +++ b/tests/Documents/Tournament/Participant.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/Tournament/ParticipantSolo.php b/tests/Documents/Tournament/ParticipantSolo.php index 7c7c045a65..281bdb6f72 100644 --- a/tests/Documents/Tournament/ParticipantSolo.php +++ b/tests/Documents/Tournament/ParticipantSolo.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class ParticipantSolo extends Participant diff --git a/tests/Documents/Tournament/ParticipantTeam.php b/tests/Documents/Tournament/ParticipantTeam.php index 44ca77509e..de5fc56d48 100644 --- a/tests/Documents/Tournament/ParticipantTeam.php +++ b/tests/Documents/Tournament/ParticipantTeam.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class ParticipantTeam extends Participant diff --git a/tests/Documents/Tournament/Tournament.php b/tests/Documents/Tournament/Tournament.php index 3c0749e135..48489a1f8f 100644 --- a/tests/Documents/Tournament/Tournament.php +++ b/tests/Documents/Tournament/Tournament.php @@ -5,7 +5,7 @@ namespace Documents\Tournament; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/Tournament/TournamentFootball.php b/tests/Documents/Tournament/TournamentFootball.php index f97a1e4bd1..957a372f4b 100644 --- a/tests/Documents/Tournament/TournamentFootball.php +++ b/tests/Documents/Tournament/TournamentFootball.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class TournamentFootball extends Tournament diff --git a/tests/Documents/Tournament/TournamentTennis.php b/tests/Documents/Tournament/TournamentTennis.php index 91959c5f2f..f2d24a27c9 100644 --- a/tests/Documents/Tournament/TournamentTennis.php +++ b/tests/Documents/Tournament/TournamentTennis.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class TournamentTennis extends Tournament diff --git a/tests/Documents/TypedDocument.php b/tests/Documents/TypedDocument.php index 9030d34b2d..64b28e6964 100644 --- a/tests/Documents/TypedDocument.php +++ b/tests/Documents/TypedDocument.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class TypedDocument diff --git a/tests/Documents/TypedEmbeddedDocument.php b/tests/Documents/TypedEmbeddedDocument.php index 2e69bdf04f..7e0893f1c1 100644 --- a/tests/Documents/TypedEmbeddedDocument.php +++ b/tests/Documents/TypedEmbeddedDocument.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\EmbeddedDocument] class TypedEmbeddedDocument diff --git a/tests/Documents/User.php b/tests/Documents/User.php index 7e1031ec33..1427ce0b2d 100644 --- a/tests/Documents/User.php +++ b/tests/Documents/User.php @@ -8,7 +8,7 @@ use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use MongoDB\BSON\ObjectId; use MongoDB\BSON\UTCDateTime; diff --git a/tests/Documents/UserName.php b/tests/Documents/UserName.php index 349fc92367..a6b9feb477 100644 --- a/tests/Documents/UserName.php +++ b/tests/Documents/UserName.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; #[ODM\View(rootClass: CmsUser::class, repositoryClass: UserNameRepository::class, view: 'user-name')] diff --git a/tests/Documents/UserTyped.php b/tests/Documents/UserTyped.php index 2f04093c32..d561db7673 100644 --- a/tests/Documents/UserTyped.php +++ b/tests/Documents/UserTyped.php @@ -6,7 +6,7 @@ use DateTime; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document() */ #[ODM\Document] diff --git a/tests/Documents/UserUpsert.php b/tests/Documents/UserUpsert.php index 5da4a07cd4..6f6ad3c025 100644 --- a/tests/Documents/UserUpsert.php +++ b/tests/Documents/UserUpsert.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'users_upsert')] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/UserUpsertChild.php b/tests/Documents/UserUpsertChild.php index b298bb1ac7..200963fce9 100644 --- a/tests/Documents/UserUpsertChild.php +++ b/tests/Documents/UserUpsertChild.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'users_upsert')] class UserUpsertChild extends UserUpsert diff --git a/tests/Documents/UserUpsertIdStrategyNone.php b/tests/Documents/UserUpsertIdStrategyNone.php index 50861f21dc..73da62cc25 100644 --- a/tests/Documents/UserUpsertIdStrategyNone.php +++ b/tests/Documents/UserUpsertIdStrategyNone.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'users_upsert_id_strategy_none')] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/VectorEmbedding.php b/tests/Documents/VectorEmbedding.php index 2a8cfbd7dc..05ef07ad48 100644 --- a/tests/Documents/VectorEmbedding.php +++ b/tests/Documents/VectorEmbedding.php @@ -4,10 +4,10 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\VectorSearchIndex; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Types\Type; diff --git a/tests/Documents/VersionedDocument.php b/tests/Documents/VersionedDocument.php index dce1736e18..2e07283579 100644 --- a/tests/Documents/VersionedDocument.php +++ b/tests/Documents/VersionedDocument.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** * Documents\VersionedDocument diff --git a/tests/Documents/VersionedUser.php b/tests/Documents/VersionedUser.php index ddae1f7258..e010f5e1f8 100644 --- a/tests/Documents/VersionedUser.php +++ b/tests/Documents/VersionedUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(collection: 'users')] #[ODM\InheritanceType('COLLECTION_PER_CLASS')] diff --git a/tests/Documents/ViewReference.php b/tests/Documents/ViewReference.php index e65f1a4200..c0ff7c73ec 100644 --- a/tests/Documents/ViewReference.php +++ b/tests/Documents/ViewReference.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class ViewReference diff --git a/tests/Documents84/PropertyHooks/MappingVirtualProperty.php b/tests/Documents84/PropertyHooks/MappingVirtualProperty.php index 7a7a2b6dbb..936000eb93 100644 --- a/tests/Documents84/PropertyHooks/MappingVirtualProperty.php +++ b/tests/Documents84/PropertyHooks/MappingVirtualProperty.php @@ -2,9 +2,9 @@ namespace Documents84\PropertyHooks; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; #[Document(collection: 'property_hooks_user')] class MappingVirtualProperty diff --git a/tests/Documents84/PropertyHooks/User.php b/tests/Documents84/PropertyHooks/User.php index cc251be3c9..3826eddea3 100644 --- a/tests/Documents84/PropertyHooks/User.php +++ b/tests/Documents84/PropertyHooks/User.php @@ -2,9 +2,9 @@ namespace Documents84\PropertyHooks; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; use ValueError; #[Document(collection: 'property_hooks_user')] diff --git a/tests/Tests/DocumentManagerTest.php b/tests/Tests/DocumentManagerTest.php index a23f5612d8..a639be3469 100644 --- a/tests/Tests/DocumentManagerTest.php +++ b/tests/Tests/DocumentManagerTest.php @@ -8,7 +8,7 @@ use Doctrine\Common\EventManager; use Doctrine\ODM\MongoDB\Aggregation\Builder as AggregationBuilder; use Doctrine\ODM\MongoDB\Configuration; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory; use Doctrine\ODM\MongoDB\Mapping\MappingException; diff --git a/tests/Tests/Events/LifecycleCallbacksTest.php b/tests/Tests/Events/LifecycleCallbacksTest.php index 3cabb91aad..547e101106 100644 --- a/tests/Tests/Events/LifecycleCallbacksTest.php +++ b/tests/Tests/Events/LifecycleCallbacksTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Event; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/tests/Tests/Events/LifecycleListenersTest.php b/tests/Tests/Events/LifecycleListenersTest.php index 088040c918..ac9a35af60 100644 --- a/tests/Tests/Events/LifecycleListenersTest.php +++ b/tests/Tests/Events/LifecycleListenersTest.php @@ -10,7 +10,7 @@ use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Event\PostCollectionLoadEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Assert; diff --git a/tests/Tests/Events/TransactionalLifecycleEventsTest.php b/tests/Tests/Events/TransactionalLifecycleEventsTest.php index d0567a57ea..9b48694b28 100644 --- a/tests/Tests/Events/TransactionalLifecycleEventsTest.php +++ b/tests/Tests/Events/TransactionalLifecycleEventsTest.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\Type; use MongoDB\Client; diff --git a/tests/Tests/Functional/AlsoLoadTest.php b/tests/Tests/Functional/AlsoLoadTest.php index 3f71000efe..8012c05761 100644 --- a/tests/Tests/Functional/AlsoLoadTest.php +++ b/tests/Tests/Functional/AlsoLoadTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function explode; diff --git a/tests/Tests/Functional/AtomicSetTest.php b/tests/Tests/Functional/AtomicSetTest.php index cd8a6437d2..31193f0ab8 100644 --- a/tests/Tests/Functional/AtomicSetTest.php +++ b/tests/Tests/Functional/AtomicSetTest.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\APM\CommandLogger; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Book; use Documents\Chapter; diff --git a/tests/Tests/Functional/BinDataTest.php b/tests/Tests/Functional/BinDataTest.php index d0ecb1462f..c011e5107b 100644 --- a/tests/Tests/Functional/BinDataTest.php +++ b/tests/Tests/Functional/BinDataTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\Binary; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/CollectionPersisterTest.php b/tests/Tests/Functional/CollectionPersisterTest.php index 4c18afe30a..ff769ac543 100644 --- a/tests/Tests/Functional/CollectionPersisterTest.php +++ b/tests/Tests/Functional/CollectionPersisterTest.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\APM\CommandLogger; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Persisters\CollectionPersister; use Doctrine\ODM\MongoDB\Persisters\PersistenceBuilder; diff --git a/tests/Tests/Functional/CollectionsTest.php b/tests/Tests/Functional/CollectionsTest.php index 7a17e28ac2..82f52b6b64 100644 --- a/tests/Tests/Functional/CollectionsTest.php +++ b/tests/Tests/Functional/CollectionsTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Bars\Bar; use Documents\Bars\Location; diff --git a/tests/Tests/Functional/CustomCollectionsTest.php b/tests/Tests/Functional/CustomCollectionsTest.php index d821746573..a30c66813c 100644 --- a/tests/Tests/Functional/CustomCollectionsTest.php +++ b/tests/Tests/Functional/CustomCollectionsTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\PersistentCollection; diff --git a/tests/Tests/Functional/CustomFieldNameTest.php b/tests/Tests/Functional/CustomFieldNameTest.php index ddc220fba5..c7ca9bd162 100644 --- a/tests/Tests/Functional/CustomFieldNameTest.php +++ b/tests/Tests/Functional/CustomFieldNameTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class CustomFieldNameTest extends BaseTestCase diff --git a/tests/Tests/Functional/CustomTypeTest.php b/tests/Tests/Functional/CustomTypeTest.php index 6543998b86..d085ea645a 100644 --- a/tests/Tests/Functional/CustomTypeTest.php +++ b/tests/Tests/Functional/CustomTypeTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Tests\CaptureDeprecationMessages; use Doctrine\ODM\MongoDB\Types\ClosureToPHP; diff --git a/tests/Tests/Functional/DatabasesTest.php b/tests/Tests/Functional/DatabasesTest.php index 757eaca4aa..492ebb4b9d 100644 --- a/tests/Tests/Functional/DatabasesTest.php +++ b/tests/Tests/Functional/DatabasesTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\ODM\MongoDB\Configuration; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class DatabasesTest extends BaseTestCase diff --git a/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php b/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php index cb19a4ec65..367e37e4be 100644 --- a/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php +++ b/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class DiscriminatorsDefaultValueTest extends BaseTestCase diff --git a/tests/Tests/Functional/DocumentPersisterTest.php b/tests/Tests/Functional/DocumentPersisterTest.php index 885d63f7d4..4bfdd7e6d4 100644 --- a/tests/Tests/Functional/DocumentPersisterTest.php +++ b/tests/Tests/Functional/DocumentPersisterTest.php @@ -8,7 +8,7 @@ use DateTime; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\LockException; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Persisters\DocumentPersister; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\ClosureToPHP; diff --git a/tests/Tests/Functional/EmbeddedIdTest.php b/tests/Tests/Functional/EmbeddedIdTest.php index 3e897f2bd8..cc0c169c8b 100644 --- a/tests/Tests/Functional/EmbeddedIdTest.php +++ b/tests/Tests/Functional/EmbeddedIdTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/EmbeddedReferenceTest.php b/tests/Tests/Functional/EmbeddedReferenceTest.php index 44368c9604..7786170958 100644 --- a/tests/Tests/Functional/EmbeddedReferenceTest.php +++ b/tests/Tests/Functional/EmbeddedReferenceTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class EmbeddedReferenceTest extends BaseTestCase diff --git a/tests/Tests/Functional/EmbeddedTest.php b/tests/Tests/Functional/EmbeddedTest.php index cbd13de081..8151d068e0 100644 --- a/tests/Tests/Functional/EmbeddedTest.php +++ b/tests/Tests/Functional/EmbeddedTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Address; diff --git a/tests/Tests/Functional/FunctionalTest.php b/tests/Tests/Functional/FunctionalTest.php index 8523a5499f..1ed5bc5a4c 100644 --- a/tests/Tests/Functional/FunctionalTest.php +++ b/tests/Tests/Functional/FunctionalTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\MongoDBException; use Doctrine\ODM\MongoDB\PersistentCollection; diff --git a/tests/Tests/Functional/HasLifecycleCallbacksTest.php b/tests/Tests/Functional/HasLifecycleCallbacksTest.php index 7990b9fe5c..647dd4576f 100644 --- a/tests/Tests/Functional/HasLifecycleCallbacksTest.php +++ b/tests/Tests/Functional/HasLifecycleCallbacksTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class HasLifecycleCallbacksTest extends BaseTestCase diff --git a/tests/Tests/Functional/IdTest.php b/tests/Tests/Functional/IdTest.php index 099e380650..d2afeb45c2 100644 --- a/tests/Tests/Functional/IdTest.php +++ b/tests/Tests/Functional/IdTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Id\UuidGenerator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; @@ -367,7 +367,7 @@ private function createIdTestClass(string $type, string $strategy): string <<<'PHP' namespace %s; - use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class %s diff --git a/tests/Tests/Functional/IndexesTest.php b/tests/Tests/Functional/IndexesTest.php index 255f861158..69c5505377 100644 --- a/tests/Tests/Functional/IndexesTest.php +++ b/tests/Tests/Functional/IndexesTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\Driver\Exception\BulkWriteException; diff --git a/tests/Tests/Functional/LifecycleTest.php b/tests/Tests/Functional/LifecycleTest.php index d51e5b3dc6..92308cc309 100644 --- a/tests/Tests/Functional/LifecycleTest.php +++ b/tests/Tests/Functional/LifecycleTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class LifecycleTest extends BaseTestCase diff --git a/tests/Tests/Functional/LockTest.php b/tests/Tests/Functional/LockTest.php index 18455ea46c..49c217b38c 100644 --- a/tests/Tests/Functional/LockTest.php +++ b/tests/Tests/Functional/LockTest.php @@ -10,7 +10,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\LockException; use Doctrine\ODM\MongoDB\LockMode; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\MongoDBException; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/MappedSuperclassTest.php b/tests/Tests/Functional/MappedSuperclassTest.php index 924cdc8e03..4a54eaca50 100644 --- a/tests/Tests/Functional/MappedSuperclassTest.php +++ b/tests/Tests/Functional/MappedSuperclassTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MappedSuperclassTest extends BaseTestCase diff --git a/tests/Tests/Functional/NestedCollectionsTest.php b/tests/Tests/Functional/NestedCollectionsTest.php index 7b4b41d55b..97f3cc0d1b 100644 --- a/tests/Tests/Functional/NestedCollectionsTest.php +++ b/tests/Tests/Functional/NestedCollectionsTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Phonebook; diff --git a/tests/Tests/Functional/NestedDocumentsTest.php b/tests/Tests/Functional/NestedDocumentsTest.php index d1998444d8..4e4be40415 100644 --- a/tests/Tests/Functional/NestedDocumentsTest.php +++ b/tests/Tests/Functional/NestedDocumentsTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/OrphanRemovalEmbedTest.php b/tests/Tests/Functional/OrphanRemovalEmbedTest.php index 5f37672eac..b078a9bc3d 100644 --- a/tests/Tests/Functional/OrphanRemovalEmbedTest.php +++ b/tests/Tests/Functional/OrphanRemovalEmbedTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/OrphanRemovalTest.php b/tests/Tests/Functional/OrphanRemovalTest.php index fbee6a5263..515c54ade3 100644 --- a/tests/Tests/Functional/OrphanRemovalTest.php +++ b/tests/Tests/Functional/OrphanRemovalTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/PrePersistTest.php b/tests/Tests/Functional/PrePersistTest.php index b419ac4d9b..90aa619bb8 100644 --- a/tests/Tests/Functional/PrePersistTest.php +++ b/tests/Tests/Functional/PrePersistTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class PrePersistTest extends BaseTestCase diff --git a/tests/Tests/Functional/RawTypeTest.php b/tests/Tests/Functional/RawTypeTest.php index 1b0c894f22..9ac50a9f37 100644 --- a/tests/Tests/Functional/RawTypeTest.php +++ b/tests/Tests/Functional/RawTypeTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; use MongoDB\BSON\UTCDateTime; diff --git a/tests/Tests/Functional/ReadOnlyDocumentTest.php b/tests/Tests/Functional/ReadOnlyDocumentTest.php index 5e7aad58d8..22597809c6 100644 --- a/tests/Tests/Functional/ReadOnlyDocumentTest.php +++ b/tests/Tests/Functional/ReadOnlyDocumentTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/ReadOnlyPropertiesTest.php b/tests/Tests/Functional/ReadOnlyPropertiesTest.php index ff0dfd28d8..192518b622 100644 --- a/tests/Tests/Functional/ReadOnlyPropertiesTest.php +++ b/tests/Tests/Functional/ReadOnlyPropertiesTest.php @@ -4,10 +4,10 @@ namespace Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; -use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class ReadOnlyPropertiesTest extends BaseTestCase diff --git a/tests/Tests/Functional/ReadPreferenceTest.php b/tests/Tests/Functional/ReadPreferenceTest.php index 3511fba7eb..7ff6647a0e 100644 --- a/tests/Tests/Functional/ReadPreferenceTest.php +++ b/tests/Tests/Functional/ReadPreferenceTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Query\Query; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/ReferenceDiscriminatorsTest.php b/tests/Tests/Functional/ReferenceDiscriminatorsTest.php index c5cd226aca..9ee13b131c 100644 --- a/tests/Tests/Functional/ReferenceDiscriminatorsTest.php +++ b/tests/Tests/Functional/ReferenceDiscriminatorsTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class ReferenceDiscriminatorsTest extends BaseTestCase diff --git a/tests/Tests/Functional/ReferencesTest.php b/tests/Tests/Functional/ReferencesTest.php index 8a04113b02..4818ba0483 100644 --- a/tests/Tests/Functional/ReferencesTest.php +++ b/tests/Tests/Functional/ReferencesTest.php @@ -9,7 +9,7 @@ use Doctrine\ODM\MongoDB\Event\DocumentNotFoundEventArgs; use Doctrine\ODM\MongoDB\Events; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/SplObjectHashCollisionsTest.php b/tests/Tests/Functional/SplObjectHashCollisionsTest.php index 8a3255de47..95f32d9deb 100644 --- a/tests/Tests/Functional/SplObjectHashCollisionsTest.php +++ b/tests/Tests/Functional/SplObjectHashCollisionsTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\IgnoreDeprecations; diff --git a/tests/Tests/Functional/TargetDocumentTest.php b/tests/Tests/Functional/TargetDocumentTest.php index 8b50453b3d..c60ba0c6fb 100644 --- a/tests/Tests/Functional/TargetDocumentTest.php +++ b/tests/Tests/Functional/TargetDocumentTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; diff --git a/tests/Tests/Functional/Ticket/GH1011Test.php b/tests/Tests/Functional/Ticket/GH1011Test.php index 701744b7aa..0c753aee4d 100644 --- a/tests/Tests/Functional/Ticket/GH1011Test.php +++ b/tests/Tests/Functional/Ticket/GH1011Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1017Test.php b/tests/Tests/Functional/Ticket/GH1017Test.php index 756b770636..e99a351f8b 100644 --- a/tests/Tests/Functional/Ticket/GH1017Test.php +++ b/tests/Tests/Functional/Ticket/GH1017Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/tests/Tests/Functional/Ticket/GH1058Test.php b/tests/Tests/Functional/Ticket/GH1058Test.php index deec528fee..e0cec2fd5c 100644 --- a/tests/Tests/Functional/Ticket/GH1058Test.php +++ b/tests/Tests/Functional/Ticket/GH1058Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Exception; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH1107Test.php b/tests/Tests/Functional/Ticket/GH1107Test.php index 21afeba89d..0084c42a49 100644 --- a/tests/Tests/Functional/Ticket/GH1107Test.php +++ b/tests/Tests/Functional/Ticket/GH1107Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1107Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1117Test.php b/tests/Tests/Functional/Ticket/GH1117Test.php index 7b24e0d154..ebb6eec9c6 100644 --- a/tests/Tests/Functional/Ticket/GH1117Test.php +++ b/tests/Tests/Functional/Ticket/GH1117Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1117Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1138Test.php b/tests/Tests/Functional/Ticket/GH1138Test.php index 0f11572ac3..8dde8eef8c 100644 --- a/tests/Tests/Functional/Ticket/GH1138Test.php +++ b/tests/Tests/Functional/Ticket/GH1138Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\APM\CommandLogger; use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1138Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1152Test.php b/tests/Tests/Functional/Ticket/GH1152Test.php index 050a36bcdb..015c3d8f3e 100644 --- a/tests/Tests/Functional/Ticket/GH1152Test.php +++ b/tests/Tests/Functional/Ticket/GH1152Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1225Test.php b/tests/Tests/Functional/Ticket/GH1225Test.php index e9a4173159..83cca69d82 100644 --- a/tests/Tests/Functional/Ticket/GH1225Test.php +++ b/tests/Tests/Functional/Ticket/GH1225Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1225Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1229Test.php b/tests/Tests/Functional/Ticket/GH1229Test.php index a1bc2aa2d3..83cf268294 100644 --- a/tests/Tests/Functional/Ticket/GH1229Test.php +++ b/tests/Tests/Functional/Ticket/GH1229Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function assert; diff --git a/tests/Tests/Functional/Ticket/GH1232Test.php b/tests/Tests/Functional/Ticket/GH1232Test.php index 59c9266914..9702eee4b0 100644 --- a/tests/Tests/Functional/Ticket/GH1232Test.php +++ b/tests/Tests/Functional/Ticket/GH1232Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; diff --git a/tests/Tests/Functional/Ticket/GH1275Test.php b/tests/Tests/Functional/Ticket/GH1275Test.php index 84a5aad4c0..8017fcec95 100644 --- a/tests/Tests/Functional/Ticket/GH1275Test.php +++ b/tests/Tests/Functional/Ticket/GH1275Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; diff --git a/tests/Tests/Functional/Ticket/GH1294Test.php b/tests/Tests/Functional/Ticket/GH1294Test.php index 2082c10cbb..1ed10a6c97 100644 --- a/tests/Tests/Functional/Ticket/GH1294Test.php +++ b/tests/Tests/Functional/Ticket/GH1294Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\Regex; diff --git a/tests/Tests/Functional/Ticket/GH1344Test.php b/tests/Tests/Functional/Ticket/GH1344Test.php index 5db7663df5..4e97e70c18 100644 --- a/tests/Tests/Functional/Ticket/GH1344Test.php +++ b/tests/Tests/Functional/Ticket/GH1344Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\Driver\Exception\CommandException; diff --git a/tests/Tests/Functional/Ticket/GH1346Test.php b/tests/Tests/Functional/Ticket/GH1346Test.php index af5259614a..2d6cdfb3cb 100644 --- a/tests/Tests/Functional/Ticket/GH1346Test.php +++ b/tests/Tests/Functional/Ticket/GH1346Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1346Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1418Test.php b/tests/Tests/Functional/Ticket/GH1418Test.php index d001f9b07f..5c8139f450 100644 --- a/tests/Tests/Functional/Ticket/GH1418Test.php +++ b/tests/Tests/Functional/Ticket/GH1418Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Query\Query; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1428Test.php b/tests/Tests/Functional/Ticket/GH1428Test.php index 232d2d71b6..594ee8e52a 100644 --- a/tests/Tests/Functional/Ticket/GH1428Test.php +++ b/tests/Tests/Functional/Ticket/GH1428Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; diff --git a/tests/Tests/Functional/Ticket/GH1435Test.php b/tests/Tests/Functional/Ticket/GH1435Test.php index 14bf4f5150..75384a7e30 100644 --- a/tests/Tests/Functional/Ticket/GH1435Test.php +++ b/tests/Tests/Functional/Ticket/GH1435Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH1525Test.php b/tests/Tests/Functional/Ticket/GH1525Test.php index d5770bc3d4..2a736539d9 100644 --- a/tests/Tests/Functional/Ticket/GH1525Test.php +++ b/tests/Tests/Functional/Ticket/GH1525Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Id\UuidGenerator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1525Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1572Test.php b/tests/Tests/Functional/Ticket/GH1572Test.php index c8cc052fff..04528697e3 100644 --- a/tests/Tests/Functional/Ticket/GH1572Test.php +++ b/tests/Tests/Functional/Ticket/GH1572Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1674Test.php b/tests/Tests/Functional/Ticket/GH1674Test.php index 47c7ac11f4..90110963e2 100644 --- a/tests/Tests/Functional/Ticket/GH1674Test.php +++ b/tests/Tests/Functional/Ticket/GH1674Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH1775Test.php b/tests/Tests/Functional/Ticket/GH1775Test.php index b368948b68..d0901c2d85 100644 --- a/tests/Tests/Functional/Ticket/GH1775Test.php +++ b/tests/Tests/Functional/Ticket/GH1775Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1962Test.php b/tests/Tests/Functional/Ticket/GH1962Test.php index 329abb7afe..6a18a67f91 100644 --- a/tests/Tests/Functional/Ticket/GH1962Test.php +++ b/tests/Tests/Functional/Ticket/GH1962Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1962Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1964Test.php b/tests/Tests/Functional/Ticket/GH1964Test.php index 0b97560bef..868f3c1c53 100644 --- a/tests/Tests/Functional/Ticket/GH1964Test.php +++ b/tests/Tests/Functional/Ticket/GH1964Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1964Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1990Test.php b/tests/Tests/Functional/Ticket/GH1990Test.php index c1becf358b..22a383d5d0 100644 --- a/tests/Tests/Functional/Ticket/GH1990Test.php +++ b/tests/Tests/Functional/Ticket/GH1990Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1990Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH2002Test.php b/tests/Tests/Functional/Ticket/GH2002Test.php index b2211d2f0b..e572680afd 100644 --- a/tests/Tests/Functional/Ticket/GH2002Test.php +++ b/tests/Tests/Functional/Ticket/GH2002Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/Ticket/GH2157Test.php b/tests/Tests/Functional/Ticket/GH2157Test.php index 32276ceb31..28cbe56e4a 100644 --- a/tests/Tests/Functional/Ticket/GH2157Test.php +++ b/tests/Tests/Functional/Ticket/GH2157Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\ODM\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH2157Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH2158Test.php b/tests/Tests/Functional/Ticket/GH2158Test.php index f01456ce21..d92792bd3b 100644 --- a/tests/Tests/Functional/Ticket/GH2158Test.php +++ b/tests/Tests/Functional/Ticket/GH2158Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH2158Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH232Test.php b/tests/Tests/Functional/Ticket/GH232Test.php index 14388fa183..0c2627ca1e 100644 --- a/tests/Tests/Functional/Ticket/GH232Test.php +++ b/tests/Tests/Functional/Ticket/GH232Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH232Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH245Test.php b/tests/Tests/Functional/Ticket/GH245Test.php index 1572f7f6a9..298c54a875 100644 --- a/tests/Tests/Functional/Ticket/GH245Test.php +++ b/tests/Tests/Functional/Ticket/GH245Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH245Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH267Test.php b/tests/Tests/Functional/Ticket/GH267Test.php index d8a48dd6f0..3a8ce9b18f 100644 --- a/tests/Tests/Functional/Ticket/GH267Test.php +++ b/tests/Tests/Functional/Ticket/GH267Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH267Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH2730Test.php b/tests/Tests/Functional/Ticket/GH2730Test.php index 808e8a1eef..e901d6c739 100644 --- a/tests/Tests/Functional/Ticket/GH2730Test.php +++ b/tests/Tests/Functional/Ticket/GH2730Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function spl_object_hash; diff --git a/tests/Tests/Functional/Ticket/GH2789Test.php b/tests/Tests/Functional/Ticket/GH2789Test.php index 92ef106f80..f4d7af5647 100644 --- a/tests/Tests/Functional/Ticket/GH2789Test.php +++ b/tests/Tests/Functional/Ticket/GH2789Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\Type; use Doctrine\ODM\MongoDB\Types\Versionable; diff --git a/tests/Tests/Functional/Ticket/GH2825Test.php b/tests/Tests/Functional/Ticket/GH2825Test.php index 1405a47b04..0dd37fa4a6 100644 --- a/tests/Tests/Functional/Ticket/GH2825Test.php +++ b/tests/Tests/Functional/Ticket/GH2825Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH2910Test.php b/tests/Tests/Functional/Ticket/GH2910Test.php index c0d4ff9c5f..f901a5b2d7 100644 --- a/tests/Tests/Functional/Ticket/GH2910Test.php +++ b/tests/Tests/Functional/Ticket/GH2910Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH2910Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH389Test.php b/tests/Tests/Functional/Ticket/GH389Test.php index eeb6bb0155..b80ea48049 100644 --- a/tests/Tests/Functional/Ticket/GH389Test.php +++ b/tests/Tests/Functional/Ticket/GH389Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH389Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH426Test.php b/tests/Tests/Functional/Ticket/GH426Test.php index 1f028a41a5..e818b79712 100644 --- a/tests/Tests/Functional/Ticket/GH426Test.php +++ b/tests/Tests/Functional/Ticket/GH426Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH426Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH435Test.php b/tests/Tests/Functional/Ticket/GH435Test.php index 2c22641c47..5e6683769f 100644 --- a/tests/Tests/Functional/Ticket/GH435Test.php +++ b/tests/Tests/Functional/Ticket/GH435Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH435Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH453Test.php b/tests/Tests/Functional/Ticket/GH453Test.php index b18a4143eb..a2adee6192 100644 --- a/tests/Tests/Functional/Ticket/GH453Test.php +++ b/tests/Tests/Functional/Ticket/GH453Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function array_values; diff --git a/tests/Tests/Functional/Ticket/GH467Test.php b/tests/Tests/Functional/Ticket/GH467Test.php index 613a906e36..9bd878d2a4 100644 --- a/tests/Tests/Functional/Ticket/GH467Test.php +++ b/tests/Tests/Functional/Ticket/GH467Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH499Test.php b/tests/Tests/Functional/Ticket/GH499Test.php index 3aca5e256c..69b4d121a4 100644 --- a/tests/Tests/Functional/Ticket/GH499Test.php +++ b/tests/Tests/Functional/Ticket/GH499Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH520Test.php b/tests/Tests/Functional/Ticket/GH520Test.php index bd44068911..5ab369f88f 100644 --- a/tests/Tests/Functional/Ticket/GH520Test.php +++ b/tests/Tests/Functional/Ticket/GH520Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH529Test.php b/tests/Tests/Functional/Ticket/GH529Test.php index 14bcd970ba..483a793bc9 100644 --- a/tests/Tests/Functional/Ticket/GH529Test.php +++ b/tests/Tests/Functional/Ticket/GH529Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH560Test.php b/tests/Tests/Functional/Ticket/GH560Test.php index 2364cd3a5e..2733047747 100644 --- a/tests/Tests/Functional/Ticket/GH560Test.php +++ b/tests/Tests/Functional/Ticket/GH560Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\EventSubscriber; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/Ticket/GH561Test.php b/tests/Tests/Functional/Ticket/GH561Test.php index 0335bd344c..2e185adca6 100644 --- a/tests/Tests/Functional/Ticket/GH561Test.php +++ b/tests/Tests/Functional/Ticket/GH561Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH561Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH566Test.php b/tests/Tests/Functional/Ticket/GH566Test.php index aadc194d69..3e933e4678 100644 --- a/tests/Tests/Functional/Ticket/GH566Test.php +++ b/tests/Tests/Functional/Ticket/GH566Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH580Test.php b/tests/Tests/Functional/Ticket/GH580Test.php index 7c12331567..43238430df 100644 --- a/tests/Tests/Functional/Ticket/GH580Test.php +++ b/tests/Tests/Functional/Ticket/GH580Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\Driver\Exception\BulkWriteException; diff --git a/tests/Tests/Functional/Ticket/GH593Test.php b/tests/Tests/Functional/Ticket/GH593Test.php index 99a741e327..68d83ffd2f 100644 --- a/tests/Tests/Functional/Ticket/GH593Test.php +++ b/tests/Tests/Functional/Ticket/GH593Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentNotFoundException; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function iterator_to_array; diff --git a/tests/Tests/Functional/Ticket/GH596Test.php b/tests/Tests/Functional/Ticket/GH596Test.php index 0663926425..8413704b41 100644 --- a/tests/Tests/Functional/Ticket/GH596Test.php +++ b/tests/Tests/Functional/Ticket/GH596Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH596Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH597Test.php b/tests/Tests/Functional/Ticket/GH597Test.php index 8f1bdfd343..d3b85dcb6f 100644 --- a/tests/Tests/Functional/Ticket/GH597Test.php +++ b/tests/Tests/Functional/Ticket/GH597Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH602Test.php b/tests/Tests/Functional/Ticket/GH602Test.php index f1e3cfe355..dbdb9b3080 100644 --- a/tests/Tests/Functional/Ticket/GH602Test.php +++ b/tests/Tests/Functional/Ticket/GH602Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentNotFoundException; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function iterator_to_array; diff --git a/tests/Tests/Functional/Ticket/GH611Test.php b/tests/Tests/Functional/Ticket/GH611Test.php index 9bf0aa7290..1a3d1172b3 100644 --- a/tests/Tests/Functional/Ticket/GH611Test.php +++ b/tests/Tests/Functional/Ticket/GH611Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH628Test.php b/tests/Tests/Functional/Ticket/GH628Test.php index 8d190fa2ab..8771a91c94 100644 --- a/tests/Tests/Functional/Ticket/GH628Test.php +++ b/tests/Tests/Functional/Ticket/GH628Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH628Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH665Test.php b/tests/Tests/Functional/Ticket/GH665Test.php index e18d10dd1a..16d046baee 100644 --- a/tests/Tests/Functional/Ticket/GH665Test.php +++ b/tests/Tests/Functional/Ticket/GH665Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH665Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH788Test.php b/tests/Tests/Functional/Ticket/GH788Test.php index 024424fa06..7db8bf6540 100644 --- a/tests/Tests/Functional/Ticket/GH788Test.php +++ b/tests/Tests/Functional/Ticket/GH788Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH816Test.php b/tests/Tests/Functional/Ticket/GH816Test.php index efaf1c2032..6f3148fcf9 100644 --- a/tests/Tests/Functional/Ticket/GH816Test.php +++ b/tests/Tests/Functional/Ticket/GH816Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH850Test.php b/tests/Tests/Functional/Ticket/GH850Test.php index e78ab6481f..6cf9756117 100644 --- a/tests/Tests/Functional/Ticket/GH850Test.php +++ b/tests/Tests/Functional/Ticket/GH850Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; diff --git a/tests/Tests/Functional/Ticket/GH852Test.php b/tests/Tests/Functional/Ticket/GH852Test.php index 14e4545154..b5f3fa9253 100644 --- a/tests/Tests/Functional/Ticket/GH852Test.php +++ b/tests/Tests/Functional/Ticket/GH852Test.php @@ -9,7 +9,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Criteria; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\Binary; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/Ticket/GH878Test.php b/tests/Tests/Functional/Ticket/GH878Test.php index 97ea8595f1..3e6c7aebe3 100644 --- a/tests/Tests/Functional/Ticket/GH878Test.php +++ b/tests/Tests/Functional/Ticket/GH878Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/tests/Tests/Functional/Ticket/GH880Test.php b/tests/Tests/Functional/Ticket/GH880Test.php index b50a0f1182..09b04e06ac 100644 --- a/tests/Tests/Functional/Ticket/GH880Test.php +++ b/tests/Tests/Functional/Ticket/GH880Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH880Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH897Test.php b/tests/Tests/Functional/Ticket/GH897Test.php index 5f535db21a..860ac7444a 100644 --- a/tests/Tests/Functional/Ticket/GH897Test.php +++ b/tests/Tests/Functional/Ticket/GH897Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH897Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH921Test.php b/tests/Tests/Functional/Ticket/GH921Test.php index 2ce01f8637..6fac9bb03d 100644 --- a/tests/Tests/Functional/Ticket/GH921Test.php +++ b/tests/Tests/Functional/Ticket/GH921Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH927Test.php b/tests/Tests/Functional/Ticket/GH927Test.php index 357a94d1bd..503747f65b 100644 --- a/tests/Tests/Functional/Ticket/GH927Test.php +++ b/tests/Tests/Functional/Ticket/GH927Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH927Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH928Test.php b/tests/Tests/Functional/Ticket/GH928Test.php index 8e23658f5b..4f19f8fcfc 100644 --- a/tests/Tests/Functional/Ticket/GH928Test.php +++ b/tests/Tests/Functional/Ticket/GH928Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH928Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH936Test.php b/tests/Tests/Functional/Ticket/GH936Test.php index fd25150b8a..a5387b761d 100644 --- a/tests/Tests/Functional/Ticket/GH936Test.php +++ b/tests/Tests/Functional/Ticket/GH936Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH936Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH942Test.php b/tests/Tests/Functional/Ticket/GH942Test.php index 44445528d2..34c61b9d22 100644 --- a/tests/Tests/Functional/Ticket/GH942Test.php +++ b/tests/Tests/Functional/Ticket/GH942Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH944Test.php b/tests/Tests/Functional/Ticket/GH944Test.php index 73b77d74c4..0f9b3136b9 100644 --- a/tests/Tests/Functional/Ticket/GH944Test.php +++ b/tests/Tests/Functional/Ticket/GH944Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH944Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH971Test.php b/tests/Tests/Functional/Ticket/GH971Test.php index d822a7043b..be1c3b66be 100644 --- a/tests/Tests/Functional/Ticket/GH971Test.php +++ b/tests/Tests/Functional/Ticket/GH971Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; diff --git a/tests/Tests/Functional/Ticket/GH977Test.php b/tests/Tests/Functional/Ticket/GH977Test.php index fe78397dc6..b0a1a58313 100644 --- a/tests/Tests/Functional/Ticket/GH977Test.php +++ b/tests/Tests/Functional/Ticket/GH977Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH977Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH999Test.php b/tests/Tests/Functional/Ticket/GH999Test.php index db06267d52..4b14407490 100644 --- a/tests/Tests/Functional/Ticket/GH999Test.php +++ b/tests/Tests/Functional/Ticket/GH999Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Exception; diff --git a/tests/Tests/Functional/Ticket/MODM116Test.php b/tests/Tests/Functional/Ticket/MODM116Test.php index 7f41791207..1658c7e6d5 100644 --- a/tests/Tests/Functional/Ticket/MODM116Test.php +++ b/tests/Tests/Functional/Ticket/MODM116Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function array_values; diff --git a/tests/Tests/Functional/Ticket/MODM140Test.php b/tests/Tests/Functional/Ticket/MODM140Test.php index ca5ba83cfe..6bb9ed3aac 100644 --- a/tests/Tests/Functional/Ticket/MODM140Test.php +++ b/tests/Tests/Functional/Ticket/MODM140Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Functional\EmbeddedTestLevel0; use Documents\Functional\EmbeddedTestLevel1; diff --git a/tests/Tests/Functional/Ticket/MODM29Test.php b/tests/Tests/Functional/Ticket/MODM29Test.php index 5fbadc34a8..32ddd25418 100644 --- a/tests/Tests/Functional/Ticket/MODM29Test.php +++ b/tests/Tests/Functional/Ticket/MODM29Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function assert; diff --git a/tests/Tests/Functional/Ticket/MODM43Test.php b/tests/Tests/Functional/Ticket/MODM43Test.php index 1206279475..8dad762840 100644 --- a/tests/Tests/Functional/Ticket/MODM43Test.php +++ b/tests/Tests/Functional/Ticket/MODM43Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\ODM\MongoDB\Event\PreLoadEventArgs; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/MODM45Test.php b/tests/Tests/Functional/Ticket/MODM45Test.php index a292d1a4f6..b80fcdd3ae 100644 --- a/tests/Tests/Functional/Ticket/MODM45Test.php +++ b/tests/Tests/Functional/Ticket/MODM45Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM45Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM46Test.php b/tests/Tests/Functional/Ticket/MODM46Test.php index b44eaa782d..a3ffc7a2c3 100644 --- a/tests/Tests/Functional/Ticket/MODM46Test.php +++ b/tests/Tests/Functional/Ticket/MODM46Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/MODM47Test.php b/tests/Tests/Functional/Ticket/MODM47Test.php index 563caaaf45..edfa17112f 100644 --- a/tests/Tests/Functional/Ticket/MODM47Test.php +++ b/tests/Tests/Functional/Ticket/MODM47Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/MODM48Test.php b/tests/Tests/Functional/Ticket/MODM48Test.php index d29e66d2af..45c2ea41eb 100644 --- a/tests/Tests/Functional/Ticket/MODM48Test.php +++ b/tests/Tests/Functional/Ticket/MODM48Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM48Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM52Test.php b/tests/Tests/Functional/Ticket/MODM52Test.php index 472798bdaf..af148126a3 100644 --- a/tests/Tests/Functional/Ticket/MODM52Test.php +++ b/tests/Tests/Functional/Ticket/MODM52Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function count; diff --git a/tests/Tests/Functional/Ticket/MODM56Test.php b/tests/Tests/Functional/Ticket/MODM56Test.php index b780aaf617..70428838d4 100644 --- a/tests/Tests/Functional/Ticket/MODM56Test.php +++ b/tests/Tests/Functional/Ticket/MODM56Test.php @@ -6,7 +6,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\UTCDateTime; diff --git a/tests/Tests/Functional/Ticket/MODM62Test.php b/tests/Tests/Functional/Ticket/MODM62Test.php index 0e2d1e8ae8..4e67bd3a47 100644 --- a/tests/Tests/Functional/Ticket/MODM62Test.php +++ b/tests/Tests/Functional/Ticket/MODM62Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM62Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM65Test.php b/tests/Tests/Functional/Ticket/MODM65Test.php index 2ff30d5a93..028fe9db2d 100644 --- a/tests/Tests/Functional/Ticket/MODM65Test.php +++ b/tests/Tests/Functional/Ticket/MODM65Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM65Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM66Test.php b/tests/Tests/Functional/Ticket/MODM66Test.php index 5e841e9615..96565997eb 100644 --- a/tests/Tests/Functional/Ticket/MODM66Test.php +++ b/tests/Tests/Functional/Ticket/MODM66Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM66Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM67Test.php b/tests/Tests/Functional/Ticket/MODM67Test.php index fc7d7cdb19..08c7881cff 100644 --- a/tests/Tests/Functional/Ticket/MODM67Test.php +++ b/tests/Tests/Functional/Ticket/MODM67Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM67Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM70Test.php b/tests/Tests/Functional/Ticket/MODM70Test.php index eb90a65a00..19c2374862 100644 --- a/tests/Tests/Functional/Ticket/MODM70Test.php +++ b/tests/Tests/Functional/Ticket/MODM70Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function array_search; diff --git a/tests/Tests/Functional/Ticket/MODM72Test.php b/tests/Tests/Functional/Ticket/MODM72Test.php index 0b379d4606..73f6024170 100644 --- a/tests/Tests/Functional/Ticket/MODM72Test.php +++ b/tests/Tests/Functional/Ticket/MODM72Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM72Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM76Test.php b/tests/Tests/Functional/Ticket/MODM76Test.php index c08de061da..1471306a4c 100644 --- a/tests/Tests/Functional/Ticket/MODM76Test.php +++ b/tests/Tests/Functional/Ticket/MODM76Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM76Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM81Test.php b/tests/Tests/Functional/Ticket/MODM81Test.php index 289ca79f52..89b100761f 100644 --- a/tests/Tests/Functional/Ticket/MODM81Test.php +++ b/tests/Tests/Functional/Ticket/MODM81Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM81Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM83Test.php b/tests/Tests/Functional/Ticket/MODM83Test.php index 01a32596c7..7c9225e846 100644 --- a/tests/Tests/Functional/Ticket/MODM83Test.php +++ b/tests/Tests/Functional/Ticket/MODM83Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM83Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM90Test.php b/tests/Tests/Functional/Ticket/MODM90Test.php index fcaa6057d9..23ef57111b 100644 --- a/tests/Tests/Functional/Ticket/MODM90Test.php +++ b/tests/Tests/Functional/Ticket/MODM90Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM90Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM91Test.php b/tests/Tests/Functional/Ticket/MODM91Test.php index 19d164047b..5664c0aff8 100644 --- a/tests/Tests/Functional/Ticket/MODM91Test.php +++ b/tests/Tests/Functional/Ticket/MODM91Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM91Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM92Test.php b/tests/Tests/Functional/Ticket/MODM92Test.php index 98d9a1f0d0..e553d4ac80 100644 --- a/tests/Tests/Functional/Ticket/MODM92Test.php +++ b/tests/Tests/Functional/Ticket/MODM92Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Traversable; diff --git a/tests/Tests/Functional/Ticket/MODM95Test.php b/tests/Tests/Functional/Ticket/MODM95Test.php index 8289f0aba5..5ae0351229 100644 --- a/tests/Tests/Functional/Ticket/MODM95Test.php +++ b/tests/Tests/Functional/Ticket/MODM95Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM95Test extends BaseTestCase diff --git a/tests/Tests/Functional/UpsertTest.php b/tests/Tests/Functional/UpsertTest.php index b33495db14..4692e112b9 100644 --- a/tests/Tests/Functional/UpsertTest.php +++ b/tests/Tests/Functional/UpsertTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/UuidMappingTest.php b/tests/Tests/Functional/UuidMappingTest.php index ad737f94e9..0a1ac92c85 100644 --- a/tests/Tests/Functional/UuidMappingTest.php +++ b/tests/Tests/Functional/UuidMappingTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\Type; use Symfony\Component\Uid\UuidV4; diff --git a/tests/Tests/Functional/ValidationTest.php b/tests/Tests/Functional/ValidationTest.php index 60f71fd1c4..5ea6fc8061 100644 --- a/tests/Tests/Functional/ValidationTest.php +++ b/tests/Tests/Functional/ValidationTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\SchemaValidated; diff --git a/tests/Tests/Functional/VersionTest.php b/tests/Tests/Functional/VersionTest.php index 4be88525fa..3f39061d47 100644 --- a/tests/Tests/Functional/VersionTest.php +++ b/tests/Tests/Functional/VersionTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class VersionTest extends BaseTestCase diff --git a/tests/Tests/HydratorTest.php b/tests/Tests/HydratorTest.php index 0982d629bb..d029e28af2 100644 --- a/tests/Tests/HydratorTest.php +++ b/tests/Tests/HydratorTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Hydrator\HydratorException; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Query\Query; diff --git a/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php b/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php index b90e6f54f4..6561b52714 100644 --- a/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php +++ b/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver; use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver; diff --git a/tests/Tests/Mapping/AbstractMappingDriverTestCase.php b/tests/Tests/Mapping/AbstractMappingDriverTestCase.php index 5d790898f9..ec6953cfed 100644 --- a/tests/Tests/Mapping/AbstractMappingDriverTestCase.php +++ b/tests/Tests/Mapping/AbstractMappingDriverTestCase.php @@ -8,7 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Aggregation\Builder; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\EnumPropertyAccessor; diff --git a/tests/Tests/Mapping/AnnotationDriverTest.php b/tests/Tests/Mapping/AnnotationDriverTest.php index 3bad2754af..7ecf8fda62 100644 --- a/tests/Tests/Mapping/AnnotationDriverTest.php +++ b/tests/Tests/Mapping/AnnotationDriverTest.php @@ -5,8 +5,8 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver; use Doctrine\Persistence\Mapping\Driver\FileClassLocator; diff --git a/tests/Tests/Mapping/BasicInheritanceMappingTest.php b/tests/Tests/Mapping/BasicInheritanceMappingTest.php index 38c787c50d..64f04ebe95 100644 --- a/tests/Tests/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Tests/Mapping/BasicInheritanceMappingTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Mapping/ClassMetadataLoadEventTest.php b/tests/Tests/Mapping/ClassMetadataLoadEventTest.php index 69887c1bbb..704e873dee 100644 --- a/tests/Tests/Mapping/ClassMetadataLoadEventTest.php +++ b/tests/Tests/Mapping/ClassMetadataLoadEventTest.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\LoadClassMetadataEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Mapping/ClassMetadataTest.php b/tests/Tests/Mapping/ClassMetadataTest.php index 612ad8c527..87768b5603 100644 --- a/tests/Tests/Mapping/ClassMetadataTest.php +++ b/tests/Tests/Mapping/ClassMetadataTest.php @@ -6,7 +6,7 @@ use DateTime; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\LegacyReflectionFields; use Doctrine\ODM\MongoDB\Mapping\MappingException; diff --git a/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php b/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php index ef5a740d26..92d900a387 100644 --- a/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php +++ b/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php @@ -3,7 +3,7 @@ declare(strict_types=1); use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php b/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php index c4a2df5b4c..735fa5ce1a 100644 --- a/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php +++ b/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping\Driver; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\Persistence\Mapping\Driver\MappingDriver; use Documents\Account; diff --git a/tests/Tests/Mapping/LegacyReflectionFieldsTest.php b/tests/Tests/Mapping/LegacyReflectionFieldsTest.php index 9d8c201f12..0a686a42f8 100644 --- a/tests/Tests/Mapping/LegacyReflectionFieldsTest.php +++ b/tests/Tests/Mapping/LegacyReflectionFieldsTest.php @@ -4,9 +4,9 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; -use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; use Doctrine\ODM\MongoDB\Mapping\LegacyReflectionFields; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Address; diff --git a/tests/Tests/Mapping/ShardKeyInheritanceMappingTest.php b/tests/Tests/Mapping/ShardKeyInheritanceMappingTest.php index 0836a97be9..ac012b52e2 100644 --- a/tests/Tests/Mapping/ShardKeyInheritanceMappingTest.php +++ b/tests/Tests/Mapping/ShardKeyInheritanceMappingTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Persisters/DocumentPersisterGetShardKeyQueryTest.php b/tests/Tests/Persisters/DocumentPersisterGetShardKeyQueryTest.php index 1f0d2ee767..6ba86e5c48 100644 --- a/tests/Tests/Persisters/DocumentPersisterGetShardKeyQueryTest.php +++ b/tests/Tests/Persisters/DocumentPersisterGetShardKeyQueryTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Persisters; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\User; use MongoDB\BSON\Binary; diff --git a/tests/Tests/Query/BuilderTest.php b/tests/Tests/Query/BuilderTest.php index 202271b621..b9be8f9215 100644 --- a/tests/Tests/Query/BuilderTest.php +++ b/tests/Tests/Query/BuilderTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\UnrewindableIterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Query\Builder; use Doctrine\ODM\MongoDB\Query\Expr; diff --git a/tests/Tests/QueryTest.php b/tests/Tests/QueryTest.php index b643dfff02..5d089a89f1 100644 --- a/tests/Tests/QueryTest.php +++ b/tests/Tests/QueryTest.php @@ -9,7 +9,7 @@ use Doctrine\Common\Collections\Collection as DoctrineCollection; use Doctrine\ODM\MongoDB\Iterator\Iterator; use Doctrine\ODM\MongoDB\Iterator\UnrewindableIterator; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Query\Query; use Documents\Phonenumber; diff --git a/tests/Tests/Tools/GH1299/BaseUser.php b/tests/Tests/Tools/GH1299/BaseUser.php index 277c84c176..50a674c569 100644 --- a/tests/Tests/Tools/GH1299/BaseUser.php +++ b/tests/Tests/Tools/GH1299/BaseUser.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Tools\GH1299; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Tests/Tools/GH1299/GH1299User.php b/tests/Tests/Tools/GH1299/GH1299User.php index 64ed574e58..96fb1574ad 100644 --- a/tests/Tests/Tools/GH1299/GH1299User.php +++ b/tests/Tests/Tools/GH1299/GH1299User.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Tools\GH1299; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Tests/Tools/GH297/Address.php b/tests/Tests/Tools/GH297/Address.php index 5a0c11f266..fe02888a87 100644 --- a/tests/Tests/Tools/GH297/Address.php +++ b/tests/Tests/Tools/GH297/Address.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Tools\GH297; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\EmbeddedDocument */ #[ODM\EmbeddedDocument] diff --git a/tests/Tests/Tools/GH297/AddressTrait.php b/tests/Tests/Tools/GH297/AddressTrait.php index eea24926f8..9261d3b237 100644 --- a/tests/Tests/Tools/GH297/AddressTrait.php +++ b/tests/Tests/Tools/GH297/AddressTrait.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Tools\GH297; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; trait AddressTrait { diff --git a/tests/Tests/Tools/GH297/Admin.php b/tests/Tests/Tools/GH297/Admin.php index 70011f5fa3..a2acabcc44 100644 --- a/tests/Tests/Tools/GH297/Admin.php +++ b/tests/Tests/Tools/GH297/Admin.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Tools\GH297; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Tests/Tools/GH297/User.php b/tests/Tests/Tools/GH297/User.php index 9fd9bca8bf..ba999feaa3 100644 --- a/tests/Tests/Tools/GH297/User.php +++ b/tests/Tests/Tools/GH297/User.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Tools\GH297; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Tests/Tools/ResolveTargetDocumentListenerTest.php b/tests/Tests/Tools/ResolveTargetDocumentListenerTest.php index 8da3d14626..4c5a10ba38 100644 --- a/tests/Tests/Tools/ResolveTargetDocumentListenerTest.php +++ b/tests/Tests/Tools/ResolveTargetDocumentListenerTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactoryInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Tools\ResolveTargetDocumentListener; diff --git a/tests/Tests/UnitOfWorkTest.php b/tests/Tests/UnitOfWorkTest.php index ceb8e8f1a3..51f10ccc4b 100644 --- a/tests/Tests/UnitOfWorkTest.php +++ b/tests/Tests/UnitOfWorkTest.php @@ -9,7 +9,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\APM\CommandLogger; -use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; use Doctrine\ODM\MongoDB\MongoDBException; use Doctrine\ODM\MongoDB\Tests\Mocks\ExceptionThrowingListenerMock; use Doctrine\ODM\MongoDB\Tests\Mocks\PreUpdateListenerMock; From a37ca0cab4278f0a699f8f992f9f2b7a3fe4bdae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Tue, 25 Nov 2025 12:27:25 +0100 Subject: [PATCH 2/6] Add deprecated aliases for attribute classes in Annotations namespace --- src/Mapping/Annotations/AbstractDocument.php | 14 ++++++++++++++ src/Mapping/Annotations/AbstractField.php | 14 ++++++++++++++ src/Mapping/Annotations/AbstractIndex.php | 14 ++++++++++++++ src/Mapping/Annotations/AlsoLoad.php | 14 ++++++++++++++ src/Mapping/Annotations/Annotation.php | 14 ++++++++++++++ src/Mapping/Annotations/ChangeTrackingPolicy.php | 14 ++++++++++++++ .../Annotations/DefaultDiscriminatorValue.php | 14 ++++++++++++++ src/Mapping/Annotations/DiscriminatorField.php | 14 ++++++++++++++ src/Mapping/Annotations/DiscriminatorMap.php | 14 ++++++++++++++ src/Mapping/Annotations/DiscriminatorValue.php | 14 ++++++++++++++ src/Mapping/Annotations/Document.php | 14 ++++++++++++++ src/Mapping/Annotations/EmbedMany.php | 14 ++++++++++++++ src/Mapping/Annotations/EmbedOne.php | 14 ++++++++++++++ src/Mapping/Annotations/EmbeddedDocument.php | 14 ++++++++++++++ src/Mapping/Annotations/Encrypt.php | 14 ++++++++++++++ src/Mapping/Annotations/EncryptQuery.php | 14 ++++++++++++++ src/Mapping/Annotations/Field.php | 14 ++++++++++++++ src/Mapping/Annotations/File.php | 14 ++++++++++++++ src/Mapping/Annotations/File/ChunkSize.php | 14 ++++++++++++++ src/Mapping/Annotations/File/Filename.php | 14 ++++++++++++++ src/Mapping/Annotations/File/Length.php | 14 ++++++++++++++ src/Mapping/Annotations/File/Metadata.php | 14 ++++++++++++++ src/Mapping/Annotations/File/UploadDate.php | 14 ++++++++++++++ src/Mapping/Annotations/HasLifecycleCallbacks.php | 14 ++++++++++++++ src/Mapping/Annotations/Id.php | 14 ++++++++++++++ src/Mapping/Annotations/Index.php | 14 ++++++++++++++ src/Mapping/Annotations/Indexes.php | 14 ++++++++++++++ src/Mapping/Annotations/InheritanceType.php | 14 ++++++++++++++ src/Mapping/Annotations/Lock.php | 14 ++++++++++++++ src/Mapping/Annotations/MappedSuperclass.php | 14 ++++++++++++++ src/Mapping/Annotations/PostLoad.php | 14 ++++++++++++++ src/Mapping/Annotations/PostPersist.php | 14 ++++++++++++++ src/Mapping/Annotations/PostRemove.php | 14 ++++++++++++++ src/Mapping/Annotations/PostUpdate.php | 14 ++++++++++++++ src/Mapping/Annotations/PreFlush.php | 14 ++++++++++++++ src/Mapping/Annotations/PreLoad.php | 14 ++++++++++++++ src/Mapping/Annotations/PrePersist.php | 14 ++++++++++++++ src/Mapping/Annotations/PreRemove.php | 14 ++++++++++++++ src/Mapping/Annotations/PreUpdate.php | 14 ++++++++++++++ src/Mapping/Annotations/QueryResultDocument.php | 14 ++++++++++++++ src/Mapping/Annotations/ReadPreference.php | 14 ++++++++++++++ src/Mapping/Annotations/ReferenceMany.php | 14 ++++++++++++++ src/Mapping/Annotations/ReferenceOne.php | 14 ++++++++++++++ src/Mapping/Annotations/SearchIndex.php | 14 ++++++++++++++ src/Mapping/Annotations/ShardKey.php | 14 ++++++++++++++ src/Mapping/Annotations/TimeSeries.php | 14 ++++++++++++++ src/Mapping/Annotations/UniqueIndex.php | 14 ++++++++++++++ src/Mapping/Annotations/Validation.php | 14 ++++++++++++++ src/Mapping/Annotations/VectorSearchIndex.php | 14 ++++++++++++++ src/Mapping/Annotations/Version.php | 14 ++++++++++++++ src/Mapping/Annotations/View.php | 14 ++++++++++++++ 51 files changed, 714 insertions(+) create mode 100644 src/Mapping/Annotations/AbstractDocument.php create mode 100644 src/Mapping/Annotations/AbstractField.php create mode 100644 src/Mapping/Annotations/AbstractIndex.php create mode 100644 src/Mapping/Annotations/AlsoLoad.php create mode 100644 src/Mapping/Annotations/Annotation.php create mode 100644 src/Mapping/Annotations/ChangeTrackingPolicy.php create mode 100644 src/Mapping/Annotations/DefaultDiscriminatorValue.php create mode 100644 src/Mapping/Annotations/DiscriminatorField.php create mode 100644 src/Mapping/Annotations/DiscriminatorMap.php create mode 100644 src/Mapping/Annotations/DiscriminatorValue.php create mode 100644 src/Mapping/Annotations/Document.php create mode 100644 src/Mapping/Annotations/EmbedMany.php create mode 100644 src/Mapping/Annotations/EmbedOne.php create mode 100644 src/Mapping/Annotations/EmbeddedDocument.php create mode 100644 src/Mapping/Annotations/Encrypt.php create mode 100644 src/Mapping/Annotations/EncryptQuery.php create mode 100644 src/Mapping/Annotations/Field.php create mode 100644 src/Mapping/Annotations/File.php create mode 100644 src/Mapping/Annotations/File/ChunkSize.php create mode 100644 src/Mapping/Annotations/File/Filename.php create mode 100644 src/Mapping/Annotations/File/Length.php create mode 100644 src/Mapping/Annotations/File/Metadata.php create mode 100644 src/Mapping/Annotations/File/UploadDate.php create mode 100644 src/Mapping/Annotations/HasLifecycleCallbacks.php create mode 100644 src/Mapping/Annotations/Id.php create mode 100644 src/Mapping/Annotations/Index.php create mode 100644 src/Mapping/Annotations/Indexes.php create mode 100644 src/Mapping/Annotations/InheritanceType.php create mode 100644 src/Mapping/Annotations/Lock.php create mode 100644 src/Mapping/Annotations/MappedSuperclass.php create mode 100644 src/Mapping/Annotations/PostLoad.php create mode 100644 src/Mapping/Annotations/PostPersist.php create mode 100644 src/Mapping/Annotations/PostRemove.php create mode 100644 src/Mapping/Annotations/PostUpdate.php create mode 100644 src/Mapping/Annotations/PreFlush.php create mode 100644 src/Mapping/Annotations/PreLoad.php create mode 100644 src/Mapping/Annotations/PrePersist.php create mode 100644 src/Mapping/Annotations/PreRemove.php create mode 100644 src/Mapping/Annotations/PreUpdate.php create mode 100644 src/Mapping/Annotations/QueryResultDocument.php create mode 100644 src/Mapping/Annotations/ReadPreference.php create mode 100644 src/Mapping/Annotations/ReferenceMany.php create mode 100644 src/Mapping/Annotations/ReferenceOne.php create mode 100644 src/Mapping/Annotations/SearchIndex.php create mode 100644 src/Mapping/Annotations/ShardKey.php create mode 100644 src/Mapping/Annotations/TimeSeries.php create mode 100644 src/Mapping/Annotations/UniqueIndex.php create mode 100644 src/Mapping/Annotations/Validation.php create mode 100644 src/Mapping/Annotations/VectorSearchIndex.php create mode 100644 src/Mapping/Annotations/Version.php create mode 100644 src/Mapping/Annotations/View.php diff --git a/src/Mapping/Annotations/AbstractDocument.php b/src/Mapping/Annotations/AbstractDocument.php new file mode 100644 index 0000000000..c5f0c4897a --- /dev/null +++ b/src/Mapping/Annotations/AbstractDocument.php @@ -0,0 +1,14 @@ + Date: Tue, 9 Dec 2025 15:37:38 +0100 Subject: [PATCH 3/6] Restore annotation classes for static analysis This classes are never loaded --- src/Mapping/Annotations/AbstractDocument.php | 11 +++++--- src/Mapping/Annotations/AbstractField.php | 11 +++++--- src/Mapping/Annotations/AbstractIndex.php | 11 +++++--- src/Mapping/Annotations/AlsoLoad.php | 20 +++++++++++++-- src/Mapping/Annotations/Annotation.php | 12 +++------ .../Annotations/ChangeTrackingPolicy.php | 20 +++++++++++++-- .../Annotations/DefaultDiscriminatorValue.php | 21 ++++++++++++++-- .../Annotations/DiscriminatorField.php | 20 +++++++++++++-- src/Mapping/Annotations/DiscriminatorMap.php | 20 +++++++++++++-- .../Annotations/DiscriminatorValue.php | 20 +++++++++++++-- src/Mapping/Annotations/Document.php | 20 +++++++++++++-- src/Mapping/Annotations/EmbedMany.php | 20 +++++++++++++-- src/Mapping/Annotations/EmbedOne.php | 20 +++++++++++++-- src/Mapping/Annotations/EmbeddedDocument.php | 20 +++++++++++++-- src/Mapping/Annotations/Encrypt.php | 22 ++++++++++++++-- src/Mapping/Annotations/EncryptQuery.php | 11 +++++--- src/Mapping/Annotations/Field.php | 20 +++++++++++++-- src/Mapping/Annotations/File.php | 20 +++++++++++++-- src/Mapping/Annotations/File/ChunkSize.php | 18 +++++++++++-- src/Mapping/Annotations/File/Filename.php | 18 +++++++++++-- src/Mapping/Annotations/File/Length.php | 18 +++++++++++-- src/Mapping/Annotations/File/Metadata.php | 18 +++++++++++-- src/Mapping/Annotations/File/UploadDate.php | 18 +++++++++++-- .../Annotations/HasLifecycleCallbacks.php | 19 ++++++++++++-- src/Mapping/Annotations/Id.php | 20 +++++++++++++-- src/Mapping/Annotations/Index.php | 20 +++++++++++++-- src/Mapping/Annotations/Indexes.php | 19 ++++++++++++-- src/Mapping/Annotations/InheritanceType.php | 20 +++++++++++++-- src/Mapping/Annotations/Lock.php | 18 +++++++++++-- src/Mapping/Annotations/MappedSuperclass.php | 21 ++++++++++++++-- src/Mapping/Annotations/PostLoad.php | 20 +++++++++++++-- src/Mapping/Annotations/PostPersist.php | 20 +++++++++++++-- src/Mapping/Annotations/PostRemove.php | 20 +++++++++++++-- src/Mapping/Annotations/PostUpdate.php | 20 +++++++++++++-- src/Mapping/Annotations/PreFlush.php | 20 +++++++++++++-- src/Mapping/Annotations/PreLoad.php | 20 +++++++++++++-- src/Mapping/Annotations/PrePersist.php | 20 +++++++++++++-- src/Mapping/Annotations/PreRemove.php | 20 +++++++++++++-- src/Mapping/Annotations/PreUpdate.php | 20 +++++++++++++-- .../Annotations/QueryResultDocument.php | 18 +++++++++++-- src/Mapping/Annotations/ReadPreference.php | 18 +++++++++++-- src/Mapping/Annotations/ReferenceMany.php | 20 +++++++++++++-- src/Mapping/Annotations/ReferenceOne.php | 20 +++++++++++++-- src/Mapping/Annotations/SearchIndex.php | 25 +++++++++++++++++-- src/Mapping/Annotations/ShardKey.php | 18 +++++++++++-- src/Mapping/Annotations/TimeSeries.php | 20 +++++++++++++-- src/Mapping/Annotations/UniqueIndex.php | 20 +++++++++++++-- src/Mapping/Annotations/Validation.php | 19 ++++++++++++-- src/Mapping/Annotations/VectorSearchIndex.php | 24 ++++++++++++++++-- src/Mapping/Annotations/Version.php | 18 +++++++++++-- src/Mapping/Annotations/View.php | 18 +++++++++++-- src/Mapping/Attribute/AlsoLoad.php | 3 ++- src/Mapping/Attribute/Annotation.php | 14 ----------- .../Attribute/ChangeTrackingPolicy.php | 3 ++- .../Attribute/DefaultDiscriminatorValue.php | 3 ++- src/Mapping/Attribute/DiscriminatorField.php | 3 ++- src/Mapping/Attribute/DiscriminatorMap.php | 3 ++- src/Mapping/Attribute/DiscriminatorValue.php | 3 ++- src/Mapping/Attribute/Document.php | 3 ++- src/Mapping/Attribute/EmbedMany.php | 3 ++- src/Mapping/Attribute/EmbedOne.php | 3 ++- src/Mapping/Attribute/EmbeddedDocument.php | 3 ++- src/Mapping/Attribute/Encrypt.php | 3 ++- src/Mapping/Attribute/Field.php | 3 ++- src/Mapping/Attribute/File.php | 3 ++- src/Mapping/Attribute/File/ChunkSize.php | 3 ++- src/Mapping/Attribute/File/Filename.php | 3 ++- src/Mapping/Attribute/File/Length.php | 3 ++- src/Mapping/Attribute/File/Metadata.php | 3 ++- src/Mapping/Attribute/File/UploadDate.php | 3 ++- .../Attribute/HasLifecycleCallbacks.php | 3 ++- src/Mapping/Attribute/Id.php | 3 ++- src/Mapping/Attribute/Index.php | 3 ++- src/Mapping/Attribute/Indexes.php | 3 ++- src/Mapping/Attribute/InheritanceType.php | 3 ++- src/Mapping/Attribute/Lock.php | 3 ++- src/Mapping/Attribute/MappedSuperclass.php | 3 ++- src/Mapping/Attribute/PostLoad.php | 3 ++- src/Mapping/Attribute/PostPersist.php | 3 ++- src/Mapping/Attribute/PostRemove.php | 3 ++- src/Mapping/Attribute/PostUpdate.php | 3 ++- src/Mapping/Attribute/PreFlush.php | 3 ++- src/Mapping/Attribute/PreLoad.php | 3 ++- src/Mapping/Attribute/PrePersist.php | 3 ++- src/Mapping/Attribute/PreRemove.php | 3 ++- src/Mapping/Attribute/PreUpdate.php | 3 ++- src/Mapping/Attribute/QueryResultDocument.php | 3 ++- src/Mapping/Attribute/ReadPreference.php | 3 ++- src/Mapping/Attribute/ReferenceMany.php | 3 ++- src/Mapping/Attribute/ReferenceOne.php | 2 +- src/Mapping/Attribute/ShardKey.php | 3 ++- src/Mapping/Attribute/TimeSeries.php | 3 ++- src/Mapping/Attribute/UniqueIndex.php | 3 ++- src/Mapping/Attribute/Version.php | 3 ++- src/Mapping/Attribute/View.php | 3 ++- 95 files changed, 937 insertions(+), 169 deletions(-) delete mode 100644 src/Mapping/Attribute/Annotation.php diff --git a/src/Mapping/Annotations/AbstractDocument.php b/src/Mapping/Annotations/AbstractDocument.php index c5f0c4897a..e4a7e9eb0e 100644 --- a/src/Mapping/Annotations/AbstractDocument.php +++ b/src/Mapping/Annotations/AbstractDocument.php @@ -4,11 +4,16 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument; - use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(AbstractDocument::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument::class); + +return; + +/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument instead */ +abstract class AbstractDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument +{ +} diff --git a/src/Mapping/Annotations/AbstractField.php b/src/Mapping/Annotations/AbstractField.php index 7a874788f7..c3c3b37515 100644 --- a/src/Mapping/Annotations/AbstractField.php +++ b/src/Mapping/Annotations/AbstractField.php @@ -4,11 +4,16 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; - use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(AbstractField::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField::class); + +return; + +/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField instead */ +abstract class AbstractField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField +{ +} diff --git a/src/Mapping/Annotations/AbstractIndex.php b/src/Mapping/Annotations/AbstractIndex.php index 8503d048e9..1e9aaf1927 100644 --- a/src/Mapping/Annotations/AbstractIndex.php +++ b/src/Mapping/Annotations/AbstractIndex.php @@ -4,11 +4,16 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex; - use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(AbstractIndex::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex::class); + +return; + +/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex instead */ +abstract class AbstractIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex +{ +} diff --git a/src/Mapping/Annotations/AlsoLoad.php b/src/Mapping/Annotations/AlsoLoad.php index e83de68bc9..ec90051b1e 100644 --- a/src/Mapping/Annotations/AlsoLoad.php +++ b/src/Mapping/Annotations/AlsoLoad.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(AlsoLoad::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad::class); + +return; + +/** + * Loads data from a different field if the original field is not set + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD)] +final class AlsoLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad +{ +} diff --git a/src/Mapping/Annotations/Annotation.php b/src/Mapping/Annotations/Annotation.php index 4ffd5ed79a..47ace5552f 100644 --- a/src/Mapping/Annotations/Annotation.php +++ b/src/Mapping/Annotations/Annotation.php @@ -4,11 +4,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Annotation; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(Annotation::class); +/** @deprecated Annotation classes are deprecated */ +interface Annotation +{ +} diff --git a/src/Mapping/Annotations/ChangeTrackingPolicy.php b/src/Mapping/Annotations/ChangeTrackingPolicy.php index d95162e5d9..8d9ec8a9f6 100644 --- a/src/Mapping/Annotations/ChangeTrackingPolicy.php +++ b/src/Mapping/Annotations/ChangeTrackingPolicy.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(ChangeTrackingPolicy::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy::class); + +return; + +/** + * Specifies the change tracking policy for a document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class ChangeTrackingPolicy extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy +{ +} diff --git a/src/Mapping/Annotations/DefaultDiscriminatorValue.php b/src/Mapping/Annotations/DefaultDiscriminatorValue.php index df707f514a..27e4c82078 100644 --- a/src/Mapping/Annotations/DefaultDiscriminatorValue.php +++ b/src/Mapping/Annotations/DefaultDiscriminatorValue.php @@ -4,11 +4,28 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(DefaultDiscriminatorValue::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue::class); + +return; + +/** + * Specifies a default discriminator value to be used when the discriminator + * field is not set in a document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] +final class DefaultDiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue +{ +} diff --git a/src/Mapping/Annotations/DiscriminatorField.php b/src/Mapping/Annotations/DiscriminatorField.php index 10860a2e4e..8c5ba8f062 100644 --- a/src/Mapping/Annotations/DiscriminatorField.php +++ b/src/Mapping/Annotations/DiscriminatorField.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(DiscriminatorField::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField::class); + +return; + +/** + * Specify a field name to store a discriminator value + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class DiscriminatorField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField +{ +} diff --git a/src/Mapping/Annotations/DiscriminatorMap.php b/src/Mapping/Annotations/DiscriminatorMap.php index b941d6e917..3cb0a7c5b1 100644 --- a/src/Mapping/Annotations/DiscriminatorMap.php +++ b/src/Mapping/Annotations/DiscriminatorMap.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(DiscriminatorMap::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap::class); + +return; + +/** + * Specify a map of discriminator values and classes + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] +final class DiscriminatorMap extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap +{ +} diff --git a/src/Mapping/Annotations/DiscriminatorValue.php b/src/Mapping/Annotations/DiscriminatorValue.php index c186891054..b0d2930126 100644 --- a/src/Mapping/Annotations/DiscriminatorValue.php +++ b/src/Mapping/Annotations/DiscriminatorValue.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(DiscriminatorValue::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue::class); + +return; + +/** + * Use the specified discriminator for this class + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class DiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue +{ +} diff --git a/src/Mapping/Annotations/Document.php b/src/Mapping/Annotations/Document.php index b0f96594e0..ca666e12b5 100644 --- a/src/Mapping/Annotations/Document.php +++ b/src/Mapping/Annotations/Document.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Document::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Document::class); + +return; + +/** + * Identifies a final class as a document that can be stored in the database + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Document instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class Document extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Document +{ +} diff --git a/src/Mapping/Annotations/EmbedMany.php b/src/Mapping/Annotations/EmbedMany.php index c10d1bfc99..15252b17dc 100644 --- a/src/Mapping/Annotations/EmbedMany.php +++ b/src/Mapping/Annotations/EmbedMany.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(EmbedMany::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany::class); + +return; + +/** + * Embeds multiple documents + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class EmbedMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany +{ +} diff --git a/src/Mapping/Annotations/EmbedOne.php b/src/Mapping/Annotations/EmbedOne.php index 98f75d8397..8705920087 100644 --- a/src/Mapping/Annotations/EmbedOne.php +++ b/src/Mapping/Annotations/EmbedOne.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(EmbedOne::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne::class); + +return; + +/** + * Embeds a single document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class EmbedOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne +{ +} diff --git a/src/Mapping/Annotations/EmbeddedDocument.php b/src/Mapping/Annotations/EmbeddedDocument.php index 4ee72da6d3..4446a0f62b 100644 --- a/src/Mapping/Annotations/EmbeddedDocument.php +++ b/src/Mapping/Annotations/EmbeddedDocument.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(EmbeddedDocument::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument::class); + +return; + +/** + * Identifies a final class as a document that can be embedded but not stored by itself + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class EmbeddedDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument +{ +} diff --git a/src/Mapping/Annotations/Encrypt.php b/src/Mapping/Annotations/Encrypt.php index 83053570c0..23e721d48f 100644 --- a/src/Mapping/Annotations/Encrypt.php +++ b/src/Mapping/Annotations/Encrypt.php @@ -4,11 +4,29 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Encrypt::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt::class); + +return; + +/** + * Defines an encrypted field mapping. + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt instead + * + * @see https://www.mongodb.com/docs/manual/core/queryable-encryption/fundamentals/encrypt-and-query/#configure-encrypted-fields-for-optimal-search-and-storage + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] +final class Encrypt extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt +{ +} diff --git a/src/Mapping/Annotations/EncryptQuery.php b/src/Mapping/Annotations/EncryptQuery.php index 20d4658252..144628725e 100644 --- a/src/Mapping/Annotations/EncryptQuery.php +++ b/src/Mapping/Annotations/EncryptQuery.php @@ -4,11 +4,16 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; - use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(EncryptQuery::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery::class); + +return; + +/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery instead */ +final class EncryptQuery extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery +{ +} diff --git a/src/Mapping/Annotations/Field.php b/src/Mapping/Annotations/Field.php index 5a3c6e5e67..4d35c2b051 100644 --- a/src/Mapping/Annotations/Field.php +++ b/src/Mapping/Annotations/Field.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Field::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Field::class); + +return; + +/** + * Specifies a generic field mapping + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Field instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Field extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Field +{ +} diff --git a/src/Mapping/Annotations/File.php b/src/Mapping/Annotations/File.php index 8a9fd4f0c9..9db0ad3cbc 100644 --- a/src/Mapping/Annotations/File.php +++ b/src/Mapping/Annotations/File.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\File; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(File::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File::class); + +return; + +/** + * Identifies a final class as a GridFS file that can be stored in the database + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class File extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File +{ +} diff --git a/src/Mapping/Annotations/File/ChunkSize.php b/src/Mapping/Annotations/File/ChunkSize.php index 04c42b052e..d68df8d29c 100644 --- a/src/Mapping/Annotations/File/ChunkSize.php +++ b/src/Mapping/Annotations/File/ChunkSize.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; -use Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(ChunkSize::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class ChunkSize extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize +{ +} diff --git a/src/Mapping/Annotations/File/Filename.php b/src/Mapping/Annotations/File/Filename.php index d6ebd375d6..3db6047ede 100644 --- a/src/Mapping/Annotations/File/Filename.php +++ b/src/Mapping/Annotations/File/Filename.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; -use Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Filename::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Filename extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename +{ +} diff --git a/src/Mapping/Annotations/File/Length.php b/src/Mapping/Annotations/File/Length.php index c7ace06443..f8651f4fd3 100644 --- a/src/Mapping/Annotations/File/Length.php +++ b/src/Mapping/Annotations/File/Length.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; -use Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Length::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Length extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length +{ +} diff --git a/src/Mapping/Annotations/File/Metadata.php b/src/Mapping/Annotations/File/Metadata.php index 4bc9ba0a8c..d5fe5aac28 100644 --- a/src/Mapping/Annotations/File/Metadata.php +++ b/src/Mapping/Annotations/File/Metadata.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; -use Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Metadata::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Metadata extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata +{ +} diff --git a/src/Mapping/Annotations/File/UploadDate.php b/src/Mapping/Annotations/File/UploadDate.php index c73030dc3a..daddf2b06e 100644 --- a/src/Mapping/Annotations/File/UploadDate.php +++ b/src/Mapping/Annotations/File/UploadDate.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations\File; -use Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(UploadDate::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class UploadDate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate +{ +} diff --git a/src/Mapping/Annotations/HasLifecycleCallbacks.php b/src/Mapping/Annotations/HasLifecycleCallbacks.php index 609b37aae3..eb833284c9 100644 --- a/src/Mapping/Annotations/HasLifecycleCallbacks.php +++ b/src/Mapping/Annotations/HasLifecycleCallbacks.php @@ -4,11 +4,26 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks; +use Attribute; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(HasLifecycleCallbacks::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks::class); + +return; + +/** + * Must be set on a document final class to instruct Doctrine to check for lifecycle + * callback annotations on public methods. + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks instead + * + * @Annotation + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class HasLifecycleCallbacks extends \Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks +{ +} diff --git a/src/Mapping/Annotations/Id.php b/src/Mapping/Annotations/Id.php index 10e7915b50..ec50d788bb 100644 --- a/src/Mapping/Annotations/Id.php +++ b/src/Mapping/Annotations/Id.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Id::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Id::class); + +return; + +/** + * Special field mapping to map document identifiers + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Id instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Id extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Id +{ +} diff --git a/src/Mapping/Annotations/Index.php b/src/Mapping/Annotations/Index.php index 5c56f99c6f..70838383d3 100644 --- a/src/Mapping/Annotations/Index.php +++ b/src/Mapping/Annotations/Index.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Index; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Index::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Index::class); + +return; + +/** + * Defines an index on a field + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Index instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] +final class Index extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Index +{ +} diff --git a/src/Mapping/Annotations/Indexes.php b/src/Mapping/Annotations/Indexes.php index da0fd8a250..a2c7545e6d 100644 --- a/src/Mapping/Annotations/Indexes.php +++ b/src/Mapping/Annotations/Indexes.php @@ -4,11 +4,26 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes; +use Attribute; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Indexes::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes::class); + +return; + +/** + * Specifies a list of indexes for a document + * + * @deprecated final class was deprecated in doctrine/mongodb-odm 2.2 and will be removed in 3.0. Specify all Index and UniqueIndex annotations on a final class level. + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes instead + * + * @Annotation + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class Indexes extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes +{ +} diff --git a/src/Mapping/Annotations/InheritanceType.php b/src/Mapping/Annotations/InheritanceType.php index 9afeb04c94..b8d1c8d48c 100644 --- a/src/Mapping/Annotations/InheritanceType.php +++ b/src/Mapping/Annotations/InheritanceType.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(InheritanceType::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType::class); + +return; + +/** + * Specifies which inheritance type to use for a document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class InheritanceType extends \Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType +{ +} diff --git a/src/Mapping/Annotations/Lock.php b/src/Mapping/Annotations/Lock.php index 86e804f654..1c0667b543 100644 --- a/src/Mapping/Annotations/Lock.php +++ b/src/Mapping/Annotations/Lock.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Lock; +use Attribute; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Lock::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Lock::class); + +return; + +/** + * Specifies a field to use for pessimistic locking + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Lock instead + * + * @Annotation + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Lock extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Lock +{ +} diff --git a/src/Mapping/Annotations/MappedSuperclass.php b/src/Mapping/Annotations/MappedSuperclass.php index db445f2665..6b8a141808 100644 --- a/src/Mapping/Annotations/MappedSuperclass.php +++ b/src/Mapping/Annotations/MappedSuperclass.php @@ -4,11 +4,28 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(MappedSuperclass::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass::class); + +return; + +/** + * Specifies a parent class that other documents may extend to inherit mapping + * information + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperfinal class instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class MappedSuperClass extends \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass +{ +} diff --git a/src/Mapping/Annotations/PostLoad.php b/src/Mapping/Annotations/PostLoad.php index 47217e90d8..1b9971a6ff 100644 --- a/src/Mapping/Annotations/PostLoad.php +++ b/src/Mapping/Annotations/PostLoad.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PostLoad::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad::class); + +return; + +/** + * Marks a method as a postLoad lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PostLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad +{ +} diff --git a/src/Mapping/Annotations/PostPersist.php b/src/Mapping/Annotations/PostPersist.php index ae17b512b8..48915330ce 100644 --- a/src/Mapping/Annotations/PostPersist.php +++ b/src/Mapping/Annotations/PostPersist.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PostPersist::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist::class); + +return; + +/** + * Marks a method as a postPersist lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PostPersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist +{ +} diff --git a/src/Mapping/Annotations/PostRemove.php b/src/Mapping/Annotations/PostRemove.php index a2e7b38491..c80f9654c1 100644 --- a/src/Mapping/Annotations/PostRemove.php +++ b/src/Mapping/Annotations/PostRemove.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PostRemove::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove::class); + +return; + +/** + * Marks a method as a postRemove lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PostRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove +{ +} diff --git a/src/Mapping/Annotations/PostUpdate.php b/src/Mapping/Annotations/PostUpdate.php index 0ae7242714..850e112acd 100644 --- a/src/Mapping/Annotations/PostUpdate.php +++ b/src/Mapping/Annotations/PostUpdate.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PostUpdate::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate::class); + +return; + +/** + * Marks a method as a postUpdate lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PostUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate +{ +} diff --git a/src/Mapping/Annotations/PreFlush.php b/src/Mapping/Annotations/PreFlush.php index 94368b319c..2c72ff7e21 100644 --- a/src/Mapping/Annotations/PreFlush.php +++ b/src/Mapping/Annotations/PreFlush.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PreFlush::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush::class); + +return; + +/** + * Marks a method as a preFlush lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PreFlush extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush +{ +} diff --git a/src/Mapping/Annotations/PreLoad.php b/src/Mapping/Annotations/PreLoad.php index 412fb135f8..7c8dd979ca 100644 --- a/src/Mapping/Annotations/PreLoad.php +++ b/src/Mapping/Annotations/PreLoad.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PreLoad::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad::class); + +return; + +/** + * Marks a method as a preLoad lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PreLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad +{ +} diff --git a/src/Mapping/Annotations/PrePersist.php b/src/Mapping/Annotations/PrePersist.php index 13ea94c86a..14847573fe 100644 --- a/src/Mapping/Annotations/PrePersist.php +++ b/src/Mapping/Annotations/PrePersist.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PrePersist::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist::class); + +return; + +/** + * Marks a method as a prePersist lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PrePersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist +{ +} diff --git a/src/Mapping/Annotations/PreRemove.php b/src/Mapping/Annotations/PreRemove.php index efeb85cf33..3e2ee6997f 100644 --- a/src/Mapping/Annotations/PreRemove.php +++ b/src/Mapping/Annotations/PreRemove.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PreRemove::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove::class); + +return; + +/** + * Marks a method as a preRemove lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PreRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove +{ +} diff --git a/src/Mapping/Annotations/PreUpdate.php b/src/Mapping/Annotations/PreUpdate.php index c6b93a2429..fbeea6fc37 100644 --- a/src/Mapping/Annotations/PreUpdate.php +++ b/src/Mapping/Annotations/PreUpdate.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(PreUpdate::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate::class); + +return; + +/** + * Marks a method as a preUpdate lifecycle callback + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_METHOD)] +final class PreUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate +{ +} diff --git a/src/Mapping/Annotations/QueryResultDocument.php b/src/Mapping/Annotations/QueryResultDocument.php index f84516a6ad..823629f940 100644 --- a/src/Mapping/Annotations/QueryResultDocument.php +++ b/src/Mapping/Annotations/QueryResultDocument.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(QueryResultDocument::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class QueryResultDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument +{ +} diff --git a/src/Mapping/Annotations/ReadPreference.php b/src/Mapping/Annotations/ReadPreference.php index 9a88d55f4b..7ade4de8e4 100644 --- a/src/Mapping/Annotations/ReadPreference.php +++ b/src/Mapping/Annotations/ReadPreference.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(ReadPreference::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class ReadPreference extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference +{ +} diff --git a/src/Mapping/Annotations/ReferenceMany.php b/src/Mapping/Annotations/ReferenceMany.php index 86e5f697d1..420c45b4c1 100644 --- a/src/Mapping/Annotations/ReferenceMany.php +++ b/src/Mapping/Annotations/ReferenceMany.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(ReferenceMany::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany::class); + +return; + +/** + * Specifies a one-to-many relationship to a different document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class ReferenceMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany +{ +} diff --git a/src/Mapping/Annotations/ReferenceOne.php b/src/Mapping/Annotations/ReferenceOne.php index 02397bbb4a..26aa16d568 100644 --- a/src/Mapping/Annotations/ReferenceOne.php +++ b/src/Mapping/Annotations/ReferenceOne.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(ReferenceOne::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne::class); + +return; + +/** + * Specifies a one-to-one relationship to a different document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class ReferenceOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne +{ +} diff --git a/src/Mapping/Annotations/SearchIndex.php b/src/Mapping/Annotations/SearchIndex.php index 58d9c90b7b..705f9c56e7 100644 --- a/src/Mapping/Annotations/SearchIndex.php +++ b/src/Mapping/Annotations/SearchIndex.php @@ -4,11 +4,32 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(SearchIndex::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex::class); + +return; + +/** + * Defines a search index on a class. + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex instead + * + * @see https://www.mongodb.com/docs/atlas/atlas-search/index-definitions/ + * + * @Annotation + * @NamedArgumentConstructor + * @phpstan-import-type SearchIndexStoredSource from ClassMetadata + * @phpstan-import-type SearchIndexSynonym from ClassMetadata + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] +final class SearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex +{ +} diff --git a/src/Mapping/Annotations/ShardKey.php b/src/Mapping/Annotations/ShardKey.php index 1b9ac9645e..f024f18428 100644 --- a/src/Mapping/Annotations/ShardKey.php +++ b/src/Mapping/Annotations/ShardKey.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(ShardKey::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class ShardKey extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey +{ +} diff --git a/src/Mapping/Annotations/TimeSeries.php b/src/Mapping/Annotations/TimeSeries.php index 0a7bde56c7..acb0c09a56 100644 --- a/src/Mapping/Annotations/TimeSeries.php +++ b/src/Mapping/Annotations/TimeSeries.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(TimeSeries::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries::class); + +return; + +/** + * Marks a document or superfinal class as a time series document + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class TimeSeries extends \Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries +{ +} diff --git a/src/Mapping/Annotations/UniqueIndex.php b/src/Mapping/Annotations/UniqueIndex.php index 64bbc55f43..76c610d3b1 100644 --- a/src/Mapping/Annotations/UniqueIndex.php +++ b/src/Mapping/Annotations/UniqueIndex.php @@ -4,11 +4,27 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(UniqueIndex::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex::class); + +return; + +/** + * Specifies a unique index on a field + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] +final class UniqueIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex +{ +} diff --git a/src/Mapping/Annotations/Validation.php b/src/Mapping/Annotations/Validation.php index a7b7096c94..54d0a11bc9 100644 --- a/src/Mapping/Annotations/Validation.php +++ b/src/Mapping/Annotations/Validation.php @@ -4,11 +4,26 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Validation; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Validation::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Validation::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation instead + * + * @Annotation + * @NamedArgumentConstructor + * @Target({"CLASS"}) + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class Validation extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation +{ +} diff --git a/src/Mapping/Annotations/VectorSearchIndex.php b/src/Mapping/Annotations/VectorSearchIndex.php index 1d829364c1..561f6c5d8a 100644 --- a/src/Mapping/Annotations/VectorSearchIndex.php +++ b/src/Mapping/Annotations/VectorSearchIndex.php @@ -4,11 +4,31 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(VectorSearchIndex::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex::class); + +return; + +/** + * Defines a vector search index on a class. + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex instead + * + * @see https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-type/ + * + * @Annotation + * @NamedArgumentConstructor + * @phpstan-import-type VectorSearchIndexField from ClassMetadata + */ +#[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] +final class VectorSearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex +{ +} diff --git a/src/Mapping/Annotations/Version.php b/src/Mapping/Annotations/Version.php index f87562d241..7d16850823 100644 --- a/src/Mapping/Annotations/Version.php +++ b/src/Mapping/Annotations/Version.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Version; +use Attribute; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(Version::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Version::class); + +return; + +/** + * Specifies a field to use for optimistic locking + * + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Version instead + * + * @Annotation + */ +#[Attribute(Attribute::TARGET_PROPERTY)] +final class Version extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Version +{ +} diff --git a/src/Mapping/Annotations/View.php b/src/Mapping/Annotations/View.php index cd7873e1ca..81be693584 100644 --- a/src/Mapping/Annotations/View.php +++ b/src/Mapping/Annotations/View.php @@ -4,11 +4,25 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\View; +use Attribute; +use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use function class_exists; use function trigger_deprecation; trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); -class_exists(View::class); +class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\View::class); + +return; + +/** + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\View instead + * + * @Annotation + * @NamedArgumentConstructor + */ +#[Attribute(Attribute::TARGET_CLASS)] +final class View extends \Doctrine\ODM\MongoDB\Mapping\Attribute\View +{ +} diff --git a/src/Mapping/Attribute/AlsoLoad.php b/src/Mapping/Attribute/AlsoLoad.php index e8ce76bbe1..553f4be2bb 100644 --- a/src/Mapping/Attribute/AlsoLoad.php +++ b/src/Mapping/Attribute/AlsoLoad.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD)] -final class AlsoLoad implements Annotation +class AlsoLoad implements Annotation { /** @param string|string[] $value */ public function __construct(public $value, public ?string $name = null) diff --git a/src/Mapping/Attribute/Annotation.php b/src/Mapping/Attribute/Annotation.php deleted file mode 100644 index 3d66460249..0000000000 --- a/src/Mapping/Attribute/Annotation.php +++ /dev/null @@ -1,14 +0,0 @@ - */ public $value; diff --git a/src/Mapping/Attribute/DiscriminatorValue.php b/src/Mapping/Attribute/DiscriminatorValue.php index e67a443e25..5a7f7e9c26 100644 --- a/src/Mapping/Attribute/DiscriminatorValue.php +++ b/src/Mapping/Attribute/DiscriminatorValue.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class DiscriminatorValue implements Annotation +class DiscriminatorValue implements Annotation { /** @var string */ public $value; diff --git a/src/Mapping/Attribute/Document.php b/src/Mapping/Attribute/Document.php index d78c2f79ef..049898cf90 100644 --- a/src/Mapping/Attribute/Document.php +++ b/src/Mapping/Attribute/Document.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class Document extends AbstractDocument +class Document extends AbstractDocument { /** @var string|null */ public $db; diff --git a/src/Mapping/Attribute/EmbedMany.php b/src/Mapping/Attribute/EmbedMany.php index 11020988c2..8e1343748e 100644 --- a/src/Mapping/Attribute/EmbedMany.php +++ b/src/Mapping/Attribute/EmbedMany.php @@ -16,9 +16,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class EmbedMany extends AbstractField +class EmbedMany extends AbstractField { /** @var bool */ public $embedded = true; diff --git a/src/Mapping/Attribute/EmbedOne.php b/src/Mapping/Attribute/EmbedOne.php index 10365be32a..3d133154c0 100644 --- a/src/Mapping/Attribute/EmbedOne.php +++ b/src/Mapping/Attribute/EmbedOne.php @@ -15,9 +15,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class EmbedOne extends AbstractField +class EmbedOne extends AbstractField { /** @var bool */ public $embedded = true; diff --git a/src/Mapping/Attribute/EmbeddedDocument.php b/src/Mapping/Attribute/EmbeddedDocument.php index 2daab3efa9..a5e07ee0d7 100644 --- a/src/Mapping/Attribute/EmbeddedDocument.php +++ b/src/Mapping/Attribute/EmbeddedDocument.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class EmbeddedDocument extends AbstractDocument +class EmbeddedDocument extends AbstractDocument { /** @var Index[] */ public $indexes; diff --git a/src/Mapping/Attribute/Encrypt.php b/src/Mapping/Attribute/Encrypt.php index b7fca098fc..3483c28fb4 100644 --- a/src/Mapping/Attribute/Encrypt.php +++ b/src/Mapping/Attribute/Encrypt.php @@ -20,9 +20,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class Encrypt implements Annotation +class Encrypt implements Annotation { public int|float|Int64|Decimal128|UTCDateTime|null $min; public int|float|Int64|Decimal128|UTCDateTime|null $max; diff --git a/src/Mapping/Attribute/Field.php b/src/Mapping/Attribute/Field.php index 69a3b5bdfa..7313a68553 100644 --- a/src/Mapping/Attribute/Field.php +++ b/src/Mapping/Attribute/Field.php @@ -15,9 +15,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Field extends AbstractField +class Field extends AbstractField { /** @var class-string|null */ public $enumType; diff --git a/src/Mapping/Attribute/File.php b/src/Mapping/Attribute/File.php index 92939959c1..f3d197ff62 100644 --- a/src/Mapping/Attribute/File.php +++ b/src/Mapping/Attribute/File.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class File extends AbstractDocument +class File extends AbstractDocument { /** @var string|null */ public $db; diff --git a/src/Mapping/Attribute/File/ChunkSize.php b/src/Mapping/Attribute/File/ChunkSize.php index 7f8d0e9f32..4791375063 100644 --- a/src/Mapping/Attribute/File/ChunkSize.php +++ b/src/Mapping/Attribute/File/ChunkSize.php @@ -13,9 +13,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ChunkSize extends AbstractField +class ChunkSize extends AbstractField { public function __construct() { diff --git a/src/Mapping/Attribute/File/Filename.php b/src/Mapping/Attribute/File/Filename.php index 34ecab8b43..a7dd31b6a3 100644 --- a/src/Mapping/Attribute/File/Filename.php +++ b/src/Mapping/Attribute/File/Filename.php @@ -13,9 +13,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Filename extends AbstractField +class Filename extends AbstractField { public function __construct() { diff --git a/src/Mapping/Attribute/File/Length.php b/src/Mapping/Attribute/File/Length.php index ce73e70e34..ca5840dcd1 100644 --- a/src/Mapping/Attribute/File/Length.php +++ b/src/Mapping/Attribute/File/Length.php @@ -13,9 +13,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Length extends AbstractField +class Length extends AbstractField { public function __construct() { diff --git a/src/Mapping/Attribute/File/Metadata.php b/src/Mapping/Attribute/File/Metadata.php index 3fdddbc8fa..04efd3889a 100644 --- a/src/Mapping/Attribute/File/Metadata.php +++ b/src/Mapping/Attribute/File/Metadata.php @@ -14,9 +14,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Metadata extends AbstractField +class Metadata extends AbstractField { /** @var bool */ public $embedded = true; diff --git a/src/Mapping/Attribute/File/UploadDate.php b/src/Mapping/Attribute/File/UploadDate.php index 6c5f9b766a..9df6b5efe7 100644 --- a/src/Mapping/Attribute/File/UploadDate.php +++ b/src/Mapping/Attribute/File/UploadDate.php @@ -13,9 +13,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class UploadDate extends AbstractField +class UploadDate extends AbstractField { public function __construct() { diff --git a/src/Mapping/Attribute/HasLifecycleCallbacks.php b/src/Mapping/Attribute/HasLifecycleCallbacks.php index 99e927935f..f7a831b417 100644 --- a/src/Mapping/Attribute/HasLifecycleCallbacks.php +++ b/src/Mapping/Attribute/HasLifecycleCallbacks.php @@ -13,9 +13,10 @@ * callback annotations on public methods. * * @Annotation + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class HasLifecycleCallbacks implements Annotation +class HasLifecycleCallbacks implements Annotation { } diff --git a/src/Mapping/Attribute/Id.php b/src/Mapping/Attribute/Id.php index 92048786e2..57b44d4e16 100644 --- a/src/Mapping/Attribute/Id.php +++ b/src/Mapping/Attribute/Id.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Id extends AbstractField +class Id extends AbstractField { /** @var bool */ public $id = true; diff --git a/src/Mapping/Attribute/Index.php b/src/Mapping/Attribute/Index.php index b279517c27..af14d920d6 100644 --- a/src/Mapping/Attribute/Index.php +++ b/src/Mapping/Attribute/Index.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -final class Index extends AbstractIndex +class Index extends AbstractIndex { } diff --git a/src/Mapping/Attribute/Indexes.php b/src/Mapping/Attribute/Indexes.php index 4de1fb19a6..09fd0487f5 100644 --- a/src/Mapping/Attribute/Indexes.php +++ b/src/Mapping/Attribute/Indexes.php @@ -15,9 +15,10 @@ * @deprecated class was deprecated in doctrine/mongodb-odm 2.2 and will be removed in 3.0. Specify all Index and UniqueIndex annotations on a class level. * * @Annotation + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class Indexes extends BaseAnnotation implements Annotation +class Indexes extends BaseAnnotation implements Annotation { /** @var AbstractIndex[]|AbstractIndex */ public $value = []; diff --git a/src/Mapping/Attribute/InheritanceType.php b/src/Mapping/Attribute/InheritanceType.php index d2fc3c3afb..1eeb74f594 100644 --- a/src/Mapping/Attribute/InheritanceType.php +++ b/src/Mapping/Attribute/InheritanceType.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class InheritanceType implements Annotation +class InheritanceType implements Annotation { /** @var string */ public $value; diff --git a/src/Mapping/Attribute/Lock.php b/src/Mapping/Attribute/Lock.php index 97a292545c..1302353c6d 100644 --- a/src/Mapping/Attribute/Lock.php +++ b/src/Mapping/Attribute/Lock.php @@ -12,9 +12,10 @@ * Specifies a field to use for pessimistic locking * * @Annotation + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Lock implements Annotation +class Lock implements Annotation { } diff --git a/src/Mapping/Attribute/MappedSuperclass.php b/src/Mapping/Attribute/MappedSuperclass.php index 908dab30e5..e558be68ef 100644 --- a/src/Mapping/Attribute/MappedSuperclass.php +++ b/src/Mapping/Attribute/MappedSuperclass.php @@ -15,9 +15,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class MappedSuperclass extends AbstractDocument +class MappedSuperclass extends AbstractDocument { /** @var string|null */ public $repositoryClass; diff --git a/src/Mapping/Attribute/PostLoad.php b/src/Mapping/Attribute/PostLoad.php index a306461b56..29516c9c49 100644 --- a/src/Mapping/Attribute/PostLoad.php +++ b/src/Mapping/Attribute/PostLoad.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostLoad implements Annotation +class PostLoad implements Annotation { } diff --git a/src/Mapping/Attribute/PostPersist.php b/src/Mapping/Attribute/PostPersist.php index 73ea18a491..ade612a95a 100644 --- a/src/Mapping/Attribute/PostPersist.php +++ b/src/Mapping/Attribute/PostPersist.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostPersist implements Annotation +class PostPersist implements Annotation { } diff --git a/src/Mapping/Attribute/PostRemove.php b/src/Mapping/Attribute/PostRemove.php index 72f0b8ac55..d27d2d7d24 100644 --- a/src/Mapping/Attribute/PostRemove.php +++ b/src/Mapping/Attribute/PostRemove.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostRemove implements Annotation +class PostRemove implements Annotation { } diff --git a/src/Mapping/Attribute/PostUpdate.php b/src/Mapping/Attribute/PostUpdate.php index 5c8b2e7434..de4940b6d1 100644 --- a/src/Mapping/Attribute/PostUpdate.php +++ b/src/Mapping/Attribute/PostUpdate.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostUpdate implements Annotation +class PostUpdate implements Annotation { } diff --git a/src/Mapping/Attribute/PreFlush.php b/src/Mapping/Attribute/PreFlush.php index 65f28dced4..87be9be2f7 100644 --- a/src/Mapping/Attribute/PreFlush.php +++ b/src/Mapping/Attribute/PreFlush.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreFlush implements Annotation +class PreFlush implements Annotation { } diff --git a/src/Mapping/Attribute/PreLoad.php b/src/Mapping/Attribute/PreLoad.php index 00ef011388..7ca356c6f1 100644 --- a/src/Mapping/Attribute/PreLoad.php +++ b/src/Mapping/Attribute/PreLoad.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreLoad implements Annotation +class PreLoad implements Annotation { } diff --git a/src/Mapping/Attribute/PrePersist.php b/src/Mapping/Attribute/PrePersist.php index 680e9011a5..adc1d29668 100644 --- a/src/Mapping/Attribute/PrePersist.php +++ b/src/Mapping/Attribute/PrePersist.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PrePersist implements Annotation +class PrePersist implements Annotation { } diff --git a/src/Mapping/Attribute/PreRemove.php b/src/Mapping/Attribute/PreRemove.php index f77bc5a1a8..12fa77f116 100644 --- a/src/Mapping/Attribute/PreRemove.php +++ b/src/Mapping/Attribute/PreRemove.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreRemove implements Annotation +class PreRemove implements Annotation { } diff --git a/src/Mapping/Attribute/PreUpdate.php b/src/Mapping/Attribute/PreUpdate.php index 35a5678fb4..e0ea497931 100644 --- a/src/Mapping/Attribute/PreUpdate.php +++ b/src/Mapping/Attribute/PreUpdate.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreUpdate implements Annotation +class PreUpdate implements Annotation { } diff --git a/src/Mapping/Attribute/QueryResultDocument.php b/src/Mapping/Attribute/QueryResultDocument.php index 0936b0821d..87608a03f5 100644 --- a/src/Mapping/Attribute/QueryResultDocument.php +++ b/src/Mapping/Attribute/QueryResultDocument.php @@ -12,9 +12,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class QueryResultDocument extends AbstractDocument +class QueryResultDocument extends AbstractDocument { } diff --git a/src/Mapping/Attribute/ReadPreference.php b/src/Mapping/Attribute/ReadPreference.php index 25b57d3d76..fed3f8ba99 100644 --- a/src/Mapping/Attribute/ReadPreference.php +++ b/src/Mapping/Attribute/ReadPreference.php @@ -12,9 +12,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class ReadPreference implements Annotation +class ReadPreference implements Annotation { /** @var string */ public $value; diff --git a/src/Mapping/Attribute/ReferenceMany.php b/src/Mapping/Attribute/ReferenceMany.php index 95fe5b28e6..4177fde150 100644 --- a/src/Mapping/Attribute/ReferenceMany.php +++ b/src/Mapping/Attribute/ReferenceMany.php @@ -16,9 +16,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ReferenceMany extends AbstractField +class ReferenceMany extends AbstractField { /** @var bool */ public $reference = true; diff --git a/src/Mapping/Attribute/ReferenceOne.php b/src/Mapping/Attribute/ReferenceOne.php index a77910cbdf..ecb2d5f47a 100644 --- a/src/Mapping/Attribute/ReferenceOne.php +++ b/src/Mapping/Attribute/ReferenceOne.php @@ -17,7 +17,7 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ReferenceOne extends AbstractField +class ReferenceOne extends AbstractField { /** @var bool */ public $reference = true; diff --git a/src/Mapping/Attribute/ShardKey.php b/src/Mapping/Attribute/ShardKey.php index 666a53c0d6..e4467e728f 100644 --- a/src/Mapping/Attribute/ShardKey.php +++ b/src/Mapping/Attribute/ShardKey.php @@ -12,9 +12,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class ShardKey implements Annotation +class ShardKey implements Annotation { /** @var string[] */ public $keys; diff --git a/src/Mapping/Attribute/TimeSeries.php b/src/Mapping/Attribute/TimeSeries.php index c64a2ecc1f..2bad64a2aa 100644 --- a/src/Mapping/Attribute/TimeSeries.php +++ b/src/Mapping/Attribute/TimeSeries.php @@ -15,9 +15,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class TimeSeries implements Annotation +class TimeSeries implements Annotation { public function __construct( public readonly string $timeField, diff --git a/src/Mapping/Attribute/UniqueIndex.php b/src/Mapping/Attribute/UniqueIndex.php index 573d18a8ac..1d3705edc7 100644 --- a/src/Mapping/Attribute/UniqueIndex.php +++ b/src/Mapping/Attribute/UniqueIndex.php @@ -14,9 +14,10 @@ * * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -final class UniqueIndex extends AbstractIndex +class UniqueIndex extends AbstractIndex { public function __construct( array $keys = [], diff --git a/src/Mapping/Attribute/Version.php b/src/Mapping/Attribute/Version.php index bb3a4d7d00..96b4bdeca1 100644 --- a/src/Mapping/Attribute/Version.php +++ b/src/Mapping/Attribute/Version.php @@ -12,9 +12,10 @@ * Specifies a field to use for optimistic locking * * @Annotation + * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Version implements Annotation +class Version implements Annotation { } diff --git a/src/Mapping/Attribute/View.php b/src/Mapping/Attribute/View.php index d1025b5d8d..829283f0ab 100644 --- a/src/Mapping/Attribute/View.php +++ b/src/Mapping/Attribute/View.php @@ -12,9 +12,10 @@ /** * @Annotation * @NamedArgumentConstructor + * @final */ #[Attribute(Attribute::TARGET_CLASS)] -final class View extends AbstractDocument +class View extends AbstractDocument { /** @var string|null */ public $db; From 265d6557a3483f4b85132256b4f23bea6ce344ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Tue, 9 Dec 2025 20:53:50 +0100 Subject: [PATCH 4/6] Make Annotation classes extend the Attribute classes The Attribute classes cannot be used as Annotation Move QueryType enum to the Mapping namespace Keep the tests on the Annotations namespace --- UPGRADE-2.16.md | 8 ++-- composer.json | 1 + .../mapping-classes-to-orm-and-odm.rst | 2 +- docs/en/cookbook/queryable-encryption.rst | 9 ++--- docs/en/cookbook/time-series-data.rst | 2 +- docs/en/cookbook/validation-of-documents.rst | 2 +- docs/en/cookbook/vector-search.rst | 2 +- docs/en/reference/annotations-reference.rst | 2 +- docs/en/reference/attributes-reference.rst | 39 +++++++++---------- docs/en/reference/basic-mapping.rst | 29 +++++++------- docs/en/reference/introduction.rst | 2 +- .../reference/storing-files-with-gridfs.rst | 22 +++++------ docs/en/tutorials/getting-started.rst | 2 +- phpstan-baseline.neon | 6 +-- phpstan.neon.dist | 4 ++ src/Mapping/Annotations/AbstractDocument.php | 14 +++---- src/Mapping/Annotations/AbstractField.php | 14 +++---- src/Mapping/Annotations/AbstractIndex.php | 14 +++---- src/Mapping/Annotations/AlsoLoad.php | 11 +----- src/Mapping/Annotations/Annotation.php | 2 +- .../Annotations/ChangeTrackingPolicy.php | 11 +----- .../Annotations/DefaultDiscriminatorValue.php | 11 +----- .../Annotations/DiscriminatorField.php | 11 +----- src/Mapping/Annotations/DiscriminatorMap.php | 11 +----- .../Annotations/DiscriminatorValue.php | 11 +----- src/Mapping/Annotations/Document.php | 13 +------ src/Mapping/Annotations/EmbedMany.php | 11 +----- src/Mapping/Annotations/EmbedOne.php | 11 +----- src/Mapping/Annotations/EmbeddedDocument.php | 13 +------ src/Mapping/Annotations/Encrypt.php | 11 +----- src/Mapping/Annotations/EncryptQuery.php | 13 ++----- src/Mapping/Annotations/Field.php | 11 +----- src/Mapping/Annotations/File.php | 13 +------ src/Mapping/Annotations/File/ChunkSize.php | 12 +----- src/Mapping/Annotations/File/Filename.php | 12 +----- src/Mapping/Annotations/File/Length.php | 12 +----- src/Mapping/Annotations/File/Metadata.php | 12 +----- src/Mapping/Annotations/File/UploadDate.php | 12 +----- .../Annotations/HasLifecycleCallbacks.php | 13 +------ src/Mapping/Annotations/Id.php | 11 +----- src/Mapping/Annotations/Index.php | 11 +----- src/Mapping/Annotations/Indexes.php | 17 +++----- src/Mapping/Annotations/InheritanceType.php | 11 +----- src/Mapping/Annotations/Lock.php | 11 +----- src/Mapping/Annotations/MappedSuperclass.php | 13 +------ src/Mapping/Annotations/PostLoad.php | 11 +----- src/Mapping/Annotations/PostPersist.php | 11 +----- src/Mapping/Annotations/PostRemove.php | 11 +----- src/Mapping/Annotations/PostUpdate.php | 11 +----- src/Mapping/Annotations/PreFlush.php | 11 +----- src/Mapping/Annotations/PreLoad.php | 11 +----- src/Mapping/Annotations/PrePersist.php | 11 +----- src/Mapping/Annotations/PreRemove.php | 11 +----- src/Mapping/Annotations/PreUpdate.php | 11 +----- .../Annotations/QueryResultDocument.php | 11 +----- src/Mapping/Annotations/ReadPreference.php | 11 +----- src/Mapping/Annotations/ReferenceMany.php | 11 +----- src/Mapping/Annotations/ReferenceOne.php | 11 +----- src/Mapping/Annotations/SearchIndex.php | 11 +----- src/Mapping/Annotations/ShardKey.php | 11 +----- src/Mapping/Annotations/TimeSeries.php | 13 +------ src/Mapping/Annotations/UniqueIndex.php | 11 +----- src/Mapping/Annotations/Validation.php | 11 +----- src/Mapping/Annotations/VectorSearchIndex.php | 11 +----- src/Mapping/Annotations/Version.php | 11 +----- src/Mapping/Annotations/View.php | 11 +----- src/Mapping/Attribute/AbstractDocument.php | 2 +- src/Mapping/Attribute/AbstractField.php | 2 +- src/Mapping/Attribute/AbstractIndex.php | 2 +- src/Mapping/Attribute/AlsoLoad.php | 10 +---- .../Attribute/ChangeTrackingPolicy.php | 10 +---- .../Attribute/DefaultDiscriminatorValue.php | 10 +---- src/Mapping/Attribute/DiscriminatorField.php | 10 +---- src/Mapping/Attribute/DiscriminatorMap.php | 10 +---- src/Mapping/Attribute/DiscriminatorValue.php | 10 +---- src/Mapping/Attribute/Document.php | 10 +---- src/Mapping/Attribute/EmbedMany.php | 10 +---- src/Mapping/Attribute/EmbedOne.php | 10 +---- src/Mapping/Attribute/EmbeddedDocument.php | 10 +---- src/Mapping/Attribute/Encrypt.php | 11 +----- src/Mapping/Attribute/Field.php | 10 +---- src/Mapping/Attribute/File.php | 10 +---- src/Mapping/Attribute/File/ChunkSize.php | 15 ++----- src/Mapping/Attribute/File/Filename.php | 15 ++----- src/Mapping/Attribute/File/Length.php | 15 ++----- src/Mapping/Attribute/File/Metadata.php | 15 ++----- src/Mapping/Attribute/File/UploadDate.php | 15 ++----- .../Attribute/HasLifecycleCallbacks.php | 8 +--- src/Mapping/Attribute/Id.php | 10 +---- src/Mapping/Attribute/Index.php | 10 +---- src/Mapping/Attribute/Indexes.php | 28 ------------- src/Mapping/Attribute/InheritanceType.php | 10 +---- src/Mapping/Attribute/Lock.php | 8 +--- src/Mapping/Attribute/MappedSuperclass.php | 10 +---- src/Mapping/Attribute/MappingAttribute.php | 14 +++++++ src/Mapping/Attribute/PostLoad.php | 10 +---- src/Mapping/Attribute/PostPersist.php | 10 +---- src/Mapping/Attribute/PostRemove.php | 10 +---- src/Mapping/Attribute/PostUpdate.php | 10 +---- src/Mapping/Attribute/PreFlush.php | 10 +---- src/Mapping/Attribute/PreLoad.php | 10 +---- src/Mapping/Attribute/PrePersist.php | 10 +---- src/Mapping/Attribute/PreRemove.php | 10 +---- src/Mapping/Attribute/PreUpdate.php | 10 +---- src/Mapping/Attribute/QueryResultDocument.php | 14 +------ src/Mapping/Attribute/ReadPreference.php | 14 +------ src/Mapping/Attribute/ReferenceMany.php | 10 +---- src/Mapping/Attribute/ReferenceOne.php | 11 +----- src/Mapping/Attribute/SearchIndex.php | 10 +---- src/Mapping/Attribute/ShardKey.php | 14 +------ src/Mapping/Attribute/TimeSeries.php | 10 +---- src/Mapping/Attribute/UniqueIndex.php | 10 +---- src/Mapping/Attribute/Validation.php | 14 +------ src/Mapping/Attribute/VectorSearchIndex.php | 10 +---- src/Mapping/Attribute/Version.php | 8 +--- src/Mapping/Attribute/View.php | 14 +------ src/Mapping/ClassMetadata.php | 1 - src/Mapping/Driver/AttributeDriver.php | 29 +++++++------- src/Mapping/Driver/AttributeReader.php | 16 ++++---- src/Mapping/Driver/XmlDriver.php | 2 +- src/Mapping/{Attribute => }/EncryptQuery.php | 6 +-- tests/Documentation/BlendingOrm/Product.php | 6 +-- tests/Documentation/CustomMapping/Thing.php | 6 +-- tests/Documentation/Introduction/Address.php | 2 +- .../Introduction/BaseEmployee.php | 2 +- tests/Documentation/Introduction/Employee.php | 2 +- tests/Documentation/Introduction/Manager.php | 2 +- tests/Documentation/Introduction/Project.php | 2 +- tests/Documentation/LookupRelations/Item.php | 6 +-- tests/Documentation/LookupRelations/Order.php | 10 ++--- .../LookupRelations/OrderResult.php | 10 ++--- tests/Documentation/LookupRelations/User.php | 6 +-- .../LookupRelations/UserOrderResult.php | 8 ++-- .../LookupRelations/UserResult.php | 8 ++-- .../MappingOrmAndOdm/BlogPost.php | 2 +- .../ResolveTargetDocument/Customer.php | 2 +- .../CustomerModule/Customer.php | 6 +-- .../InvoiceModule/Invoice.php | 6 +-- tests/Documentation/Validation/Customer.php | 6 +-- tests/Documentation/Validation/Order.php | 12 +++--- tests/Documentation/Validation/OrderLine.php | 6 +-- .../Validation/SchemaValidated.php | 2 +- tests/Documents/Account.php | 2 +- tests/Documents/Address.php | 2 +- tests/Documents/Agent.php | 2 +- tests/Documents/Album.php | 2 +- tests/Documents/Article.php | 2 +- tests/Documents/Bars/Bar.php | 2 +- tests/Documents/Bars/Location.php | 2 +- tests/Documents/BaseCategory.php | 2 +- tests/Documents/BaseDocument.php | 2 +- tests/Documents/BaseEmployee.php | 2 +- tests/Documents/BlogPost.php | 2 +- tests/Documents/BlogTagAggregation.php | 2 +- tests/Documents/Book.php | 2 +- tests/Documents/BrowseNode.php | 2 +- tests/Documents/Card.php | 2 +- tests/Documents/Cart.php | 2 +- tests/Documents/Category.php | 2 +- tests/Documents/Chapter.php | 2 +- tests/Documents/CmsAddress.php | 2 +- tests/Documents/CmsArticle.php | 2 +- tests/Documents/CmsComment.php | 4 +- tests/Documents/CmsContent.php | 2 +- tests/Documents/CmsGroup.php | 2 +- tests/Documents/CmsPage.php | 4 +- tests/Documents/CmsPhonenumber.php | 2 +- tests/Documents/CmsProduct.php | 2 +- tests/Documents/CmsUser.php | 2 +- tests/Documents/Comment.php | 2 +- tests/Documents/CustomRepository/Document.php | 2 +- tests/Documents/CustomUser.php | 2 +- tests/Documents/Customer.php | 2 +- tests/Documents/Developer.php | 2 +- .../DocumentWithUnmappedProperties.php | 2 +- tests/Documents/Ecommerce/Basket.php | 2 +- .../Ecommerce/ConfigurableProduct.php | 2 +- tests/Documents/Ecommerce/Currency.php | 2 +- tests/Documents/Ecommerce/Money.php | 2 +- tests/Documents/Ecommerce/Option.php | 2 +- tests/Documents/Ecommerce/Order.php | 2 +- tests/Documents/Ecommerce/StockItem.php | 2 +- tests/Documents/Employee.php | 2 +- tests/Documents/Encryption/Client.php | 2 +- tests/Documents/Encryption/ClientCard.php | 2 +- .../Encryption/InvalidRootEncrypt.php | 6 +-- tests/Documents/Encryption/Patient.php | 2 +- tests/Documents/Encryption/PatientBilling.php | 2 +- tests/Documents/Encryption/PatientRecord.php | 7 ++-- tests/Documents/Encryption/RangeTypes.php | 10 ++--- tests/Documents/Event.php | 2 +- tests/Documents/Feature.php | 2 +- tests/Documents/File.php | 2 +- tests/Documents/FileMetadata.php | 2 +- tests/Documents/FileWithoutChunkSize.php | 2 +- tests/Documents/FileWithoutMetadata.php | 2 +- tests/Documents/ForumAvatar.php | 2 +- tests/Documents/ForumStar.php | 2 +- tests/Documents/ForumUser.php | 2 +- tests/Documents/FriendUser.php | 2 +- tests/Documents/Functional/EmbedNamed.php | 2 +- tests/Documents/Functional/Embedded.php | 2 +- .../Functional/EmbeddedTestLevel0.php | 2 +- .../Functional/EmbeddedTestLevel0b.php | 2 +- .../Functional/EmbeddedTestLevel1.php | 2 +- .../Functional/EmbeddedTestLevel2.php | 2 +- .../Functional/EmbeddedWhichReferences.php | 2 +- tests/Documents/Functional/FavoritesUser.php | 2 +- .../Functional/NotAnnotatedDocument.php | 2 +- tests/Documents/Functional/NotSaved.php | 2 +- .../Documents/Functional/NotSavedEmbedded.php | 2 +- .../Documents/Functional/NullFieldValues.php | 2 +- .../Functional/PreUpdateTestProduct.php | 2 +- .../Functional/PreUpdateTestSellable.php | 2 +- .../Functional/PreUpdateTestSeller.php | 2 +- tests/Documents/Functional/Reference.php | 2 +- .../Documents/Functional/SameCollection1.php | 2 +- .../Documents/Functional/SameCollection2.php | 2 +- .../Documents/Functional/SameCollection3.php | 2 +- .../Functional/SimpleEmbedAndReference.php | 2 +- .../Ticket/GH683/AbstractEmbedded.php | 2 +- .../Ticket/GH683/EmbeddedSubDocument1.php | 2 +- .../Ticket/GH683/EmbeddedSubDocument2.php | 2 +- .../Ticket/GH683/ParentDocument.php | 2 +- .../EmbedManyInArrayCollectionLevel0.php | 2 +- .../EmbedManyInArrayCollectionLevel1.php | 2 +- .../Ticket/MODM160/EmbedManyInArrayLevel0.php | 2 +- .../Ticket/MODM160/EmbedManyInArrayLevel1.php | 2 +- .../Ticket/MODM160/EmbedOneLevel0.php | 2 +- .../Ticket/MODM160/EmbedOneLevel1.php | 2 +- .../Ticket/MODM160/MODM160Level2.php | 2 +- tests/Documents/Functional/VirtualHost.php | 2 +- .../Functional/VirtualHostDirective.php | 2 +- tests/Documents/GH2310Container.php | 2 +- tests/Documents/GraphLookup/Airport.php | 2 +- tests/Documents/GraphLookup/Employee.php | 2 +- .../GraphLookup/ReportingHierarchy.php | 2 +- tests/Documents/GraphLookup/Traveller.php | 2 +- tests/Documents/Group.php | 2 +- tests/Documents/GuestServer.php | 2 +- tests/Documents/IdentifiedChapter.php | 2 +- tests/Documents/IndirectlyReferencedUser.php | 2 +- tests/Documents/Issue.php | 2 +- tests/Documents/Manager.php | 2 +- tests/Documents/Message.php | 2 +- tests/Documents/OtherSubProject.php | 2 +- tests/Documents/Page.php | 2 +- tests/Documents/Phonebook.php | 2 +- tests/Documents/Phonenumber.php | 2 +- tests/Documents/Place.php | 2 +- tests/Documents/Product.php | 2 +- tests/Documents/Profile.php | 2 +- tests/Documents/ProfileNotify.php | 2 +- tests/Documents/Project.php | 2 +- tests/Documents/ReferenceUser.php | 2 +- tests/Documents/SchemaValidated.php | 2 +- tests/Documents/Server.php | 2 +- tests/Documents/Sharded/ShardedByUser.php | 2 +- tests/Documents/Sharded/ShardedOne.php | 2 +- .../Sharded/ShardedOneWithDifferentKey.php | 2 +- tests/Documents/Sharded/ShardedUser.php | 2 +- tests/Documents/SimpleReferenceUser.php | 2 +- tests/Documents/Song.php | 2 +- tests/Documents/SpecialUser.php | 2 +- tests/Documents/Strategy.php | 2 +- tests/Documents/SubCategory.php | 2 +- tests/Documents/SubProject.php | 2 +- tests/Documents/Tag.php | 2 +- tests/Documents/Task.php | 2 +- .../TimeSeries/TimeSeriesDocument.php | 2 +- tests/Documents/Tournament/Participant.php | 2 +- .../Documents/Tournament/ParticipantSolo.php | 2 +- .../Documents/Tournament/ParticipantTeam.php | 2 +- tests/Documents/Tournament/Tournament.php | 2 +- .../Tournament/TournamentFootball.php | 2 +- .../Documents/Tournament/TournamentTennis.php | 2 +- tests/Documents/TypedDocument.php | 2 +- tests/Documents/TypedEmbeddedDocument.php | 2 +- tests/Documents/User.php | 2 +- tests/Documents/UserName.php | 2 +- tests/Documents/UserTyped.php | 2 +- tests/Documents/UserUpsert.php | 2 +- tests/Documents/UserUpsertChild.php | 2 +- tests/Documents/UserUpsertIdStrategyNone.php | 2 +- tests/Documents/VectorEmbedding.php | 8 ++-- tests/Documents/VersionedDocument.php | 2 +- tests/Documents/VersionedUser.php | 2 +- tests/Documents/ViewReference.php | 2 +- .../PropertyHooks/MappingVirtualProperty.php | 6 +-- tests/Documents84/PropertyHooks/User.php | 6 +-- tests/Tests/DocumentManagerTest.php | 2 +- tests/Tests/Events/LifecycleCallbacksTest.php | 2 +- tests/Tests/Events/LifecycleListenersTest.php | 2 +- .../TransactionalLifecycleEventsTest.php | 2 +- tests/Tests/Functional/AlsoLoadTest.php | 2 +- tests/Tests/Functional/AtomicSetTest.php | 2 +- tests/Tests/Functional/BinDataTest.php | 2 +- .../Functional/CollectionPersisterTest.php | 2 +- tests/Tests/Functional/CollectionsTest.php | 2 +- .../Functional/CustomCollectionsTest.php | 2 +- .../Tests/Functional/CustomFieldNameTest.php | 2 +- tests/Tests/Functional/CustomTypeTest.php | 2 +- tests/Tests/Functional/DatabasesTest.php | 2 +- .../DiscriminatorsDefaultValueTest.php | 2 +- .../Functional/DocumentPersisterTest.php | 2 +- tests/Tests/Functional/EmbeddedIdTest.php | 2 +- .../Functional/EmbeddedReferenceTest.php | 2 +- tests/Tests/Functional/EmbeddedTest.php | 2 +- tests/Tests/Functional/FunctionalTest.php | 2 +- .../Functional/HasLifecycleCallbacksTest.php | 2 +- tests/Tests/Functional/IdTest.php | 4 +- tests/Tests/Functional/IndexesTest.php | 2 +- tests/Tests/Functional/LifecycleTest.php | 2 +- tests/Tests/Functional/LockTest.php | 2 +- .../Tests/Functional/MappedSuperclassTest.php | 2 +- .../Functional/NestedCollectionsTest.php | 2 +- .../Tests/Functional/NestedDocumentsTest.php | 2 +- .../Functional/OrphanRemovalEmbedTest.php | 2 +- tests/Tests/Functional/OrphanRemovalTest.php | 2 +- tests/Tests/Functional/PrePersistTest.php | 2 +- tests/Tests/Functional/RawTypeTest.php | 2 +- .../Tests/Functional/ReadOnlyDocumentTest.php | 2 +- .../Functional/ReadOnlyPropertiesTest.php | 8 ++-- tests/Tests/Functional/ReadPreferenceTest.php | 2 +- .../ReferenceDiscriminatorsTest.php | 2 +- tests/Tests/Functional/ReferencesTest.php | 2 +- .../SplObjectHashCollisionsTest.php | 2 +- tests/Tests/Functional/TargetDocumentTest.php | 2 +- tests/Tests/Functional/Ticket/GH1011Test.php | 2 +- tests/Tests/Functional/Ticket/GH1017Test.php | 2 +- tests/Tests/Functional/Ticket/GH1058Test.php | 2 +- tests/Tests/Functional/Ticket/GH1107Test.php | 2 +- tests/Tests/Functional/Ticket/GH1117Test.php | 2 +- tests/Tests/Functional/Ticket/GH1138Test.php | 2 +- tests/Tests/Functional/Ticket/GH1152Test.php | 2 +- tests/Tests/Functional/Ticket/GH1225Test.php | 2 +- tests/Tests/Functional/Ticket/GH1229Test.php | 2 +- tests/Tests/Functional/Ticket/GH1232Test.php | 2 +- tests/Tests/Functional/Ticket/GH1275Test.php | 2 +- tests/Tests/Functional/Ticket/GH1294Test.php | 2 +- tests/Tests/Functional/Ticket/GH1344Test.php | 2 +- tests/Tests/Functional/Ticket/GH1346Test.php | 2 +- tests/Tests/Functional/Ticket/GH1418Test.php | 2 +- tests/Tests/Functional/Ticket/GH1428Test.php | 2 +- tests/Tests/Functional/Ticket/GH1435Test.php | 2 +- tests/Tests/Functional/Ticket/GH1525Test.php | 2 +- tests/Tests/Functional/Ticket/GH1572Test.php | 2 +- tests/Tests/Functional/Ticket/GH1674Test.php | 2 +- tests/Tests/Functional/Ticket/GH1775Test.php | 2 +- tests/Tests/Functional/Ticket/GH1962Test.php | 2 +- tests/Tests/Functional/Ticket/GH1964Test.php | 2 +- tests/Tests/Functional/Ticket/GH1990Test.php | 2 +- tests/Tests/Functional/Ticket/GH2002Test.php | 2 +- tests/Tests/Functional/Ticket/GH2157Test.php | 2 +- tests/Tests/Functional/Ticket/GH2158Test.php | 2 +- tests/Tests/Functional/Ticket/GH232Test.php | 2 +- tests/Tests/Functional/Ticket/GH245Test.php | 2 +- tests/Tests/Functional/Ticket/GH267Test.php | 2 +- tests/Tests/Functional/Ticket/GH2730Test.php | 2 +- tests/Tests/Functional/Ticket/GH2789Test.php | 2 +- tests/Tests/Functional/Ticket/GH2825Test.php | 2 +- tests/Tests/Functional/Ticket/GH2910Test.php | 2 +- tests/Tests/Functional/Ticket/GH389Test.php | 2 +- tests/Tests/Functional/Ticket/GH426Test.php | 2 +- tests/Tests/Functional/Ticket/GH435Test.php | 2 +- tests/Tests/Functional/Ticket/GH453Test.php | 2 +- tests/Tests/Functional/Ticket/GH467Test.php | 2 +- tests/Tests/Functional/Ticket/GH499Test.php | 2 +- tests/Tests/Functional/Ticket/GH520Test.php | 2 +- tests/Tests/Functional/Ticket/GH529Test.php | 2 +- tests/Tests/Functional/Ticket/GH560Test.php | 2 +- tests/Tests/Functional/Ticket/GH561Test.php | 2 +- tests/Tests/Functional/Ticket/GH566Test.php | 2 +- tests/Tests/Functional/Ticket/GH580Test.php | 2 +- tests/Tests/Functional/Ticket/GH593Test.php | 2 +- tests/Tests/Functional/Ticket/GH596Test.php | 2 +- tests/Tests/Functional/Ticket/GH597Test.php | 2 +- tests/Tests/Functional/Ticket/GH602Test.php | 2 +- tests/Tests/Functional/Ticket/GH611Test.php | 2 +- tests/Tests/Functional/Ticket/GH628Test.php | 2 +- tests/Tests/Functional/Ticket/GH665Test.php | 2 +- tests/Tests/Functional/Ticket/GH788Test.php | 2 +- tests/Tests/Functional/Ticket/GH816Test.php | 2 +- tests/Tests/Functional/Ticket/GH850Test.php | 2 +- tests/Tests/Functional/Ticket/GH852Test.php | 2 +- tests/Tests/Functional/Ticket/GH878Test.php | 2 +- tests/Tests/Functional/Ticket/GH880Test.php | 2 +- tests/Tests/Functional/Ticket/GH897Test.php | 2 +- tests/Tests/Functional/Ticket/GH921Test.php | 2 +- tests/Tests/Functional/Ticket/GH927Test.php | 2 +- tests/Tests/Functional/Ticket/GH928Test.php | 2 +- tests/Tests/Functional/Ticket/GH936Test.php | 2 +- tests/Tests/Functional/Ticket/GH942Test.php | 2 +- tests/Tests/Functional/Ticket/GH944Test.php | 2 +- tests/Tests/Functional/Ticket/GH971Test.php | 2 +- tests/Tests/Functional/Ticket/GH977Test.php | 2 +- tests/Tests/Functional/Ticket/GH999Test.php | 2 +- tests/Tests/Functional/Ticket/MODM116Test.php | 2 +- tests/Tests/Functional/Ticket/MODM140Test.php | 2 +- tests/Tests/Functional/Ticket/MODM29Test.php | 2 +- tests/Tests/Functional/Ticket/MODM43Test.php | 2 +- tests/Tests/Functional/Ticket/MODM45Test.php | 2 +- tests/Tests/Functional/Ticket/MODM46Test.php | 2 +- tests/Tests/Functional/Ticket/MODM47Test.php | 2 +- tests/Tests/Functional/Ticket/MODM48Test.php | 2 +- tests/Tests/Functional/Ticket/MODM52Test.php | 2 +- tests/Tests/Functional/Ticket/MODM56Test.php | 2 +- tests/Tests/Functional/Ticket/MODM62Test.php | 2 +- tests/Tests/Functional/Ticket/MODM65Test.php | 2 +- tests/Tests/Functional/Ticket/MODM66Test.php | 2 +- tests/Tests/Functional/Ticket/MODM67Test.php | 2 +- tests/Tests/Functional/Ticket/MODM70Test.php | 2 +- tests/Tests/Functional/Ticket/MODM72Test.php | 2 +- tests/Tests/Functional/Ticket/MODM76Test.php | 2 +- tests/Tests/Functional/Ticket/MODM81Test.php | 2 +- tests/Tests/Functional/Ticket/MODM83Test.php | 2 +- tests/Tests/Functional/Ticket/MODM90Test.php | 2 +- tests/Tests/Functional/Ticket/MODM91Test.php | 2 +- tests/Tests/Functional/Ticket/MODM92Test.php | 2 +- tests/Tests/Functional/Ticket/MODM95Test.php | 2 +- tests/Tests/Functional/UpsertTest.php | 2 +- tests/Tests/Functional/UuidMappingTest.php | 2 +- tests/Tests/Functional/ValidationTest.php | 2 +- tests/Tests/Functional/VersionTest.php | 2 +- tests/Tests/HydratorTest.php | 2 +- .../AbstractAnnotationDriverTestCase.php | 2 +- .../Mapping/AbstractMappingDriverTestCase.php | 14 ++++--- tests/Tests/Mapping/AnnotationDriverTest.php | 4 +- .../Mapping/BasicInheritanceMappingTest.php | 2 +- .../Mapping/ClassMetadataLoadEventTest.php | 2 +- tests/Tests/Mapping/ClassMetadataTest.php | 2 +- .../Documents/GlobalNamespaceDocument.php | 2 +- .../Mapping/Driver/AbstractDriverTestCase.php | 2 +- tests/Tests/Mapping/EncryptQueryTest.php | 19 +++++++++ .../Mapping/LegacyReflectionFieldsTest.php | 6 +-- .../ShardKeyInheritanceMappingTest.php | 2 +- .../DocumentPersisterGetShardKeyQueryTest.php | 2 +- tests/Tests/Query/BuilderTest.php | 2 +- tests/Tests/QueryTest.php | 2 +- tests/Tests/Tools/GH1299/BaseUser.php | 2 +- tests/Tests/Tools/GH1299/GH1299User.php | 2 +- tests/Tests/Tools/GH297/Address.php | 2 +- tests/Tests/Tools/GH297/AddressTrait.php | 2 +- tests/Tests/Tools/GH297/Admin.php | 2 +- tests/Tests/Tools/GH297/User.php | 2 +- .../ResolveTargetDocumentListenerTest.php | 2 +- tests/Tests/UnitOfWorkTest.php | 2 +- 447 files changed, 665 insertions(+), 1446 deletions(-) delete mode 100644 src/Mapping/Attribute/Indexes.php create mode 100644 src/Mapping/Attribute/MappingAttribute.php rename src/Mapping/{Attribute => }/EncryptQuery.php (57%) create mode 100644 tests/Tests/Mapping/EncryptQueryTest.php diff --git a/UPGRADE-2.16.md b/UPGRADE-2.16.md index b3a4cf4999..f015afed23 100644 --- a/UPGRADE-2.16.md +++ b/UPGRADE-2.16.md @@ -3,10 +3,9 @@ ## Attribute namespaces Doctrine annotations are already deprecated in favor of PHP attributes. -As of MongoDB ODM 2.16, the attribute namespaces have been changed from +As of MongoDB ODM 2.16, the namespace of attribute classes has been changed from `Doctrine\ODM\MongoDB\Mapping\Annotations` to `Doctrine\ODM\MongoDB\Mapping\Attribute`. -The old annotation namespaces continue to work for the time being, but they are -deprecated and will be removed in 3.0. +The old classes continue to work, but they are deprecated and will be removed in 3.0. ```diff - use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; @@ -23,6 +22,9 @@ deprecated and will be removed in 3.0. } ``` +The enum `Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery` has been moved to +`Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery`. + ## Package `doctrine/cache` no longer required If you use `Doctrine\ODM\MongoDB\Configuration::getMetadataCacheImpl()`, diff --git a/composer.json b/composer.json index d994a6ff55..879844894d 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "psr/cache": "^1.0 || ^2.0 || ^3.0", "symfony/console": "^5.4 || ^6.4 || ^7.0 || ^8.0", "symfony/deprecation-contracts": "^2.2 || ^3.0", + "symfony/polyfill-php84": "^1.33", "symfony/var-dumper": "^5.4 || ^6.4 || ^7.0 || ^8.0", "symfony/var-exporter": "^6.4.1 || ^7.0 || ^8.0" }, diff --git a/docs/en/cookbook/mapping-classes-to-orm-and-odm.rst b/docs/en/cookbook/mapping-classes-to-orm-and-odm.rst index 4d6fd90883..de4f924a4b 100644 --- a/docs/en/cookbook/mapping-classes-to-orm-and-odm.rst +++ b/docs/en/cookbook/mapping-classes-to-orm-and-odm.rst @@ -113,7 +113,7 @@ Now map the same class to the Doctrine MongoDB ODM: namespace Documents\Blog; use Documents\Blog\Repository\ODM\BlogPostRepository; - use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document(repositoryClass: BlogPostRepository::class)] class BlogPost diff --git a/docs/en/cookbook/queryable-encryption.rst b/docs/en/cookbook/queryable-encryption.rst index cf0f0ed10b..2613607be1 100644 --- a/docs/en/cookbook/queryable-encryption.rst +++ b/docs/en/cookbook/queryable-encryption.rst @@ -47,9 +47,8 @@ fields that require encryption. namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt; - use Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; + use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; #[ODM\Document] class Patient @@ -69,7 +68,7 @@ fields that require encryption. * This allows us to find a patient by their exact SSN. */ #[ODM\Field(type: 'string')] - #[Encrypt(queryType: EncryptQuery::Equality)] + #[ODM\Encrypt(queryType: EncryptQuery::Equality)] public string $ssn; /** @@ -77,7 +76,7 @@ fields that require encryption. * By not specifying a queryType, we make it non-queryable. */ #[ODM\EmbedOne(targetDocument: Billing::class)] - #[Encrypt] + #[ODM\Encrypt] public Billing $billing; /** diff --git a/docs/en/cookbook/time-series-data.rst b/docs/en/cookbook/time-series-data.rst index 3614153f52..9cd225e7f1 100644 --- a/docs/en/cookbook/time-series-data.rst +++ b/docs/en/cookbook/time-series-data.rst @@ -47,7 +47,7 @@ First, we define the model for our data: 'vector', @@ -1501,14 +1498,14 @@ Example: )] class VectorEmbedding { - #[Id] + #[ODM\Id] public ?string $id = null; /** @var list */ - #[Field(type: Type::COLLECTION)] + #[ODM\Field(type: Type::COLLECTION)] public array $plotEmbeddingVoyage3Large = []; - #[Field] + #[ODM\Field] public string $category; } diff --git a/docs/en/reference/basic-mapping.rst b/docs/en/reference/basic-mapping.rst index f47d912cc3..9f1553edd4 100644 --- a/docs/en/reference/basic-mapping.rst +++ b/docs/en/reference/basic-mapping.rst @@ -57,9 +57,9 @@ to be designated as a document. This can be done through the namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; - #[Document] + #[ODM\Document] class User { } @@ -88,9 +88,9 @@ option as follows: namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; - #[Document(db: 'my_db', collection: 'users')] + #[ODM\Document(db: 'my_db', collection: 'users')] class User { } @@ -257,13 +257,12 @@ Here is an example: namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; - #[Document] + #[ODM\Document] class User { - #[Id] + #[ODM\Id] public string $id; } @@ -309,13 +308,12 @@ Here is an example how to manually set a string identifier for your documents: namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; - #[Document] + #[ODM\Document] class MyPersistentClass { - #[Id(strategy: 'NONE', type: 'string')] + #[ODM\Id(strategy: 'NONE', type: 'string')] public string $id; //... @@ -430,15 +428,14 @@ Example: namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; - #[Document] + #[ODM\Document] class User { // ... - #[Field] + #[ODM\Field] public string $username; } diff --git a/docs/en/reference/introduction.rst b/docs/en/reference/introduction.rst index c7a06ec622..baaa252618 100644 --- a/docs/en/reference/introduction.rst +++ b/docs/en/reference/introduction.rst @@ -46,7 +46,7 @@ the features. use DateTimeImmutable; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; - use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\MappedSuperclass] abstract class BaseEmployee diff --git a/docs/en/reference/storing-files-with-gridfs.rst b/docs/en/reference/storing-files-with-gridfs.rst index 044bfe4f07..73e3d86288 100644 --- a/docs/en/reference/storing-files-with-gridfs.rst +++ b/docs/en/reference/storing-files-with-gridfs.rst @@ -41,28 +41,27 @@ Mapping documents as GridFS files namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\File; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[File(bucketName: 'image')] class Image { - #[Id] + #[ODM\Id] private ?string $id; - #[File\Filename] + #[ODM\File\Filename] private ?string $name; - #[File\UploadDate] + #[ODM\File\UploadDate] private \DateTimeInterface $uploadDate; - #[File\Length] + #[ODM\File\Length] private ?int $length; - #[File\ChunkSize] + #[ODM\File\ChunkSize] private ?int $chunkSize; - #[File\Metadata(targetDocument: ImageMetadata::class)] + #[ODM\File\Metadata(targetDocument: ImageMetadata::class)] private ImageMetadata $metadata; public function getId(): ?string @@ -131,13 +130,12 @@ The ``ImageMetadata`` class must be an embedded document: namespace Documents; - use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument; - use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; - #[EmbeddedDocument] + #[ODM\EmbeddedDocument] class ImageMetadata { - #[Field(type: 'string')] + #[ODM\Field(type: 'string')] private string $contentType; public function __construct(string $contentType) diff --git a/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst index af64d5571f..e05ef484ae 100755 --- a/docs/en/tutorials/getting-started.rst +++ b/docs/en/tutorials/getting-started.rst @@ -86,7 +86,7 @@ You can provide your mapping information in Attribute or XML: use DateTimeImmutable; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; - use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; + use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; #[ODM\Document] class User diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 0835031f7a..7e725cb8a9 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -475,7 +475,7 @@ parameters: path: src/Mapping/Driver/XmlDriver.php - - message: '#^Parameter \#2 \$mapping of method Doctrine\\ODM\\MongoDB\\Mapping\\Driver\\XmlDriver\:\:addFieldMapping\(\) expects array\{type\?\: string, fieldName\?\: string, name\?\: string, strategy\?\: string, association\?\: int, id\?\: bool, isOwningSide\?\: bool, collectionClass\?\: class\-string, \.\.\.\}, array\, Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\EncryptQuery\|float\|int\|MongoDB\\BSON\\Decimal128\|MongoDB\\BSON\\Int64\|MongoDB\\BSON\\UTCDateTime\|string\|null\>\|bool\|string\> given\.$#' + message: '#^Parameter \#2 \$mapping of method Doctrine\\ODM\\MongoDB\\Mapping\\Driver\\XmlDriver\:\:addFieldMapping\(\) expects array\{type\?\: string, fieldName\?\: string, name\?\: string, strategy\?\: string, association\?\: int, id\?\: bool, isOwningSide\?\: bool, collectionClass\?\: class\-string, \.\.\.\}, array\, Doctrine\\ODM\\MongoDB\\Mapping\\EncryptQuery\|float\|int\|MongoDB\\BSON\\Decimal128\|MongoDB\\BSON\\Int64\|MongoDB\\BSON\\UTCDateTime\|string\|null\>\|bool\|string\> given\.$#' identifier: argument.type count: 1 path: src/Mapping/Driver/XmlDriver.php @@ -1069,13 +1069,13 @@ parameters: path: tests/Tests/Functional/QueryableEncryptionTest.php - - message: '#^Parameter \$discriminatorMap of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\ReferenceOne constructor expects array\\|null, array\ given\.$#' + message: '#^Parameter \$discriminatorMap of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\ReferenceOne constructor expects array\\|null, array\ given\.$#' identifier: argument.type count: 1 path: tests/Tests/Functional/TargetDocumentTest.php - - message: '#^Parameter \$targetDocument of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\ReferenceOne constructor expects class\-string\|null, string given\.$#' + message: '#^Parameter \$targetDocument of attribute class Doctrine\\ODM\\MongoDB\\Mapping\\Annotations\\ReferenceOne constructor expects class\-string\|null, string given\.$#' identifier: argument.type count: 1 path: tests/Tests/Functional/TargetDocumentTest.php diff --git a/phpstan.neon.dist b/phpstan.neon.dist index a6f7ff93e1..fada396846 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -54,6 +54,10 @@ parameters: - message: '#MongoDB\\BSON\\VectorType#' - message: '#MongoDB\\BSON\\Binary\:\:(TYPE_VECTOR|getVectorType|toArray|fromVector)#' + - message: '#^Class Doctrine\\ODM\\MongoDB\\Mapping\\([a-zA-Z0-9\\]+) extends @final class Doctrine\\ODM\\MongoDB\\Mapping\\Attribute\\([a-zA-Z0-9\\]+)\.$#' + identifier: class.extendsFinalByPhpDoc + path: src/Mapping/Annotations/ + # To be removed when reaching phpstan level 6 checkMissingVarTagTypehint: true checkMissingTypehints: true diff --git a/src/Mapping/Annotations/AbstractDocument.php b/src/Mapping/Annotations/AbstractDocument.php index e4a7e9eb0e..26695015e9 100644 --- a/src/Mapping/Annotations/AbstractDocument.php +++ b/src/Mapping/Annotations/AbstractDocument.php @@ -5,15 +5,13 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument::class); -return; - -/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument instead */ -abstract class AbstractDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument -{ +// @phpstan-ignore-next-line if.alwaysFalse +if (false) { + /** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument instead */ + abstract class AbstractDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractDocument + { + } } diff --git a/src/Mapping/Annotations/AbstractField.php b/src/Mapping/Annotations/AbstractField.php index c3c3b37515..afc643191e 100644 --- a/src/Mapping/Annotations/AbstractField.php +++ b/src/Mapping/Annotations/AbstractField.php @@ -5,15 +5,13 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField::class); -return; - -/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField instead */ -abstract class AbstractField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField -{ +// @phpstan-ignore-next-line if.alwaysFalse +if (false) { + /** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField instead */ + abstract class AbstractField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField + { + } } diff --git a/src/Mapping/Annotations/AbstractIndex.php b/src/Mapping/Annotations/AbstractIndex.php index 1e9aaf1927..d1c8cfec7e 100644 --- a/src/Mapping/Annotations/AbstractIndex.php +++ b/src/Mapping/Annotations/AbstractIndex.php @@ -5,15 +5,13 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex::class); -return; - -/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex instead */ -abstract class AbstractIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex -{ +// @phpstan-ignore-next-line if.alwaysFalse +if (false) { + /** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex instead */ + abstract class AbstractIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex + { + } } diff --git a/src/Mapping/Annotations/AlsoLoad.php b/src/Mapping/Annotations/AlsoLoad.php index ec90051b1e..33b181a351 100644 --- a/src/Mapping/Annotations/AlsoLoad.php +++ b/src/Mapping/Annotations/AlsoLoad.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad::class); - -return; - /** * Loads data from a different field if the original field is not set * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD)] -final class AlsoLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad +final class AlsoLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad implements Annotation { } diff --git a/src/Mapping/Annotations/Annotation.php b/src/Mapping/Annotations/Annotation.php index 47ace5552f..3d12d9b471 100644 --- a/src/Mapping/Annotations/Annotation.php +++ b/src/Mapping/Annotations/Annotation.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; -/** @deprecated Annotation classes are deprecated */ +/** @deprecated Annotation classes are deprecated, {@see MappingAttribute} */ interface Annotation { } diff --git a/src/Mapping/Annotations/ChangeTrackingPolicy.php b/src/Mapping/Annotations/ChangeTrackingPolicy.php index 8d9ec8a9f6..ddf28a7b24 100644 --- a/src/Mapping/Annotations/ChangeTrackingPolicy.php +++ b/src/Mapping/Annotations/ChangeTrackingPolicy.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy::class); - -return; - /** * Specifies the change tracking policy for a document * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy::class * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class ChangeTrackingPolicy extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy +final class ChangeTrackingPolicy extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy implements Annotation { } diff --git a/src/Mapping/Annotations/DefaultDiscriminatorValue.php b/src/Mapping/Annotations/DefaultDiscriminatorValue.php index 27e4c82078..9d0175fe4a 100644 --- a/src/Mapping/Annotations/DefaultDiscriminatorValue.php +++ b/src/Mapping/Annotations/DefaultDiscriminatorValue.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue::class); - -return; - /** * Specifies a default discriminator value to be used when the discriminator * field is not set in a document @@ -26,6 +17,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue:: * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class DefaultDiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue +final class DefaultDiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue implements Annotation { } diff --git a/src/Mapping/Annotations/DiscriminatorField.php b/src/Mapping/Annotations/DiscriminatorField.php index 8c5ba8f062..0cee47a3ba 100644 --- a/src/Mapping/Annotations/DiscriminatorField.php +++ b/src/Mapping/Annotations/DiscriminatorField.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField::class); - -return; - /** * Specify a field name to store a discriminator value * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class DiscriminatorField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField +final class DiscriminatorField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField implements Annotation { } diff --git a/src/Mapping/Annotations/DiscriminatorMap.php b/src/Mapping/Annotations/DiscriminatorMap.php index 3cb0a7c5b1..d5a7f7bab6 100644 --- a/src/Mapping/Annotations/DiscriminatorMap.php +++ b/src/Mapping/Annotations/DiscriminatorMap.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap::class); - -return; - /** * Specify a map of discriminator values and classes * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class DiscriminatorMap extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap +final class DiscriminatorMap extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap implements Annotation { } diff --git a/src/Mapping/Annotations/DiscriminatorValue.php b/src/Mapping/Annotations/DiscriminatorValue.php index b0d2930126..6511fcb29a 100644 --- a/src/Mapping/Annotations/DiscriminatorValue.php +++ b/src/Mapping/Annotations/DiscriminatorValue.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue::class); - -return; - /** * Use the specified discriminator for this class * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class DiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue +final class DiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue implements Annotation { } diff --git a/src/Mapping/Annotations/Document.php b/src/Mapping/Annotations/Document.php index ca666e12b5..bad3bcecd4 100644 --- a/src/Mapping/Annotations/Document.php +++ b/src/Mapping/Annotations/Document.php @@ -7,17 +7,8 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Document::class); - -return; - /** - * Identifies a final class as a document that can be stored in the database + * Identifies a class as a document that can be stored in the database * * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Document instead * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Document::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class Document extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Document +final class Document extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Document implements Annotation { } diff --git a/src/Mapping/Annotations/EmbedMany.php b/src/Mapping/Annotations/EmbedMany.php index 15252b17dc..e1139c5c65 100644 --- a/src/Mapping/Annotations/EmbedMany.php +++ b/src/Mapping/Annotations/EmbedMany.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany::class); - -return; - /** * Embeds multiple documents * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class EmbedMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany +final class EmbedMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany implements Annotation { } diff --git a/src/Mapping/Annotations/EmbedOne.php b/src/Mapping/Annotations/EmbedOne.php index 8705920087..ed3a37eb61 100644 --- a/src/Mapping/Annotations/EmbedOne.php +++ b/src/Mapping/Annotations/EmbedOne.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne::class); - -return; - /** * Embeds a single document * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class EmbedOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne +final class EmbedOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne implements Annotation { } diff --git a/src/Mapping/Annotations/EmbeddedDocument.php b/src/Mapping/Annotations/EmbeddedDocument.php index 4446a0f62b..7779b90330 100644 --- a/src/Mapping/Annotations/EmbeddedDocument.php +++ b/src/Mapping/Annotations/EmbeddedDocument.php @@ -7,17 +7,8 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument::class); - -return; - /** - * Identifies a final class as a document that can be embedded but not stored by itself + * Identifies a class as a document that can be embedded but not stored by itself * * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument instead * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class EmbeddedDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument +final class EmbeddedDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument implements Annotation { } diff --git a/src/Mapping/Annotations/Encrypt.php b/src/Mapping/Annotations/Encrypt.php index 23e721d48f..b26e7b9ed7 100644 --- a/src/Mapping/Annotations/Encrypt.php +++ b/src/Mapping/Annotations/Encrypt.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt::class); - -return; - /** * Defines an encrypted field mapping. * @@ -27,6 +18,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class Encrypt extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt +final class Encrypt extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt implements Annotation { } diff --git a/src/Mapping/Annotations/EncryptQuery.php b/src/Mapping/Annotations/EncryptQuery.php index 144628725e..b1ed4825dd 100644 --- a/src/Mapping/Annotations/EncryptQuery.php +++ b/src/Mapping/Annotations/EncryptQuery.php @@ -4,16 +4,11 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; +use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; + use function class_exists; use function trigger_deprecation; -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery::class); - -return; +trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Enum %s\\EncryptQuery is deprecated, use %s instead.', __NAMESPACE__, EncryptQuery::class); -/** @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery instead */ -final class EncryptQuery extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery -{ -} +class_exists(EncryptQuery::class); diff --git a/src/Mapping/Annotations/Field.php b/src/Mapping/Annotations/Field.php index 4d35c2b051..39d719161e 100644 --- a/src/Mapping/Annotations/Field.php +++ b/src/Mapping/Annotations/Field.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Field::class); - -return; - /** * Specifies a generic field mapping * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Field::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Field extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Field +final class Field extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Field implements Annotation { } diff --git a/src/Mapping/Annotations/File.php b/src/Mapping/Annotations/File.php index 9db0ad3cbc..49504769ef 100644 --- a/src/Mapping/Annotations/File.php +++ b/src/Mapping/Annotations/File.php @@ -7,17 +7,8 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File::class); - -return; - /** - * Identifies a final class as a GridFS file that can be stored in the database + * Identifies a class as a GridFS file that can be stored in the database * * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File instead * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class File extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File +final class File extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File implements Annotation { } diff --git a/src/Mapping/Annotations/File/ChunkSize.php b/src/Mapping/Annotations/File/ChunkSize.php index d68df8d29c..856d164186 100644 --- a/src/Mapping/Annotations/File/ChunkSize.php +++ b/src/Mapping/Annotations/File/ChunkSize.php @@ -6,15 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize::class); - -return; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize instead @@ -23,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ChunkSize extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize +final class ChunkSize extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize implements Annotation { } diff --git a/src/Mapping/Annotations/File/Filename.php b/src/Mapping/Annotations/File/Filename.php index 3db6047ede..d28876e84e 100644 --- a/src/Mapping/Annotations/File/Filename.php +++ b/src/Mapping/Annotations/File/Filename.php @@ -6,15 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename::class); - -return; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename instead @@ -23,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Filename extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename +final class Filename extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename implements Annotation { } diff --git a/src/Mapping/Annotations/File/Length.php b/src/Mapping/Annotations/File/Length.php index f8651f4fd3..ea5a22b0db 100644 --- a/src/Mapping/Annotations/File/Length.php +++ b/src/Mapping/Annotations/File/Length.php @@ -6,15 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length::class); - -return; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length instead @@ -23,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Length extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length +final class Length extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length implements Annotation { } diff --git a/src/Mapping/Annotations/File/Metadata.php b/src/Mapping/Annotations/File/Metadata.php index d5fe5aac28..0ee32ec52b 100644 --- a/src/Mapping/Annotations/File/Metadata.php +++ b/src/Mapping/Annotations/File/Metadata.php @@ -6,15 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata::class); - -return; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata instead @@ -23,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Metadata extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata +final class Metadata extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata implements Annotation { } diff --git a/src/Mapping/Annotations/File/UploadDate.php b/src/Mapping/Annotations/File/UploadDate.php index daddf2b06e..afc3152d75 100644 --- a/src/Mapping/Annotations/File/UploadDate.php +++ b/src/Mapping/Annotations/File/UploadDate.php @@ -6,15 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate::class); - -return; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate instead @@ -23,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class UploadDate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate +final class UploadDate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate implements Annotation { } diff --git a/src/Mapping/Annotations/HasLifecycleCallbacks.php b/src/Mapping/Annotations/HasLifecycleCallbacks.php index eb833284c9..15021f9bcd 100644 --- a/src/Mapping/Annotations/HasLifecycleCallbacks.php +++ b/src/Mapping/Annotations/HasLifecycleCallbacks.php @@ -6,17 +6,8 @@ use Attribute; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks::class); - -return; - /** - * Must be set on a document final class to instruct Doctrine to check for lifecycle + * Must be set on a document class to instruct Doctrine to check for lifecycle * callback annotations on public methods. * * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks instead @@ -24,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks::clas * @Annotation */ #[Attribute(Attribute::TARGET_CLASS)] -final class HasLifecycleCallbacks extends \Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks +final class HasLifecycleCallbacks extends \Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks implements Annotation { } diff --git a/src/Mapping/Annotations/Id.php b/src/Mapping/Annotations/Id.php index ec50d788bb..5aad8da190 100644 --- a/src/Mapping/Annotations/Id.php +++ b/src/Mapping/Annotations/Id.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Id::class); - -return; - /** * Special field mapping to map document identifiers * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Id::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Id extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Id +final class Id extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Id implements Annotation { } diff --git a/src/Mapping/Annotations/Index.php b/src/Mapping/Annotations/Index.php index 70838383d3..78a9c30064 100644 --- a/src/Mapping/Annotations/Index.php +++ b/src/Mapping/Annotations/Index.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Index::class); - -return; - /** * Defines an index on a field * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Index::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -final class Index extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Index +final class Index extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Index implements Annotation { } diff --git a/src/Mapping/Annotations/Indexes.php b/src/Mapping/Annotations/Indexes.php index a2c7545e6d..91c67b8e18 100644 --- a/src/Mapping/Annotations/Indexes.php +++ b/src/Mapping/Annotations/Indexes.php @@ -5,25 +5,18 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use Attribute; - -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes::class); - -return; +use Doctrine\Common\Annotations\Annotation as BaseAnnotation; /** * Specifies a list of indexes for a document * - * @deprecated final class was deprecated in doctrine/mongodb-odm 2.2 and will be removed in 3.0. Specify all Index and UniqueIndex annotations on a final class level. - * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes instead + * @deprecated class was deprecated in doctrine/mongodb-odm 2.2 and will be removed in 3.0. Specify all Index and UniqueIndex annotations on a class level. * * @Annotation */ #[Attribute(Attribute::TARGET_CLASS)] -final class Indexes extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Indexes +final class Indexes extends BaseAnnotation implements Annotation { + /** @var AbstractIndex[]|AbstractIndex */ + public $value = []; } diff --git a/src/Mapping/Annotations/InheritanceType.php b/src/Mapping/Annotations/InheritanceType.php index b8d1c8d48c..bf808691fc 100644 --- a/src/Mapping/Annotations/InheritanceType.php +++ b/src/Mapping/Annotations/InheritanceType.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType::class); - -return; - /** * Specifies which inheritance type to use for a document * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class InheritanceType extends \Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType +final class InheritanceType extends \Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType implements Annotation { } diff --git a/src/Mapping/Annotations/Lock.php b/src/Mapping/Annotations/Lock.php index 1c0667b543..4527747ae5 100644 --- a/src/Mapping/Annotations/Lock.php +++ b/src/Mapping/Annotations/Lock.php @@ -6,15 +6,6 @@ use Attribute; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Lock::class); - -return; - /** * Specifies a field to use for pessimistic locking * @@ -23,6 +14,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Lock::class); * @Annotation */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Lock extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Lock +final class Lock extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Lock implements Annotation { } diff --git a/src/Mapping/Annotations/MappedSuperclass.php b/src/Mapping/Annotations/MappedSuperclass.php index 6b8a141808..8f7f042b69 100644 --- a/src/Mapping/Annotations/MappedSuperclass.php +++ b/src/Mapping/Annotations/MappedSuperclass.php @@ -7,25 +7,16 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass::class); - -return; - /** * Specifies a parent class that other documents may extend to inherit mapping * information * - * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperfinal class instead + * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass instead * * @Annotation * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class MappedSuperClass extends \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass +final class MappedSuperclass extends \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass implements Annotation { } diff --git a/src/Mapping/Annotations/PostLoad.php b/src/Mapping/Annotations/PostLoad.php index 1b9971a6ff..ef3cefebe5 100644 --- a/src/Mapping/Annotations/PostLoad.php +++ b/src/Mapping/Annotations/PostLoad.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad::class); - -return; - /** * Marks a method as a postLoad lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad +final class PostLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad implements Annotation { } diff --git a/src/Mapping/Annotations/PostPersist.php b/src/Mapping/Annotations/PostPersist.php index 48915330ce..dd9defefda 100644 --- a/src/Mapping/Annotations/PostPersist.php +++ b/src/Mapping/Annotations/PostPersist.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist::class); - -return; - /** * Marks a method as a postPersist lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostPersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist +final class PostPersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist implements Annotation { } diff --git a/src/Mapping/Annotations/PostRemove.php b/src/Mapping/Annotations/PostRemove.php index c80f9654c1..4fa36dee66 100644 --- a/src/Mapping/Annotations/PostRemove.php +++ b/src/Mapping/Annotations/PostRemove.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove::class); - -return; - /** * Marks a method as a postRemove lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove +final class PostRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove implements Annotation { } diff --git a/src/Mapping/Annotations/PostUpdate.php b/src/Mapping/Annotations/PostUpdate.php index 850e112acd..7bd90791d7 100644 --- a/src/Mapping/Annotations/PostUpdate.php +++ b/src/Mapping/Annotations/PostUpdate.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate::class); - -return; - /** * Marks a method as a postUpdate lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate +final class PostUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate implements Annotation { } diff --git a/src/Mapping/Annotations/PreFlush.php b/src/Mapping/Annotations/PreFlush.php index 2c72ff7e21..2f40f372b8 100644 --- a/src/Mapping/Annotations/PreFlush.php +++ b/src/Mapping/Annotations/PreFlush.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush::class); - -return; - /** * Marks a method as a preFlush lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreFlush extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush +final class PreFlush extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush implements Annotation { } diff --git a/src/Mapping/Annotations/PreLoad.php b/src/Mapping/Annotations/PreLoad.php index 7c8dd979ca..971f86c764 100644 --- a/src/Mapping/Annotations/PreLoad.php +++ b/src/Mapping/Annotations/PreLoad.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad::class); - -return; - /** * Marks a method as a preLoad lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad +final class PreLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad implements Annotation { } diff --git a/src/Mapping/Annotations/PrePersist.php b/src/Mapping/Annotations/PrePersist.php index 14847573fe..fb0dee2f61 100644 --- a/src/Mapping/Annotations/PrePersist.php +++ b/src/Mapping/Annotations/PrePersist.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist::class); - -return; - /** * Marks a method as a prePersist lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PrePersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist +final class PrePersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist implements Annotation { } diff --git a/src/Mapping/Annotations/PreRemove.php b/src/Mapping/Annotations/PreRemove.php index 3e2ee6997f..9550be9092 100644 --- a/src/Mapping/Annotations/PreRemove.php +++ b/src/Mapping/Annotations/PreRemove.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove::class); - -return; - /** * Marks a method as a preRemove lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove +final class PreRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove implements Annotation { } diff --git a/src/Mapping/Annotations/PreUpdate.php b/src/Mapping/Annotations/PreUpdate.php index fbeea6fc37..096ee7f610 100644 --- a/src/Mapping/Annotations/PreUpdate.php +++ b/src/Mapping/Annotations/PreUpdate.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate::class); - -return; - /** * Marks a method as a preUpdate lifecycle callback * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate +final class PreUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate implements Annotation { } diff --git a/src/Mapping/Annotations/QueryResultDocument.php b/src/Mapping/Annotations/QueryResultDocument.php index 823629f940..254fa2b22f 100644 --- a/src/Mapping/Annotations/QueryResultDocument.php +++ b/src/Mapping/Annotations/QueryResultDocument.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument::class); - -return; - /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument instead * @@ -23,6 +14,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument::class) * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class QueryResultDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument +final class QueryResultDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument implements Annotation { } diff --git a/src/Mapping/Annotations/ReadPreference.php b/src/Mapping/Annotations/ReadPreference.php index 7ade4de8e4..b876dc16d4 100644 --- a/src/Mapping/Annotations/ReadPreference.php +++ b/src/Mapping/Annotations/ReadPreference.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference::class); - -return; - /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference instead * @@ -23,6 +14,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class ReadPreference extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference +final class ReadPreference extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference implements Annotation { } diff --git a/src/Mapping/Annotations/ReferenceMany.php b/src/Mapping/Annotations/ReferenceMany.php index 420c45b4c1..b7a6fc4c97 100644 --- a/src/Mapping/Annotations/ReferenceMany.php +++ b/src/Mapping/Annotations/ReferenceMany.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany::class); - -return; - /** * Specifies a one-to-many relationship to a different document * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ReferenceMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany +final class ReferenceMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany implements Annotation { } diff --git a/src/Mapping/Annotations/ReferenceOne.php b/src/Mapping/Annotations/ReferenceOne.php index 26aa16d568..459cd1e7de 100644 --- a/src/Mapping/Annotations/ReferenceOne.php +++ b/src/Mapping/Annotations/ReferenceOne.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne::class); - -return; - /** * Specifies a one-to-one relationship to a different document * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ReferenceOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne +final class ReferenceOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne implements Annotation { } diff --git a/src/Mapping/Annotations/SearchIndex.php b/src/Mapping/Annotations/SearchIndex.php index 705f9c56e7..bd487ab054 100644 --- a/src/Mapping/Annotations/SearchIndex.php +++ b/src/Mapping/Annotations/SearchIndex.php @@ -8,15 +8,6 @@ use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex::class); - -return; - /** * Defines a search index on a class. * @@ -30,6 +21,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex::class); * @phpstan-import-type SearchIndexSynonym from ClassMetadata */ #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] -final class SearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex +final class SearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex implements Annotation { } diff --git a/src/Mapping/Annotations/ShardKey.php b/src/Mapping/Annotations/ShardKey.php index f024f18428..117da16196 100644 --- a/src/Mapping/Annotations/ShardKey.php +++ b/src/Mapping/Annotations/ShardKey.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey::class); - -return; - /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey instead * @@ -23,6 +14,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class ShardKey extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey +final class ShardKey extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey implements Annotation { } diff --git a/src/Mapping/Annotations/TimeSeries.php b/src/Mapping/Annotations/TimeSeries.php index acb0c09a56..05a70e1e0a 100644 --- a/src/Mapping/Annotations/TimeSeries.php +++ b/src/Mapping/Annotations/TimeSeries.php @@ -7,17 +7,8 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries::class); - -return; - /** - * Marks a document or superfinal class as a time series document + * Marks a document or superclass as a time series document * * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries instead * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class TimeSeries extends \Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries +final class TimeSeries extends \Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries implements Annotation { } diff --git a/src/Mapping/Annotations/UniqueIndex.php b/src/Mapping/Annotations/UniqueIndex.php index 76c610d3b1..d385200acc 100644 --- a/src/Mapping/Annotations/UniqueIndex.php +++ b/src/Mapping/Annotations/UniqueIndex.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex::class); - -return; - /** * Specifies a unique index on a field * @@ -25,6 +16,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -final class UniqueIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex +final class UniqueIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex implements Annotation { } diff --git a/src/Mapping/Annotations/Validation.php b/src/Mapping/Annotations/Validation.php index 54d0a11bc9..49f92ecb65 100644 --- a/src/Mapping/Annotations/Validation.php +++ b/src/Mapping/Annotations/Validation.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Validation::class); - -return; - /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation instead * @@ -24,6 +15,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Validation::class); * @Target({"CLASS"}) */ #[Attribute(Attribute::TARGET_CLASS)] -final class Validation extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation +final class Validation extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation implements Annotation { } diff --git a/src/Mapping/Annotations/VectorSearchIndex.php b/src/Mapping/Annotations/VectorSearchIndex.php index 561f6c5d8a..1162195546 100644 --- a/src/Mapping/Annotations/VectorSearchIndex.php +++ b/src/Mapping/Annotations/VectorSearchIndex.php @@ -8,15 +8,6 @@ use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex::class); - -return; - /** * Defines a vector search index on a class. * @@ -29,6 +20,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex::class); * @phpstan-import-type VectorSearchIndexField from ClassMetadata */ #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] -final class VectorSearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex +final class VectorSearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex implements Annotation { } diff --git a/src/Mapping/Annotations/Version.php b/src/Mapping/Annotations/Version.php index 7d16850823..f97eb0e2d0 100644 --- a/src/Mapping/Annotations/Version.php +++ b/src/Mapping/Annotations/Version.php @@ -6,15 +6,6 @@ use Attribute; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Version::class); - -return; - /** * Specifies a field to use for optimistic locking * @@ -23,6 +14,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\Version::class); * @Annotation */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Version extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Version +final class Version extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Version implements Annotation { } diff --git a/src/Mapping/Annotations/View.php b/src/Mapping/Annotations/View.php index 81be693584..1204a84139 100644 --- a/src/Mapping/Annotations/View.php +++ b/src/Mapping/Annotations/View.php @@ -7,15 +7,6 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_exists; -use function trigger_deprecation; - -trigger_deprecation('doctrine/mongodb-odm', '2.16', 'Namespace "Doctrine\ODM\MongoDB\Mapping\Annotations" is deprecated, use "Doctrine\ODM\MongoDB\Mapping\Attribute" instead.'); - -class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\View::class); - -return; - /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\View instead * @@ -23,6 +14,6 @@ class_exists(\Doctrine\ODM\MongoDB\Mapping\Attribute\View::class); * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class View extends \Doctrine\ODM\MongoDB\Mapping\Attribute\View +final class View extends \Doctrine\ODM\MongoDB\Mapping\Attribute\View implements Annotation { } diff --git a/src/Mapping/Attribute/AbstractDocument.php b/src/Mapping/Attribute/AbstractDocument.php index 33cbc4ceee..5a81684ed0 100644 --- a/src/Mapping/Attribute/AbstractDocument.php +++ b/src/Mapping/Attribute/AbstractDocument.php @@ -6,7 +6,7 @@ use function class_alias; -abstract class AbstractDocument implements Annotation +abstract class AbstractDocument { } diff --git a/src/Mapping/Attribute/AbstractField.php b/src/Mapping/Attribute/AbstractField.php index db4d4fa34a..413d46d72b 100644 --- a/src/Mapping/Attribute/AbstractField.php +++ b/src/Mapping/Attribute/AbstractField.php @@ -6,7 +6,7 @@ use function class_alias; -abstract class AbstractField implements Annotation +abstract class AbstractField { /** @var string|null */ public $name; diff --git a/src/Mapping/Attribute/AbstractIndex.php b/src/Mapping/Attribute/AbstractIndex.php index 191d56dc97..24e5c9e01d 100644 --- a/src/Mapping/Attribute/AbstractIndex.php +++ b/src/Mapping/Attribute/AbstractIndex.php @@ -6,7 +6,7 @@ use function class_alias; -abstract class AbstractIndex implements Annotation +abstract class AbstractIndex { /** @var string[] */ public $keys; diff --git a/src/Mapping/Attribute/AlsoLoad.php b/src/Mapping/Attribute/AlsoLoad.php index 553f4be2bb..046b3d896d 100644 --- a/src/Mapping/Attribute/AlsoLoad.php +++ b/src/Mapping/Attribute/AlsoLoad.php @@ -5,25 +5,17 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Loads data from a different field if the original field is not set * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD)] -class AlsoLoad implements Annotation +class AlsoLoad implements MappingAttribute { /** @param string|string[] $value */ public function __construct(public $value, public ?string $name = null) { } } - -// @phpstan-ignore class.notFound -class_alias(AlsoLoad::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\AlsoLoad::class); diff --git a/src/Mapping/Attribute/ChangeTrackingPolicy.php b/src/Mapping/Attribute/ChangeTrackingPolicy.php index fd04e9241d..6bb6b33cd2 100644 --- a/src/Mapping/Attribute/ChangeTrackingPolicy.php +++ b/src/Mapping/Attribute/ChangeTrackingPolicy.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specifies the change tracking policy for a document * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class ChangeTrackingPolicy implements Annotation +class ChangeTrackingPolicy implements MappingAttribute { /** @var string */ public $value; @@ -27,6 +22,3 @@ public function __construct(string $value) $this->value = $value; } } - -// @phpstan-ignore class.notFound -class_alias(ChangeTrackingPolicy::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ChangeTrackingPolicy::class); diff --git a/src/Mapping/Attribute/DefaultDiscriminatorValue.php b/src/Mapping/Attribute/DefaultDiscriminatorValue.php index 60615ef380..769155d91e 100644 --- a/src/Mapping/Attribute/DefaultDiscriminatorValue.php +++ b/src/Mapping/Attribute/DefaultDiscriminatorValue.php @@ -5,20 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specifies a default discriminator value to be used when the discriminator * field is not set in a document * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -class DefaultDiscriminatorValue implements Annotation +class DefaultDiscriminatorValue implements MappingAttribute { /** @var string */ public $value; @@ -28,6 +23,3 @@ public function __construct(string $value) $this->value = $value; } } - -// @phpstan-ignore class.notFound -class_alias(DefaultDiscriminatorValue::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DefaultDiscriminatorValue::class); diff --git a/src/Mapping/Attribute/DiscriminatorField.php b/src/Mapping/Attribute/DiscriminatorField.php index 8300d4b528..924cb1066e 100644 --- a/src/Mapping/Attribute/DiscriminatorField.php +++ b/src/Mapping/Attribute/DiscriminatorField.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specify a field name to store a discriminator value * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class DiscriminatorField implements Annotation +class DiscriminatorField implements MappingAttribute { /** @var string */ public $value; @@ -27,6 +22,3 @@ public function __construct(string $value) $this->value = $value; } } - -// @phpstan-ignore class.notFound -class_alias(DiscriminatorField::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DiscriminatorField::class); diff --git a/src/Mapping/Attribute/DiscriminatorMap.php b/src/Mapping/Attribute/DiscriminatorMap.php index 316ee9d394..d210311d11 100644 --- a/src/Mapping/Attribute/DiscriminatorMap.php +++ b/src/Mapping/Attribute/DiscriminatorMap.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specify a map of discriminator values and classes * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -class DiscriminatorMap implements Annotation +class DiscriminatorMap implements MappingAttribute { /** @var array */ public $value; @@ -28,6 +23,3 @@ public function __construct(array $value) $this->value = $value; } } - -// @phpstan-ignore class.notFound -class_alias(DiscriminatorMap::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DiscriminatorMap::class); diff --git a/src/Mapping/Attribute/DiscriminatorValue.php b/src/Mapping/Attribute/DiscriminatorValue.php index 5a7f7e9c26..0c717a9f98 100644 --- a/src/Mapping/Attribute/DiscriminatorValue.php +++ b/src/Mapping/Attribute/DiscriminatorValue.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Use the specified discriminator for this class * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class DiscriminatorValue implements Annotation +class DiscriminatorValue implements MappingAttribute { /** @var string */ public $value; @@ -27,6 +22,3 @@ public function __construct(string $value) $this->value = $value; } } - -// @phpstan-ignore class.notFound -class_alias(DiscriminatorValue::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\DiscriminatorValue::class); diff --git a/src/Mapping/Attribute/Document.php b/src/Mapping/Attribute/Document.php index 049898cf90..ccd2470eff 100644 --- a/src/Mapping/Attribute/Document.php +++ b/src/Mapping/Attribute/Document.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Identifies a class as a document that can be stored in the database * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class Document extends AbstractDocument +class Document extends AbstractDocument implements MappingAttribute { /** @var string|null */ public $db; @@ -55,6 +50,3 @@ public function __construct( $this->shardKey = $shardKey; } } - -// @phpstan-ignore class.notFound -class_alias(Document::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Document::class); diff --git a/src/Mapping/Attribute/EmbedMany.php b/src/Mapping/Attribute/EmbedMany.php index 8e1343748e..cd0bb64783 100644 --- a/src/Mapping/Attribute/EmbedMany.php +++ b/src/Mapping/Attribute/EmbedMany.php @@ -5,21 +5,16 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Utility\CollectionHelper; -use function class_alias; - /** * Embeds multiple documents * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class EmbedMany extends AbstractField +class EmbedMany extends AbstractField implements MappingAttribute { /** @var bool */ public $embedded = true; @@ -66,6 +61,3 @@ public function __construct( $this->storeEmptyArray = $storeEmptyArray; } } - -// @phpstan-ignore class.notFound -class_alias(EmbedMany::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany::class); diff --git a/src/Mapping/Attribute/EmbedOne.php b/src/Mapping/Attribute/EmbedOne.php index 3d133154c0..b5bdbd448b 100644 --- a/src/Mapping/Attribute/EmbedOne.php +++ b/src/Mapping/Attribute/EmbedOne.php @@ -5,20 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_alias; - /** * Embeds a single document * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class EmbedOne extends AbstractField +class EmbedOne extends AbstractField implements MappingAttribute { /** @var bool */ public $embedded = true; @@ -55,6 +50,3 @@ public function __construct( $this->defaultDiscriminatorValue = $defaultDiscriminatorValue; } } - -// @phpstan-ignore class.notFound -class_alias(EmbedOne::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne::class); diff --git a/src/Mapping/Attribute/EmbeddedDocument.php b/src/Mapping/Attribute/EmbeddedDocument.php index a5e07ee0d7..8490f20e39 100644 --- a/src/Mapping/Attribute/EmbeddedDocument.php +++ b/src/Mapping/Attribute/EmbeddedDocument.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Identifies a class as a document that can be embedded but not stored by itself * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class EmbeddedDocument extends AbstractDocument +class EmbeddedDocument extends AbstractDocument implements MappingAttribute { /** @var Index[] */ public $indexes; @@ -28,6 +23,3 @@ public function __construct(array $indexes = []) $this->indexes = $indexes; } } - -// @phpstan-ignore class.notFound -class_alias(EmbeddedDocument::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument::class); diff --git a/src/Mapping/Attribute/Encrypt.php b/src/Mapping/Attribute/Encrypt.php index 3483c28fb4..7fd9b6800d 100644 --- a/src/Mapping/Attribute/Encrypt.php +++ b/src/Mapping/Attribute/Encrypt.php @@ -6,24 +6,20 @@ use Attribute; use DateTimeInterface; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; use MongoDB\BSON\Decimal128; use MongoDB\BSON\Int64; use MongoDB\BSON\UTCDateTime; -use function class_alias; - /** * Defines an encrypted field mapping. * * @see https://www.mongodb.com/docs/manual/core/queryable-encryption/fundamentals/encrypt-and-query/#configure-encrypted-fields-for-optimal-search-and-storage * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -class Encrypt implements Annotation +class Encrypt implements MappingAttribute { public int|float|Int64|Decimal128|UTCDateTime|null $min; public int|float|Int64|Decimal128|UTCDateTime|null $max; @@ -48,6 +44,3 @@ public function __construct( $this->max = $max instanceof DateTimeInterface ? new UTCDateTime($max) : $max; } } - -// @phpstan-ignore class.notFound -class_alias(Encrypt::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt::class); diff --git a/src/Mapping/Attribute/Field.php b/src/Mapping/Attribute/Field.php index 7313a68553..60c0f6fdb4 100644 --- a/src/Mapping/Attribute/Field.php +++ b/src/Mapping/Attribute/Field.php @@ -6,19 +6,14 @@ use Attribute; use BackedEnum; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specifies a generic field mapping * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Field extends AbstractField +class Field extends AbstractField implements MappingAttribute { /** @var class-string|null */ public $enumType; @@ -41,6 +36,3 @@ public function __construct( $this->enumType = $enumType; } } - -// @phpstan-ignore class.notFound -class_alias(Field::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Field::class); diff --git a/src/Mapping/Attribute/File.php b/src/Mapping/Attribute/File.php index f3d197ff62..87cca46f44 100644 --- a/src/Mapping/Attribute/File.php +++ b/src/Mapping/Attribute/File.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Identifies a class as a GridFS file that can be stored in the database * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class File extends AbstractDocument +class File extends AbstractDocument implements MappingAttribute { /** @var string|null */ public $db; @@ -63,6 +58,3 @@ public function __construct( $this->chunkSizeBytes = $chunkSizeBytes; } } - -// @phpstan-ignore class.notFound -class_alias(File::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File::class); diff --git a/src/Mapping/Attribute/File/ChunkSize.php b/src/Mapping/Attribute/File/ChunkSize.php index 4791375063..847fdaa092 100644 --- a/src/Mapping/Attribute/File/ChunkSize.php +++ b/src/Mapping/Attribute/File/ChunkSize.php @@ -5,24 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappingAttribute; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class ChunkSize extends AbstractField +class ChunkSize extends AbstractField implements MappingAttribute { public function __construct() { parent::__construct('chunkSize', 'int', false, [], null, true); } } - -// @phpstan-ignore class.notFound -class_alias(ChunkSize::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\ChunkSize::class); diff --git a/src/Mapping/Attribute/File/Filename.php b/src/Mapping/Attribute/File/Filename.php index a7dd31b6a3..926516753d 100644 --- a/src/Mapping/Attribute/File/Filename.php +++ b/src/Mapping/Attribute/File/Filename.php @@ -5,24 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappingAttribute; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Filename extends AbstractField +class Filename extends AbstractField implements MappingAttribute { public function __construct() { parent::__construct('filename', 'string', false, [], null, true); } } - -// @phpstan-ignore class.notFound -class_alias(Filename::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\Filename::class); diff --git a/src/Mapping/Attribute/File/Length.php b/src/Mapping/Attribute/File/Length.php index ca5840dcd1..e9a311ecfd 100644 --- a/src/Mapping/Attribute/File/Length.php +++ b/src/Mapping/Attribute/File/Length.php @@ -5,24 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappingAttribute; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Length extends AbstractField +class Length extends AbstractField implements MappingAttribute { public function __construct() { parent::__construct('length', 'int', false, [], null, true); } } - -// @phpstan-ignore class.notFound -class_alias(Length::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\Length::class); diff --git a/src/Mapping/Attribute/File/Metadata.php b/src/Mapping/Attribute/File/Metadata.php index 04efd3889a..9e9d8fee52 100644 --- a/src/Mapping/Attribute/File/Metadata.php +++ b/src/Mapping/Attribute/File/Metadata.php @@ -5,19 +5,13 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappingAttribute; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Metadata extends AbstractField +class Metadata extends AbstractField implements MappingAttribute { /** @var bool */ public $embedded = true; @@ -53,6 +47,3 @@ public function __construct( $this->defaultDiscriminatorValue = $defaultDiscriminatorValue; } } - -// @phpstan-ignore class.notFound -class_alias(Metadata::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\Metadata::class); diff --git a/src/Mapping/Attribute/File/UploadDate.php b/src/Mapping/Attribute/File/UploadDate.php index 9df6b5efe7..d8d793fcce 100644 --- a/src/Mapping/Attribute/File/UploadDate.php +++ b/src/Mapping/Attribute/File/UploadDate.php @@ -5,24 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute\File; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractField; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappingAttribute; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class UploadDate extends AbstractField +class UploadDate extends AbstractField implements MappingAttribute { public function __construct() { parent::__construct('uploadDate', 'date', false, [], null, true); } } - -// @phpstan-ignore class.notFound -class_alias(UploadDate::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\File\UploadDate::class); diff --git a/src/Mapping/Attribute/HasLifecycleCallbacks.php b/src/Mapping/Attribute/HasLifecycleCallbacks.php index f7a831b417..843679c163 100644 --- a/src/Mapping/Attribute/HasLifecycleCallbacks.php +++ b/src/Mapping/Attribute/HasLifecycleCallbacks.php @@ -6,19 +6,13 @@ use Attribute; -use function class_alias; - /** * Must be set on a document class to instruct Doctrine to check for lifecycle * callback annotations on public methods. * - * @Annotation * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class HasLifecycleCallbacks implements Annotation +class HasLifecycleCallbacks implements MappingAttribute { } - -// @phpstan-ignore class.notFound -class_alias(HasLifecycleCallbacks::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\HasLifecycleCallbacks::class); diff --git a/src/Mapping/Attribute/Id.php b/src/Mapping/Attribute/Id.php index 57b44d4e16..718179ae2f 100644 --- a/src/Mapping/Attribute/Id.php +++ b/src/Mapping/Attribute/Id.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Special field mapping to map document identifiers * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Id extends AbstractField +class Id extends AbstractField implements MappingAttribute { /** @var bool */ public $id = true; @@ -33,6 +28,3 @@ public function __construct( parent::__construct($name, $type, $nullable, $options, $strategy, $notSaved); } } - -// @phpstan-ignore class.notFound -class_alias(Id::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Id::class); diff --git a/src/Mapping/Attribute/Index.php b/src/Mapping/Attribute/Index.php index af14d920d6..1ded2f439f 100644 --- a/src/Mapping/Attribute/Index.php +++ b/src/Mapping/Attribute/Index.php @@ -5,21 +5,13 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Defines an index on a field * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -class Index extends AbstractIndex +class Index extends AbstractIndex implements MappingAttribute { } - -// @phpstan-ignore class.notFound -class_alias(Index::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Index::class); diff --git a/src/Mapping/Attribute/Indexes.php b/src/Mapping/Attribute/Indexes.php deleted file mode 100644 index 09fd0487f5..0000000000 --- a/src/Mapping/Attribute/Indexes.php +++ /dev/null @@ -1,28 +0,0 @@ -value = $value; } } - -// @phpstan-ignore class.notFound -class_alias(InheritanceType::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\InheritanceType::class); diff --git a/src/Mapping/Attribute/Lock.php b/src/Mapping/Attribute/Lock.php index 1302353c6d..694493b7d4 100644 --- a/src/Mapping/Attribute/Lock.php +++ b/src/Mapping/Attribute/Lock.php @@ -6,18 +6,12 @@ use Attribute; -use function class_alias; - /** * Specifies a field to use for pessimistic locking * - * @Annotation * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Lock implements Annotation +class Lock implements MappingAttribute { } - -// @phpstan-ignore class.notFound -class_alias(Lock::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Lock::class); diff --git a/src/Mapping/Attribute/MappedSuperclass.php b/src/Mapping/Attribute/MappedSuperclass.php index e558be68ef..34028382dd 100644 --- a/src/Mapping/Attribute/MappedSuperclass.php +++ b/src/Mapping/Attribute/MappedSuperclass.php @@ -5,20 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specifies a parent class that other documents may extend to inherit mapping * information * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class MappedSuperclass extends AbstractDocument +class MappedSuperclass extends AbstractDocument implements MappingAttribute { /** @var string|null */ public $repositoryClass; @@ -32,6 +27,3 @@ public function __construct(?string $repositoryClass = null, ?string $collection $this->collection = $collection; } } - -// @phpstan-ignore class.notFound -class_alias(MappedSuperclass::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\MappedSuperclass::class); diff --git a/src/Mapping/Attribute/MappingAttribute.php b/src/Mapping/Attribute/MappingAttribute.php new file mode 100644 index 0000000000..13bc8e8bae --- /dev/null +++ b/src/Mapping/Attribute/MappingAttribute.php @@ -0,0 +1,14 @@ +tags = $tags; } } - -// @phpstan-ignore class.notFound -class_alias(ReadPreference::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ReadPreference::class); diff --git a/src/Mapping/Attribute/ReferenceMany.php b/src/Mapping/Attribute/ReferenceMany.php index 4177fde150..d784b90538 100644 --- a/src/Mapping/Attribute/ReferenceMany.php +++ b/src/Mapping/Attribute/ReferenceMany.php @@ -5,21 +5,16 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Utility\CollectionHelper; -use function class_alias; - /** * Specifies a one-to-many relationship to a different document * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class ReferenceMany extends AbstractField +class ReferenceMany extends AbstractField implements MappingAttribute { /** @var bool */ public $reference = true; @@ -123,6 +118,3 @@ public function __construct( $this->storeEmptyArray = $storeEmptyArray; } } - -// @phpstan-ignore class.notFound -class_alias(ReferenceMany::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany::class); diff --git a/src/Mapping/Attribute/ReferenceOne.php b/src/Mapping/Attribute/ReferenceOne.php index ecb2d5f47a..c2598f453a 100644 --- a/src/Mapping/Attribute/ReferenceOne.php +++ b/src/Mapping/Attribute/ReferenceOne.php @@ -5,19 +5,13 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_alias; - /** * Specifies a one-to-one relationship to a different document - * - * @Annotation - * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -class ReferenceOne extends AbstractField +class ReferenceOne extends AbstractField implements MappingAttribute { /** @var bool */ public $reference = true; @@ -106,6 +100,3 @@ public function __construct( $this->skip = $skip; } } - -// @phpstan-ignore class.notFound -class_alias(ReferenceOne::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne::class); diff --git a/src/Mapping/Attribute/SearchIndex.php b/src/Mapping/Attribute/SearchIndex.php index ce0c2689eb..11f2a9047b 100644 --- a/src/Mapping/Attribute/SearchIndex.php +++ b/src/Mapping/Attribute/SearchIndex.php @@ -5,23 +5,18 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_alias; - /** * Defines a search index on a class. * * @see https://www.mongodb.com/docs/atlas/atlas-search/index-definitions/ * - * @Annotation - * @NamedArgumentConstructor * @phpstan-import-type SearchIndexStoredSource from ClassMetadata * @phpstan-import-type SearchIndexSynonym from ClassMetadata */ #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] -class SearchIndex implements Annotation +class SearchIndex implements MappingAttribute { /** * @param array|null $fields @@ -41,6 +36,3 @@ public function __construct( ) { } } - -// @phpstan-ignore class.notFound -class_alias(SearchIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\SearchIndex::class); diff --git a/src/Mapping/Attribute/ShardKey.php b/src/Mapping/Attribute/ShardKey.php index e4467e728f..649b2d8041 100644 --- a/src/Mapping/Attribute/ShardKey.php +++ b/src/Mapping/Attribute/ShardKey.php @@ -5,17 +5,10 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_CLASS)] -class ShardKey implements Annotation +class ShardKey implements MappingAttribute { /** @var string[] */ public $keys; @@ -34,6 +27,3 @@ public function __construct(array $keys = [], ?bool $unique = null, ?int $numIni $this->numInitialChunks = $numInitialChunks; } } - -// @phpstan-ignore class.notFound -class_alias(ShardKey::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\ShardKey::class); diff --git a/src/Mapping/Attribute/TimeSeries.php b/src/Mapping/Attribute/TimeSeries.php index 2bad64a2aa..4ecd1f7bf2 100644 --- a/src/Mapping/Attribute/TimeSeries.php +++ b/src/Mapping/Attribute/TimeSeries.php @@ -5,20 +5,15 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\TimeSeries\Granularity; -use function class_alias; - /** * Marks a document or superclass as a time series document * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class TimeSeries implements Annotation +class TimeSeries implements MappingAttribute { public function __construct( public readonly string $timeField, @@ -30,6 +25,3 @@ public function __construct( ) { } } - -// @phpstan-ignore class.notFound -class_alias(TimeSeries::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\TimeSeries::class); diff --git a/src/Mapping/Attribute/UniqueIndex.php b/src/Mapping/Attribute/UniqueIndex.php index 1d3705edc7..7d2f828661 100644 --- a/src/Mapping/Attribute/UniqueIndex.php +++ b/src/Mapping/Attribute/UniqueIndex.php @@ -5,19 +5,14 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; - -use function class_alias; /** * Specifies a unique index on a field * - * @Annotation - * @NamedArgumentConstructor * @final */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -class UniqueIndex extends AbstractIndex +class UniqueIndex extends AbstractIndex implements MappingAttribute { public function __construct( array $keys = [], @@ -42,6 +37,3 @@ public function __construct( ); } } - -// @phpstan-ignore class.notFound -class_alias(UniqueIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\UniqueIndex::class); diff --git a/src/Mapping/Attribute/Validation.php b/src/Mapping/Attribute/Validation.php index 22a7e5aa8e..19e965070f 100644 --- a/src/Mapping/Attribute/Validation.php +++ b/src/Mapping/Attribute/Validation.php @@ -5,18 +5,11 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @Target({"CLASS"}) - */ +/** @Target({"CLASS"}) */ #[Attribute(Attribute::TARGET_CLASS)] -class Validation implements Annotation +class Validation implements MappingAttribute { /** @var string|null */ public $validator; @@ -47,6 +40,3 @@ public function __construct(?string $validator = null, ?string $action = null, ? $this->level = $level; } } - -// @phpstan-ignore class.notFound -class_alias(Validation::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Validation::class); diff --git a/src/Mapping/Attribute/VectorSearchIndex.php b/src/Mapping/Attribute/VectorSearchIndex.php index 97a64a4c15..241a78da99 100644 --- a/src/Mapping/Attribute/VectorSearchIndex.php +++ b/src/Mapping/Attribute/VectorSearchIndex.php @@ -5,22 +5,17 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; -use function class_alias; - /** * Defines a vector search index on a class. * * @see https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-type/ * - * @Annotation - * @NamedArgumentConstructor * @phpstan-import-type VectorSearchIndexField from ClassMetadata */ #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] -class VectorSearchIndex implements Annotation +class VectorSearchIndex implements MappingAttribute { /** @param list $fields */ public function __construct( @@ -29,6 +24,3 @@ public function __construct( ) { } } - -// @phpstan-ignore class.notFound -class_alias(VectorSearchIndex::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\VectorSearchIndex::class); diff --git a/src/Mapping/Attribute/Version.php b/src/Mapping/Attribute/Version.php index 96b4bdeca1..295a25b615 100644 --- a/src/Mapping/Attribute/Version.php +++ b/src/Mapping/Attribute/Version.php @@ -6,18 +6,12 @@ use Attribute; -use function class_alias; - /** * Specifies a field to use for optimistic locking * - * @Annotation * @final */ #[Attribute(Attribute::TARGET_PROPERTY)] -class Version implements Annotation +class Version implements MappingAttribute { } - -// @phpstan-ignore class.notFound -class_alias(Version::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\Version::class); diff --git a/src/Mapping/Attribute/View.php b/src/Mapping/Attribute/View.php index 829283f0ab..6015c79a12 100644 --- a/src/Mapping/Attribute/View.php +++ b/src/Mapping/Attribute/View.php @@ -5,17 +5,10 @@ namespace Doctrine\ODM\MongoDB\Mapping\Attribute; use Attribute; -use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; -use function class_alias; - -/** - * @Annotation - * @NamedArgumentConstructor - * @final - */ +/** @final */ #[Attribute(Attribute::TARGET_CLASS)] -class View extends AbstractDocument +class View extends AbstractDocument implements MappingAttribute { /** @var string|null */ public $db; @@ -41,6 +34,3 @@ public function __construct( $this->repositoryClass = $repositoryClass; } } - -// @phpstan-ignore class.notFound -class_alias(View::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\View::class); diff --git a/src/Mapping/ClassMetadata.php b/src/Mapping/ClassMetadata.php index c3c3fd7b92..658e0d33e3 100644 --- a/src/Mapping/ClassMetadata.php +++ b/src/Mapping/ClassMetadata.php @@ -13,7 +13,6 @@ use Doctrine\Instantiator\InstantiatorInterface; use Doctrine\ODM\MongoDB\Id\IdGenerator; use Doctrine\ODM\MongoDB\LockException; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\EnumPropertyAccessor; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\PropertyAccessor; diff --git a/src/Mapping/Driver/AttributeDriver.php b/src/Mapping/Driver/AttributeDriver.php index 9f36d4397f..1f4697535a 100644 --- a/src/Mapping/Driver/AttributeDriver.php +++ b/src/Mapping/Driver/AttributeDriver.php @@ -6,10 +6,8 @@ use Doctrine\Common\Annotations\Reader; use Doctrine\ODM\MongoDB\Events; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Indexes; use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; -use Doctrine\ODM\MongoDB\Mapping\Attribute\AbstractIndex; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey; -use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\Persistence\Mapping\ClassMetadata as PersistenceClassMetadata; @@ -22,6 +20,8 @@ use ReflectionMethod; use ReflectionProperty; +use function array_any; +use function array_find; use function array_merge; use function array_replace; use function assert; @@ -88,8 +88,6 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad $documentAttribute = null; foreach ($classAttributes as $attribute) { - $classAttributes[$attribute::class] = $attribute; - if ($attribute instanceof ODM\AbstractDocument) { if ($documentAttribute !== null) { throw MappingException::classCanOnlyBeMappedByOneAbstractDocument($className, $documentAttribute, $attribute); @@ -111,7 +109,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad $this->addVectorSearchIndex($metadata, $attribute); } - if ($attribute instanceof ODM\Indexes) { + if ($attribute instanceof Indexes) { trigger_deprecation( 'doctrine/mongodb-odm', '2.2', @@ -255,7 +253,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad $indexes[] = $propertyAttribute; } - if ($propertyAttribute instanceof ODM\Indexes) { + if ($propertyAttribute instanceof Indexes) { trigger_deprecation( 'doctrine/mongodb-odm', '2.2', @@ -296,17 +294,18 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad } // Set shard key after all fields to ensure we mapped all its keys - if (isset($classAttributes[ShardKey::class])) { - assert($classAttributes[ShardKey::class] instanceof ShardKey); - $this->setShardKey($metadata, $classAttributes[ShardKey::class]); + $attribute = array_find($classAttributes, static fn ($attr) => $attr instanceof ODM\ShardKey); + if ($attribute) { + $this->setShardKey($metadata, $attribute); } // Mark as time series only after mapping all fields - if (isset($classAttributes[TimeSeries::class])) { - assert($classAttributes[TimeSeries::class] instanceof TimeSeries); - $metadata->markAsTimeSeries($classAttributes[TimeSeries::class]); + $attribute = array_find($classAttributes, static fn ($attr) => $attr instanceof ODM\TimeSeries); + if ($attribute) { + $metadata->markAsTimeSeries($attribute); } + $hasLifecycleCallbacks = array_any($classAttributes, static fn ($attr) => $attr instanceof ODM\HasLifecycleCallbacks); foreach ($reflClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) { /* Filter for the declaring class only. Callbacks from parent * classes will already be registered. @@ -320,7 +319,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad $metadata->registerAlsoLoadMethod($method->getName(), $methodAttribute->value); } - if (! isset($classAttributes[ODM\HasLifecycleCallbacks::class])) { + if (! $hasLifecycleCallbacks) { continue; } @@ -348,7 +347,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad } /** @param array $keys */ - private function addIndex(ClassMetadata $class, AbstractIndex $index, array $keys = []): void + private function addIndex(ClassMetadata $class, ODM\AbstractIndex $index, array $keys = []): void { $keys = array_merge($keys, $index->keys); $options = []; diff --git a/src/Mapping/Driver/AttributeReader.php b/src/Mapping/Driver/AttributeReader.php index 04904b5f5e..bd4c3251b7 100644 --- a/src/Mapping/Driver/AttributeReader.php +++ b/src/Mapping/Driver/AttributeReader.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Driver; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappingAttribute; use ReflectionAttribute; use ReflectionClass; use ReflectionMethod; @@ -16,19 +16,19 @@ /** @internal */ final class AttributeReader { - /** @return array */ + /** @return MappingAttribute[] */ public function getClassAttributes(ReflectionClass $class): array { return $this->convertToAttributeInstances($class->getAttributes()); } - /** @return array */ + /** @return MappingAttribute[] */ public function getMethodAttributes(ReflectionMethod $method): array { return $this->convertToAttributeInstances($method->getAttributes()); } - /** @return array */ + /** @return MappingAttribute[] */ public function getPropertyAttributes(ReflectionProperty $property): array { return $this->convertToAttributeInstances($property->getAttributes()); @@ -37,7 +37,7 @@ public function getPropertyAttributes(ReflectionProperty $property): array /** * @param ReflectionAttribute[] $attributes * - * @return Annotation[] + * @return MappingAttribute[] */ private function convertToAttributeInstances(array $attributes): array { @@ -45,13 +45,13 @@ private function convertToAttributeInstances(array $attributes): array foreach ($attributes as $attribute) { $attributeName = $attribute->getName(); - // Make sure we only get Doctrine Annotations - if (! is_subclass_of($attributeName, Annotation::class)) { + // Make sure we only get MongoDB ODM attribute classes + if (! is_subclass_of($attributeName, MappingAttribute::class)) { continue; } $instance = $attribute->newInstance(); - assert($instance instanceof Annotation); + assert($instance instanceof MappingAttribute); $instances[] = $instance; } diff --git a/src/Mapping/Driver/XmlDriver.php b/src/Mapping/Driver/XmlDriver.php index 1e7f5cacc8..e0a839c5e2 100644 --- a/src/Mapping/Driver/XmlDriver.php +++ b/src/Mapping/Driver/XmlDriver.php @@ -4,9 +4,9 @@ namespace Doctrine\ODM\MongoDB\Mapping\Driver; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Mapping\TimeSeries\Granularity; use Doctrine\ODM\MongoDB\Utility\CollectionHelper; diff --git a/src/Mapping/Attribute/EncryptQuery.php b/src/Mapping/EncryptQuery.php similarity index 57% rename from src/Mapping/Attribute/EncryptQuery.php rename to src/Mapping/EncryptQuery.php index fc5e329ddf..db9a6767e7 100644 --- a/src/Mapping/Attribute/EncryptQuery.php +++ b/src/Mapping/EncryptQuery.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\ODM\MongoDB\Mapping\Attribute; +namespace Doctrine\ODM\MongoDB\Mapping; use MongoDB\Driver\ClientEncryption; @@ -14,5 +14,5 @@ enum EncryptQuery: string case Range = ClientEncryption::QUERY_TYPE_RANGE; } -// @phpstan-ignore class.notFound -class_alias(EncryptQuery::class, \Doctrine\ODM\MongoDB\Mapping\Annotations\EncryptQuery::class); +// @phpstan-ignore-next-line class.notFound +class_alias(EncryptQuery::class, Annotations\EncryptQuery::class); diff --git a/tests/Documentation/BlendingOrm/Product.php b/tests/Documentation/BlendingOrm/Product.php index 8b81b7590b..1e82fe70f6 100644 --- a/tests/Documentation/BlendingOrm/Product.php +++ b/tests/Documentation/BlendingOrm/Product.php @@ -4,9 +4,9 @@ namespace Documentation\BlendingOrm; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] class Product diff --git a/tests/Documentation/CustomMapping/Thing.php b/tests/Documentation/CustomMapping/Thing.php index 230a2bf9aa..982ac0396e 100644 --- a/tests/Documentation/CustomMapping/Thing.php +++ b/tests/Documentation/CustomMapping/Thing.php @@ -5,9 +5,9 @@ namespace Documentation\CustomMapping; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] class Thing diff --git a/tests/Documentation/Introduction/Address.php b/tests/Documentation/Introduction/Address.php index e583fb6990..99573d3b09 100644 --- a/tests/Documentation/Introduction/Address.php +++ b/tests/Documentation/Introduction/Address.php @@ -4,7 +4,7 @@ namespace Documentation\Introduction; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Address diff --git a/tests/Documentation/Introduction/BaseEmployee.php b/tests/Documentation/Introduction/BaseEmployee.php index 22dd19136a..e9b5b3a350 100644 --- a/tests/Documentation/Introduction/BaseEmployee.php +++ b/tests/Documentation/Introduction/BaseEmployee.php @@ -5,7 +5,7 @@ namespace Documentation\Introduction; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\MappedSuperclass] abstract class BaseEmployee diff --git a/tests/Documentation/Introduction/Employee.php b/tests/Documentation/Introduction/Employee.php index 1e3b8ef5bb..23ed65b98a 100644 --- a/tests/Documentation/Introduction/Employee.php +++ b/tests/Documentation/Introduction/Employee.php @@ -4,7 +4,7 @@ namespace Documentation\Introduction; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Employee extends BaseEmployee diff --git a/tests/Documentation/Introduction/Manager.php b/tests/Documentation/Introduction/Manager.php index 211affe1cf..e6ec3c9cd4 100644 --- a/tests/Documentation/Introduction/Manager.php +++ b/tests/Documentation/Introduction/Manager.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Manager extends BaseEmployee diff --git a/tests/Documentation/Introduction/Project.php b/tests/Documentation/Introduction/Project.php index 077222d926..c8f587c64b 100644 --- a/tests/Documentation/Introduction/Project.php +++ b/tests/Documentation/Introduction/Project.php @@ -4,7 +4,7 @@ namespace Documentation\Introduction; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Project diff --git a/tests/Documentation/LookupRelations/Item.php b/tests/Documentation/LookupRelations/Item.php index e855a3d39a..a08706d13f 100644 --- a/tests/Documentation/LookupRelations/Item.php +++ b/tests/Documentation/LookupRelations/Item.php @@ -4,9 +4,9 @@ namespace Documentation\LookupRelations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] class Item diff --git a/tests/Documentation/LookupRelations/Order.php b/tests/Documentation/LookupRelations/Order.php index 0034d21fbb..d256677b05 100644 --- a/tests/Documentation/LookupRelations/Order.php +++ b/tests/Documentation/LookupRelations/Order.php @@ -7,11 +7,11 @@ use DateTimeImmutable; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany; +use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; #[Document] class Order diff --git a/tests/Documentation/LookupRelations/OrderResult.php b/tests/Documentation/LookupRelations/OrderResult.php index 8851906cca..174c99521c 100644 --- a/tests/Documentation/LookupRelations/OrderResult.php +++ b/tests/Documentation/LookupRelations/OrderResult.php @@ -6,11 +6,11 @@ use DateTimeImmutable; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument; +use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\QueryResultDocument; #[QueryResultDocument] class OrderResult diff --git a/tests/Documentation/LookupRelations/User.php b/tests/Documentation/LookupRelations/User.php index fcc2755121..f84d960ad3 100644 --- a/tests/Documentation/LookupRelations/User.php +++ b/tests/Documentation/LookupRelations/User.php @@ -4,9 +4,9 @@ namespace Documentation\LookupRelations; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] class User diff --git a/tests/Documentation/LookupRelations/UserOrderResult.php b/tests/Documentation/LookupRelations/UserOrderResult.php index efddf8868a..b46fd6bec6 100644 --- a/tests/Documentation/LookupRelations/UserOrderResult.php +++ b/tests/Documentation/LookupRelations/UserOrderResult.php @@ -6,10 +6,10 @@ use DateTimeImmutable; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument; +use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\QueryResultDocument; #[QueryResultDocument] class UserOrderResult diff --git a/tests/Documentation/LookupRelations/UserResult.php b/tests/Documentation/LookupRelations/UserResult.php index bc31da75e8..312a7ed1e6 100644 --- a/tests/Documentation/LookupRelations/UserResult.php +++ b/tests/Documentation/LookupRelations/UserResult.php @@ -5,10 +5,10 @@ namespace Documentation\LookupRelations; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] class UserResult diff --git a/tests/Documentation/MappingOrmAndOdm/BlogPost.php b/tests/Documentation/MappingOrmAndOdm/BlogPost.php index 292efc5356..67d00ecff0 100644 --- a/tests/Documentation/MappingOrmAndOdm/BlogPost.php +++ b/tests/Documentation/MappingOrmAndOdm/BlogPost.php @@ -4,7 +4,7 @@ namespace Documentation\MappingOrmAndOdm; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ORM\Mapping as ORM; #[ORM\Entity(repositoryClass: OrmBlogPostRepository::class)] diff --git a/tests/Documentation/ResolveTargetDocument/Customer.php b/tests/Documentation/ResolveTargetDocument/Customer.php index 86075920ee..3d41a168a1 100644 --- a/tests/Documentation/ResolveTargetDocument/Customer.php +++ b/tests/Documentation/ResolveTargetDocument/Customer.php @@ -4,7 +4,7 @@ namespace Documentation\ResolveTargetDocument; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; use Documentation\ResolveTargetDocument\CustomerModule\Customer as BaseCustomer; use Documentation\ResolveTargetDocument\InvoiceModule\InvoiceSubjectInterface; diff --git a/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php b/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php index 1d73b38f82..e2d8f64d38 100644 --- a/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php +++ b/tests/Documentation/ResolveTargetDocument/CustomerModule/Customer.php @@ -4,9 +4,9 @@ namespace Documentation\ResolveTargetDocument\CustomerModule; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] abstract class Customer diff --git a/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php b/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php index c45808b113..810f18fc72 100644 --- a/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php +++ b/tests/Documentation/ResolveTargetDocument/InvoiceModule/Invoice.php @@ -4,9 +4,9 @@ namespace Documentation\ResolveTargetDocument\InvoiceModule; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; #[Document] class Invoice diff --git a/tests/Documentation/Validation/Customer.php b/tests/Documentation/Validation/Customer.php index 29aa15f951..83a2335838 100644 --- a/tests/Documentation/Validation/Customer.php +++ b/tests/Documentation/Validation/Customer.php @@ -4,9 +4,9 @@ namespace Documentation\Validation; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document] class Customer diff --git a/tests/Documentation/Validation/Order.php b/tests/Documentation/Validation/Order.php index db3644f69a..2defa3e115 100644 --- a/tests/Documentation/Validation/Order.php +++ b/tests/Documentation/Validation/Order.php @@ -6,12 +6,12 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany; -use Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany; +use Doctrine\ODM\MongoDB\Mapping\Annotations\HasLifecycleCallbacks; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\PreFlush; +use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; #[Document] #[HasLifecycleCallbacks] diff --git a/tests/Documentation/Validation/OrderLine.php b/tests/Documentation/Validation/OrderLine.php index 4f9fbcb1ec..c554d81669 100644 --- a/tests/Documentation/Validation/OrderLine.php +++ b/tests/Documentation/Validation/OrderLine.php @@ -4,9 +4,9 @@ namespace Documentation\Validation; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[EmbeddedDocument] class OrderLine diff --git a/tests/Documentation/Validation/SchemaValidated.php b/tests/Documentation/Validation/SchemaValidated.php index e2c6a18165..0640f91da5 100644 --- a/tests/Documentation/Validation/SchemaValidated.php +++ b/tests/Documentation/Validation/SchemaValidated.php @@ -4,7 +4,7 @@ namespace Documentation\Validation; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; #[ODM\Document] diff --git a/tests/Documents/Account.php b/tests/Documents/Account.php index 0156fece35..2d47b78fb4 100644 --- a/tests/Documents/Account.php +++ b/tests/Documents/Account.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Account diff --git a/tests/Documents/Address.php b/tests/Documents/Address.php index 516d063da6..c3b46c8144 100644 --- a/tests/Documents/Address.php +++ b/tests/Documents/Address.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Address diff --git a/tests/Documents/Agent.php b/tests/Documents/Agent.php index 9b3e386381..7dc8fb452a 100644 --- a/tests/Documents/Agent.php +++ b/tests/Documents/Agent.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'agents')] class Agent diff --git a/tests/Documents/Album.php b/tests/Documents/Album.php index 4264151f83..76495a6df1 100644 --- a/tests/Documents/Album.php +++ b/tests/Documents/Album.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'albums')] class Album diff --git a/tests/Documents/Article.php b/tests/Documents/Article.php index d03957f04f..4560751234 100644 --- a/tests/Documents/Article.php +++ b/tests/Documents/Article.php @@ -5,7 +5,7 @@ namespace Documents; use DateTimeInterface; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use MongoDB\BSON\UTCDateTime; use function array_search; diff --git a/tests/Documents/Bars/Bar.php b/tests/Documents/Bars/Bar.php index b6f92c371b..68240e9e13 100644 --- a/tests/Documents/Bars/Bar.php +++ b/tests/Documents/Bars/Bar.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'bars')] class Bar diff --git a/tests/Documents/Bars/Location.php b/tests/Documents/Bars/Location.php index ccd30d45f1..aecf83278b 100644 --- a/tests/Documents/Bars/Location.php +++ b/tests/Documents/Bars/Location.php @@ -4,7 +4,7 @@ namespace Documents\Bars; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Location diff --git a/tests/Documents/BaseCategory.php b/tests/Documents/BaseCategory.php index 0ff70727a7..c7706c3179 100644 --- a/tests/Documents/BaseCategory.php +++ b/tests/Documents/BaseCategory.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\MappedSuperclass(repositoryClass: 'Documents\BaseCategoryRepository')] abstract class BaseCategory diff --git a/tests/Documents/BaseDocument.php b/tests/Documents/BaseDocument.php index 3c71c409ae..0f9d335bf8 100644 --- a/tests/Documents/BaseDocument.php +++ b/tests/Documents/BaseDocument.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\MappedSuperclass] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/BaseEmployee.php b/tests/Documents/BaseEmployee.php index 9d471de54d..7fdab418eb 100644 --- a/tests/Documents/BaseEmployee.php +++ b/tests/Documents/BaseEmployee.php @@ -5,7 +5,7 @@ namespace Documents; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\MappedSuperclass] abstract class BaseEmployee diff --git a/tests/Documents/BlogPost.php b/tests/Documents/BlogPost.php index 450868dd5e..77fa3655c1 100644 --- a/tests/Documents/BlogPost.php +++ b/tests/Documents/BlogPost.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class BlogPost diff --git a/tests/Documents/BlogTagAggregation.php b/tests/Documents/BlogTagAggregation.php index e8b252f31b..250f438c6e 100644 --- a/tests/Documents/BlogTagAggregation.php +++ b/tests/Documents/BlogTagAggregation.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\QueryResultDocument] class BlogTagAggregation diff --git a/tests/Documents/Book.php b/tests/Documents/Book.php index 5f6c2ff223..5b30d2ddcc 100644 --- a/tests/Documents/Book.php +++ b/tests/Documents/Book.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Book diff --git a/tests/Documents/BrowseNode.php b/tests/Documents/BrowseNode.php index 2d99ac1330..c2a4bf0eb9 100644 --- a/tests/Documents/BrowseNode.php +++ b/tests/Documents/BrowseNode.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class BrowseNode diff --git a/tests/Documents/Card.php b/tests/Documents/Card.php index 0e06ad3bd9..6589303aaf 100644 --- a/tests/Documents/Card.php +++ b/tests/Documents/Card.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Documents/Cart.php b/tests/Documents/Cart.php index 8787970767..3b72a9efb6 100644 --- a/tests/Documents/Cart.php +++ b/tests/Documents/Cart.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Cart diff --git a/tests/Documents/Category.php b/tests/Documents/Category.php index 8cc45500f4..cac07afaa0 100644 --- a/tests/Documents/Category.php +++ b/tests/Documents/Category.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Category extends BaseCategory diff --git a/tests/Documents/Chapter.php b/tests/Documents/Chapter.php index 373437a065..05b59eefaf 100644 --- a/tests/Documents/Chapter.php +++ b/tests/Documents/Chapter.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/CmsAddress.php b/tests/Documents/CmsAddress.php index 654a4821f2..f695d4d6bc 100644 --- a/tests/Documents/CmsAddress.php +++ b/tests/Documents/CmsAddress.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Index(keys: ['country' => 'asc', 'zip' => 'asc', 'city' => 'asc'])] #[ODM\SearchIndex(dynamic: true)] diff --git a/tests/Documents/CmsArticle.php b/tests/Documents/CmsArticle.php index 8df826f407..cd059c9543 100644 --- a/tests/Documents/CmsArticle.php +++ b/tests/Documents/CmsArticle.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Index(keys: ['topic' => 'asc'])] #[ODM\SearchIndex( diff --git a/tests/Documents/CmsComment.php b/tests/Documents/CmsComment.php index b97ff20600..1c96292047 100644 --- a/tests/Documents/CmsComment.php +++ b/tests/Documents/CmsComment.php @@ -4,8 +4,8 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Index; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Index; #[Index(keys: ['topic' => 'asc'])] #[ODM\Document] diff --git a/tests/Documents/CmsContent.php b/tests/Documents/CmsContent.php index 985d1f5a9b..a6e129a0ff 100644 --- a/tests/Documents/CmsContent.php +++ b/tests/Documents/CmsContent.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\MappedSuperclass] abstract class CmsContent extends CmsPage diff --git a/tests/Documents/CmsGroup.php b/tests/Documents/CmsGroup.php index 875cd499f4..a875465460 100644 --- a/tests/Documents/CmsGroup.php +++ b/tests/Documents/CmsGroup.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class CmsGroup diff --git a/tests/Documents/CmsPage.php b/tests/Documents/CmsPage.php index f7e28bd4dd..ff74dba687 100644 --- a/tests/Documents/CmsPage.php +++ b/tests/Documents/CmsPage.php @@ -4,8 +4,8 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Index; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Index; #[Index(keys: ['slug' => 'asc'], options: ['unique' => 'true'])] #[ODM\MappedSuperclass] diff --git a/tests/Documents/CmsPhonenumber.php b/tests/Documents/CmsPhonenumber.php index 3ea225fbca..232b864719 100644 --- a/tests/Documents/CmsPhonenumber.php +++ b/tests/Documents/CmsPhonenumber.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class CmsPhonenumber diff --git a/tests/Documents/CmsProduct.php b/tests/Documents/CmsProduct.php index 6bf5c0709d..2989ac2ad2 100644 --- a/tests/Documents/CmsProduct.php +++ b/tests/Documents/CmsProduct.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class CmsProduct extends CmsContent diff --git a/tests/Documents/CmsUser.php b/tests/Documents/CmsUser.php index 3edd4de285..17a8a38f4a 100644 --- a/tests/Documents/CmsUser.php +++ b/tests/Documents/CmsUser.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Documents/Comment.php b/tests/Documents/Comment.php index 32a28d92ac..5d3c07e0a9 100644 --- a/tests/Documents/Comment.php +++ b/tests/Documents/Comment.php @@ -5,7 +5,7 @@ namespace Documents; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(repositoryClass: CommentRepository::class)] class Comment diff --git a/tests/Documents/CustomRepository/Document.php b/tests/Documents/CustomRepository/Document.php index 94a414a019..4376668cbb 100644 --- a/tests/Documents/CustomRepository/Document.php +++ b/tests/Documents/CustomRepository/Document.php @@ -4,7 +4,7 @@ namespace Documents\CustomRepository; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(repositoryClass: 'Documents\CustomRepository\Repository')] class Document diff --git a/tests/Documents/CustomUser.php b/tests/Documents/CustomUser.php index b6a0cf3320..b1f08c8dae 100644 --- a/tests/Documents/CustomUser.php +++ b/tests/Documents/CustomUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'custom_users')] class CustomUser diff --git a/tests/Documents/Customer.php b/tests/Documents/Customer.php index caa965864e..f7fc8e22cd 100644 --- a/tests/Documents/Customer.php +++ b/tests/Documents/Customer.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Customer diff --git a/tests/Documents/Developer.php b/tests/Documents/Developer.php index 7764eb6e3b..4215f50889 100644 --- a/tests/Documents/Developer.php +++ b/tests/Documents/Developer.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Developer diff --git a/tests/Documents/DocumentWithUnmappedProperties.php b/tests/Documents/DocumentWithUnmappedProperties.php index 42135ee0c0..e338fc5117 100644 --- a/tests/Documents/DocumentWithUnmappedProperties.php +++ b/tests/Documents/DocumentWithUnmappedProperties.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class DocumentWithUnmappedProperties diff --git a/tests/Documents/Ecommerce/Basket.php b/tests/Documents/Ecommerce/Basket.php index 1a0536163e..b521d77284 100644 --- a/tests/Documents/Ecommerce/Basket.php +++ b/tests/Documents/Ecommerce/Basket.php @@ -5,7 +5,7 @@ namespace Documents\Ecommerce; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Basket diff --git a/tests/Documents/Ecommerce/ConfigurableProduct.php b/tests/Documents/Ecommerce/ConfigurableProduct.php index f4f5179bc1..68b4e1f010 100644 --- a/tests/Documents/Ecommerce/ConfigurableProduct.php +++ b/tests/Documents/Ecommerce/ConfigurableProduct.php @@ -5,7 +5,7 @@ namespace Documents\Ecommerce; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use InvalidArgumentException; use function array_map; diff --git a/tests/Documents/Ecommerce/Currency.php b/tests/Documents/Ecommerce/Currency.php index 1c5c720f8a..e87c07da7b 100644 --- a/tests/Documents/Ecommerce/Currency.php +++ b/tests/Documents/Ecommerce/Currency.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use InvalidArgumentException; use function implode; diff --git a/tests/Documents/Ecommerce/Money.php b/tests/Documents/Ecommerce/Money.php index 346819994d..d5c4463edb 100644 --- a/tests/Documents/Ecommerce/Money.php +++ b/tests/Documents/Ecommerce/Money.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use InvalidArgumentException; #[ODM\EmbeddedDocument] diff --git a/tests/Documents/Ecommerce/Option.php b/tests/Documents/Ecommerce/Option.php index 011db878be..02dbc20a95 100644 --- a/tests/Documents/Ecommerce/Option.php +++ b/tests/Documents/Ecommerce/Option.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use InvalidArgumentException; #[ODM\EmbeddedDocument] diff --git a/tests/Documents/Ecommerce/Order.php b/tests/Documents/Ecommerce/Order.php index d132eb24df..ca26f47946 100644 --- a/tests/Documents/Ecommerce/Order.php +++ b/tests/Documents/Ecommerce/Order.php @@ -5,7 +5,7 @@ namespace Documents\Ecommerce; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Order diff --git a/tests/Documents/Ecommerce/StockItem.php b/tests/Documents/Ecommerce/StockItem.php index f76d080dbf..bfe0bbfb24 100644 --- a/tests/Documents/Ecommerce/StockItem.php +++ b/tests/Documents/Ecommerce/StockItem.php @@ -4,7 +4,7 @@ namespace Documents\Ecommerce; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class StockItem diff --git a/tests/Documents/Employee.php b/tests/Documents/Employee.php index ace28af0ca..a6ca9b4167 100644 --- a/tests/Documents/Employee.php +++ b/tests/Documents/Employee.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Employee extends BaseEmployee diff --git a/tests/Documents/Encryption/Client.php b/tests/Documents/Encryption/Client.php index 0d29a8fa55..8c1be9eff9 100644 --- a/tests/Documents/Encryption/Client.php +++ b/tests/Documents/Encryption/Client.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'client')] class Client diff --git a/tests/Documents/Encryption/ClientCard.php b/tests/Documents/Encryption/ClientCard.php index e29306335c..6d993818db 100644 --- a/tests/Documents/Encryption/ClientCard.php +++ b/tests/Documents/Encryption/ClientCard.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] #[ODM\Encrypt] diff --git a/tests/Documents/Encryption/InvalidRootEncrypt.php b/tests/Documents/Encryption/InvalidRootEncrypt.php index e50de621e9..a2f5b6669c 100644 --- a/tests/Documents/Encryption/InvalidRootEncrypt.php +++ b/tests/Documents/Encryption/InvalidRootEncrypt.php @@ -4,9 +4,9 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt; /** Root document cannot be encrypted. */ #[Document] diff --git a/tests/Documents/Encryption/Patient.php b/tests/Documents/Encryption/Patient.php index 9519cd7e74..42872e188b 100644 --- a/tests/Documents/Encryption/Patient.php +++ b/tests/Documents/Encryption/Patient.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'patients')] class Patient diff --git a/tests/Documents/Encryption/PatientBilling.php b/tests/Documents/Encryption/PatientBilling.php index 87da4f7e83..9b9c117da4 100644 --- a/tests/Documents/Encryption/PatientBilling.php +++ b/tests/Documents/Encryption/PatientBilling.php @@ -4,7 +4,7 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class PatientBilling diff --git a/tests/Documents/Encryption/PatientRecord.php b/tests/Documents/Encryption/PatientRecord.php index 7df54e6ac8..4244605476 100644 --- a/tests/Documents/Encryption/PatientRecord.php +++ b/tests/Documents/Encryption/PatientRecord.php @@ -4,7 +4,8 @@ namespace Documents\Encryption; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; #[ODM\EmbeddedDocument] class PatientRecord @@ -14,13 +15,13 @@ class PatientRecord public function __construct( #[ODM\Field] - #[ODM\Encrypt(queryType: ODM\EncryptQuery::Equality)] + #[ODM\Encrypt(queryType: EncryptQuery::Equality)] public string $ssn, #[ODM\EmbedOne(targetDocument: PatientBilling::class)] #[ODM\Encrypt] public PatientBilling $billing, #[ODM\Field] - #[ODM\Encrypt(queryType: ODM\EncryptQuery::Range, sparsity: 1, trimFactor: 4, min: 100, max: 2000)] + #[ODM\Encrypt(queryType: EncryptQuery::Range, sparsity: 1, trimFactor: 4, min: 100, max: 2000)] public int $billingAmount, ) { } diff --git a/tests/Documents/Encryption/RangeTypes.php b/tests/Documents/Encryption/RangeTypes.php index 8e79d65226..a5a0bc2cdf 100644 --- a/tests/Documents/Encryption/RangeTypes.php +++ b/tests/Documents/Encryption/RangeTypes.php @@ -5,11 +5,11 @@ namespace Documents\Encryption; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Encrypt; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; use Doctrine\ODM\MongoDB\Types\Type; use MongoDB\BSON\Decimal128; diff --git a/tests/Documents/Event.php b/tests/Documents/Event.php index 612e9ae240..a8f9682a5e 100644 --- a/tests/Documents/Event.php +++ b/tests/Documents/Event.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Event diff --git a/tests/Documents/Feature.php b/tests/Documents/Feature.php index 8385f5f583..e6b291e6c1 100644 --- a/tests/Documents/Feature.php +++ b/tests/Documents/Feature.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Feature diff --git a/tests/Documents/File.php b/tests/Documents/File.php index 9afdb2c937..dd77eae1dd 100644 --- a/tests/Documents/File.php +++ b/tests/Documents/File.php @@ -6,7 +6,7 @@ use DateTime; use DateTimeInterface; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\File(chunkSizeBytes: 12345)] class File diff --git a/tests/Documents/FileMetadata.php b/tests/Documents/FileMetadata.php index 45a8079027..a1e3a67fd2 100644 --- a/tests/Documents/FileMetadata.php +++ b/tests/Documents/FileMetadata.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Documents\Functional\Embedded; #[ODM\EmbeddedDocument] diff --git a/tests/Documents/FileWithoutChunkSize.php b/tests/Documents/FileWithoutChunkSize.php index 13bbb6154d..702bc52aab 100644 --- a/tests/Documents/FileWithoutChunkSize.php +++ b/tests/Documents/FileWithoutChunkSize.php @@ -6,7 +6,7 @@ use DateTime; use DateTimeInterface; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\File] class FileWithoutChunkSize diff --git a/tests/Documents/FileWithoutMetadata.php b/tests/Documents/FileWithoutMetadata.php index 4f3dee82b0..806276b2bf 100644 --- a/tests/Documents/FileWithoutMetadata.php +++ b/tests/Documents/FileWithoutMetadata.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\File] class FileWithoutMetadata diff --git a/tests/Documents/ForumAvatar.php b/tests/Documents/ForumAvatar.php index 5d534420a0..c0187a6c6b 100644 --- a/tests/Documents/ForumAvatar.php +++ b/tests/Documents/ForumAvatar.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class ForumAvatar diff --git a/tests/Documents/ForumStar.php b/tests/Documents/ForumStar.php index 5ee8da420f..df3fb2ad43 100644 --- a/tests/Documents/ForumStar.php +++ b/tests/Documents/ForumStar.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** * Special entity that only has the $id field. diff --git a/tests/Documents/ForumUser.php b/tests/Documents/ForumUser.php index 643cdd7f4b..aee26fa559 100644 --- a/tests/Documents/ForumUser.php +++ b/tests/Documents/ForumUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use MongoDB\BSON\ObjectId; #[ODM\Document] diff --git a/tests/Documents/FriendUser.php b/tests/Documents/FriendUser.php index deecabb23a..e11647ff75 100644 --- a/tests/Documents/FriendUser.php +++ b/tests/Documents/FriendUser.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class FriendUser diff --git a/tests/Documents/Functional/EmbedNamed.php b/tests/Documents/Functional/EmbedNamed.php index f911e9f833..bae46c6a95 100644 --- a/tests/Documents/Functional/EmbedNamed.php +++ b/tests/Documents/Functional/EmbedNamed.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class EmbedNamed diff --git a/tests/Documents/Functional/Embedded.php b/tests/Documents/Functional/Embedded.php index 8bff6f06ff..d56647b894 100644 --- a/tests/Documents/Functional/Embedded.php +++ b/tests/Documents/Functional/Embedded.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Embedded diff --git a/tests/Documents/Functional/EmbeddedTestLevel0.php b/tests/Documents/Functional/EmbeddedTestLevel0.php index 2c9c2862a7..58316e5899 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel0.php +++ b/tests/Documents/Functional/EmbeddedTestLevel0.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbeddedTestLevel0 diff --git a/tests/Documents/Functional/EmbeddedTestLevel0b.php b/tests/Documents/Functional/EmbeddedTestLevel0b.php index fbcc5ed3d0..1902706316 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel0b.php +++ b/tests/Documents/Functional/EmbeddedTestLevel0b.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbeddedTestLevel0b diff --git a/tests/Documents/Functional/EmbeddedTestLevel1.php b/tests/Documents/Functional/EmbeddedTestLevel1.php index 39a2c2e783..ae160d4f15 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel1.php +++ b/tests/Documents/Functional/EmbeddedTestLevel1.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/Functional/EmbeddedTestLevel2.php b/tests/Documents/Functional/EmbeddedTestLevel2.php index 173fb6cf1e..650e67b92d 100644 --- a/tests/Documents/Functional/EmbeddedTestLevel2.php +++ b/tests/Documents/Functional/EmbeddedTestLevel2.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] #[ODM\HasLifecycleCallbacks] diff --git a/tests/Documents/Functional/EmbeddedWhichReferences.php b/tests/Documents/Functional/EmbeddedWhichReferences.php index 794b2bd789..4d197f998a 100644 --- a/tests/Documents/Functional/EmbeddedWhichReferences.php +++ b/tests/Documents/Functional/EmbeddedWhichReferences.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class EmbeddedWhichReferences diff --git a/tests/Documents/Functional/FavoritesUser.php b/tests/Documents/Functional/FavoritesUser.php index 0ef49333ad..4085f52650 100644 --- a/tests/Documents/Functional/FavoritesUser.php +++ b/tests/Documents/Functional/FavoritesUser.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Documents\Group; use Documents\Project; diff --git a/tests/Documents/Functional/NotAnnotatedDocument.php b/tests/Documents/Functional/NotAnnotatedDocument.php index 62ebd4b766..36e5556d6f 100644 --- a/tests/Documents/Functional/NotAnnotatedDocument.php +++ b/tests/Documents/Functional/NotAnnotatedDocument.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'functional_tests')] class NotAnnotatedDocument diff --git a/tests/Documents/Functional/NotSaved.php b/tests/Documents/Functional/NotSaved.php index dae8b95046..e271bd139e 100644 --- a/tests/Documents/Functional/NotSaved.php +++ b/tests/Documents/Functional/NotSaved.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'functional_tests')] class NotSaved diff --git a/tests/Documents/Functional/NotSavedEmbedded.php b/tests/Documents/Functional/NotSavedEmbedded.php index 2975e18047..e89e872e9a 100644 --- a/tests/Documents/Functional/NotSavedEmbedded.php +++ b/tests/Documents/Functional/NotSavedEmbedded.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class NotSavedEmbedded diff --git a/tests/Documents/Functional/NullFieldValues.php b/tests/Documents/Functional/NullFieldValues.php index 207069ba86..2559089b21 100644 --- a/tests/Documents/Functional/NullFieldValues.php +++ b/tests/Documents/Functional/NullFieldValues.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'functional_tests')] class NullFieldValues diff --git a/tests/Documents/Functional/PreUpdateTestProduct.php b/tests/Documents/Functional/PreUpdateTestProduct.php index aa9e2c444d..59f3992a32 100644 --- a/tests/Documents/Functional/PreUpdateTestProduct.php +++ b/tests/Documents/Functional/PreUpdateTestProduct.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'pre_update_test_product')] class PreUpdateTestProduct diff --git a/tests/Documents/Functional/PreUpdateTestSellable.php b/tests/Documents/Functional/PreUpdateTestSellable.php index c5907be4b4..550959f869 100644 --- a/tests/Documents/Functional/PreUpdateTestSellable.php +++ b/tests/Documents/Functional/PreUpdateTestSellable.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class PreUpdateTestSellable diff --git a/tests/Documents/Functional/PreUpdateTestSeller.php b/tests/Documents/Functional/PreUpdateTestSeller.php index 87bb554c00..c6d5c9724d 100644 --- a/tests/Documents/Functional/PreUpdateTestSeller.php +++ b/tests/Documents/Functional/PreUpdateTestSeller.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'pre_update_test_seller')] class PreUpdateTestSeller diff --git a/tests/Documents/Functional/Reference.php b/tests/Documents/Functional/Reference.php index 1f03031646..dee52ac688 100644 --- a/tests/Documents/Functional/Reference.php +++ b/tests/Documents/Functional/Reference.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Reference diff --git a/tests/Documents/Functional/SameCollection1.php b/tests/Documents/Functional/SameCollection1.php index 7956e53436..6b9d642044 100644 --- a/tests/Documents/Functional/SameCollection1.php +++ b/tests/Documents/Functional/SameCollection1.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'same_collection')] #[ODM\DiscriminatorField('type')] diff --git a/tests/Documents/Functional/SameCollection2.php b/tests/Documents/Functional/SameCollection2.php index 1a72299ca0..9e857bf023 100644 --- a/tests/Documents/Functional/SameCollection2.php +++ b/tests/Documents/Functional/SameCollection2.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'same_collection')] #[ODM\DiscriminatorField('type')] diff --git a/tests/Documents/Functional/SameCollection3.php b/tests/Documents/Functional/SameCollection3.php index 0ecb79ad9f..80f63da40d 100644 --- a/tests/Documents/Functional/SameCollection3.php +++ b/tests/Documents/Functional/SameCollection3.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** * Sample document without discriminator field to test defaultDiscriminatorValue diff --git a/tests/Documents/Functional/SimpleEmbedAndReference.php b/tests/Documents/Functional/SimpleEmbedAndReference.php index 12dee203f1..0f93fb9c45 100644 --- a/tests/Documents/Functional/SimpleEmbedAndReference.php +++ b/tests/Documents/Functional/SimpleEmbedAndReference.php @@ -5,7 +5,7 @@ namespace Documents\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'functional_tests')] class SimpleEmbedAndReference diff --git a/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php b/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php index d4483a5398..d99e886a21 100644 --- a/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php +++ b/tests/Documents/Functional/Ticket/GH683/AbstractEmbedded.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\GH683; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] #[ODM\DiscriminatorField('type')] diff --git a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php index 69f39f945f..d5cb64085e 100644 --- a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php +++ b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument1.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\GH683; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class EmbeddedSubDocument1 extends AbstractEmbedded diff --git a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php index b962dfc4b0..006e207330 100644 --- a/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php +++ b/tests/Documents/Functional/Ticket/GH683/EmbeddedSubDocument2.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\GH683; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class EmbeddedSubDocument2 extends AbstractEmbedded diff --git a/tests/Documents/Functional/Ticket/GH683/ParentDocument.php b/tests/Documents/Functional/Ticket/GH683/ParentDocument.php index 498eb2ff3c..de1e7e368c 100644 --- a/tests/Documents/Functional/Ticket/GH683/ParentDocument.php +++ b/tests/Documents/Functional/Ticket/GH683/ParentDocument.php @@ -5,7 +5,7 @@ namespace Documents\Functional\Ticket\GH683; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'gh683_test')] class ParentDocument diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php index a2c44f43af..269f88c615 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel0.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbedManyInArrayCollectionLevel0 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php index 51c8c5b88f..a00044b3c4 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayCollectionLevel1.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class EmbedManyInArrayCollectionLevel1 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php index 1c849d6389..2bbf6780ad 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel0.php @@ -5,7 +5,7 @@ namespace Documents\Functional\Ticket\MODM160; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbedManyInArrayLevel0 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php index d78609cb44..dfbaac222c 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedManyInArrayLevel1.php @@ -5,7 +5,7 @@ namespace Documents\Functional\Ticket\MODM160; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class EmbedManyInArrayLevel1 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php index a7557515c7..510450e89a 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel0.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\MODM160; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'embedded_test')] class EmbedOneLevel0 diff --git a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php index 3263999820..fd1aabaffb 100644 --- a/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php +++ b/tests/Documents/Functional/Ticket/MODM160/EmbedOneLevel1.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\MODM160; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class EmbedOneLevel1 diff --git a/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php b/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php index 0ee004b3f4..475f6aa23e 100644 --- a/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php +++ b/tests/Documents/Functional/Ticket/MODM160/MODM160Level2.php @@ -4,7 +4,7 @@ namespace Documents\Functional\Ticket\MODM160; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class MODM160Level2 diff --git a/tests/Documents/Functional/VirtualHost.php b/tests/Documents/Functional/VirtualHost.php index 0d0916f42b..280b990bcf 100644 --- a/tests/Documents/Functional/VirtualHost.php +++ b/tests/Documents/Functional/VirtualHost.php @@ -4,7 +4,7 @@ namespace Documents\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'test_functional_virtual_host')] class VirtualHost diff --git a/tests/Documents/Functional/VirtualHostDirective.php b/tests/Documents/Functional/VirtualHostDirective.php index a2a5a0a971..eb1b0dbbc9 100644 --- a/tests/Documents/Functional/VirtualHostDirective.php +++ b/tests/Documents/Functional/VirtualHostDirective.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use function uniqid; diff --git a/tests/Documents/GH2310Container.php b/tests/Documents/GH2310Container.php index 68e3d9d7dd..b0323a94a1 100644 --- a/tests/Documents/GH2310Container.php +++ b/tests/Documents/GH2310Container.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class GH2310Container diff --git a/tests/Documents/GraphLookup/Airport.php b/tests/Documents/GraphLookup/Airport.php index a8dbfdd230..5f31f15bc5 100644 --- a/tests/Documents/GraphLookup/Airport.php +++ b/tests/Documents/GraphLookup/Airport.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Airport diff --git a/tests/Documents/GraphLookup/Employee.php b/tests/Documents/GraphLookup/Employee.php index 66d9d5ab3c..32f781191d 100644 --- a/tests/Documents/GraphLookup/Employee.php +++ b/tests/Documents/GraphLookup/Employee.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Employee diff --git a/tests/Documents/GraphLookup/ReportingHierarchy.php b/tests/Documents/GraphLookup/ReportingHierarchy.php index b8e87574f7..e17e6af770 100644 --- a/tests/Documents/GraphLookup/ReportingHierarchy.php +++ b/tests/Documents/GraphLookup/ReportingHierarchy.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\QueryResultDocument] class ReportingHierarchy diff --git a/tests/Documents/GraphLookup/Traveller.php b/tests/Documents/GraphLookup/Traveller.php index 629a59dd55..6afbf14c7b 100644 --- a/tests/Documents/GraphLookup/Traveller.php +++ b/tests/Documents/GraphLookup/Traveller.php @@ -4,7 +4,7 @@ namespace Documents\GraphLookup; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Traveller diff --git a/tests/Documents/Group.php b/tests/Documents/Group.php index b8331913e8..f3fad5eedf 100644 --- a/tests/Documents/Group.php +++ b/tests/Documents/Group.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Group diff --git a/tests/Documents/GuestServer.php b/tests/Documents/GuestServer.php index e2175f8cb0..7d98aa880a 100644 --- a/tests/Documents/GuestServer.php +++ b/tests/Documents/GuestServer.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class GuestServer extends Server diff --git a/tests/Documents/IdentifiedChapter.php b/tests/Documents/IdentifiedChapter.php index 5de12c5522..1a82989798 100644 --- a/tests/Documents/IdentifiedChapter.php +++ b/tests/Documents/IdentifiedChapter.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class IdentifiedChapter diff --git a/tests/Documents/IndirectlyReferencedUser.php b/tests/Documents/IndirectlyReferencedUser.php index a2858bcf80..bce2025be9 100644 --- a/tests/Documents/IndirectlyReferencedUser.php +++ b/tests/Documents/IndirectlyReferencedUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class IndirectlyReferencedUser diff --git a/tests/Documents/Issue.php b/tests/Documents/Issue.php index 5d351475df..3414af613c 100644 --- a/tests/Documents/Issue.php +++ b/tests/Documents/Issue.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Issue diff --git a/tests/Documents/Manager.php b/tests/Documents/Manager.php index de6e2f4559..a0f80d071e 100644 --- a/tests/Documents/Manager.php +++ b/tests/Documents/Manager.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Manager extends BaseEmployee diff --git a/tests/Documents/Message.php b/tests/Documents/Message.php index 4f1bee22cd..58a687a6e2 100644 --- a/tests/Documents/Message.php +++ b/tests/Documents/Message.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Message diff --git a/tests/Documents/OtherSubProject.php b/tests/Documents/OtherSubProject.php index 56f089bf07..2466a9ef79 100644 --- a/tests/Documents/OtherSubProject.php +++ b/tests/Documents/OtherSubProject.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class OtherSubProject extends Project diff --git a/tests/Documents/Page.php b/tests/Documents/Page.php index ed33afc899..dc01c46ec0 100644 --- a/tests/Documents/Page.php +++ b/tests/Documents/Page.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Page diff --git a/tests/Documents/Phonebook.php b/tests/Documents/Phonebook.php index cabb389857..207cd4c452 100644 --- a/tests/Documents/Phonebook.php +++ b/tests/Documents/Phonebook.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Phonebook diff --git a/tests/Documents/Phonenumber.php b/tests/Documents/Phonenumber.php index 58f2ea1906..aacbd5162d 100644 --- a/tests/Documents/Phonenumber.php +++ b/tests/Documents/Phonenumber.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Phonenumber diff --git a/tests/Documents/Place.php b/tests/Documents/Place.php index e21758ff8c..57e1a6a615 100644 --- a/tests/Documents/Place.php +++ b/tests/Documents/Place.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** For testing $geoNear and other geographic operators */ #[ODM\Document(collection: 'places')] diff --git a/tests/Documents/Product.php b/tests/Documents/Product.php index bae062d07f..ac1b0f9bcf 100644 --- a/tests/Documents/Product.php +++ b/tests/Documents/Product.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Product diff --git a/tests/Documents/Profile.php b/tests/Documents/Profile.php index e0690dbeb5..570ed3a4cd 100644 --- a/tests/Documents/Profile.php +++ b/tests/Documents/Profile.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use MongoDB\BSON\ObjectId; #[ODM\Document] diff --git a/tests/Documents/ProfileNotify.php b/tests/Documents/ProfileNotify.php index a128af6dca..1453768d2e 100644 --- a/tests/Documents/ProfileNotify.php +++ b/tests/Documents/ProfileNotify.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\Persistence\NotifyPropertyChanged; use Doctrine\Persistence\PropertyChangedListener; diff --git a/tests/Documents/Project.php b/tests/Documents/Project.php index 4975c7e8db..62dd3e78d8 100644 --- a/tests/Documents/Project.php +++ b/tests/Documents/Project.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/ReferenceUser.php b/tests/Documents/ReferenceUser.php index 8c3c8c074d..24e33b867e 100644 --- a/tests/Documents/ReferenceUser.php +++ b/tests/Documents/ReferenceUser.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** * A document to test the different "storeAs" values diff --git a/tests/Documents/SchemaValidated.php b/tests/Documents/SchemaValidated.php index 116be2c927..b46600b429 100644 --- a/tests/Documents/SchemaValidated.php +++ b/tests/Documents/SchemaValidated.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; #[ODM\Document] diff --git a/tests/Documents/Server.php b/tests/Documents/Server.php index d1470e471f..1209463bab 100644 --- a/tests/Documents/Server.php +++ b/tests/Documents/Server.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'servers')] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/Sharded/ShardedByUser.php b/tests/Documents/Sharded/ShardedByUser.php index 00793d250d..139e56f432 100644 --- a/tests/Documents/Sharded/ShardedByUser.php +++ b/tests/Documents/Sharded/ShardedByUser.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'sharded.users')] #[ODM\ShardKey(keys: ['user' => 'asc'])] diff --git a/tests/Documents/Sharded/ShardedOne.php b/tests/Documents/Sharded/ShardedOne.php index e353b9b3a9..2c55550074 100644 --- a/tests/Documents/Sharded/ShardedOne.php +++ b/tests/Documents/Sharded/ShardedOne.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use MongoDB\BSON\ObjectId; #[ODM\Document(collection: 'sharded.one')] diff --git a/tests/Documents/Sharded/ShardedOneWithDifferentKey.php b/tests/Documents/Sharded/ShardedOneWithDifferentKey.php index c7bfa0e7b2..5f8eb597ab 100644 --- a/tests/Documents/Sharded/ShardedOneWithDifferentKey.php +++ b/tests/Documents/Sharded/ShardedOneWithDifferentKey.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** * Note: this document intentially collides with ShardedOne to test shard key changes diff --git a/tests/Documents/Sharded/ShardedUser.php b/tests/Documents/Sharded/ShardedUser.php index 175acd6e0e..c1b27be5d1 100644 --- a/tests/Documents/Sharded/ShardedUser.php +++ b/tests/Documents/Sharded/ShardedUser.php @@ -4,7 +4,7 @@ namespace Documents\Sharded; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'sharded.users')] #[ODM\ShardKey(keys: ['_id' => 'hashed'])] diff --git a/tests/Documents/SimpleReferenceUser.php b/tests/Documents/SimpleReferenceUser.php index a8ffe49605..ea564ba4c9 100644 --- a/tests/Documents/SimpleReferenceUser.php +++ b/tests/Documents/SimpleReferenceUser.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class SimpleReferenceUser diff --git a/tests/Documents/Song.php b/tests/Documents/Song.php index c99d58d011..5c1c57464d 100644 --- a/tests/Documents/Song.php +++ b/tests/Documents/Song.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class Song diff --git a/tests/Documents/SpecialUser.php b/tests/Documents/SpecialUser.php index 0f2b1f8017..40a043bf36 100644 --- a/tests/Documents/SpecialUser.php +++ b/tests/Documents/SpecialUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class SpecialUser extends User diff --git a/tests/Documents/Strategy.php b/tests/Documents/Strategy.php index 5788f4d0d7..a348a30184 100644 --- a/tests/Documents/Strategy.php +++ b/tests/Documents/Strategy.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'strategy')] class Strategy diff --git a/tests/Documents/SubCategory.php b/tests/Documents/SubCategory.php index 470edf5f0d..0f23a01e54 100644 --- a/tests/Documents/SubCategory.php +++ b/tests/Documents/SubCategory.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class SubCategory extends BaseCategory diff --git a/tests/Documents/SubProject.php b/tests/Documents/SubProject.php index d289b4c01d..5e21090f06 100644 --- a/tests/Documents/SubProject.php +++ b/tests/Documents/SubProject.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class SubProject extends Project diff --git a/tests/Documents/Tag.php b/tests/Documents/Tag.php index 36cc7c1f8e..70471bb678 100644 --- a/tests/Documents/Tag.php +++ b/tests/Documents/Tag.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class Tag diff --git a/tests/Documents/Task.php b/tests/Documents/Task.php index e3430a98e7..36a67fa74b 100644 --- a/tests/Documents/Task.php +++ b/tests/Documents/Task.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'tasks')] class Task diff --git a/tests/Documents/TimeSeries/TimeSeriesDocument.php b/tests/Documents/TimeSeries/TimeSeriesDocument.php index 0d17d14e9a..74426a4144 100644 --- a/tests/Documents/TimeSeries/TimeSeriesDocument.php +++ b/tests/Documents/TimeSeries/TimeSeriesDocument.php @@ -5,7 +5,7 @@ namespace Documents\TimeSeries; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\TimeSeries\Granularity; #[ODM\Document] diff --git a/tests/Documents/Tournament/Participant.php b/tests/Documents/Tournament/Participant.php index c3c2d68314..1f2e405433 100644 --- a/tests/Documents/Tournament/Participant.php +++ b/tests/Documents/Tournament/Participant.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/Tournament/ParticipantSolo.php b/tests/Documents/Tournament/ParticipantSolo.php index 281bdb6f72..7c7c045a65 100644 --- a/tests/Documents/Tournament/ParticipantSolo.php +++ b/tests/Documents/Tournament/ParticipantSolo.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class ParticipantSolo extends Participant diff --git a/tests/Documents/Tournament/ParticipantTeam.php b/tests/Documents/Tournament/ParticipantTeam.php index de5fc56d48..44ca77509e 100644 --- a/tests/Documents/Tournament/ParticipantTeam.php +++ b/tests/Documents/Tournament/ParticipantTeam.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class ParticipantTeam extends Participant diff --git a/tests/Documents/Tournament/Tournament.php b/tests/Documents/Tournament/Tournament.php index 48489a1f8f..3c0749e135 100644 --- a/tests/Documents/Tournament/Tournament.php +++ b/tests/Documents/Tournament/Tournament.php @@ -5,7 +5,7 @@ namespace Documents\Tournament; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/Tournament/TournamentFootball.php b/tests/Documents/Tournament/TournamentFootball.php index 957a372f4b..f97a1e4bd1 100644 --- a/tests/Documents/Tournament/TournamentFootball.php +++ b/tests/Documents/Tournament/TournamentFootball.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class TournamentFootball extends Tournament diff --git a/tests/Documents/Tournament/TournamentTennis.php b/tests/Documents/Tournament/TournamentTennis.php index f2d24a27c9..91959c5f2f 100644 --- a/tests/Documents/Tournament/TournamentTennis.php +++ b/tests/Documents/Tournament/TournamentTennis.php @@ -4,7 +4,7 @@ namespace Documents\Tournament; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class TournamentTennis extends Tournament diff --git a/tests/Documents/TypedDocument.php b/tests/Documents/TypedDocument.php index 64b28e6964..9030d34b2d 100644 --- a/tests/Documents/TypedDocument.php +++ b/tests/Documents/TypedDocument.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class TypedDocument diff --git a/tests/Documents/TypedEmbeddedDocument.php b/tests/Documents/TypedEmbeddedDocument.php index 7e0893f1c1..2e69bdf04f 100644 --- a/tests/Documents/TypedEmbeddedDocument.php +++ b/tests/Documents/TypedEmbeddedDocument.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\EmbeddedDocument] class TypedEmbeddedDocument diff --git a/tests/Documents/User.php b/tests/Documents/User.php index 1427ce0b2d..7e1031ec33 100644 --- a/tests/Documents/User.php +++ b/tests/Documents/User.php @@ -8,7 +8,7 @@ use DateTimeInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use MongoDB\BSON\ObjectId; use MongoDB\BSON\UTCDateTime; diff --git a/tests/Documents/UserName.php b/tests/Documents/UserName.php index a6b9feb477..349fc92367 100644 --- a/tests/Documents/UserName.php +++ b/tests/Documents/UserName.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; #[ODM\View(rootClass: CmsUser::class, repositoryClass: UserNameRepository::class, view: 'user-name')] diff --git a/tests/Documents/UserTyped.php b/tests/Documents/UserTyped.php index d561db7673..2f04093c32 100644 --- a/tests/Documents/UserTyped.php +++ b/tests/Documents/UserTyped.php @@ -6,7 +6,7 @@ use DateTime; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** @ODM\Document() */ #[ODM\Document] diff --git a/tests/Documents/UserUpsert.php b/tests/Documents/UserUpsert.php index 6f6ad3c025..5da4a07cd4 100644 --- a/tests/Documents/UserUpsert.php +++ b/tests/Documents/UserUpsert.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'users_upsert')] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/UserUpsertChild.php b/tests/Documents/UserUpsertChild.php index 200963fce9..b298bb1ac7 100644 --- a/tests/Documents/UserUpsertChild.php +++ b/tests/Documents/UserUpsertChild.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'users_upsert')] class UserUpsertChild extends UserUpsert diff --git a/tests/Documents/UserUpsertIdStrategyNone.php b/tests/Documents/UserUpsertIdStrategyNone.php index 73da62cc25..50861f21dc 100644 --- a/tests/Documents/UserUpsertIdStrategyNone.php +++ b/tests/Documents/UserUpsertIdStrategyNone.php @@ -5,7 +5,7 @@ namespace Documents; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'users_upsert_id_strategy_none')] #[ODM\InheritanceType('SINGLE_COLLECTION')] diff --git a/tests/Documents/VectorEmbedding.php b/tests/Documents/VectorEmbedding.php index 05ef07ad48..2a8cfbd7dc 100644 --- a/tests/Documents/VectorEmbedding.php +++ b/tests/Documents/VectorEmbedding.php @@ -4,10 +4,10 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\VectorSearchIndex; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Types\Type; diff --git a/tests/Documents/VersionedDocument.php b/tests/Documents/VersionedDocument.php index 2e07283579..dce1736e18 100644 --- a/tests/Documents/VersionedDocument.php +++ b/tests/Documents/VersionedDocument.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** * Documents\VersionedDocument diff --git a/tests/Documents/VersionedUser.php b/tests/Documents/VersionedUser.php index e010f5e1f8..ddae1f7258 100644 --- a/tests/Documents/VersionedUser.php +++ b/tests/Documents/VersionedUser.php @@ -4,7 +4,7 @@ namespace Documents; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document(collection: 'users')] #[ODM\InheritanceType('COLLECTION_PER_CLASS')] diff --git a/tests/Documents/ViewReference.php b/tests/Documents/ViewReference.php index c0ff7c73ec..e65f1a4200 100644 --- a/tests/Documents/ViewReference.php +++ b/tests/Documents/ViewReference.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class ViewReference diff --git a/tests/Documents84/PropertyHooks/MappingVirtualProperty.php b/tests/Documents84/PropertyHooks/MappingVirtualProperty.php index 936000eb93..7a7a2b6dbb 100644 --- a/tests/Documents84/PropertyHooks/MappingVirtualProperty.php +++ b/tests/Documents84/PropertyHooks/MappingVirtualProperty.php @@ -2,9 +2,9 @@ namespace Documents84\PropertyHooks; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; #[Document(collection: 'property_hooks_user')] class MappingVirtualProperty diff --git a/tests/Documents84/PropertyHooks/User.php b/tests/Documents84/PropertyHooks/User.php index 3826eddea3..cc251be3c9 100644 --- a/tests/Documents84/PropertyHooks/User.php +++ b/tests/Documents84/PropertyHooks/User.php @@ -2,9 +2,9 @@ namespace Documents84\PropertyHooks; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; use ValueError; #[Document(collection: 'property_hooks_user')] diff --git a/tests/Tests/DocumentManagerTest.php b/tests/Tests/DocumentManagerTest.php index a639be3469..a23f5612d8 100644 --- a/tests/Tests/DocumentManagerTest.php +++ b/tests/Tests/DocumentManagerTest.php @@ -8,7 +8,7 @@ use Doctrine\Common\EventManager; use Doctrine\ODM\MongoDB\Aggregation\Builder as AggregationBuilder; use Doctrine\ODM\MongoDB\Configuration; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory; use Doctrine\ODM\MongoDB\Mapping\MappingException; diff --git a/tests/Tests/Events/LifecycleCallbacksTest.php b/tests/Tests/Events/LifecycleCallbacksTest.php index 547e101106..3cabb91aad 100644 --- a/tests/Tests/Events/LifecycleCallbacksTest.php +++ b/tests/Tests/Events/LifecycleCallbacksTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Event; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/tests/Tests/Events/LifecycleListenersTest.php b/tests/Tests/Events/LifecycleListenersTest.php index ac9a35af60..088040c918 100644 --- a/tests/Tests/Events/LifecycleListenersTest.php +++ b/tests/Tests/Events/LifecycleListenersTest.php @@ -10,7 +10,7 @@ use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Event\PostCollectionLoadEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Assert; diff --git a/tests/Tests/Events/TransactionalLifecycleEventsTest.php b/tests/Tests/Events/TransactionalLifecycleEventsTest.php index 9b48694b28..d0567a57ea 100644 --- a/tests/Tests/Events/TransactionalLifecycleEventsTest.php +++ b/tests/Tests/Events/TransactionalLifecycleEventsTest.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\Type; use MongoDB\Client; diff --git a/tests/Tests/Functional/AlsoLoadTest.php b/tests/Tests/Functional/AlsoLoadTest.php index 8012c05761..3f71000efe 100644 --- a/tests/Tests/Functional/AlsoLoadTest.php +++ b/tests/Tests/Functional/AlsoLoadTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function explode; diff --git a/tests/Tests/Functional/AtomicSetTest.php b/tests/Tests/Functional/AtomicSetTest.php index 31193f0ab8..cd8a6437d2 100644 --- a/tests/Tests/Functional/AtomicSetTest.php +++ b/tests/Tests/Functional/AtomicSetTest.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\APM\CommandLogger; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Book; use Documents\Chapter; diff --git a/tests/Tests/Functional/BinDataTest.php b/tests/Tests/Functional/BinDataTest.php index c011e5107b..d0ecb1462f 100644 --- a/tests/Tests/Functional/BinDataTest.php +++ b/tests/Tests/Functional/BinDataTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\Binary; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/CollectionPersisterTest.php b/tests/Tests/Functional/CollectionPersisterTest.php index ff769ac543..4c18afe30a 100644 --- a/tests/Tests/Functional/CollectionPersisterTest.php +++ b/tests/Tests/Functional/CollectionPersisterTest.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\APM\CommandLogger; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Persisters\CollectionPersister; use Doctrine\ODM\MongoDB\Persisters\PersistenceBuilder; diff --git a/tests/Tests/Functional/CollectionsTest.php b/tests/Tests/Functional/CollectionsTest.php index 82f52b6b64..7a17e28ac2 100644 --- a/tests/Tests/Functional/CollectionsTest.php +++ b/tests/Tests/Functional/CollectionsTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\ArrayCollection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Bars\Bar; use Documents\Bars\Location; diff --git a/tests/Tests/Functional/CustomCollectionsTest.php b/tests/Tests/Functional/CustomCollectionsTest.php index a30c66813c..d821746573 100644 --- a/tests/Tests/Functional/CustomCollectionsTest.php +++ b/tests/Tests/Functional/CustomCollectionsTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\PersistentCollection; diff --git a/tests/Tests/Functional/CustomFieldNameTest.php b/tests/Tests/Functional/CustomFieldNameTest.php index c7ca9bd162..ddc220fba5 100644 --- a/tests/Tests/Functional/CustomFieldNameTest.php +++ b/tests/Tests/Functional/CustomFieldNameTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class CustomFieldNameTest extends BaseTestCase diff --git a/tests/Tests/Functional/CustomTypeTest.php b/tests/Tests/Functional/CustomTypeTest.php index d085ea645a..6543998b86 100644 --- a/tests/Tests/Functional/CustomTypeTest.php +++ b/tests/Tests/Functional/CustomTypeTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use DateTime; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Tests\CaptureDeprecationMessages; use Doctrine\ODM\MongoDB\Types\ClosureToPHP; diff --git a/tests/Tests/Functional/DatabasesTest.php b/tests/Tests/Functional/DatabasesTest.php index 492ebb4b9d..757eaca4aa 100644 --- a/tests/Tests/Functional/DatabasesTest.php +++ b/tests/Tests/Functional/DatabasesTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\ODM\MongoDB\Configuration; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class DatabasesTest extends BaseTestCase diff --git a/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php b/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php index 367e37e4be..cb19a4ec65 100644 --- a/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php +++ b/tests/Tests/Functional/DiscriminatorsDefaultValueTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class DiscriminatorsDefaultValueTest extends BaseTestCase diff --git a/tests/Tests/Functional/DocumentPersisterTest.php b/tests/Tests/Functional/DocumentPersisterTest.php index 4bfdd7e6d4..885d63f7d4 100644 --- a/tests/Tests/Functional/DocumentPersisterTest.php +++ b/tests/Tests/Functional/DocumentPersisterTest.php @@ -8,7 +8,7 @@ use DateTime; use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\LockException; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Persisters\DocumentPersister; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\ClosureToPHP; diff --git a/tests/Tests/Functional/EmbeddedIdTest.php b/tests/Tests/Functional/EmbeddedIdTest.php index cc0c169c8b..3e897f2bd8 100644 --- a/tests/Tests/Functional/EmbeddedIdTest.php +++ b/tests/Tests/Functional/EmbeddedIdTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/EmbeddedReferenceTest.php b/tests/Tests/Functional/EmbeddedReferenceTest.php index 7786170958..44368c9604 100644 --- a/tests/Tests/Functional/EmbeddedReferenceTest.php +++ b/tests/Tests/Functional/EmbeddedReferenceTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class EmbeddedReferenceTest extends BaseTestCase diff --git a/tests/Tests/Functional/EmbeddedTest.php b/tests/Tests/Functional/EmbeddedTest.php index 8151d068e0..cbd13de081 100644 --- a/tests/Tests/Functional/EmbeddedTest.php +++ b/tests/Tests/Functional/EmbeddedTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Address; diff --git a/tests/Tests/Functional/FunctionalTest.php b/tests/Tests/Functional/FunctionalTest.php index 1ed5bc5a4c..8523a5499f 100644 --- a/tests/Tests/Functional/FunctionalTest.php +++ b/tests/Tests/Functional/FunctionalTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\MongoDBException; use Doctrine\ODM\MongoDB\PersistentCollection; diff --git a/tests/Tests/Functional/HasLifecycleCallbacksTest.php b/tests/Tests/Functional/HasLifecycleCallbacksTest.php index 647dd4576f..7990b9fe5c 100644 --- a/tests/Tests/Functional/HasLifecycleCallbacksTest.php +++ b/tests/Tests/Functional/HasLifecycleCallbacksTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class HasLifecycleCallbacksTest extends BaseTestCase diff --git a/tests/Tests/Functional/IdTest.php b/tests/Tests/Functional/IdTest.php index d2afeb45c2..099e380650 100644 --- a/tests/Tests/Functional/IdTest.php +++ b/tests/Tests/Functional/IdTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Id\UuidGenerator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; @@ -367,7 +367,7 @@ private function createIdTestClass(string $type, string $strategy): string <<<'PHP' namespace %s; - use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; + use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; #[ODM\Document] class %s diff --git a/tests/Tests/Functional/IndexesTest.php b/tests/Tests/Functional/IndexesTest.php index 69c5505377..255f861158 100644 --- a/tests/Tests/Functional/IndexesTest.php +++ b/tests/Tests/Functional/IndexesTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\Driver\Exception\BulkWriteException; diff --git a/tests/Tests/Functional/LifecycleTest.php b/tests/Tests/Functional/LifecycleTest.php index 92308cc309..d51e5b3dc6 100644 --- a/tests/Tests/Functional/LifecycleTest.php +++ b/tests/Tests/Functional/LifecycleTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class LifecycleTest extends BaseTestCase diff --git a/tests/Tests/Functional/LockTest.php b/tests/Tests/Functional/LockTest.php index 49c217b38c..18455ea46c 100644 --- a/tests/Tests/Functional/LockTest.php +++ b/tests/Tests/Functional/LockTest.php @@ -10,7 +10,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\LockException; use Doctrine\ODM\MongoDB\LockMode; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\MongoDBException; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/MappedSuperclassTest.php b/tests/Tests/Functional/MappedSuperclassTest.php index 4a54eaca50..924cdc8e03 100644 --- a/tests/Tests/Functional/MappedSuperclassTest.php +++ b/tests/Tests/Functional/MappedSuperclassTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MappedSuperclassTest extends BaseTestCase diff --git a/tests/Tests/Functional/NestedCollectionsTest.php b/tests/Tests/Functional/NestedCollectionsTest.php index 97f3cc0d1b..7b4b41d55b 100644 --- a/tests/Tests/Functional/NestedCollectionsTest.php +++ b/tests/Tests/Functional/NestedCollectionsTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Phonebook; diff --git a/tests/Tests/Functional/NestedDocumentsTest.php b/tests/Tests/Functional/NestedDocumentsTest.php index 4e4be40415..d1998444d8 100644 --- a/tests/Tests/Functional/NestedDocumentsTest.php +++ b/tests/Tests/Functional/NestedDocumentsTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/OrphanRemovalEmbedTest.php b/tests/Tests/Functional/OrphanRemovalEmbedTest.php index b078a9bc3d..5f37672eac 100644 --- a/tests/Tests/Functional/OrphanRemovalEmbedTest.php +++ b/tests/Tests/Functional/OrphanRemovalEmbedTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/OrphanRemovalTest.php b/tests/Tests/Functional/OrphanRemovalTest.php index 515c54ade3..fbee6a5263 100644 --- a/tests/Tests/Functional/OrphanRemovalTest.php +++ b/tests/Tests/Functional/OrphanRemovalTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/PrePersistTest.php b/tests/Tests/Functional/PrePersistTest.php index 90aa619bb8..b419ac4d9b 100644 --- a/tests/Tests/Functional/PrePersistTest.php +++ b/tests/Tests/Functional/PrePersistTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class PrePersistTest extends BaseTestCase diff --git a/tests/Tests/Functional/RawTypeTest.php b/tests/Tests/Functional/RawTypeTest.php index 9ac50a9f37..1b0c894f22 100644 --- a/tests/Tests/Functional/RawTypeTest.php +++ b/tests/Tests/Functional/RawTypeTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; use MongoDB\BSON\UTCDateTime; diff --git a/tests/Tests/Functional/ReadOnlyDocumentTest.php b/tests/Tests/Functional/ReadOnlyDocumentTest.php index 22597809c6..5e7aad58d8 100644 --- a/tests/Tests/Functional/ReadOnlyDocumentTest.php +++ b/tests/Tests/Functional/ReadOnlyDocumentTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/ReadOnlyPropertiesTest.php b/tests/Tests/Functional/ReadOnlyPropertiesTest.php index 192518b622..ff0dfd28d8 100644 --- a/tests/Tests/Functional/ReadOnlyPropertiesTest.php +++ b/tests/Tests/Functional/ReadOnlyPropertiesTest.php @@ -4,10 +4,10 @@ namespace Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Field; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Id; -use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Field; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Id; +use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class ReadOnlyPropertiesTest extends BaseTestCase diff --git a/tests/Tests/Functional/ReadPreferenceTest.php b/tests/Tests/Functional/ReadPreferenceTest.php index 7ff6647a0e..3511fba7eb 100644 --- a/tests/Tests/Functional/ReadPreferenceTest.php +++ b/tests/Tests/Functional/ReadPreferenceTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Query\Query; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/ReferenceDiscriminatorsTest.php b/tests/Tests/Functional/ReferenceDiscriminatorsTest.php index 9ee13b131c..c5cd226aca 100644 --- a/tests/Tests/Functional/ReferenceDiscriminatorsTest.php +++ b/tests/Tests/Functional/ReferenceDiscriminatorsTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class ReferenceDiscriminatorsTest extends BaseTestCase diff --git a/tests/Tests/Functional/ReferencesTest.php b/tests/Tests/Functional/ReferencesTest.php index 4818ba0483..8a04113b02 100644 --- a/tests/Tests/Functional/ReferencesTest.php +++ b/tests/Tests/Functional/ReferencesTest.php @@ -9,7 +9,7 @@ use Doctrine\ODM\MongoDB\Event\DocumentNotFoundEventArgs; use Doctrine\ODM\MongoDB\Events; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/SplObjectHashCollisionsTest.php b/tests/Tests/Functional/SplObjectHashCollisionsTest.php index 95f32d9deb..8a3255de47 100644 --- a/tests/Tests/Functional/SplObjectHashCollisionsTest.php +++ b/tests/Tests/Functional/SplObjectHashCollisionsTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\IgnoreDeprecations; diff --git a/tests/Tests/Functional/TargetDocumentTest.php b/tests/Tests/Functional/TargetDocumentTest.php index c60ba0c6fb..8b50453b3d 100644 --- a/tests/Tests/Functional/TargetDocumentTest.php +++ b/tests/Tests/Functional/TargetDocumentTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; diff --git a/tests/Tests/Functional/Ticket/GH1011Test.php b/tests/Tests/Functional/Ticket/GH1011Test.php index 0c753aee4d..701744b7aa 100644 --- a/tests/Tests/Functional/Ticket/GH1011Test.php +++ b/tests/Tests/Functional/Ticket/GH1011Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1017Test.php b/tests/Tests/Functional/Ticket/GH1017Test.php index e99a351f8b..756b770636 100644 --- a/tests/Tests/Functional/Ticket/GH1017Test.php +++ b/tests/Tests/Functional/Ticket/GH1017Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/tests/Tests/Functional/Ticket/GH1058Test.php b/tests/Tests/Functional/Ticket/GH1058Test.php index e0cec2fd5c..deec528fee 100644 --- a/tests/Tests/Functional/Ticket/GH1058Test.php +++ b/tests/Tests/Functional/Ticket/GH1058Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Exception; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH1107Test.php b/tests/Tests/Functional/Ticket/GH1107Test.php index 0084c42a49..21afeba89d 100644 --- a/tests/Tests/Functional/Ticket/GH1107Test.php +++ b/tests/Tests/Functional/Ticket/GH1107Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1107Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1117Test.php b/tests/Tests/Functional/Ticket/GH1117Test.php index ebb6eec9c6..7b24e0d154 100644 --- a/tests/Tests/Functional/Ticket/GH1117Test.php +++ b/tests/Tests/Functional/Ticket/GH1117Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1117Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1138Test.php b/tests/Tests/Functional/Ticket/GH1138Test.php index 8dde8eef8c..0f11572ac3 100644 --- a/tests/Tests/Functional/Ticket/GH1138Test.php +++ b/tests/Tests/Functional/Ticket/GH1138Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\APM\CommandLogger; use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1138Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1152Test.php b/tests/Tests/Functional/Ticket/GH1152Test.php index 015c3d8f3e..050a36bcdb 100644 --- a/tests/Tests/Functional/Ticket/GH1152Test.php +++ b/tests/Tests/Functional/Ticket/GH1152Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1225Test.php b/tests/Tests/Functional/Ticket/GH1225Test.php index 83cca69d82..e9a4173159 100644 --- a/tests/Tests/Functional/Ticket/GH1225Test.php +++ b/tests/Tests/Functional/Ticket/GH1225Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1225Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1229Test.php b/tests/Tests/Functional/Ticket/GH1229Test.php index 83cf268294..a1bc2aa2d3 100644 --- a/tests/Tests/Functional/Ticket/GH1229Test.php +++ b/tests/Tests/Functional/Ticket/GH1229Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function assert; diff --git a/tests/Tests/Functional/Ticket/GH1232Test.php b/tests/Tests/Functional/Ticket/GH1232Test.php index 9702eee4b0..59c9266914 100644 --- a/tests/Tests/Functional/Ticket/GH1232Test.php +++ b/tests/Tests/Functional/Ticket/GH1232Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; diff --git a/tests/Tests/Functional/Ticket/GH1275Test.php b/tests/Tests/Functional/Ticket/GH1275Test.php index 8017fcec95..84a5aad4c0 100644 --- a/tests/Tests/Functional/Ticket/GH1275Test.php +++ b/tests/Tests/Functional/Ticket/GH1275Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; diff --git a/tests/Tests/Functional/Ticket/GH1294Test.php b/tests/Tests/Functional/Ticket/GH1294Test.php index 1ed10a6c97..2082c10cbb 100644 --- a/tests/Tests/Functional/Ticket/GH1294Test.php +++ b/tests/Tests/Functional/Ticket/GH1294Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\Regex; diff --git a/tests/Tests/Functional/Ticket/GH1344Test.php b/tests/Tests/Functional/Ticket/GH1344Test.php index 4e97e70c18..5db7663df5 100644 --- a/tests/Tests/Functional/Ticket/GH1344Test.php +++ b/tests/Tests/Functional/Ticket/GH1344Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\Driver\Exception\CommandException; diff --git a/tests/Tests/Functional/Ticket/GH1346Test.php b/tests/Tests/Functional/Ticket/GH1346Test.php index 2d6cdfb3cb..af5259614a 100644 --- a/tests/Tests/Functional/Ticket/GH1346Test.php +++ b/tests/Tests/Functional/Ticket/GH1346Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1346Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1418Test.php b/tests/Tests/Functional/Ticket/GH1418Test.php index 5c8139f450..d001f9b07f 100644 --- a/tests/Tests/Functional/Ticket/GH1418Test.php +++ b/tests/Tests/Functional/Ticket/GH1418Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Query\Query; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1428Test.php b/tests/Tests/Functional/Ticket/GH1428Test.php index 594ee8e52a..232d2d71b6 100644 --- a/tests/Tests/Functional/Ticket/GH1428Test.php +++ b/tests/Tests/Functional/Ticket/GH1428Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; diff --git a/tests/Tests/Functional/Ticket/GH1435Test.php b/tests/Tests/Functional/Ticket/GH1435Test.php index 75384a7e30..14bf4f5150 100644 --- a/tests/Tests/Functional/Ticket/GH1435Test.php +++ b/tests/Tests/Functional/Ticket/GH1435Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH1525Test.php b/tests/Tests/Functional/Ticket/GH1525Test.php index 2a736539d9..d5770bc3d4 100644 --- a/tests/Tests/Functional/Ticket/GH1525Test.php +++ b/tests/Tests/Functional/Ticket/GH1525Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Id\UuidGenerator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1525Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1572Test.php b/tests/Tests/Functional/Ticket/GH1572Test.php index 04528697e3..c8cc052fff 100644 --- a/tests/Tests/Functional/Ticket/GH1572Test.php +++ b/tests/Tests/Functional/Ticket/GH1572Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Repository\DocumentRepository; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1674Test.php b/tests/Tests/Functional/Ticket/GH1674Test.php index 90110963e2..47c7ac11f4 100644 --- a/tests/Tests/Functional/Ticket/GH1674Test.php +++ b/tests/Tests/Functional/Ticket/GH1674Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH1775Test.php b/tests/Tests/Functional/Ticket/GH1775Test.php index d0901c2d85..b368948b68 100644 --- a/tests/Tests/Functional/Ticket/GH1775Test.php +++ b/tests/Tests/Functional/Ticket/GH1775Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH1962Test.php b/tests/Tests/Functional/Ticket/GH1962Test.php index 6a18a67f91..329abb7afe 100644 --- a/tests/Tests/Functional/Ticket/GH1962Test.php +++ b/tests/Tests/Functional/Ticket/GH1962Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1962Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1964Test.php b/tests/Tests/Functional/Ticket/GH1964Test.php index 868f3c1c53..0b97560bef 100644 --- a/tests/Tests/Functional/Ticket/GH1964Test.php +++ b/tests/Tests/Functional/Ticket/GH1964Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1964Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH1990Test.php b/tests/Tests/Functional/Ticket/GH1990Test.php index 22a383d5d0..c1becf358b 100644 --- a/tests/Tests/Functional/Ticket/GH1990Test.php +++ b/tests/Tests/Functional/Ticket/GH1990Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH1990Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH2002Test.php b/tests/Tests/Functional/Ticket/GH2002Test.php index e572680afd..b2211d2f0b 100644 --- a/tests/Tests/Functional/Ticket/GH2002Test.php +++ b/tests/Tests/Functional/Ticket/GH2002Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/Ticket/GH2157Test.php b/tests/Tests/Functional/Ticket/GH2157Test.php index 28cbe56e4a..32276ceb31 100644 --- a/tests/Tests/Functional/Ticket/GH2157Test.php +++ b/tests/Tests/Functional/Ticket/GH2157Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\ODM\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH2157Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH2158Test.php b/tests/Tests/Functional/Ticket/GH2158Test.php index d92792bd3b..f01456ce21 100644 --- a/tests/Tests/Functional/Ticket/GH2158Test.php +++ b/tests/Tests/Functional/Ticket/GH2158Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH2158Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH232Test.php b/tests/Tests/Functional/Ticket/GH232Test.php index 0c2627ca1e..14388fa183 100644 --- a/tests/Tests/Functional/Ticket/GH232Test.php +++ b/tests/Tests/Functional/Ticket/GH232Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH232Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH245Test.php b/tests/Tests/Functional/Ticket/GH245Test.php index 298c54a875..1572f7f6a9 100644 --- a/tests/Tests/Functional/Ticket/GH245Test.php +++ b/tests/Tests/Functional/Ticket/GH245Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH245Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH267Test.php b/tests/Tests/Functional/Ticket/GH267Test.php index 3a8ce9b18f..d8a48dd6f0 100644 --- a/tests/Tests/Functional/Ticket/GH267Test.php +++ b/tests/Tests/Functional/Ticket/GH267Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH267Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH2730Test.php b/tests/Tests/Functional/Ticket/GH2730Test.php index e901d6c739..808e8a1eef 100644 --- a/tests/Tests/Functional/Ticket/GH2730Test.php +++ b/tests/Tests/Functional/Ticket/GH2730Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function spl_object_hash; diff --git a/tests/Tests/Functional/Ticket/GH2789Test.php b/tests/Tests/Functional/Ticket/GH2789Test.php index f4d7af5647..92ef106f80 100644 --- a/tests/Tests/Functional/Ticket/GH2789Test.php +++ b/tests/Tests/Functional/Ticket/GH2789Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\Type; use Doctrine\ODM\MongoDB\Types\Versionable; diff --git a/tests/Tests/Functional/Ticket/GH2825Test.php b/tests/Tests/Functional/Ticket/GH2825Test.php index 0dd37fa4a6..1405a47b04 100644 --- a/tests/Tests/Functional/Ticket/GH2825Test.php +++ b/tests/Tests/Functional/Ticket/GH2825Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH2910Test.php b/tests/Tests/Functional/Ticket/GH2910Test.php index f901a5b2d7..c0d4ff9c5f 100644 --- a/tests/Tests/Functional/Ticket/GH2910Test.php +++ b/tests/Tests/Functional/Ticket/GH2910Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH2910Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH389Test.php b/tests/Tests/Functional/Ticket/GH389Test.php index b80ea48049..eeb6bb0155 100644 --- a/tests/Tests/Functional/Ticket/GH389Test.php +++ b/tests/Tests/Functional/Ticket/GH389Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH389Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH426Test.php b/tests/Tests/Functional/Ticket/GH426Test.php index e818b79712..1f028a41a5 100644 --- a/tests/Tests/Functional/Ticket/GH426Test.php +++ b/tests/Tests/Functional/Ticket/GH426Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH426Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH435Test.php b/tests/Tests/Functional/Ticket/GH435Test.php index 5e6683769f..2c22641c47 100644 --- a/tests/Tests/Functional/Ticket/GH435Test.php +++ b/tests/Tests/Functional/Ticket/GH435Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH435Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH453Test.php b/tests/Tests/Functional/Ticket/GH453Test.php index a2adee6192..b18a4143eb 100644 --- a/tests/Tests/Functional/Ticket/GH453Test.php +++ b/tests/Tests/Functional/Ticket/GH453Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function array_values; diff --git a/tests/Tests/Functional/Ticket/GH467Test.php b/tests/Tests/Functional/Ticket/GH467Test.php index 9bd878d2a4..613a906e36 100644 --- a/tests/Tests/Functional/Ticket/GH467Test.php +++ b/tests/Tests/Functional/Ticket/GH467Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH499Test.php b/tests/Tests/Functional/Ticket/GH499Test.php index 69b4d121a4..3aca5e256c 100644 --- a/tests/Tests/Functional/Ticket/GH499Test.php +++ b/tests/Tests/Functional/Ticket/GH499Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH520Test.php b/tests/Tests/Functional/Ticket/GH520Test.php index 5ab369f88f..bd44068911 100644 --- a/tests/Tests/Functional/Ticket/GH520Test.php +++ b/tests/Tests/Functional/Ticket/GH520Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH529Test.php b/tests/Tests/Functional/Ticket/GH529Test.php index 483a793bc9..14bcd970ba 100644 --- a/tests/Tests/Functional/Ticket/GH529Test.php +++ b/tests/Tests/Functional/Ticket/GH529Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH560Test.php b/tests/Tests/Functional/Ticket/GH560Test.php index 2733047747..2364cd3a5e 100644 --- a/tests/Tests/Functional/Ticket/GH560Test.php +++ b/tests/Tests/Functional/Ticket/GH560Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\EventSubscriber; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/Ticket/GH561Test.php b/tests/Tests/Functional/Ticket/GH561Test.php index 2e185adca6..0335bd344c 100644 --- a/tests/Tests/Functional/Ticket/GH561Test.php +++ b/tests/Tests/Functional/Ticket/GH561Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH561Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH566Test.php b/tests/Tests/Functional/Ticket/GH566Test.php index 3e933e4678..aadc194d69 100644 --- a/tests/Tests/Functional/Ticket/GH566Test.php +++ b/tests/Tests/Functional/Ticket/GH566Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH580Test.php b/tests/Tests/Functional/Ticket/GH580Test.php index 43238430df..7c12331567 100644 --- a/tests/Tests/Functional/Ticket/GH580Test.php +++ b/tests/Tests/Functional/Ticket/GH580Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\Driver\Exception\BulkWriteException; diff --git a/tests/Tests/Functional/Ticket/GH593Test.php b/tests/Tests/Functional/Ticket/GH593Test.php index 68d83ffd2f..99a741e327 100644 --- a/tests/Tests/Functional/Ticket/GH593Test.php +++ b/tests/Tests/Functional/Ticket/GH593Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentNotFoundException; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function iterator_to_array; diff --git a/tests/Tests/Functional/Ticket/GH596Test.php b/tests/Tests/Functional/Ticket/GH596Test.php index 8413704b41..0663926425 100644 --- a/tests/Tests/Functional/Ticket/GH596Test.php +++ b/tests/Tests/Functional/Ticket/GH596Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH596Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH597Test.php b/tests/Tests/Functional/Ticket/GH597Test.php index d3b85dcb6f..8f1bdfd343 100644 --- a/tests/Tests/Functional/Ticket/GH597Test.php +++ b/tests/Tests/Functional/Ticket/GH597Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH602Test.php b/tests/Tests/Functional/Ticket/GH602Test.php index dbdb9b3080..f1e3cfe355 100644 --- a/tests/Tests/Functional/Ticket/GH602Test.php +++ b/tests/Tests/Functional/Ticket/GH602Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentNotFoundException; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function iterator_to_array; diff --git a/tests/Tests/Functional/Ticket/GH611Test.php b/tests/Tests/Functional/Ticket/GH611Test.php index 1a3d1172b3..9bf0aa7290 100644 --- a/tests/Tests/Functional/Ticket/GH611Test.php +++ b/tests/Tests/Functional/Ticket/GH611Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH628Test.php b/tests/Tests/Functional/Ticket/GH628Test.php index 8771a91c94..8d190fa2ab 100644 --- a/tests/Tests/Functional/Ticket/GH628Test.php +++ b/tests/Tests/Functional/Ticket/GH628Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH628Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH665Test.php b/tests/Tests/Functional/Ticket/GH665Test.php index 16d046baee..e18d10dd1a 100644 --- a/tests/Tests/Functional/Ticket/GH665Test.php +++ b/tests/Tests/Functional/Ticket/GH665Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH665Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH788Test.php b/tests/Tests/Functional/Ticket/GH788Test.php index 7db8bf6540..024424fa06 100644 --- a/tests/Tests/Functional/Ticket/GH788Test.php +++ b/tests/Tests/Functional/Ticket/GH788Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH816Test.php b/tests/Tests/Functional/Ticket/GH816Test.php index 6f3148fcf9..efaf1c2032 100644 --- a/tests/Tests/Functional/Ticket/GH816Test.php +++ b/tests/Tests/Functional/Ticket/GH816Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH850Test.php b/tests/Tests/Functional/Ticket/GH850Test.php index 6cf9756117..e78ab6481f 100644 --- a/tests/Tests/Functional/Ticket/GH850Test.php +++ b/tests/Tests/Functional/Ticket/GH850Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; diff --git a/tests/Tests/Functional/Ticket/GH852Test.php b/tests/Tests/Functional/Ticket/GH852Test.php index b5f3fa9253..14e4545154 100644 --- a/tests/Tests/Functional/Ticket/GH852Test.php +++ b/tests/Tests/Functional/Ticket/GH852Test.php @@ -9,7 +9,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\Common\Collections\Criteria; use Doctrine\ODM\MongoDB\Iterator\Iterator; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\Binary; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/Tests/Functional/Ticket/GH878Test.php b/tests/Tests/Functional/Ticket/GH878Test.php index 3e6c7aebe3..97ea8595f1 100644 --- a/tests/Tests/Functional/Ticket/GH878Test.php +++ b/tests/Tests/Functional/Ticket/GH878Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\UnitOfWork; diff --git a/tests/Tests/Functional/Ticket/GH880Test.php b/tests/Tests/Functional/Ticket/GH880Test.php index 09b04e06ac..b50a0f1182 100644 --- a/tests/Tests/Functional/Ticket/GH880Test.php +++ b/tests/Tests/Functional/Ticket/GH880Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH880Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH897Test.php b/tests/Tests/Functional/Ticket/GH897Test.php index 860ac7444a..5f535db21a 100644 --- a/tests/Tests/Functional/Ticket/GH897Test.php +++ b/tests/Tests/Functional/Ticket/GH897Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH897Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH921Test.php b/tests/Tests/Functional/Ticket/GH921Test.php index 6fac9bb03d..2ce01f8637 100644 --- a/tests/Tests/Functional/Ticket/GH921Test.php +++ b/tests/Tests/Functional/Ticket/GH921Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Functional/Ticket/GH927Test.php b/tests/Tests/Functional/Ticket/GH927Test.php index 503747f65b..357a94d1bd 100644 --- a/tests/Tests/Functional/Ticket/GH927Test.php +++ b/tests/Tests/Functional/Ticket/GH927Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH927Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH928Test.php b/tests/Tests/Functional/Ticket/GH928Test.php index 4f19f8fcfc..8e23658f5b 100644 --- a/tests/Tests/Functional/Ticket/GH928Test.php +++ b/tests/Tests/Functional/Ticket/GH928Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH928Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH936Test.php b/tests/Tests/Functional/Ticket/GH936Test.php index a5387b761d..fd25150b8a 100644 --- a/tests/Tests/Functional/Ticket/GH936Test.php +++ b/tests/Tests/Functional/Ticket/GH936Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH936Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH942Test.php b/tests/Tests/Functional/Ticket/GH942Test.php index 34c61b9d22..44445528d2 100644 --- a/tests/Tests/Functional/Ticket/GH942Test.php +++ b/tests/Tests/Functional/Ticket/GH942Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/GH944Test.php b/tests/Tests/Functional/Ticket/GH944Test.php index 0f9b3136b9..73b77d74c4 100644 --- a/tests/Tests/Functional/Ticket/GH944Test.php +++ b/tests/Tests/Functional/Ticket/GH944Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH944Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH971Test.php b/tests/Tests/Functional/Ticket/GH971Test.php index be1c3b66be..d822a7043b 100644 --- a/tests/Tests/Functional/Ticket/GH971Test.php +++ b/tests/Tests/Functional/Ticket/GH971Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use InvalidArgumentException; diff --git a/tests/Tests/Functional/Ticket/GH977Test.php b/tests/Tests/Functional/Ticket/GH977Test.php index b0a1a58313..fe78397dc6 100644 --- a/tests/Tests/Functional/Ticket/GH977Test.php +++ b/tests/Tests/Functional/Ticket/GH977Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class GH977Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/GH999Test.php b/tests/Tests/Functional/Ticket/GH999Test.php index 4b14407490..db06267d52 100644 --- a/tests/Tests/Functional/Ticket/GH999Test.php +++ b/tests/Tests/Functional/Ticket/GH999Test.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Exception; diff --git a/tests/Tests/Functional/Ticket/MODM116Test.php b/tests/Tests/Functional/Ticket/MODM116Test.php index 1658c7e6d5..7f41791207 100644 --- a/tests/Tests/Functional/Ticket/MODM116Test.php +++ b/tests/Tests/Functional/Ticket/MODM116Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function array_values; diff --git a/tests/Tests/Functional/Ticket/MODM140Test.php b/tests/Tests/Functional/Ticket/MODM140Test.php index 6bb9ed3aac..ca5ba83cfe 100644 --- a/tests/Tests/Functional/Ticket/MODM140Test.php +++ b/tests/Tests/Functional/Ticket/MODM140Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\Functional\EmbeddedTestLevel0; use Documents\Functional\EmbeddedTestLevel1; diff --git a/tests/Tests/Functional/Ticket/MODM29Test.php b/tests/Tests/Functional/Ticket/MODM29Test.php index 32ddd25418..5fbadc34a8 100644 --- a/tests/Tests/Functional/Ticket/MODM29Test.php +++ b/tests/Tests/Functional/Ticket/MODM29Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function assert; diff --git a/tests/Tests/Functional/Ticket/MODM43Test.php b/tests/Tests/Functional/Ticket/MODM43Test.php index 8dad762840..1206279475 100644 --- a/tests/Tests/Functional/Ticket/MODM43Test.php +++ b/tests/Tests/Functional/Ticket/MODM43Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\ODM\MongoDB\Event\PreLoadEventArgs; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/MODM45Test.php b/tests/Tests/Functional/Ticket/MODM45Test.php index b80fcdd3ae..a292d1a4f6 100644 --- a/tests/Tests/Functional/Ticket/MODM45Test.php +++ b/tests/Tests/Functional/Ticket/MODM45Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM45Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM46Test.php b/tests/Tests/Functional/Ticket/MODM46Test.php index a3ffc7a2c3..b44eaa782d 100644 --- a/tests/Tests/Functional/Ticket/MODM46Test.php +++ b/tests/Tests/Functional/Ticket/MODM46Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/MODM47Test.php b/tests/Tests/Functional/Ticket/MODM47Test.php index edfa17112f..563caaaf45 100644 --- a/tests/Tests/Functional/Ticket/MODM47Test.php +++ b/tests/Tests/Functional/Ticket/MODM47Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/Ticket/MODM48Test.php b/tests/Tests/Functional/Ticket/MODM48Test.php index 45c2ea41eb..d29e66d2af 100644 --- a/tests/Tests/Functional/Ticket/MODM48Test.php +++ b/tests/Tests/Functional/Ticket/MODM48Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM48Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM52Test.php b/tests/Tests/Functional/Ticket/MODM52Test.php index af148126a3..472798bdaf 100644 --- a/tests/Tests/Functional/Ticket/MODM52Test.php +++ b/tests/Tests/Functional/Ticket/MODM52Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function count; diff --git a/tests/Tests/Functional/Ticket/MODM56Test.php b/tests/Tests/Functional/Ticket/MODM56Test.php index 70428838d4..b780aaf617 100644 --- a/tests/Tests/Functional/Ticket/MODM56Test.php +++ b/tests/Tests/Functional/Ticket/MODM56Test.php @@ -6,7 +6,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\UTCDateTime; diff --git a/tests/Tests/Functional/Ticket/MODM62Test.php b/tests/Tests/Functional/Ticket/MODM62Test.php index 4e67bd3a47..0e2d1e8ae8 100644 --- a/tests/Tests/Functional/Ticket/MODM62Test.php +++ b/tests/Tests/Functional/Ticket/MODM62Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM62Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM65Test.php b/tests/Tests/Functional/Ticket/MODM65Test.php index 028fe9db2d..2ff30d5a93 100644 --- a/tests/Tests/Functional/Ticket/MODM65Test.php +++ b/tests/Tests/Functional/Ticket/MODM65Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM65Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM66Test.php b/tests/Tests/Functional/Ticket/MODM66Test.php index 96565997eb..5e841e9615 100644 --- a/tests/Tests/Functional/Ticket/MODM66Test.php +++ b/tests/Tests/Functional/Ticket/MODM66Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM66Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM67Test.php b/tests/Tests/Functional/Ticket/MODM67Test.php index 08c7881cff..fc7d7cdb19 100644 --- a/tests/Tests/Functional/Ticket/MODM67Test.php +++ b/tests/Tests/Functional/Ticket/MODM67Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM67Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM70Test.php b/tests/Tests/Functional/Ticket/MODM70Test.php index 19c2374862..eb90a65a00 100644 --- a/tests/Tests/Functional/Ticket/MODM70Test.php +++ b/tests/Tests/Functional/Ticket/MODM70Test.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use function array_search; diff --git a/tests/Tests/Functional/Ticket/MODM72Test.php b/tests/Tests/Functional/Ticket/MODM72Test.php index 73f6024170..0b379d4606 100644 --- a/tests/Tests/Functional/Ticket/MODM72Test.php +++ b/tests/Tests/Functional/Ticket/MODM72Test.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM72Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM76Test.php b/tests/Tests/Functional/Ticket/MODM76Test.php index 1471306a4c..c08de061da 100644 --- a/tests/Tests/Functional/Ticket/MODM76Test.php +++ b/tests/Tests/Functional/Ticket/MODM76Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM76Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM81Test.php b/tests/Tests/Functional/Ticket/MODM81Test.php index 89b100761f..289ca79f52 100644 --- a/tests/Tests/Functional/Ticket/MODM81Test.php +++ b/tests/Tests/Functional/Ticket/MODM81Test.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\DocumentManager; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM81Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM83Test.php b/tests/Tests/Functional/Ticket/MODM83Test.php index 7c9225e846..01a32596c7 100644 --- a/tests/Tests/Functional/Ticket/MODM83Test.php +++ b/tests/Tests/Functional/Ticket/MODM83Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM83Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM90Test.php b/tests/Tests/Functional/Ticket/MODM90Test.php index 23ef57111b..fcaa6057d9 100644 --- a/tests/Tests/Functional/Ticket/MODM90Test.php +++ b/tests/Tests/Functional/Ticket/MODM90Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM90Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM91Test.php b/tests/Tests/Functional/Ticket/MODM91Test.php index 5664c0aff8..19d164047b 100644 --- a/tests/Tests/Functional/Ticket/MODM91Test.php +++ b/tests/Tests/Functional/Ticket/MODM91Test.php @@ -7,7 +7,7 @@ use Doctrine\ODM\MongoDB\DocumentManager; use Doctrine\ODM\MongoDB\Event\LifecycleEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM91Test extends BaseTestCase diff --git a/tests/Tests/Functional/Ticket/MODM92Test.php b/tests/Tests/Functional/Ticket/MODM92Test.php index e553d4ac80..98d9a1f0d0 100644 --- a/tests/Tests/Functional/Ticket/MODM92Test.php +++ b/tests/Tests/Functional/Ticket/MODM92Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Traversable; diff --git a/tests/Tests/Functional/Ticket/MODM95Test.php b/tests/Tests/Functional/Ticket/MODM95Test.php index 5ae0351229..8289f0aba5 100644 --- a/tests/Tests/Functional/Ticket/MODM95Test.php +++ b/tests/Tests/Functional/Ticket/MODM95Test.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class MODM95Test extends BaseTestCase diff --git a/tests/Tests/Functional/UpsertTest.php b/tests/Tests/Functional/UpsertTest.php index 4692e112b9..b33495db14 100644 --- a/tests/Tests/Functional/UpsertTest.php +++ b/tests/Tests/Functional/UpsertTest.php @@ -5,7 +5,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use MongoDB\BSON\ObjectId; diff --git a/tests/Tests/Functional/UuidMappingTest.php b/tests/Tests/Functional/UuidMappingTest.php index 0a1ac92c85..ad737f94e9 100644 --- a/tests/Tests/Functional/UuidMappingTest.php +++ b/tests/Tests/Functional/UuidMappingTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Doctrine\ODM\MongoDB\Types\Type; use Symfony\Component\Uid\UuidV4; diff --git a/tests/Tests/Functional/ValidationTest.php b/tests/Tests/Functional/ValidationTest.php index 5ea6fc8061..60f71fd1c4 100644 --- a/tests/Tests/Functional/ValidationTest.php +++ b/tests/Tests/Functional/ValidationTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Functional; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; use Documents\SchemaValidated; diff --git a/tests/Tests/Functional/VersionTest.php b/tests/Tests/Functional/VersionTest.php index 3f39061d47..4be88525fa 100644 --- a/tests/Tests/Functional/VersionTest.php +++ b/tests/Tests/Functional/VersionTest.php @@ -6,7 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; class VersionTest extends BaseTestCase diff --git a/tests/Tests/HydratorTest.php b/tests/Tests/HydratorTest.php index d029e28af2..0982d629bb 100644 --- a/tests/Tests/HydratorTest.php +++ b/tests/Tests/HydratorTest.php @@ -7,7 +7,7 @@ use DateTime; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Hydrator\HydratorException; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\PersistentCollection; use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionInterface; use Doctrine\ODM\MongoDB\Query\Query; diff --git a/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php b/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php index 6561b52714..b90e6f54f4 100644 --- a/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php +++ b/tests/Tests/Mapping/AbstractAnnotationDriverTestCase.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver; use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver; diff --git a/tests/Tests/Mapping/AbstractMappingDriverTestCase.php b/tests/Tests/Mapping/AbstractMappingDriverTestCase.php index ec6953cfed..4bdbc8b19d 100644 --- a/tests/Tests/Mapping/AbstractMappingDriverTestCase.php +++ b/tests/Tests/Mapping/AbstractMappingDriverTestCase.php @@ -8,7 +8,8 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ODM\MongoDB\Aggregation\Builder; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Mapping\PropertyAccessors\EnumPropertyAccessor; @@ -711,9 +712,11 @@ public function testTimeSeriesDocumentWithGranularity(): void { $metadata = $this->dm->getClassMetadata(AbstractMappingDriverTimeSeriesDocumentWithGranularity::class); + self::assertInstanceOf(TimeSeries::class, $metadata->timeSeriesOptions); + // Compare using arrays as the object can be an instance of the Attribute or the child Annotation class self::assertEquals( - new ODM\TimeSeries('time', 'metadata', Granularity::Seconds, 86400), - $metadata->timeSeriesOptions, + (array) new TimeSeries('time', 'metadata', Granularity::Seconds, 86400), + (array) $metadata->timeSeriesOptions, ); } @@ -721,9 +724,10 @@ public function testTimeSeriesDocumentWithBucket(): void { $metadata = $this->dm->getClassMetadata(AbstractMappingDriverTimeSeriesDocumentWithBucket::class); + self::assertInstanceOf(TimeSeries::class, $metadata->timeSeriesOptions); self::assertEquals( - new ODM\TimeSeries('time', 'metadata', expireAfterSeconds: 86400, bucketMaxSpanSeconds: 10, bucketRoundingSeconds: 15), - $metadata->timeSeriesOptions, + (array) new TimeSeries('time', 'metadata', expireAfterSeconds: 86400, bucketMaxSpanSeconds: 10, bucketRoundingSeconds: 15), + (array) $metadata->timeSeriesOptions, ); } } diff --git a/tests/Tests/Mapping/AnnotationDriverTest.php b/tests/Tests/Mapping/AnnotationDriverTest.php index 7ecf8fda62..3bad2754af 100644 --- a/tests/Tests/Mapping/AnnotationDriverTest.php +++ b/tests/Tests/Mapping/AnnotationDriverTest.php @@ -5,8 +5,8 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; -use Doctrine\ODM\MongoDB\Mapping\Attribute\Document; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations\Document; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver; use Doctrine\Persistence\Mapping\Driver\FileClassLocator; diff --git a/tests/Tests/Mapping/BasicInheritanceMappingTest.php b/tests/Tests/Mapping/BasicInheritanceMappingTest.php index 64f04ebe95..38c787c50d 100644 --- a/tests/Tests/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Tests/Mapping/BasicInheritanceMappingTest.php @@ -4,7 +4,7 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadataFactory; use Doctrine\ODM\MongoDB\Mapping\MappingException; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Mapping/ClassMetadataLoadEventTest.php b/tests/Tests/Mapping/ClassMetadataLoadEventTest.php index 704e873dee..69887c1bbb 100644 --- a/tests/Tests/Mapping/ClassMetadataLoadEventTest.php +++ b/tests/Tests/Mapping/ClassMetadataLoadEventTest.php @@ -6,7 +6,7 @@ use Doctrine\ODM\MongoDB\Event\LoadClassMetadataEventArgs; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Tests\BaseTestCase; diff --git a/tests/Tests/Mapping/ClassMetadataTest.php b/tests/Tests/Mapping/ClassMetadataTest.php index 87768b5603..612ad8c527 100644 --- a/tests/Tests/Mapping/ClassMetadataTest.php +++ b/tests/Tests/Mapping/ClassMetadataTest.php @@ -6,7 +6,7 @@ use DateTime; use Doctrine\ODM\MongoDB\Events; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; use Doctrine\ODM\MongoDB\Mapping\LegacyReflectionFields; use Doctrine\ODM\MongoDB\Mapping\MappingException; diff --git a/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php b/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php index 92d900a387..ef5a740d26 100644 --- a/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php +++ b/tests/Tests/Mapping/Documents/GlobalNamespaceDocument.php @@ -3,7 +3,7 @@ declare(strict_types=1); use Doctrine\Common\Collections\Collection; -use Doctrine\ODM\MongoDB\Mapping\Attribute as ODM; +use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM; /** @ODM\Document */ #[ODM\Document] diff --git a/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php b/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php index 735fa5ce1a..1a84114f9b 100644 --- a/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php +++ b/tests/Tests/Mapping/Driver/AbstractDriverTestCase.php @@ -5,8 +5,8 @@ namespace Doctrine\ODM\MongoDB\Tests\Mapping\Driver; use DateTimeImmutable; -use Doctrine\ODM\MongoDB\Mapping\Attribute\EncryptQuery; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; +use Doctrine\ODM\MongoDB\Mapping\EncryptQuery; use Doctrine\Persistence\Mapping\Driver\MappingDriver; use Documents\Account; use Documents\Address; diff --git a/tests/Tests/Mapping/EncryptQueryTest.php b/tests/Tests/Mapping/EncryptQueryTest.php new file mode 100644 index 0000000000..0056335281 --- /dev/null +++ b/tests/Tests/Mapping/EncryptQueryTest.php @@ -0,0 +1,19 @@ + Date: Wed, 10 Dec 2025 07:53:52 +0100 Subject: [PATCH 5/6] Move MappingAttribute to AbstractDocument --- src/Mapping/Attribute/AbstractDocument.php | 2 +- src/Mapping/Attribute/Document.php | 2 +- src/Mapping/Attribute/EmbeddedDocument.php | 2 +- src/Mapping/Attribute/File.php | 2 +- src/Mapping/Attribute/MappedSuperclass.php | 2 +- src/Mapping/Attribute/QueryResultDocument.php | 2 +- src/Mapping/Attribute/View.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Mapping/Attribute/AbstractDocument.php b/src/Mapping/Attribute/AbstractDocument.php index 5a81684ed0..acd694e3ab 100644 --- a/src/Mapping/Attribute/AbstractDocument.php +++ b/src/Mapping/Attribute/AbstractDocument.php @@ -6,7 +6,7 @@ use function class_alias; -abstract class AbstractDocument +abstract class AbstractDocument implements MappingAttribute { } diff --git a/src/Mapping/Attribute/Document.php b/src/Mapping/Attribute/Document.php index ccd2470eff..b895d5bcf8 100644 --- a/src/Mapping/Attribute/Document.php +++ b/src/Mapping/Attribute/Document.php @@ -12,7 +12,7 @@ * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class Document extends AbstractDocument implements MappingAttribute +class Document extends AbstractDocument { /** @var string|null */ public $db; diff --git a/src/Mapping/Attribute/EmbeddedDocument.php b/src/Mapping/Attribute/EmbeddedDocument.php index 8490f20e39..33abe93dc9 100644 --- a/src/Mapping/Attribute/EmbeddedDocument.php +++ b/src/Mapping/Attribute/EmbeddedDocument.php @@ -12,7 +12,7 @@ * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class EmbeddedDocument extends AbstractDocument implements MappingAttribute +class EmbeddedDocument extends AbstractDocument { /** @var Index[] */ public $indexes; diff --git a/src/Mapping/Attribute/File.php b/src/Mapping/Attribute/File.php index 87cca46f44..b5a49de8ca 100644 --- a/src/Mapping/Attribute/File.php +++ b/src/Mapping/Attribute/File.php @@ -12,7 +12,7 @@ * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class File extends AbstractDocument implements MappingAttribute +class File extends AbstractDocument { /** @var string|null */ public $db; diff --git a/src/Mapping/Attribute/MappedSuperclass.php b/src/Mapping/Attribute/MappedSuperclass.php index 34028382dd..e817cab92a 100644 --- a/src/Mapping/Attribute/MappedSuperclass.php +++ b/src/Mapping/Attribute/MappedSuperclass.php @@ -13,7 +13,7 @@ * @final */ #[Attribute(Attribute::TARGET_CLASS)] -class MappedSuperclass extends AbstractDocument implements MappingAttribute +class MappedSuperclass extends AbstractDocument { /** @var string|null */ public $repositoryClass; diff --git a/src/Mapping/Attribute/QueryResultDocument.php b/src/Mapping/Attribute/QueryResultDocument.php index a7de7427d2..9226cbb9d8 100644 --- a/src/Mapping/Attribute/QueryResultDocument.php +++ b/src/Mapping/Attribute/QueryResultDocument.php @@ -8,6 +8,6 @@ /** @final */ #[Attribute(Attribute::TARGET_CLASS)] -class QueryResultDocument extends AbstractDocument implements MappingAttribute +class QueryResultDocument extends AbstractDocument { } diff --git a/src/Mapping/Attribute/View.php b/src/Mapping/Attribute/View.php index 6015c79a12..cab14d880f 100644 --- a/src/Mapping/Attribute/View.php +++ b/src/Mapping/Attribute/View.php @@ -8,7 +8,7 @@ /** @final */ #[Attribute(Attribute::TARGET_CLASS)] -class View extends AbstractDocument implements MappingAttribute +class View extends AbstractDocument { /** @var string|null */ public $db; From 7a756e14d8d0cbf89951cd4659c32c1d60cab391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= Date: Fri, 12 Dec 2025 16:15:08 +0100 Subject: [PATCH 6/6] Add use statement to Attribute class in Annotation classes --- src/Mapping/Annotations/AlsoLoad.php | 3 ++- src/Mapping/Annotations/ChangeTrackingPolicy.php | 3 ++- src/Mapping/Annotations/DefaultDiscriminatorValue.php | 3 ++- src/Mapping/Annotations/DiscriminatorField.php | 3 ++- src/Mapping/Annotations/DiscriminatorMap.php | 3 ++- src/Mapping/Annotations/DiscriminatorValue.php | 3 ++- src/Mapping/Annotations/Document.php | 3 ++- src/Mapping/Annotations/EmbedMany.php | 3 ++- src/Mapping/Annotations/EmbedOne.php | 3 ++- src/Mapping/Annotations/EmbeddedDocument.php | 3 ++- src/Mapping/Annotations/Encrypt.php | 3 ++- src/Mapping/Annotations/Field.php | 3 ++- src/Mapping/Annotations/File.php | 3 ++- src/Mapping/Annotations/File/ChunkSize.php | 3 ++- src/Mapping/Annotations/File/Filename.php | 3 ++- src/Mapping/Annotations/File/Length.php | 3 ++- src/Mapping/Annotations/File/Metadata.php | 3 ++- src/Mapping/Annotations/File/UploadDate.php | 3 ++- src/Mapping/Annotations/HasLifecycleCallbacks.php | 3 ++- src/Mapping/Annotations/Id.php | 3 ++- src/Mapping/Annotations/Index.php | 3 ++- src/Mapping/Annotations/InheritanceType.php | 3 ++- src/Mapping/Annotations/Lock.php | 3 ++- src/Mapping/Annotations/MappedSuperclass.php | 3 ++- src/Mapping/Annotations/PostLoad.php | 3 ++- src/Mapping/Annotations/PostPersist.php | 3 ++- src/Mapping/Annotations/PostRemove.php | 3 ++- src/Mapping/Annotations/PostUpdate.php | 3 ++- src/Mapping/Annotations/PreFlush.php | 3 ++- src/Mapping/Annotations/PreLoad.php | 3 ++- src/Mapping/Annotations/PrePersist.php | 3 ++- src/Mapping/Annotations/PreRemove.php | 3 ++- src/Mapping/Annotations/PreUpdate.php | 3 ++- src/Mapping/Annotations/QueryResultDocument.php | 3 ++- src/Mapping/Annotations/ReadPreference.php | 3 ++- src/Mapping/Annotations/ReferenceMany.php | 3 ++- src/Mapping/Annotations/ReferenceOne.php | 3 ++- src/Mapping/Annotations/SearchIndex.php | 3 ++- src/Mapping/Annotations/ShardKey.php | 3 ++- src/Mapping/Annotations/TimeSeries.php | 3 ++- src/Mapping/Annotations/UniqueIndex.php | 3 ++- src/Mapping/Annotations/Validation.php | 3 ++- src/Mapping/Annotations/VectorSearchIndex.php | 3 ++- src/Mapping/Annotations/Version.php | 3 ++- src/Mapping/Annotations/View.php | 3 ++- 45 files changed, 90 insertions(+), 45 deletions(-) diff --git a/src/Mapping/Annotations/AlsoLoad.php b/src/Mapping/Annotations/AlsoLoad.php index 33b181a351..5e6a31c2c3 100644 --- a/src/Mapping/Annotations/AlsoLoad.php +++ b/src/Mapping/Annotations/AlsoLoad.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad as AlsoLoadAttribute; /** * Loads data from a different field if the original field is not set @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_METHOD)] -final class AlsoLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\AlsoLoad implements Annotation +final class AlsoLoad extends AlsoLoadAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/ChangeTrackingPolicy.php b/src/Mapping/Annotations/ChangeTrackingPolicy.php index ddf28a7b24..e18c8f7c5b 100644 --- a/src/Mapping/Annotations/ChangeTrackingPolicy.php +++ b/src/Mapping/Annotations/ChangeTrackingPolicy.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy as ChangeTrackingPolicyAttribute; /** * Specifies the change tracking policy for a document @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class ChangeTrackingPolicy extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ChangeTrackingPolicy implements Annotation +final class ChangeTrackingPolicy extends ChangeTrackingPolicyAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/DefaultDiscriminatorValue.php b/src/Mapping/Annotations/DefaultDiscriminatorValue.php index 9d0175fe4a..13258a5a2c 100644 --- a/src/Mapping/Annotations/DefaultDiscriminatorValue.php +++ b/src/Mapping/Annotations/DefaultDiscriminatorValue.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue as DefaultDiscriminatorValueAttribute; /** * Specifies a default discriminator value to be used when the discriminator @@ -17,6 +18,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class DefaultDiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DefaultDiscriminatorValue implements Annotation +final class DefaultDiscriminatorValue extends DefaultDiscriminatorValueAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/DiscriminatorField.php b/src/Mapping/Annotations/DiscriminatorField.php index 0cee47a3ba..fa49e72b8f 100644 --- a/src/Mapping/Annotations/DiscriminatorField.php +++ b/src/Mapping/Annotations/DiscriminatorField.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField as DiscriminatorFieldAttribute; /** * Specify a field name to store a discriminator value @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class DiscriminatorField extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorField implements Annotation +final class DiscriminatorField extends DiscriminatorFieldAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/DiscriminatorMap.php b/src/Mapping/Annotations/DiscriminatorMap.php index d5a7f7bab6..a4cb27e53d 100644 --- a/src/Mapping/Annotations/DiscriminatorMap.php +++ b/src/Mapping/Annotations/DiscriminatorMap.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap as DiscriminatorMapAttribute; /** * Specify a map of discriminator values and classes @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class DiscriminatorMap extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorMap implements Annotation +final class DiscriminatorMap extends DiscriminatorMapAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/DiscriminatorValue.php b/src/Mapping/Annotations/DiscriminatorValue.php index 6511fcb29a..a8a7c7b0c5 100644 --- a/src/Mapping/Annotations/DiscriminatorValue.php +++ b/src/Mapping/Annotations/DiscriminatorValue.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue as DiscriminatorValueAttribute; /** * Use the specified discriminator for this class @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class DiscriminatorValue extends \Doctrine\ODM\MongoDB\Mapping\Attribute\DiscriminatorValue implements Annotation +final class DiscriminatorValue extends DiscriminatorValueAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Document.php b/src/Mapping/Annotations/Document.php index bad3bcecd4..05a9506c4f 100644 --- a/src/Mapping/Annotations/Document.php +++ b/src/Mapping/Annotations/Document.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Document as DocumentAttribute; /** * Identifies a class as a document that can be stored in the database @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class Document extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Document implements Annotation +final class Document extends DocumentAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/EmbedMany.php b/src/Mapping/Annotations/EmbedMany.php index e1139c5c65..fad20901fa 100644 --- a/src/Mapping/Annotations/EmbedMany.php +++ b/src/Mapping/Annotations/EmbedMany.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany as EmbedManyAttribute; /** * Embeds multiple documents @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class EmbedMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedMany implements Annotation +final class EmbedMany extends EmbedManyAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/EmbedOne.php b/src/Mapping/Annotations/EmbedOne.php index ed3a37eb61..512ccb8c81 100644 --- a/src/Mapping/Annotations/EmbedOne.php +++ b/src/Mapping/Annotations/EmbedOne.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne as EmbedOneAttribute; /** * Embeds a single document @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class EmbedOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbedOne implements Annotation +final class EmbedOne extends EmbedOneAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/EmbeddedDocument.php b/src/Mapping/Annotations/EmbeddedDocument.php index 7779b90330..a307ac3026 100644 --- a/src/Mapping/Annotations/EmbeddedDocument.php +++ b/src/Mapping/Annotations/EmbeddedDocument.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument as EmbeddedDocumentAttribute; /** * Identifies a class as a document that can be embedded but not stored by itself @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class EmbeddedDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\EmbeddedDocument implements Annotation +final class EmbeddedDocument extends EmbeddedDocumentAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Encrypt.php b/src/Mapping/Annotations/Encrypt.php index b26e7b9ed7..fd8c284de9 100644 --- a/src/Mapping/Annotations/Encrypt.php +++ b/src/Mapping/Annotations/Encrypt.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt as EncryptAttribute; /** * Defines an encrypted field mapping. @@ -18,6 +19,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY)] -final class Encrypt extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Encrypt implements Annotation +final class Encrypt extends EncryptAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Field.php b/src/Mapping/Annotations/Field.php index 39d719161e..b160109a5c 100644 --- a/src/Mapping/Annotations/Field.php +++ b/src/Mapping/Annotations/Field.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Field as FieldAttribute; /** * Specifies a generic field mapping @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Field extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Field implements Annotation +final class Field extends FieldAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/File.php b/src/Mapping/Annotations/File.php index 49504769ef..4aa88088cd 100644 --- a/src/Mapping/Annotations/File.php +++ b/src/Mapping/Annotations/File.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\File as FileAttribute; /** * Identifies a class as a GridFS file that can be stored in the database @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class File extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File implements Annotation +final class File extends FileAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/File/ChunkSize.php b/src/Mapping/Annotations/File/ChunkSize.php index 856d164186..5f7738f473 100644 --- a/src/Mapping/Annotations/File/ChunkSize.php +++ b/src/Mapping/Annotations/File/ChunkSize.php @@ -7,6 +7,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize as ChunkSizeAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize instead @@ -15,6 +16,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ChunkSize extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\ChunkSize implements Annotation +final class ChunkSize extends ChunkSizeAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/File/Filename.php b/src/Mapping/Annotations/File/Filename.php index d28876e84e..702203150a 100644 --- a/src/Mapping/Annotations/File/Filename.php +++ b/src/Mapping/Annotations/File/Filename.php @@ -7,6 +7,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename as FilenameAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename instead @@ -15,6 +16,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Filename extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Filename implements Annotation +final class Filename extends FilenameAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/File/Length.php b/src/Mapping/Annotations/File/Length.php index ea5a22b0db..4590610b8d 100644 --- a/src/Mapping/Annotations/File/Length.php +++ b/src/Mapping/Annotations/File/Length.php @@ -7,6 +7,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length as LengthAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length instead @@ -15,6 +16,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Length extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Length implements Annotation +final class Length extends LengthAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/File/Metadata.php b/src/Mapping/Annotations/File/Metadata.php index 0ee32ec52b..9992640bce 100644 --- a/src/Mapping/Annotations/File/Metadata.php +++ b/src/Mapping/Annotations/File/Metadata.php @@ -7,6 +7,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata as MetadataAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata instead @@ -15,6 +16,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Metadata extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\Metadata implements Annotation +final class Metadata extends MetadataAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/File/UploadDate.php b/src/Mapping/Annotations/File/UploadDate.php index afc3152d75..dfb4fcf48a 100644 --- a/src/Mapping/Annotations/File/UploadDate.php +++ b/src/Mapping/Annotations/File/UploadDate.php @@ -7,6 +7,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; use Doctrine\ODM\MongoDB\Mapping\Annotations\Annotation; +use Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate as UploadDateAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate instead @@ -15,6 +16,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class UploadDate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\File\UploadDate implements Annotation +final class UploadDate extends UploadDateAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/HasLifecycleCallbacks.php b/src/Mapping/Annotations/HasLifecycleCallbacks.php index 15021f9bcd..e44a816339 100644 --- a/src/Mapping/Annotations/HasLifecycleCallbacks.php +++ b/src/Mapping/Annotations/HasLifecycleCallbacks.php @@ -5,6 +5,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use Attribute; +use Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks as HasLifecycleCallbacksAttribute; /** * Must be set on a document class to instruct Doctrine to check for lifecycle @@ -15,6 +16,6 @@ * @Annotation */ #[Attribute(Attribute::TARGET_CLASS)] -final class HasLifecycleCallbacks extends \Doctrine\ODM\MongoDB\Mapping\Attribute\HasLifecycleCallbacks implements Annotation +final class HasLifecycleCallbacks extends HasLifecycleCallbacksAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Id.php b/src/Mapping/Annotations/Id.php index 5aad8da190..3cfdc53eaa 100644 --- a/src/Mapping/Annotations/Id.php +++ b/src/Mapping/Annotations/Id.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Id as IdAttribute; /** * Special field mapping to map document identifiers @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Id extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Id implements Annotation +final class Id extends IdAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Index.php b/src/Mapping/Annotations/Index.php index 78a9c30064..7081c33590 100644 --- a/src/Mapping/Annotations/Index.php +++ b/src/Mapping/Annotations/Index.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Index as IndexAttribute; /** * Defines an index on a field @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -final class Index extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Index implements Annotation +final class Index extends IndexAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/InheritanceType.php b/src/Mapping/Annotations/InheritanceType.php index bf808691fc..794652c0d6 100644 --- a/src/Mapping/Annotations/InheritanceType.php +++ b/src/Mapping/Annotations/InheritanceType.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType as InheritanceTypeAttribute; /** * Specifies which inheritance type to use for a document @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class InheritanceType extends \Doctrine\ODM\MongoDB\Mapping\Attribute\InheritanceType implements Annotation +final class InheritanceType extends InheritanceTypeAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Lock.php b/src/Mapping/Annotations/Lock.php index 4527747ae5..412677ed00 100644 --- a/src/Mapping/Annotations/Lock.php +++ b/src/Mapping/Annotations/Lock.php @@ -5,6 +5,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use Attribute; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Lock as LockAttribute; /** * Specifies a field to use for pessimistic locking @@ -14,6 +15,6 @@ * @Annotation */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Lock extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Lock implements Annotation +final class Lock extends LockAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/MappedSuperclass.php b/src/Mapping/Annotations/MappedSuperclass.php index 8f7f042b69..157cfa7884 100644 --- a/src/Mapping/Annotations/MappedSuperclass.php +++ b/src/Mapping/Annotations/MappedSuperclass.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass as MappedSuperclassAttribute; /** * Specifies a parent class that other documents may extend to inherit mapping @@ -17,6 +18,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class MappedSuperclass extends \Doctrine\ODM\MongoDB\Mapping\Attribute\MappedSuperclass implements Annotation +final class MappedSuperclass extends MappedSuperclassAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PostLoad.php b/src/Mapping/Annotations/PostLoad.php index ef3cefebe5..5fc7b97174 100644 --- a/src/Mapping/Annotations/PostLoad.php +++ b/src/Mapping/Annotations/PostLoad.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad as PostLoadAttribute; /** * Marks a method as a postLoad lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostLoad implements Annotation +final class PostLoad extends PostLoadAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PostPersist.php b/src/Mapping/Annotations/PostPersist.php index dd9defefda..a6928dd3ec 100644 --- a/src/Mapping/Annotations/PostPersist.php +++ b/src/Mapping/Annotations/PostPersist.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist as PostPersistAttribute; /** * Marks a method as a postPersist lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostPersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostPersist implements Annotation +final class PostPersist extends PostPersistAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PostRemove.php b/src/Mapping/Annotations/PostRemove.php index 4fa36dee66..7ef2993625 100644 --- a/src/Mapping/Annotations/PostRemove.php +++ b/src/Mapping/Annotations/PostRemove.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove as PostRemoveAttribute; /** * Marks a method as a postRemove lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostRemove implements Annotation +final class PostRemove extends PostRemoveAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PostUpdate.php b/src/Mapping/Annotations/PostUpdate.php index 7bd90791d7..6a13a87a7e 100644 --- a/src/Mapping/Annotations/PostUpdate.php +++ b/src/Mapping/Annotations/PostUpdate.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate as PostUpdateAttribute; /** * Marks a method as a postUpdate lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PostUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PostUpdate implements Annotation +final class PostUpdate extends PostUpdateAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PreFlush.php b/src/Mapping/Annotations/PreFlush.php index 2f40f372b8..8c8ef39636 100644 --- a/src/Mapping/Annotations/PreFlush.php +++ b/src/Mapping/Annotations/PreFlush.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush as PreFlushAttribute; /** * Marks a method as a preFlush lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreFlush extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreFlush implements Annotation +final class PreFlush extends PreFlushAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PreLoad.php b/src/Mapping/Annotations/PreLoad.php index 971f86c764..047b7f5d2b 100644 --- a/src/Mapping/Annotations/PreLoad.php +++ b/src/Mapping/Annotations/PreLoad.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad as PreLoadAttribute; /** * Marks a method as a preLoad lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreLoad extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreLoad implements Annotation +final class PreLoad extends PreLoadAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PrePersist.php b/src/Mapping/Annotations/PrePersist.php index fb0dee2f61..42ed14181a 100644 --- a/src/Mapping/Annotations/PrePersist.php +++ b/src/Mapping/Annotations/PrePersist.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist as PrePersistAttribute; /** * Marks a method as a prePersist lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PrePersist extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PrePersist implements Annotation +final class PrePersist extends PrePersistAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PreRemove.php b/src/Mapping/Annotations/PreRemove.php index 9550be9092..acc18c64ea 100644 --- a/src/Mapping/Annotations/PreRemove.php +++ b/src/Mapping/Annotations/PreRemove.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove as PreRemoveAttribute; /** * Marks a method as a preRemove lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreRemove extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreRemove implements Annotation +final class PreRemove extends PreRemoveAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/PreUpdate.php b/src/Mapping/Annotations/PreUpdate.php index 096ee7f610..15ff25eef9 100644 --- a/src/Mapping/Annotations/PreUpdate.php +++ b/src/Mapping/Annotations/PreUpdate.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate as PreUpdateAttribute; /** * Marks a method as a preUpdate lifecycle callback @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_METHOD)] -final class PreUpdate extends \Doctrine\ODM\MongoDB\Mapping\Attribute\PreUpdate implements Annotation +final class PreUpdate extends PreUpdateAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/QueryResultDocument.php b/src/Mapping/Annotations/QueryResultDocument.php index 254fa2b22f..b84aa17add 100644 --- a/src/Mapping/Annotations/QueryResultDocument.php +++ b/src/Mapping/Annotations/QueryResultDocument.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument as QueryResultDocumentAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument instead @@ -14,6 +15,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class QueryResultDocument extends \Doctrine\ODM\MongoDB\Mapping\Attribute\QueryResultDocument implements Annotation +final class QueryResultDocument extends QueryResultDocumentAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/ReadPreference.php b/src/Mapping/Annotations/ReadPreference.php index b876dc16d4..a8641fb372 100644 --- a/src/Mapping/Annotations/ReadPreference.php +++ b/src/Mapping/Annotations/ReadPreference.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference as ReadPreferenceAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference instead @@ -14,6 +15,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class ReadPreference extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReadPreference implements Annotation +final class ReadPreference extends ReadPreferenceAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/ReferenceMany.php b/src/Mapping/Annotations/ReferenceMany.php index b7a6fc4c97..d21282ac25 100644 --- a/src/Mapping/Annotations/ReferenceMany.php +++ b/src/Mapping/Annotations/ReferenceMany.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany as ReferenceManyAttribute; /** * Specifies a one-to-many relationship to a different document @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ReferenceMany extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceMany implements Annotation +final class ReferenceMany extends ReferenceManyAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/ReferenceOne.php b/src/Mapping/Annotations/ReferenceOne.php index 459cd1e7de..7a311b6ecc 100644 --- a/src/Mapping/Annotations/ReferenceOne.php +++ b/src/Mapping/Annotations/ReferenceOne.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne as ReferenceOneAttribute; /** * Specifies a one-to-one relationship to a different document @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class ReferenceOne extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ReferenceOne implements Annotation +final class ReferenceOne extends ReferenceOneAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/SearchIndex.php b/src/Mapping/Annotations/SearchIndex.php index bd487ab054..a3e9be130f 100644 --- a/src/Mapping/Annotations/SearchIndex.php +++ b/src/Mapping/Annotations/SearchIndex.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex as SearchIndexAttribute; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; /** @@ -21,6 +22,6 @@ * @phpstan-import-type SearchIndexSynonym from ClassMetadata */ #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] -final class SearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\SearchIndex implements Annotation +final class SearchIndex extends SearchIndexAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/ShardKey.php b/src/Mapping/Annotations/ShardKey.php index 117da16196..7f0bbacb13 100644 --- a/src/Mapping/Annotations/ShardKey.php +++ b/src/Mapping/Annotations/ShardKey.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey as ShardKeyAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey instead @@ -14,6 +15,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class ShardKey extends \Doctrine\ODM\MongoDB\Mapping\Attribute\ShardKey implements Annotation +final class ShardKey extends ShardKeyAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/TimeSeries.php b/src/Mapping/Annotations/TimeSeries.php index 05a70e1e0a..cc02589e7f 100644 --- a/src/Mapping/Annotations/TimeSeries.php +++ b/src/Mapping/Annotations/TimeSeries.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries as TimeSeriesAttribute; /** * Marks a document or superclass as a time series document @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class TimeSeries extends \Doctrine\ODM\MongoDB\Mapping\Attribute\TimeSeries implements Annotation +final class TimeSeries extends TimeSeriesAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/UniqueIndex.php b/src/Mapping/Annotations/UniqueIndex.php index d385200acc..017ea4c816 100644 --- a/src/Mapping/Annotations/UniqueIndex.php +++ b/src/Mapping/Annotations/UniqueIndex.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex as UniqueIndexAttribute; /** * Specifies a unique index on a field @@ -16,6 +17,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::IS_REPEATABLE)] -final class UniqueIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\UniqueIndex implements Annotation +final class UniqueIndex extends UniqueIndexAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Validation.php b/src/Mapping/Annotations/Validation.php index 49f92ecb65..081419e94c 100644 --- a/src/Mapping/Annotations/Validation.php +++ b/src/Mapping/Annotations/Validation.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Validation as ValidationAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation instead @@ -15,6 +16,6 @@ * @Target({"CLASS"}) */ #[Attribute(Attribute::TARGET_CLASS)] -final class Validation extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Validation implements Annotation +final class Validation extends ValidationAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/VectorSearchIndex.php b/src/Mapping/Annotations/VectorSearchIndex.php index 1162195546..8857a70bc9 100644 --- a/src/Mapping/Annotations/VectorSearchIndex.php +++ b/src/Mapping/Annotations/VectorSearchIndex.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex as VectorSearchIndexAttribute; use Doctrine\ODM\MongoDB\Mapping\ClassMetadata; /** @@ -20,6 +21,6 @@ * @phpstan-import-type VectorSearchIndexField from ClassMetadata */ #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)] -final class VectorSearchIndex extends \Doctrine\ODM\MongoDB\Mapping\Attribute\VectorSearchIndex implements Annotation +final class VectorSearchIndex extends VectorSearchIndexAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/Version.php b/src/Mapping/Annotations/Version.php index f97eb0e2d0..bbf71704ec 100644 --- a/src/Mapping/Annotations/Version.php +++ b/src/Mapping/Annotations/Version.php @@ -5,6 +5,7 @@ namespace Doctrine\ODM\MongoDB\Mapping\Annotations; use Attribute; +use Doctrine\ODM\MongoDB\Mapping\Attribute\Version as VersionAttribute; /** * Specifies a field to use for optimistic locking @@ -14,6 +15,6 @@ * @Annotation */ #[Attribute(Attribute::TARGET_PROPERTY)] -final class Version extends \Doctrine\ODM\MongoDB\Mapping\Attribute\Version implements Annotation +final class Version extends VersionAttribute implements Annotation { } diff --git a/src/Mapping/Annotations/View.php b/src/Mapping/Annotations/View.php index 1204a84139..64d21b6729 100644 --- a/src/Mapping/Annotations/View.php +++ b/src/Mapping/Annotations/View.php @@ -6,6 +6,7 @@ use Attribute; use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; +use Doctrine\ODM\MongoDB\Mapping\Attribute\View as ViewAttribute; /** * @deprecated Use \Doctrine\ODM\MongoDB\Mapping\Attribute\View instead @@ -14,6 +15,6 @@ * @NamedArgumentConstructor */ #[Attribute(Attribute::TARGET_CLASS)] -final class View extends \Doctrine\ODM\MongoDB\Mapping\Attribute\View implements Annotation +final class View extends ViewAttribute implements Annotation { }