Skip to content

Commit 7c27ed8

Browse files
phansysphansys
committed
Minor typing improvements
1 parent 4de41de commit 7c27ed8

File tree

33 files changed

+155
-275
lines changed

33 files changed

+155
-275
lines changed

‎phpstan-baseline.neon‎

Lines changed: 17 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,13 @@ parameters:
2020
count: 3
2121
path: src/AbstractTrackingListener.php
2222

23-
-
24-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
25-
count: 1
26-
path: src/Blameable/Mapping/Driver/Annotation.php
27-
2823
-
2924
message: "#^Access to an undefined property object\\:\\:\\$value\\.$#"
3025
count: 1
3126
path: src/Blameable/Mapping/Driver/Annotation.php
3227

3328
-
34-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
29+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
3530
count: 1
3631
path: src/Blameable/Mapping/Driver/Annotation.php
3732

@@ -45,18 +40,13 @@ parameters:
4540
count: 1
4641
path: src/Blameable/Mapping/Driver/Yaml.php
4742

48-
-
49-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
50-
count: 1
51-
path: src/IpTraceable/Mapping/Driver/Annotation.php
52-
5343
-
5444
message: "#^Access to an undefined property object\\:\\:\\$value\\.$#"
5545
count: 1
5646
path: src/IpTraceable/Mapping/Driver/Annotation.php
5747

5848
-
59-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
49+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
6050
count: 1
6151
path: src/IpTraceable/Mapping/Driver/Annotation.php
6252

@@ -70,11 +60,6 @@ parameters:
7060
count: 1
7161
path: src/IpTraceable/Mapping/Driver/Yaml.php
7262

73-
-
74-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
75-
count: 1
76-
path: src/Loggable/Document/Repository/LogEntryRepository.php
77-
7863
-
7964
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\<Gedmo\\\\Loggable\\\\LogEntryInterface\\>\\:\\:getReflectionProperty\\(\\)\\.$#"
8065
count: 1
@@ -90,26 +75,11 @@ parameters:
9075
count: 4
9176
path: src/Loggable/LoggableListener.php
9277

93-
-
94-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
95-
count: 2
96-
path: src/Loggable/Mapping/Driver/Annotation.php
97-
9878
-
9979
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$associationMappings\\.$#"
10080
count: 1
10181
path: src/Loggable/Mapping/Driver/Xml.php
10282

103-
-
104-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
105-
count: 1
106-
path: src/Loggable/Mapping/Driver/Xml.php
107-
108-
-
109-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
110-
count: 1
111-
path: src/Loggable/Mapping/Driver/Yaml.php
112-
11383
-
11484
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
11585
count: 1
@@ -185,11 +155,6 @@ parameters:
185155
count: 1
186156
path: src/Mapping/MappedEventSubscriber.php
187157

188-
-
189-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
190-
count: 1
191-
path: src/ReferenceIntegrity/Mapping/Driver/Annotation.php
192-
193158
-
194159
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\<object\\>\\:\\:getFieldMapping\\(\\)\\.$#"
195160
count: 1
@@ -211,12 +176,7 @@ parameters:
211176
path: src/ReferenceIntegrity/ReferenceIntegrityListener.php
212177

213178
-
214-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
215-
count: 1
216-
path: src/References/Mapping/Driver/Annotation.php
217-
218-
-
219-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
179+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
220180
count: 1
221181
path: src/References/Mapping/Driver/Annotation.php
222182

@@ -336,12 +296,7 @@ parameters:
336296
path: src/Sluggable/Handler/TreeSlugHandler.php
337297

338298
-
339-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
340-
count: 1
341-
path: src/Sluggable/Mapping/Driver/Annotation.php
342-
343-
-
344-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
299+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
345300
count: 1
346301
path: src/Sluggable/Mapping/Driver/Annotation.php
347302

@@ -370,16 +325,6 @@ parameters:
370325
count: 1
371326
path: src/Sluggable/Mapping/Driver/Yaml.php
372327

