Skip to content

Commit f550ba1

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 f550ba1

File tree

17 files changed

+397
-210
lines changed

17 files changed

+397
-210
lines changed

‎phpstan-baseline.neon‎

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ parameters:
170170
count: 1
171171
path: src/bundle/Core/Command/RegenerateUrlAliasesCommand.php
172172

173+
-
174+
message: "#^Cannot access offset int on iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Content\\>\\.$#"
175+
count: 1
176+
path: src/bundle/Core/Command/RegenerateUrlAliasesCommand.php
177+
173178
-
174179
message: "#^Method Ibexa\\\\Bundle\\\\Core\\\\Command\\\\RegenerateUrlAliasesCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
175180
count: 1
@@ -5400,11 +5405,6 @@ parameters:
54005405
count: 1
54015406
path: src/contracts/Persistence/User/Policy.php
54025407

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-
54085408
-
54095409
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
54105410
count: 1
@@ -5415,21 +5415,6 @@ parameters:
54155415
count: 1
54165416
path: src/contracts/Repository/ContentService.php
54175417

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-
54335418
-
54345419
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Decorator\\\\ContentServiceDecorator\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
54355420
count: 1
@@ -8431,7 +8416,7 @@ parameters:
84318416
path: src/lib/Base/Utils/DeprecationWarnerInterface.php
84328417

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

@@ -18980,11 +18965,6 @@ parameters:
1898018965
count: 1
1898118966
path: src/lib/Repository/ContentService.php
1898218967

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-
1898818968
-
1898918969
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByRemoteId\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
1899018970
count: 1
@@ -19036,7 +19016,7 @@ parameters:
1903619016
path: src/lib/Repository/ContentService.php
1903719017

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

@@ -19985,11 +19965,6 @@ parameters:
1998519965
count: 1
1998619966
path: src/lib/Repository/SettingService.php
1998719967

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-
1999319968
-
1999419969
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\SiteAccessAware\\\\ContentService\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
1999519970
count: 1
@@ -26756,7 +26731,7 @@ parameters:
2675626731
path: tests/integration/Core/Repository/ContentServiceTest.php
2675726732

2675826733
-
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\\>\\.$#"
26734+
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\\>\\.$#"
2676026735
count: 1
2676126736
path: tests/integration/Core/Repository/ContentServiceTest.php
2676226737

@@ -53606,7 +53581,7 @@ parameters:
5360653581
path: tests/lib/Repository/Decorator/ContentServiceDecoratorTest.php
5360753582

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

‎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)