Skip to content

Commit f6c2dab

Browse files
committed
Drop more usages of SimpleAnnotationReader
1 parent a1c1577 commit f6c2dab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+66
-17
lines changed

tests/Doctrine/Tests/Mocks/EntityManagerMock.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static function create($conn, ?Configuration $config = null, ?EventManage
6060
$config = new Configuration();
6161
$config->setProxyDir(__DIR__ . '/../Proxies');
6262
$config->setProxyNamespace('Doctrine\Tests\Proxies');
63-
$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
63+
$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], false));
6464
}
6565

6666
if ($eventManager === null) {

tests/Doctrine/Tests/Models/CMS/CmsArticle.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\ORM\Mapping\ManyToOne;
1414
use Doctrine\ORM\Mapping\OneToMany;
1515
use Doctrine\ORM\Mapping\Table;
16+
use Doctrine\ORM\Mapping\Version;
1617

1718
/**
1819
* @Entity

tests/Doctrine/Tests/Models/DDC1590/DDC1590Entity.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
use Doctrine\ORM\Mapping\Entity;
1010
use Doctrine\ORM\Mapping\GeneratedValue;
1111
use Doctrine\ORM\Mapping\Id;
12+
use Doctrine\ORM\Mapping\MappedSuperclass;
1213

1314
/**
1415
* @Entity
15-
* @MappedSuperClass
16+
* @MappedSuperclass
1617
*/
1718
abstract class DDC1590Entity
1819
{

tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Doctrine\ORM\Mapping\Column;
88
use Doctrine\ORM\Mapping\Entity;
99
use Doctrine\ORM\Mapping\Id;
10+
use Doctrine\ORM\Mapping\JoinColumn;
1011
use Doctrine\ORM\Mapping\JoinTable;
1112
use Doctrine\ORM\Mapping\ManyToMany;
1213
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/Models/Pagination/Logo.php

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
/**
1616
* Logo
1717
*
18-
* @Author Bill Schaller
1918
* @Entity
2019
* @Table(name="pagination_logo")
2120
*/

tests/Doctrine/Tests/Models/Routing/RoutingRoute.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\Entity;
1111
use Doctrine\ORM\Mapping\GeneratedValue;
1212
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\JoinColumn;
1314
use Doctrine\ORM\Mapping\JoinTable;
1415
use Doctrine\ORM\Mapping\ManyToMany;
1516
use Doctrine\ORM\Mapping\OneToMany;

tests/Doctrine/Tests/Models/StockExchange/Bond.php

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Doctrine\Tests\Models\StockExchange;
66

7+
use Doctrine\ORM\Mapping\Column;
78
use Doctrine\ORM\Mapping\Entity;
89
use Doctrine\ORM\Mapping\GeneratedValue;
910
use Doctrine\ORM\Mapping\Id;

tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\Id;
1111
use Doctrine\ORM\Mapping\ManyToOne;
1212
use Doctrine\ORM\Mapping\Table;
13+
use Doctrine\ORM\Mapping\Version;
1314

1415
/**
1516
* @Entity

tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Mapping\GeneratedValue;
1010
use Doctrine\ORM\Mapping\Id;
1111
use Doctrine\ORM\Mapping\Table;
12+
use Doctrine\ORM\Mapping\Version;
1213

1314
/**
1415
* @Entity

tests/Doctrine/Tests/Models/VersionedOneToOne/FirstRelatedEntity.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\JoinColumn;
1111
use Doctrine\ORM\Mapping\OneToOne;
1212
use Doctrine\ORM\Mapping\Table;
13+
use Doctrine\ORM\Mapping\Version;
1314

1415
/**
1516
* @Entity

tests/Doctrine/Tests/Models/VersionedOneToOne/SecondRelatedEntity.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Mapping\GeneratedValue;
1010
use Doctrine\ORM\Mapping\Id;
1111
use Doctrine\ORM\Mapping\Table;
12+
use Doctrine\ORM\Mapping\Version;
1213

1314
/**
1415
* @Entity

tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function createEntityManager(Connection $conn): EntityManagerInterface
120120
$config->setProxyNamespace('MyProject\Proxies');
121121
$config->setAutoGenerateProxyClasses(true);
122122

123-
$annotDriver = $config->newDefaultAnnotationDriver([__DIR__ . '/../../../Models/'], true);
123+
$annotDriver = $config->newDefaultAnnotationDriver([__DIR__ . '/../../../Models/'], false);
124124
$config->setMetadataDriverImpl($annotDriver);
125125
$config->setMetadataCache(new ArrayAdapter());
126126

tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\ORM\Mapping\Id;
1515
use Doctrine\ORM\Mapping\InheritanceType;
1616
use Doctrine\ORM\Mapping\Table;
17+
use Doctrine\ORM\Mapping\Version;
1718
use Doctrine\ORM\OptimisticLockException;
1819
use Doctrine\Tests\OrmFunctionalTestCase;
1920
use Exception;
@@ -306,6 +307,7 @@ class OptimisticJoinedParent
306307
public $version;
307308
}
308309

310+
309311
/**
310312
* @Entity
311313
* @Table(name="optimistic_joined_child")

tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ private function createEntityManager(SQLLogger $logger): EntityManager
241241
$config->setProxyNamespace('Doctrine\Tests\Proxies');
242242
$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
243243
[realpath(__DIR__ . '/../../Models/Cache')],
244-
true
244+
false
245245
));
246246
$config->setSQLLogger($logger);
247247

tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Doctrine\ORM\Mapping\GeneratedValue;
1212
use Doctrine\ORM\Mapping\Id;
1313
use Doctrine\ORM\Mapping\InheritanceType;
14+
use Doctrine\ORM\Mapping\JoinColumn;
1415
use Doctrine\ORM\Mapping\JoinTable;
1516
use Doctrine\ORM\Mapping\ManyToMany;
1617
use Doctrine\ORM\Mapping\ManyToOne;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Doctrine\ORM\Mapping\JoinColumn;
1212
use Doctrine\ORM\Mapping\JoinColumns;
1313
use Doctrine\ORM\Mapping\ManyToOne;
14+
use Doctrine\ORM\Mapping\OneToMany;
1415
use Doctrine\Tests\OrmFunctionalTestCase;
1516

1617
class DDC1181Test extends OrmFunctionalTestCase
@@ -75,7 +76,7 @@ class DDC1181Hotel
7576
public $id;
7677

7778
/**
78-
* @oneToMany(targetEntity="DDC1181Booking", mappedBy="hotel", cascade={"remove"})
79+
* @OneToMany(targetEntity="DDC1181Booking", mappedBy="hotel", cascade={"remove"})
7980
* @var Booking[]
8081
*/
8182
public $bookings;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\ORM\Mapping\GeneratedValue;
1414
use Doctrine\ORM\Mapping\Id;
1515
use Doctrine\ORM\Mapping\InheritanceType;
16+
use Doctrine\ORM\Mapping\JoinColumn;
1617
use Doctrine\ORM\Mapping\JoinTable;
1718
use Doctrine\ORM\Mapping\ManyToMany;
1819
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Doctrine\ORM\Mapping\GeneratedValue;
1212
use Doctrine\ORM\Mapping\Id;
1313
use Doctrine\ORM\Mapping\InheritanceType;
14+
use Doctrine\ORM\Mapping\Version;
1415
use Doctrine\Tests\OrmFunctionalTestCase;
1516

1617
/**

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\Entity;
1111
use Doctrine\ORM\Mapping\GeneratedValue;
1212
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\JoinColumn;
1314
use Doctrine\ORM\Mapping\JoinTable;
1415
use Doctrine\ORM\Mapping\ManyToMany;
1516
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2084Test.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44

55
namespace Doctrine\Tests\ORM\Functional\Ticket;
66

7-
use Doctrine\ORM\Mapping\Column;
8-
use Doctrine\ORM\Mapping\Entity;
9-
use Doctrine\ORM\Mapping\GeneratedValue;
10-
use Doctrine\ORM\Mapping\Id;
11-
use Doctrine\ORM\Mapping\JoinColumn;
12-
use Doctrine\ORM\Mapping\OneToOne;
13-
use Doctrine\ORM\Mapping\Table;
147
use Doctrine\Tests\OrmFunctionalTestCase;
158
use Exception;
169

@@ -71,6 +64,14 @@ public function testinvalidIdentifierBindingEntityException(): void
7164

7265
namespace Doctrine\Tests\ORM\Functional\Ticket\DDC2084;
7366

67+
use Doctrine\ORM\Mapping\Column;
68+
use Doctrine\ORM\Mapping\Entity;
69+
use Doctrine\ORM\Mapping\GeneratedValue;
70+
use Doctrine\ORM\Mapping\Id;
71+
use Doctrine\ORM\Mapping\JoinColumn;
72+
use Doctrine\ORM\Mapping\OneToOne;
73+
use Doctrine\ORM\Mapping\Table;
74+
7475
/**
7576
* @Entity
7677
* @Table(name="DDC2084_ENTITY1")

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\Entity;
1111
use Doctrine\ORM\Mapping\GeneratedValue;
1212
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\JoinColumn;
1314
use Doctrine\ORM\Mapping\JoinTable;
1415
use Doctrine\ORM\Mapping\ManyToMany;
1516
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2175Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\GeneratedValue;
1111
use Doctrine\ORM\Mapping\Id;
1212
use Doctrine\ORM\Mapping\InheritanceType;
13+
use Doctrine\ORM\Mapping\Version;
1314
use Doctrine\Tests\OrmFunctionalTestCase;
1415

1516
/**

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\ORM\Mapping\Entity;
1414
use Doctrine\ORM\Mapping\GeneratedValue;
1515
use Doctrine\ORM\Mapping\Id;
16+
use Doctrine\ORM\Mapping\JoinColumn;
1617
use Doctrine\ORM\Mapping\JoinTable;
1718
use Doctrine\ORM\Mapping\ManyToMany;
1819
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\ORM\Mapping\GeneratedValue;
1414
use Doctrine\ORM\Mapping\Id;
1515
use Doctrine\ORM\Mapping\InheritanceType;
16+
use Doctrine\ORM\Mapping\JoinColumn;
1617
use Doctrine\ORM\Mapping\JoinTable;
1718
use Doctrine\ORM\Mapping\ManyToMany;
1819
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Mapping\Entity;
1010
use Doctrine\ORM\Mapping\GeneratedValue;
1111
use Doctrine\ORM\Mapping\Id;
12+
use Doctrine\ORM\Mapping\JoinColumn;
1213
use Doctrine\ORM\Mapping\JoinTable;
1314
use Doctrine\ORM\Mapping\ManyToMany;
1415
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Mapping\Entity;
1010
use Doctrine\ORM\Mapping\GeneratedValue;
1111
use Doctrine\ORM\Mapping\Id;
12+
use Doctrine\ORM\Mapping\JoinColumn;
1213
use Doctrine\ORM\Mapping\JoinTable;
1314
use Doctrine\ORM\Mapping\ManyToMany;
1415
use Doctrine\ORM\Mapping\MappedSuperclass;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\ORM\Mapping\Id;
1414
use Doctrine\ORM\Mapping\InheritanceType;
1515
use Doctrine\ORM\Mapping\Table;
16+
use Doctrine\ORM\Mapping\Version;
1617
use Doctrine\Tests\OrmFunctionalTestCase;
1718
use Exception;
1819

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\GeneratedValue;
1111
use Doctrine\ORM\Mapping\Id;
1212
use Doctrine\ORM\Mapping\InheritanceType;
13+
use Doctrine\ORM\Mapping\Version;
1314
use Doctrine\Tests\OrmFunctionalTestCase;
1415
use Exception;
1516

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Doctrine\ORM\Mapping\GeneratedValue;
1313
use Doctrine\ORM\Mapping\Id;
1414
use Doctrine\ORM\Mapping\InheritanceType;
15+
use Doctrine\ORM\Mapping\JoinColumn;
1516
use Doctrine\ORM\Mapping\JoinTable;
1617
use Doctrine\ORM\Mapping\ManyToMany;
1718
use Doctrine\ORM\Mapping\ManyToOne;

tests/Doctrine/Tests/ORM/Functional/Ticket/GH5804Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\ORM\Mapping\Entity;
1414
use Doctrine\ORM\Mapping\GeneratedValue;
1515
use Doctrine\ORM\Mapping\Id;
16+
use Doctrine\ORM\Mapping\Version;
1617
use Doctrine\Tests\OrmFunctionalTestCase;
1718

1819
/**

tests/Doctrine/Tests/ORM/Functional/Ticket/GH6394Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Mapping\Id;
1010
use Doctrine\ORM\Mapping\JoinColumn;
1111
use Doctrine\ORM\Mapping\ManyToOne;
12+
use Doctrine\ORM\Mapping\Version;
1213
use Doctrine\Tests\OrmFunctionalTestCase;
1314

1415
class GH6394Test extends OrmFunctionalTestCase

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7067Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\ORM\Mapping\Entity;
1111
use Doctrine\ORM\Mapping\GeneratedValue;
1212
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\Version;
1314
use Doctrine\Tests\OrmFunctionalTestCase;
1415

1516
use function assert;

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7366Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Doctrine\ORM\Mapping\Entity;
1010
use Doctrine\ORM\Mapping\GeneratedValue;
1111
use Doctrine\ORM\Mapping\Id;
12+
use Doctrine\ORM\Mapping\Version;
1213
use Doctrine\ORM\TransactionRequiredException;
1314
use Doctrine\Tests\OrmFunctionalTestCase;
1415

tests/Doctrine/Tests/ORM/Functional/Ticket/GH7761Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Doctrine\ORM\Mapping\Entity;
1212
use Doctrine\ORM\Mapping\GeneratedValue;
1313
use Doctrine\ORM\Mapping\Id;
14+
use Doctrine\ORM\Mapping\JoinColumn;
1415
use Doctrine\ORM\Mapping\JoinTable;
1516
use Doctrine\ORM\Mapping\ManyToMany;
1617
use Doctrine\ORM\Mapping\OrderBy;

tests/Doctrine/Tests/ORM/Functional/Ticket/GH8443Test.php

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44

55
namespace Doctrine\Tests\ORM\Functional\Ticket;
66

7+
use Doctrine\ORM\Mapping\Column;
8+
use Doctrine\ORM\Mapping\DiscriminatorColumn;
9+
use Doctrine\ORM\Mapping\DiscriminatorMap;
10+
use Doctrine\ORM\Mapping\Entity;
11+
use Doctrine\ORM\Mapping\GeneratedValue;
12+
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\InheritanceType;
14+
use Doctrine\ORM\Mapping\JoinColumn;
15+
use Doctrine\ORM\Mapping\OneToOne;
16+
use Doctrine\ORM\Mapping\Table;
717
use Doctrine\ORM\Query;
818
use Doctrine\Tests\Models\Company\CompanyManager;
919
use Doctrine\Tests\Models\Company\CompanyPerson;

tests/Doctrine/Tests/ORM/Functional/Ticket/GH8914Test.php

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44

55
namespace Doctrine\Tests\ORM\Functional\Ticket;
66

7+
use Doctrine\ORM\Mapping\Column;
8+
use Doctrine\ORM\Mapping\DiscriminatorColumn;
9+
use Doctrine\ORM\Mapping\DiscriminatorMap;
10+
use Doctrine\ORM\Mapping\Entity;
11+
use Doctrine\ORM\Mapping\GeneratedValue;
12+
use Doctrine\ORM\Mapping\Id;
13+
use Doctrine\ORM\Mapping\InheritanceType;
14+
use Doctrine\ORM\Mapping\MappedSuperclass;
715
use Doctrine\Tests\OrmTestCase;
816

917
use function assert;

tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Doctrine\ORM\Mapping\OneToOne;
2323
use Doctrine\ORM\Mapping\SequenceGenerator;
2424
use Doctrine\ORM\Mapping\Table;
25+
use Doctrine\ORM\Mapping\UniqueConstraint;
2526
use Doctrine\Persistence\Mapping\RuntimeReflectionService;
2627
use Doctrine\Tests\Models\DDC869\DDC869ChequePayment;
2728
use Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment;

tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ protected function setUp(): void
5050
mkdir($this->tmpDir);
5151

5252
$this->generator = new EntityGenerator();
53-
$this->generator->setAnnotationPrefix('');
5453
$this->generator->setGenerateAnnotations(true);
5554
$this->generator->setGenerateStubMethods(true);
5655
$this->generator->setRegenerateEntityIfExists(false);

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Doctrine\ORM\Mapping\Id;
1717
use Doctrine\ORM\Mapping\ManyToOne;
1818
use Doctrine\ORM\Mapping\OneToMany;
19+
use Doctrine\ORM\Mapping\Version;
1920
use Doctrine\ORM\OptimisticLockException;
2021
use Doctrine\ORM\ORMInvalidArgumentException;
2122
use Doctrine\ORM\UnitOfWork;

tests/Doctrine/Tests/OrmFunctionalTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ protected function getEntityManager(
764764
realpath(__DIR__ . '/Models/Cache'),
765765
realpath(__DIR__ . '/Models/GeoNames'),
766766
],
767-
true
767+
false
768768
)
769769
);
770770

0 commit comments

Comments
 (0)