373-
-
374-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getAssociationMapping\\(\\)\\.$#"
375-
count: 1
376-
path: src/Sluggable/Mapping/Event/Adapter/ORM.php
377-
378-
-
379-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getAssociationMappings\\(\\)\\.$#"
380-
count: 1
381-
path: src/Sluggable/Mapping/Event/Adapter/ORM.php
382-
383328
-
384329
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\<object\\>\\:\\:getFieldMapping\\(\\)\\.$#"
385330
count: 2
@@ -416,30 +361,15 @@ parameters:
416361
path: src/SoftDeleteable/SoftDeleteableListener.php
417362

418363
-
419-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
420-
count: 2
421-
path: src/Sortable/Mapping/Driver/Annotation.php
422-
423-
-
424-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
364+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
425365
count: 1
426366
path: src/Sortable/Mapping/Driver/Annotation.php
427367

428-
-
429-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
430-
count: 1
431-
path: src/Sortable/Mapping/Driver/Xml.php
432-
433368
-
434369
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
435370
count: 1
436371
path: src/Sortable/Mapping/Driver/Xml.php
437372

438-
-
439-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
440-
count: 1
441-
path: src/Sortable/Mapping/Driver/Yaml.php
442-
443373
-
444374
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
445375
count: 1
@@ -475,18 +405,13 @@ parameters:
475405
count: 1
476406
path: src/Sortable/SortableListener.php
477407

478-
-
479-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
480-
count: 1
481-
path: src/Timestampable/Mapping/Driver/Annotation.php
482-
483408
-
484409
message: "#^Access to an undefined property object\\:\\:\\$value\\.$#"
485410
count: 1
486411
path: src/Timestampable/Mapping/Driver/Annotation.php
487412

488413
-
489-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
414+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
490415
count: 1
491416
path: src/Timestampable/Mapping/Driver/Annotation.php
492417

@@ -505,51 +430,16 @@ parameters:
505430
count: 1
506431
path: src/Timestampable/Mapping/Event/Adapter/ORM.php
507432

508-
-
509-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$identifier\\.$#"
510-
count: 1
511-
path: src/Tool/Wrapper/EntityWrapper.php
512-
513-
-
514-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$rootEntityName\\.$#"
515-
count: 1
516-
path: src/Tool/Wrapper/EntityWrapper.php
517-
518-
-
519-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getReflectionProperty\\(\\)\\.$#"
520-
count: 2
521-
path: src/Tool/Wrapper/EntityWrapper.php
522-
523433
-
524434
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getUnitOfWork\\(\\)\\.$#"
525435
count: 1
526436
path: src/Tool/Wrapper/EntityWrapper.php
527437

528-
-
529-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$identifier\\.$#"
530-
count: 1
531-
path: src/Tool/Wrapper/MongoDocumentWrapper.php
532-
533-
-
534-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$rootDocumentName\\.$#"
535-
count: 1
536-
path: src/Tool/Wrapper/MongoDocumentWrapper.php
537-
538438
-
539439
message: "#^Access to an undefined property ProxyManager\\\\Proxy\\\\GhostObjectInterface\\:\\:\\$identifier\\.$#"
540440
count: 1
541441
path: src/Tool/Wrapper/MongoDocumentWrapper.php
542442

543-
-
544-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getReflectionProperty\\(\\)\\.$#"
545-
count: 2
546-
path: src/Tool/Wrapper/MongoDocumentWrapper.php
547-
548-
-
549-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isSingleValuedEmbed\\(\\)\\.$#"
550-
count: 1
551-
path: src/Tool/Wrapper/MongoDocumentWrapper.php
552-
553443
-
554444
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getUnitOfWork\\(\\)\\.$#"
555445
count: 2
@@ -571,43 +461,28 @@ parameters:
571461
path: src/Translatable/Entity/Repository/TranslationRepository.php
572462

573463
-
574-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
575-
count: 2
576-
path: src/Translatable/Mapping/Driver/Annotation.php
577-
578-
-
579-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedEmbeddedClass\\(\\)\\.$#"
580-
count: 1
581-
path: src/Translatable/Mapping/Driver/Annotation.php
582-
583-
-
584-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
464+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
585465
count: 1
586466
path: src/Translatable/Mapping/Driver/Annotation.php
587467

