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

Merge 1.8.x up into 2.0.x #510

Merged
merged 3 commits into from
Dec 10, 2024
Merged

Merge 1.8.x up into 2.0.x #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce28039
Relax type of identifiers
greg0ire Dec 2, 2024
a367a09
Merge pull request #506 from greg0ire/relax-identity-type
greg0ire Dec 10, 2024
a8d9df5
Merge remote-tracking branch 'origin/1.8.x' into 2.0.x
greg0ire Dec 10, 2024
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
5 changes: 0 additions & 5 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ parameters:
count: 2
path: src/ReferenceRepository.php

-
message: "#^Method Doctrine\\\\Common\\\\DataFixtures\\\\ReferenceRepository\\:\\:getIdentifier\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: src/ReferenceRepository.php

-
message: "#^Parameter \\#1 \\$className of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getClassMetadata\\(\\) expects class\\-string\\<object\\>, string given\\.$#"
count: 1
Expand Down
4 changes: 2 additions & 2 deletions src/ReferenceRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct(ObjectManager $manager)
* @param object $reference Reference object
* @param object $uow Unit of work
*/
protected function getIdentifier(object $reference, object $uow): array
protected function getIdentifier(object $reference, object $uow): mixed
{
// In case Reference is not yet managed in UnitOfWork
if (! $this->hasIdentifier($reference)) {
Expand Down Expand Up @@ -208,7 +208,7 @@ public function hasIdentity(string $name, string $class): bool
/**
* Get all stored identities
*
* @phpstan-return array<class-string, array<string, object>>
* @phpstan-return array<class-string, array<string, mixed>>
*/
public function getIdentitiesByClass(): array
{
Expand Down