Skip to content

Commit ae12de3

Browse files
adriendupuisadriendupuis
committed
Merge branch '4.6'
# Conflicts: # phpstan-baseline-7.4.neon # phpstan-baseline-gte-8.0.neon # phpstan-baseline.neon # src/contracts/Repository/ContentService.php
2 parents aba61e9 + 02200e6 commit ae12de3

File tree

17 files changed

+397
-215
lines changed

17 files changed

+397
-215
lines changed

‎phpstan-baseline.neon‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ parameters:
4646
path: src/bundle/Core/Command/CleanupVersionsCommand.php
4747

4848
-
49-
message: "#^Parameter \\#1 \\$array of function array_filter expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
49+
message: "#^Parameter \\#1 \\$array of function array_filter expects array, iterable\\<int, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
5050
count: 1
5151
path: src/bundle/Core/Command/CleanupVersionsCommand.php
5252

5353
-
54-
message: "#^Parameter \\#1 \\$array of function array_slice expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
54+
message: "#^Parameter \\#1 \\$array of function array_slice expects array, iterable\\<int, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
5555
count: 1
5656
path: src/bundle/Core/Command/CleanupVersionsCommand.php
5757

5858
-
59-
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
59+
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, iterable\\<int, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
6060
count: 1
6161
path: src/bundle/Core/Command/CleanupVersionsCommand.php
6262

@@ -5400,11 +5400,6 @@ parameters:
54005400
count: 1
54015401
path: src/contracts/Persistence/User/Policy.php
54025402

5403-
-
5404-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
5405-
count: 1
5406-
path: src/contracts/Repository/ContentService.php
5407-
54085403
-
54095404
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
54105405
count: 1
@@ -5415,21 +5410,6 @@ parameters:
54155410
count: 1
54165411
path: src/contracts/Repository/ContentService.php
54175412

5418-
-
5419-
message: "#^PHPDoc tag @param for parameter \\$contentId with type mixed is not subtype of native type int\\.$#"
5420-
count: 1
5421-
path: src/contracts/Repository/ContentService.php
5422-
5423-
-
5424-
message: "#^PHPDoc tag @param has invalid value \\(\\\\Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Language\\|null if not set the draft is created with the initialLanguage code of the source version or if not present with the main language\\.\\)\\: Unexpected token \"if\", expected variable at offset 870$#"
5425-
count: 1
5426-
path: src/contracts/Repository/ContentService.php
5427-
5428-
-
5429-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Decorator\\\\ContentServiceDecorator\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
5430-
count: 1
5431-
path: src/contracts/Repository/Decorator/ContentServiceDecorator.php
5432-
54335413
-
54345414
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Decorator\\\\ContentServiceDecorator\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
54355415
count: 1
@@ -8431,7 +8411,7 @@ parameters:
84318411
path: src/lib/Base/Utils/DeprecationWarnerInterface.php
84328412

84338413
-
8434-
message: "#^Parameter \\#1 \\$locations of class Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Events\\\\Content\\\\DeleteContentEvent constructor expects array, array\\|iterable\\<int\\> given\\.$#"
8414+
message: "#^Parameter \\#1 \\$locations of class Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Events\\\\Content\\\\DeleteContentEvent constructor expects array, array\\|iterable\\<int, int\\> given\\.$#"
84358415
count: 1
84368416
path: src/lib/Event/ContentService.php
84378417

@@ -11121,7 +11101,7 @@ parameters:
1112111101
path: src/lib/MVC/Symfony/FieldType/RelationList/ParameterProvider.php
1112211102

1112311103
-
11124-
message: "#^Parameter \\#1 \\$array of function array_keys expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\ContentInfo\\> given\\.$#"
11104+
message: "#^Parameter \\#1 \\$array of function array_keys expects array, iterable\\<int, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\ContentInfo\\> given\\.$#"
1112511105
count: 1
1112611106
path: src/lib/MVC/Symfony/FieldType/RelationList/ParameterProvider.php
1112711107

