Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests directory to phpstan #2317

Merged
merged 8 commits into from
Jun 2, 2021
Merged

Add tests directory to phpstan #2317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
082d02b
Add phpstan to tests
franmomu May 26, 2021
498b009
Add phpstan-phpunit
franmomu Jun 1, 2021
1580962
Remove dead code
franmomu Jun 1, 2021
25b86cd
Remove unused arguments
franmomu Jun 1, 2021
85c6ccb
Add baseline
franmomu Jun 1, 2021
4db26b2
Add some types to phpdoc
franmomu Jun 1, 2021
01ab049
Fix duplicate keys and types in psalm types
franmomu Jun 1, 2021
251a855
Use proper arguments in tests
franmomu Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"jmikola/geojson": "^1.0",
"phpbench/phpbench": "^1.0.0",
"phpstan/phpstan": "^0.12.32",
"phpstan/phpstan-phpunit": "^0.12.19",
"phpunit/phpunit": "^8.5 || ^9",
"squizlabs/php_codesniffer": "^3.5",
"symfony/cache": "^4.4 || ^5.0",
Expand Down
29 changes: 13 additions & 16 deletions lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,28 @@
* fieldName?: string,
* name?: string,
* strategy?: string,
* notSaved?: bool,
* association?: int,
* id?: bool,
* collectionClass?: class-string,
* cascade?: list<string>,
* cascade?: list<string>|string,
* embedded?: bool,
* orphanRemoval?: bool,
* options?: array<string, mixed>,
* nullable?: bool,
* reference?: bool,
* storeAs?: string,
* targetDocument?: class-string,
* targetDocument?: class-string|null,
* mappedBy?: string|null,
* inversedBy?: string|null,
* discriminatorField?: string,
* defaultDiscriminatorValue?: string,
* discriminatorMap?: array<string, class-string>,
* repositoryMethod?: string|null,
* sort?: array<string, string>,
* sort?: array<string, string|int>,
* limit?: int|null,
* skip?: int|null,
* version?: bool,
* lock?: bool,
* notSaved?: bool,
* inherited?: string,
* declared?: class-string
* }
Expand All @@ -105,21 +103,21 @@
* association?: int,
* id?: bool,
* collectionClass?: class-string,
* cascade?: list<string>,
* cascade?: list<string>|string,
* embedded?: bool,
* orphanRemoval?: bool,
* options?: array<string, mixed>,
* nullable?: bool,
* reference?: bool,
* storeAs?: string,
* targetDocument?: class-string,
* targetDocument?: class-string|null,
* mappedBy?: string|null,
* inversedBy?: string|null,
* discriminatorField?: string,
* defaultDiscriminatorValue?: string,
* discriminatorMap?: array<string, class-string>,
* repositoryMethod?: string|null,
* sort?: array<string, string>,
* sort?: array<string, string|int>,
* limit?: int|null,
* skip?: int|null,
* version?: bool,
Expand All @@ -128,7 +126,7 @@
* inherited?: string,
* declared?: class-string
* }
* @psalm-type AssociationMappingField = array{
* @psalm-type AssociationFieldMapping = array{
* type: string,
* fieldName: string,
* name: string,
Expand All @@ -139,13 +137,12 @@
* isCascadeDetach: bool,
* isOwningSide: bool,
* isInverseSide: bool,
* targetDocument: class-string,
* targetDocument: class-string|null,
* association: int,
* strategy?: string,
* notSaved?: bool,
* id?: bool,
* collectionClass?: class-string,
* cascade?: list<string>,
* cascade?: list<string>|string,
* embedded?: bool,
* orphanRemoval?: bool,
* options?: array<string, mixed>,
Expand All @@ -158,7 +155,7 @@
* defaultDiscriminatorValue?: string,
* discriminatorMap?: array<string, class-string>,
* repositoryMethod?: string|null,
* sort?: array<string, string>,
* sort?: array<string, string|int>,
* limit?: int|null,
* skip?: int|null,
* version?: bool,
Expand Down Expand Up @@ -535,7 +532,7 @@
* Keys are field names and values are mapping definitions.
*
* @var array<string, mixed>
* @psalm-var array<string, AssociationMappingField>
* @psalm-var array<string, AssociationFieldMapping>
*/
public $associationMappings = [];

Expand Down Expand Up @@ -1535,7 +1532,7 @@ public function mapOneReference(array $mapping): void
/**
* Map a collection of document references.
*
* @psalm-param FieldMapping $mapping
* @psalm-param FieldMappingConfig $mapping
*/
public function mapManyReference(array $mapping): void
{
Expand Down Expand Up @@ -1569,7 +1566,7 @@ public function addInheritedFieldMapping(array $fieldMapping): void
*
* @internal
*
* @psalm-param FieldMapping $mapping
* @psalm-param AssociationFieldMapping $mapping
*
* @throws MappingException
*/
Expand Down
Loading