Skip to content

Commit a056552

Browse files
derrabusderrabus
committed
Merge branch '2.14.x' into 2.15.x
* 2.14.x: PHPStan 1.10.14 (#10655) Remove JoinColumn from inverse side (#10652) Apply `SlevomatCodingStandard.Commenting.AnnotationName` CS rule (#10653)
2 parents ba9f51a + 1142a39 commit a056552

File tree

201 files changed

+651
-658
lines changed

Some content is hidden

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

201 files changed

+651
-658
lines changed

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
},
4141
"require-dev": {
4242
"doctrine/annotations": "^1.13 || ^2",
43-
"doctrine/coding-standard": "^9.0.2 || ^11.0",
43+
"doctrine/coding-standard": "^9.0.2 || ^12.0",
4444
"phpbench/phpbench": "^0.16.10 || ^1.0",
45-
"phpstan/phpstan": "~1.4.10 || 1.10.6",
45+
"phpstan/phpstan": "~1.4.10 || 1.10.14",
4646
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.6",
4747
"psr/log": "^1 || ^2 || ^3",
4848
"squizlabs/php_codesniffer": "3.7.2",

‎docs/en/reference/metadata-drivers.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ the ``FileDriver`` implementation for you to extend from:
123123
class MyMetadataDriver extends FileDriver
124124
{
125125
/**
126-
* {@inheritdoc}
126+
* {@inheritDoc}
127127
*/
128128
protected $_fileExtension = '.dcm.ext';
129129
130130
/**
131-
* {@inheritdoc}
131+
* {@inheritDoc}
132132
*/
133133
public function loadMetadataForClass($className, ClassMetadata $metadata)
134134
{
@@ -138,7 +138,7 @@ the ``FileDriver`` implementation for you to extend from:
138138
}
139139
140140
/**
141-
* {@inheritdoc}
141+
* {@inheritDoc}
142142
*/
143143
protected function _loadMappingFile($file)
144144
{

‎docs/en/reference/typedfieldmapper.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ You need to create a class which implements ``Doctrine\ORM\Mapping\TypedFieldMap
153153
final class CustomEnumTypedFieldMapper implements TypedFieldMapper
154154
{
155155
/**
156-
* {@inheritdoc}
156+
* {@inheritDoc}
157157
*/
158158
public function validateAndComplete(array $mapping, ReflectionProperty $field): array
159159
{

‎lib/Doctrine/ORM/Cache/DefaultCache.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(EntityManagerInterface $em)
4848
}
4949

5050
/**
51-
* {@inheritdoc}
51+
* {@inheritDoc}
5252
*/
5353
public function getEntityCacheRegion($className)
5454
{
@@ -63,7 +63,7 @@ public function getEntityCacheRegion($className)
6363
}
6464

6565
/**
66-
* {@inheritdoc}
66+
* {@inheritDoc}
6767
*/
6868
public function getCollectionCacheRegion($className, $association)
6969
{
@@ -78,7 +78,7 @@ public function getCollectionCacheRegion($className, $association)
7878
}
7979

8080
/**
81-
* {@inheritdoc}
81+
* {@inheritDoc}
8282
*/
8383
public function containsEntity($className, $identifier)
8484
{
@@ -93,7 +93,7 @@ public function containsEntity($className, $identifier)
9393
}
9494

9595
/**
96-
* {@inheritdoc}
96+
* {@inheritDoc}
9797
*/
9898
public function evictEntity($className, $identifier)
9999
{
@@ -108,7 +108,7 @@ public function evictEntity($className, $identifier)
108108
}
109109

110110
/**
111-
* {@inheritdoc}
111+
* {@inheritDoc}
112112
*/
113113
public function evictEntityRegion($className)
114114
{
@@ -123,7 +123,7 @@ public function evictEntityRegion($className)
123123
}
124124

125125
/**
126-
* {@inheritdoc}
126+
* {@inheritDoc}
127127
*/
128128
public function evictEntityRegions()
129129
{
@@ -141,7 +141,7 @@ public function evictEntityRegions()
141141
}
142142

143143
/**
144-
* {@inheritdoc}
144+
* {@inheritDoc}
145145
*/
146146
public function containsCollection($className, $association, $ownerIdentifier)
147147
{
@@ -156,7 +156,7 @@ public function containsCollection($className, $association, $ownerIdentifier)
156156
}
157157

158158
/**
159-
* {@inheritdoc}
159+
* {@inheritDoc}
160160
*/
161161
public function evictCollection($className, $association, $ownerIdentifier)
162162
{
@@ -171,7 +171,7 @@ public function evictCollection($className, $association, $ownerIdentifier)
171171
}
172172

173173
/**
174-
* {@inheritdoc}
174+
* {@inheritDoc}
175175
*/
176176
public function evictCollectionRegion($className, $association)
177177
{
@@ -186,7 +186,7 @@ public function evictCollectionRegion($className, $association)
186186
}
187187

188188
/**
189-
* {@inheritdoc}
189+
* {@inheritDoc}
190190
*/
191191
public function evictCollectionRegions()
192192
{
@@ -210,15 +210,15 @@ public function evictCollectionRegions()
210210
}
211211

212212
/**
213-
* {@inheritdoc}
213+
* {@inheritDoc}
214214
*/
215215
public function containsQuery($regionName)
216216
{
217217
return isset($this->queryCaches[$regionName]);
218218
}
219219

220220
/**
221-
* {@inheritdoc}
221+
* {@inheritDoc}
222222
*/
223223
public function evictQueryRegion($regionName = null)
224224
{
@@ -234,7 +234,7 @@ public function evictQueryRegion($regionName = null)
234234
}
235235

236236
/**
237-
* {@inheritdoc}
237+
* {@inheritDoc}
238238
*/
239239
public function evictQueryRegions()
240240
{
@@ -246,7 +246,7 @@ public function evictQueryRegions()
246246
}
247247

248248
/**
249-
* {@inheritdoc}
249+
* {@inheritDoc}
250250
*/
251251
public function getQueryCache($regionName = null)
252252
{

‎lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function setTimestampRegion(TimestampRegion $region)
106106
}
107107

108108
/**
109-
* {@inheritdoc}
109+
* {@inheritDoc}
110110
*/
111111
public function buildCachedEntityPersister(EntityManagerInterface $em, EntityPersister $persister, ClassMetadata $metadata)
112112
{
@@ -134,7 +134,7 @@ public function buildCachedEntityPersister(EntityManagerInterface $em, EntityPer
134134
}
135135

136136
/**
137-
* {@inheritdoc}
137+
* {@inheritDoc}
138138
*/
139139
public function buildCachedCollectionPersister(EntityManagerInterface $em, CollectionPersister $persister, array $mapping)
140140
{
@@ -162,7 +162,7 @@ public function buildCachedCollectionPersister(EntityManagerInterface $em, Colle
162162
}
163163

164164
/**
165-
* {@inheritdoc}
165+
* {@inheritDoc}
166166
*/
167167
public function buildQueryCache(EntityManagerInterface $em, $regionName = null)
168168
{
@@ -178,23 +178,23 @@ public function buildQueryCache(EntityManagerInterface $em, $regionName = null)
178178
}
179179

180180
/**
181-
* {@inheritdoc}
181+
* {@inheritDoc}
182182
*/
183183
public function buildCollectionHydrator(EntityManagerInterface $em, array $mapping)
184184
{
185185
return new DefaultCollectionHydrator($em);
186186
}
187187

188188
/**
189-
* {@inheritdoc}
189+
* {@inheritDoc}
190190
*/
191191
public function buildEntityHydrator(EntityManagerInterface $em, ClassMetadata $metadata)
192192
{
193193
return new DefaultEntityHydrator($em);
194194
}
195195

196196
/**
197-
* {@inheritdoc}
197+
* {@inheritDoc}
198198
*/
199199
public function getRegion(array $cache)
200200
{
@@ -225,7 +225,7 @@ public function getRegion(array $cache)
225225
}
226226

227227
/**
228-
* {@inheritdoc}
228+
* {@inheritDoc}
229229
*/
230230
public function getTimestampRegion()
231231
{
@@ -240,7 +240,7 @@ public function getTimestampRegion()
240240
}
241241

242242
/**
243-
* {@inheritdoc}
243+
* {@inheritDoc}
244244
*/
245245
public function createCache(EntityManagerInterface $entityManager)
246246
{

‎lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct(EntityManagerInterface $em)
3535
}
3636

3737
/**
38-
* {@inheritdoc}
38+
* {@inheritDoc}
3939
*/
4040
public function buildCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key, $collection)
4141
{
@@ -49,7 +49,7 @@ public function buildCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key
4949
}
5050

5151
/**
52-
* {@inheritdoc}
52+
* {@inheritDoc}
5353
*/
5454
public function loadCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key, CollectionCacheEntry $entry, PersistentCollection $collection)
5555
{

‎lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(EntityManagerInterface $em)
4747
}
4848

4949
/**
50-
* {@inheritdoc}
50+
* {@inheritDoc}
5151
*/
5252
public function buildCacheEntry(ClassMetadata $metadata, EntityCacheKey $key, $entity)
5353
{
@@ -140,7 +140,7 @@ public function buildCacheEntry(ClassMetadata $metadata, EntityCacheKey $key, $e
140140
}
141141

142142
/**
143-
* {@inheritdoc}
143+
* {@inheritDoc}
144144
*/
145145
public function loadCacheEntry(ClassMetadata $metadata, EntityCacheKey $key, EntityCacheEntry $entry, $entity = null)
146146
{

‎lib/Doctrine/ORM/Cache/DefaultQueryCache.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function __construct(EntityManagerInterface $em, Region $region)
6868
}
6969

7070
/**
71-
* {@inheritdoc}
71+
* {@inheritDoc}
7272
*/
7373
public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = [])
7474
{
@@ -227,7 +227,7 @@ public function get(QueryCacheKey $key, ResultSetMapping $rsm, array $hints = []
227227
}
228228

229229
/**
230-
* {@inheritdoc}
230+
* {@inheritDoc}
231231
*/
232232
public function put(QueryCacheKey $key, ResultSetMapping $rsm, $result, array $hints = [])
233233
{
@@ -450,15 +450,15 @@ private function getAssociationPathValue($value, array $path)
450450
}
451451

452452
/**
453-
* {@inheritdoc}
453+
* {@inheritDoc}
454454
*/
455455
public function clear()
456456
{
457457
return $this->region->evictAll();
458458
}
459459

460460
/**
461-
* {@inheritdoc}
461+
* {@inheritDoc}
462462
*/
463463
public function getRegion()
464464
{

‎lib/Doctrine/ORM/Cache/Logging/CacheLoggerChain.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getLoggers()
4040
}
4141

4242
/**
43-
* {@inheritdoc}
43+
* {@inheritDoc}
4444
*/
4545
public function collectionCacheHit($regionName, CollectionCacheKey $key)
4646
{
@@ -50,7 +50,7 @@ public function collectionCacheHit($regionName, CollectionCacheKey $key)
5050
}
5151

5252
/**
53-
* {@inheritdoc}
53+
* {@inheritDoc}
5454
*/
5555
public function collectionCacheMiss($regionName, CollectionCacheKey $key)
5656
{
@@ -60,7 +60,7 @@ public function collectionCacheMiss($regionName, CollectionCacheKey $key)
6060
}
6161

6262
/**
63-
* {@inheritdoc}
63+
* {@inheritDoc}
6464
*/
6565
public function collectionCachePut($regionName, CollectionCacheKey $key)
6666
{
@@ -70,7 +70,7 @@ public function collectionCachePut($regionName, CollectionCacheKey $key)
7070
}
7171

7272
/**
73-
* {@inheritdoc}
73+
* {@inheritDoc}
7474
*/
7575
public function entityCacheHit($regionName, EntityCacheKey $key)
7676
{
@@ -80,7 +80,7 @@ public function entityCacheHit($regionName, EntityCacheKey $key)
8080
}
8181

8282
/**
83-
* {@inheritdoc}
83+
* {@inheritDoc}
8484
*/
8585
public function entityCacheMiss($regionName, EntityCacheKey $key)
8686
{
@@ -90,7 +90,7 @@ public function entityCacheMiss($regionName, EntityCacheKey $key)
9090
}
9191

9292
/**
93-
* {@inheritdoc}
93+
* {@inheritDoc}
9494
*/
9595
public function entityCachePut($regionName, EntityCacheKey $key)
9696
{
@@ -100,7 +100,7 @@ public function entityCachePut($regionName, EntityCacheKey $key)
100100
}
101101

102102
/**
103-
* {@inheritdoc}
103+
* {@inheritDoc}
104104
*/
105105
public function queryCacheHit($regionName, QueryCacheKey $key)
106106
{
@@ -110,7 +110,7 @@ public function queryCacheHit($regionName, QueryCacheKey $key)
110110
}
111111

112112
/**
113-
* {@inheritdoc}
113+
* {@inheritDoc}
114114
*/
115115
public function queryCacheMiss($regionName, QueryCacheKey $key)
116116
{
@@ -120,7 +120,7 @@ public function queryCacheMiss($regionName, QueryCacheKey $key)
120120
}
121121

122122
/**
123-
* {@inheritdoc}
123+
* {@inheritDoc}
124124
*/
125125
public function queryCachePut($regionName, QueryCacheKey $key)
126126
{

0 commit comments

Comments
 (0)