@@ -18980,11 +18960,6 @@ parameters:
1898018960
count: 1
1898118961
path: src/lib/Repository/ContentService.php
1898218962

18983-
-
18984-
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
18985-
count: 1
18986-
path: src/lib/Repository/ContentService.php
18987-
1898818963
-
1898918964
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByRemoteId\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
1899018965
count: 1
@@ -19036,7 +19011,7 @@ parameters:
1903619011
path: src/lib/Repository/ContentService.php
1903719012

1903819013
-
19039-
message: "#^Parameter \\#3 \\$prioritizedLanguages of method Ibexa\\\\Core\\\\Repository\\\\Mapper\\\\ContentDomainMapper\\:\\:buildContentDomainObjectFromPersistence\\(\\) expects array\\<string\\>, array\\<string\\>\\|null given\\.$#"
19014+
message: "#^Parameter \\#3 \\$prioritizedLanguages of method Ibexa\\\\Core\\\\Repository\\\\Mapper\\\\ContentDomainMapper\\:\\:buildContentDomainObjectFromPersistence\\(\\) expects array\\<string\\>, array\\<int, string\\>\\|null given\\.$#"
1904019015
count: 1
1904119016
path: src/lib/Repository/ContentService.php
1904219017

@@ -19985,11 +19960,6 @@ parameters:
1998519960
count: 1
1998619961
path: src/lib/Repository/SettingService.php
1998719962

19988-
-
19989-
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\SiteAccessAware\\\\ContentService\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
19990-
count: 1
19991-
path: src/lib/Repository/SiteAccessAware/ContentService.php
19992-
1999319963
-
1999419964
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\SiteAccessAware\\\\ContentService\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
1999519965
count: 1
@@ -26756,7 +26726,7 @@ parameters:
2675626726
path: tests/integration/Core/Repository/ContentServiceTest.php
2675726727

2675826728
-
26759-
message: "#^Method Ibexa\\\\Tests\\\\Integration\\\\Core\\\\Repository\\\\ContentServiceTest\\:\\:testLoadVersions\\(\\) should return array\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> but returns iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\>\\.$#"
26729+
message: "#^Method Ibexa\\\\Tests\\\\Integration\\\\Core\\\\Repository\\\\ContentServiceTest\\:\\:testLoadVersions\\(\\) should return array\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> but returns iterable\\<int, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\>\\.$#"
2676026730
count: 1
2676126731
path: tests/integration/Core/Repository/ContentServiceTest.php
2676226732

@@ -27021,7 +26991,7 @@ parameters:
2702126991
path: tests/integration/Core/Repository/ContentServiceTest.php
2702226992

2702326993
-
27024-
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
26994+
message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, iterable\\<int, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
2702526995
count: 2
2702626996
path: tests/integration/Core/Repository/ContentServiceTest.php
2702726997

@@ -53606,7 +53576,7 @@ parameters:
5360653576
path: tests/lib/Repository/Decorator/ContentServiceDecoratorTest.php
5360753577

5360853578
-
53609-
message: "#^Parameter \\#1 \\$contentIds of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentInfoList\\(\\) expects array\\<int\\>, array\\<int, string\\> given\\.$#"
53579+
message: "#^Parameter \\#1 \\$contentIds of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentInfoList\\(\\) expects array\\<int, int\\>, array\\<int, string\\> given\\.$#"
5361053580
count: 1
5361153581
path: tests/lib/Repository/Decorator/ContentServiceDecoratorTest.php
5361253582

‎src/contracts/Persistence/Content/Location/Handler.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ public function create(CreateStruct $location);
216216
*/
217217
public function removeSubtree($locationId);
218218

219+
/**
220+
* Removes all draft contents that have no location assigned to them under the given parent location.
221+
*/
222+
public function deleteChildrenDrafts(int $locationId): void;
223+
219224
/**
220225
* Set section on all content objects in the subtree.
221226
* Only main locations will be updated.

0 commit comments

Comments
 (0)