588468
-
589-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
590-
count: 1
591-
path: src/Translatable/Mapping/Driver/Xml.php
592-
593-
-
594-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedEmbeddedClass\\(\\)\\.$#"
595-
count: 1
596-
path: src/Translatable/Mapping/Driver/Xml.php
469+
message: "#^Access to offset 'association' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\FieldMapping\\.$#"
470+
count: 2
471+
path: src/Translatable/Mapping/Event/Adapter/ODM.php
597472

598473
-
599-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
474+
message: "#^Access to offset 'fieldName' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\FieldMapping\\.$#"
600475
count: 1
601-
path: src/Translatable/Mapping/Driver/Yaml.php
476+
path: src/Translatable/Mapping/Event/Adapter/ODM.php
602477

603478
-
604-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$fieldMappings\\.$#"
479+
message: "#^Access to offset 'mappedBy' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\FieldMapping\\.$#"
605480
count: 1
606481
path: src/Translatable/Mapping/Event/Adapter/ODM.php
607482

608483
-
609-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
610-
count: 2
484+
message: "#^Access to offset 'targetDocument' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\FieldMapping\\.$#"
485+
count: 1
611486
path: src/Translatable/Mapping/Event/Adapter/ODM.php
612487

613488
-
@@ -676,25 +551,10 @@ parameters:
676551
path: src/Tree/Entity/Repository/NestedTreeRepository.php
677552

678553
-
679-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
680-
count: 2
681-
path: src/Tree/Mapping/Driver/Annotation.php
682-
683-
-
684-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
554+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
685555
count: 1
686556
path: src/Tree/Mapping/Driver/Annotation.php
687557

688-
-
689-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
690-
count: 1
691-
path: src/Tree/Mapping/Driver/Xml.php
692-
693-
-
694-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
695-
count: 1
696-
path: src/Tree/Mapping/Driver/Yaml.php
697-
698558
-
699559
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
700560
count: 6
@@ -811,17 +671,7 @@ parameters:
811671
path: tests/Gedmo/Mapping/Mock/Extension/Encoder/EncoderListener.php
812672

813673
-
814-
message: "#^Access to an undefined property Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:\\$isMappedSuperclass\\.$#"
815-
count: 1
816-
path: tests/Gedmo/Mapping/Mock/Extension/Encoder/Mapping/Driver/Annotation.php
817-
818-
-
819-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:getFieldMapping\\(\\)\\.$#"
820-
count: 1
821-
path: tests/Gedmo/Mapping/Mock/Extension/Encoder/Mapping/Driver/Annotation.php
822-
823-
-
824-
message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\Mapping\\\\ClassMetadata\\:\\:isInheritedField\\(\\)\\.$#"
674+
message: "#^Access to offset 'inherited' on an unknown class Doctrine\\\\ODM\\\\MongoDB\\\\Mapping\\\\AssociationFieldMapping\\.$#"
825675
count: 1
826676
path: tests/Gedmo/Mapping/Mock/Extension/Encoder/Mapping/Driver/Annotation.php
827677

‎src/Blameable/Mapping/Driver/Annotation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Annotation extends AbstractAnnotationDriver
3333
/**
3434
* List of types which are valid for blame
3535
*
36-
* @var array
36+
* @var string[]
3737
*/
3838
protected $validTypes = [
3939
'one',

‎src/Blameable/Mapping/Driver/Xml.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ class Xml extends BaseXml
2828
/**
2929
* List of types which are valid for blame
3030
*
31-
* @var array
31+
* @var string[]
3232
*/
33-
private $validTypes = [
33+
private const VALID_TYPES = [
3434
'one',
3535
'string',
3636
'int',
@@ -124,6 +124,6 @@ protected function isValidField($meta, $field)
124124
{
125125
$mapping = $meta->getFieldMapping($field);
126126

127-
return $mapping && in_array($mapping['type'], $this->validTypes, true);
127+
return $mapping && in_array($mapping['type'], self::VALID_TYPES, true);
128128
}
129129
}

0 commit comments

Comments
 (0)