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

Fix CI #2620

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Fix CI #2620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
339f618
Run phpcbf
malarzm Mar 27, 2024
18f9828
Fix psalm errors
malarzm Mar 27, 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
Next Next commit
Run phpcbf
  • Loading branch information
@malarzm
malarzm committed Mar 27, 2024
commit 339f61895f0f8cda8795041d5e102c0dac0185d7
6 changes: 1 addition & 5 deletions lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Search/GeoWithin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,7 @@ public function getOperatorParams(): object
return $this->appendScore($params);
}

/**
* @param array|Geometry $geometry
*
* @return array
*/
/** @param array|Geometry $geometry */
private function convertGeometry($geometry): array
{
if (! $geometry instanceof Geometry) {
Expand Down
5 changes: 1 addition & 4 deletions lib/Doctrine/ODM/MongoDB/Aggregation/Stage/SetWindowFields/Output.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ class Output extends Operator implements WindowOperators

private string $currentField = '';

/**
* @var array
* @psalm-var array<string, Window>
*/
/** @psalm-var array<string, Window> */
private array $windows = [];

public function __construct(Builder $builder, private SetWindowFields $setWindowFields)
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php

Check failure on line 1 in lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php

View workflow job for this annotation

GitHub Actions / Static Analysis with Psalm (8.2)

UnusedBaselineEntry 

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php:0:0: UnusedBaselineEntry: Baseline for issue "InvalidReturnStatement" has 1 extra entry. (see https://psalm.dev/316)

declare(strict_types=1);

Expand Down Expand Up @@ -1849,9 +1849,9 @@
*/
public function getEmbeddedFieldsMappings(): array
{
return array_filter(

Check failure on line 1852 in lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php

View workflow job for this annotation

GitHub Actions / Static Analysis with Psalm (8.2)

InvalidReturnStatement 

lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php:1852:16: InvalidReturnStatement: The inferred type 'array<string, array{alsoLoadFields?: list<string>, association: int, cascade?: list<string>|string, collectionClass?: class-string, criteria?: array<string, mixed>, declared?: class-string, defaultDiscriminatorValue?: string, discriminatorField?: string, discriminatorMap?: array<string, class-string>, embedded?: bool, fieldName: string, id?: bool, index?: bool, inherited?: string, inversedBy?: null|string, isCascadeDetach: bool, isCascadeMerge: bool, isCascadePersist: bool, isCascadeRefresh: bool, isCascadeRemove: bool, isInverseSide: bool, isOwningSide: bool, limit?: int|null, lock?: bool, mappedBy?: null|string, name: string, notSaved?: bool, nullable?: bool, options?: array<string, mixed>, orphanRemoval?: bool, prime?: list<string>, reference?: bool, repositoryMethod?: null|string, skip?: int|null, sort?: array<string, int|string>, sparse?: bool, storeAs?: string, storeEmptyArray?: bool, strategy?: string, targetDocument: class-string|null, type?: string, unique?: bool, version?: bool}>' does not match the declared return type 'array<string, array{alsoLoadFields?: list<string>, association?: int, cascade?: list<string>|string, collectionClass?: class-string, criteria?: array<string, mixed>, declared?: class-string, defaultDiscriminatorValue?: string, discriminatorField?: string, discriminatorMap?: array<string, class-string>, embedded?: bool, enumType?: class-string<BackedEnum>, fieldName: string, id?: bool, index?: bool, inherited?: string, inversedBy?: null|string, isCascadeDetach: bool, isCascadeMerge: bool, isCascadePersist: bool, isCascadeRefresh: bool, isCascadeRemove: bool, isInverseSide: bool, isOwningSide: bool, limit?: int|null, lock?: bool, mappedBy?: null|string, name: string, notSaved?: bool, nullable?: bool, options?: array<string, mixed>, orphanRemoval?: bool, prime?: list<string>, reference?: bool, repositoryMethod?: null|string, skip?: int|null, sort?: array<string, int|string>, sparse?: bool, storeAs?: string, storeEmptyArray?: bool, strategy?: string, targetDocument?: class-string|null, type: string, unique?: bool, version?: bool}>' for Doctrine\ODM\MongoDB\Mapping\ClassMetadata::getEmbeddedFieldsMappings (see https://psalm.dev/128)
$this->associationMappings,
static fn ($assoc) => ! empty($assoc['embedded'])
static fn ($assoc) => ! empty($assoc['embedded']),
);
}

Expand Down
8 changes: 4 additions & 4 deletions lib/Doctrine/ODM/MongoDB/UnitOfWork.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ private function computeOrRecomputeChangeSet(ClassMetadata $class, object $docum
// Look for changes in associations of the document
$associationMappings = array_filter(
$class->associationMappings,
static fn ($assoc) => empty($assoc['notSaved'])
static fn ($assoc) => empty($assoc['notSaved']),
);

foreach ($associationMappings as $mapping) {
Expand Down Expand Up @@ -2169,7 +2169,7 @@ private function cascadeRefresh(object $document, array &$visited): void

$associationMappings = array_filter(
$class->associationMappings,
static fn ($assoc) => $assoc['isCascadeRefresh']
static fn ($assoc) => $assoc['isCascadeRefresh'],
);

foreach ($associationMappings as $mapping) {
Expand Down Expand Up @@ -2229,7 +2229,7 @@ private function cascadeMerge(object $document, object $managedCopy, array &$vis

$associationMappings = array_filter(
$class->associationMappings,
static fn ($assoc) => $assoc['isCascadeMerge']
static fn ($assoc) => $assoc['isCascadeMerge'],
);

foreach ($associationMappings as $assoc) {
Expand Down Expand Up @@ -2261,7 +2261,7 @@ private function cascadePersist(object $document, array &$visited): void

$associationMappings = array_filter(
$class->associationMappings,
static fn ($assoc) => $assoc['isCascadePersist']
static fn ($assoc) => $assoc['isCascadePersist'],
);

foreach ($associationMappings as $fieldName => $mapping) {
Expand Down
1 change: 0 additions & 1 deletion tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,6 @@ public function testPrepareQueryOrNewObjWithEmbeddedReferenceToTargetDocumentWit
self::assertEquals($expected, $documentPersister->prepareQueryOrNewObj($value));
}

/** @return array */
public static function dataProviderTestWriteConcern(): array
{
return [
Expand Down
2 changes: 0 additions & 2 deletions tests/Doctrine/ODM/MongoDB/Tests/Persisters/PersistenceBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ public function testPrepareInsertData(object $document, array $expectedData): vo
/**
* Provides data for @see PersistenceBuilderTest::testPrepareInsertData()
* Returns arrays of array(document => expected data)
*
* @return array
*/
public static function getDocumentsAndExpectedData(): array
{
Expand Down
2 changes: 0 additions & 2 deletions tests/Doctrine/ODM/MongoDB/Tests/Query/BuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,6 @@ public static function provideExcludeProjections(): array
* Provide arguments for select() and exclude() tests.
*
* @param bool $include Whether the field should be included or excluded
*
* @return array
*/
private static function provideProjections(bool $include): array
{
Expand Down
Loading