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

Jump to bottom

Merge branch '1.3' of ezsystems/ezplatform-kernel into 4.6 #378

Merged
merged 3 commits into from
Jun 7, 2024
Merged

Merge branch '1.3' of ezsystems/ezplatform-kernel into 4.6 #378

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
c88c397
IBX-8019: Added performance consideration notice to `LocationService:…
webhdx Jun 7, 2024
39aed20
Merged branch '1.3' of ezsystems/ezplatform-kernel into 4.6
alongosz Jun 7, 2024
439d1d8
[PHPStan] Aligned baseline with PHPStan update
alongosz Jun 7, 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
45 changes: 0 additions & 45 deletions phpstan-baseline-7.4.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,6 @@ parameters:
count: 1
path: src/bundle/Core/Command/CleanupVersionsCommand.php

-
message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Parameter \\#1 \\$fp of function fwrite expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Parameter \\#1 \\$fp of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Parameter \\#2 \\$str of function fwrite expects string, string\\|false given\\.$#"
count: 1
Expand Down Expand Up @@ -95,36 +80,11 @@ parameters:
count: 1
path: src/bundle/Core/Imagine/Cache/AliasGeneratorDecorator.php

-
message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#1 \\$fp of function fwrite expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#1 \\$fp of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#2 \\$str of function fwrite expects string, string\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#1 \\$fp of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/PlaceholderProvider/GenericProvider.php

-
message: "#^Parameter \\#1 \\$fp of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php

-
message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
count: 1
Expand Down Expand Up @@ -490,11 +450,6 @@ parameters:
count: 1
path: tests/integration/Core/Repository/Values/User/Limitation/BaseLimitationTest.php

-
message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: tests/lib/IO/Flysystem/Adapter/DynamicPathFilesystemAdapterDecoratorTest.php

-
message: "#^Parameter \\#1 \\$str of function md5 expects string, float given\\.$#"
count: 1
Expand Down
45 changes: 0 additions & 45 deletions phpstan-baseline-gte-8.0.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,6 @@ parameters:
count: 1
path: src/bundle/Core/Command/CleanupVersionsCommand.php

-
message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Parameter \\#1 \\$stream of function fwrite expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Parameter \\#1 \\$stream of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Parameter \\#2 \\$data of function fwrite expects string, string\\|false given\\.$#"
count: 1
Expand Down Expand Up @@ -80,36 +65,11 @@ parameters:
count: 1
path: src/bundle/Core/Features/Context/UserContext.php

-
message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#1 \\$stream of function fwrite expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#1 \\$stream of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#2 \\$data of function fwrite expects string, string\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Parameter \\#1 \\$stream of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/PlaceholderProvider/GenericProvider.php

-
message: "#^Parameter \\#1 \\$stream of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php

-
message: "#^Method Ibexa\\\\Bundle\\\\Core\\\\URLChecker\\\\Handler\\\\HTTPHandler\\:\\:createCurlHandlerForUrl\\(\\) should return resource but returns CurlHandle\\.$#"
count: 1
Expand Down Expand Up @@ -455,11 +415,6 @@ parameters:
count: 1
path: tests/integration/Core/Repository/Values/User/Limitation/BaseLimitationTest.php

-
message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: tests/lib/IO/Flysystem/Adapter/DynamicPathFilesystemAdapterDecoratorTest.php

-
message: "#^Parameter \\#1 \\$string of function md5 expects string, float given\\.$#"
count: 1
Expand Down
8 changes: 4 additions & 4 deletions phpstan-baseline-lte-8.2.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ parameters:
-
message: "#^Offset 'uri' does not exist on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\}\\.$#"
count: 1
path: src/bundle/Core/Imagine/IORepositoryResolver.php
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php

-
message: "#^Offset 'uri' does not exist on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\}\\.$#"
count: 1
path: src/bundle/Core/Imagine/PlaceholderProvider/GenericProvider.php
path: src/bundle/Core/Imagine/IORepositoryResolver.php

-
message: "#^Offset 'uri' does not exist on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\}\\.$#"
count: 1
path: src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php
path: src/bundle/Core/Imagine/PlaceholderProvider/GenericProvider.php

-
message: "#^Offset 'uri' does not exist on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\}\\.$#"
count: 1
path: src/bundle/Core/Command/ResizeOriginalImagesCommand.php
path: src/bundle/Core/Imagine/PlaceholderProvider/RemoteProvider.php
20 changes: 0 additions & 20 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7640,11 +7640,6 @@ parameters:
count: 1
path: src/contracts/Test/Repository/SetupFactory/Legacy.php

-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Test\\\\Repository\\\\SetupFactory\\\\Legacy\\:\\:createTemporaryDirectory\\(\\) should return string but returns string\\|false\\.$#"
count: 1
path: src/contracts/Test/Repository/SetupFactory/Legacy.php

-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Test\\\\Repository\\\\SetupFactory\\\\Legacy\\:\\:externalBuildContainer\\(\\) has no return type specified\\.$#"
count: 1
Expand All @@ -7670,16 +7665,6 @@ parameters:
count: 1
path: src/contracts/Test/Repository/SetupFactory/Legacy.php

-
message: "#^Parameter \\#1 \\$dirs of method Symfony\\\\Component\\\\Filesystem\\\\Filesystem\\:\\:mkdir\\(\\) expects iterable\\|string, string\\|false given\\.$#"
count: 1
path: src/contracts/Test/Repository/SetupFactory/Legacy.php

-
message: "#^Parameter \\#1 \\$filename of function unlink expects string, string\\|false given\\.$#"
count: 1
path: src/contracts/Test/Repository/SetupFactory/Legacy.php

-
message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Test\\\\Repository\\\\SetupFactory\\\\Legacy\\:\\:\\$connection \\(Doctrine\\\\DBAL\\\\Connection\\) does not accept object\\.$#"
count: 1
Expand Down Expand Up @@ -44695,11 +44680,6 @@ parameters:
count: 1
path: tests/lib/IO/FilePathNormalizer/FlysystemTest.php

-
message: "#^Parameter \\#2 \\$contents of method League\\\\Flysystem\\\\FilesystemAdapter\\:\\:writeStream\\(\\) expects resource, resource\\|false given\\.$#"
count: 1
path: tests/lib/IO/Flysystem/Adapter/DynamicPathFilesystemAdapterDecoratorTest.php

-
message: "#^Method Ibexa\\\\Tests\\\\Core\\\\IO\\\\Flysystem\\\\VisibilityConverter\\\\BaseVisibilityConverterTest\\:\\:getDataForTestForDirectory\\(\\) return type has no value type specified in iterable type iterable\\.$#"
count: 1
Expand Down
4 changes: 4 additions & 0 deletions src/contracts/Repository/LocationService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ public function loadLocations(ContentInfo $contentInfo, ?Location $rootLocation
/**
* Loads children which are readable by the current user of a location object sorted by sortField and sortOrder.
*
* Use this method with caution. It performs heavy queries on the database.
* Consider using {@see \eZ\Publish\API\Repository\SearchService::findLocations()} with
* {@see \eZ\Publish\Core\QueryType\BuiltIn\ChildrenQueryType} as an alternative.
*
* @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location
* @param int $offset the start offset for paging
* @param int $limit the number of locations returned
Expand Down
Loading