Skip to content

Commit

Permalink
Merge branch '4.6'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	phpstan-baseline-7.4.neon
#	phpstan-baseline-gte-8.0.neon
#	phpstan-baseline.neon
#	src/contracts/Repository/ContentService.php
  • Loading branch information
@adriendupuis
adriendupuis committed Nov 13, 2024
2 parents aba61e9 + 02200e6 commit f550ba1
Show file tree
Hide file tree
Showing 17 changed files with 397 additions and 210 deletions.
43 changes: 9 additions & 34 deletions phpstan-baseline.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@ parameters:
count: 1
path: src/bundle/Core/Command/RegenerateUrlAliasesCommand.php

-
message: "#^Cannot access offset int on iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Content\\>\\.$#"
count: 1
path: src/bundle/Core/Command/RegenerateUrlAliasesCommand.php

-
message: "#^Method Ibexa\\\\Bundle\\\\Core\\\\Command\\\\RegenerateUrlAliasesCommand\\:\\:configure\\(\\) has no return type specified\\.$#"
count: 1
Expand Down Expand Up @@ -5400,11 +5405,6 @@ parameters:
count: 1
path: src/contracts/Persistence/User/Policy.php

-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
count: 1
path: src/contracts/Repository/ContentService.php

-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\ContentService\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
count: 1
Expand All @@ -5415,21 +5415,6 @@ parameters:
count: 1
path: src/contracts/Repository/ContentService.php

-
message: "#^PHPDoc tag @param for parameter \\$contentId with type mixed is not subtype of native type int\\.$#"
count: 1
path: src/contracts/Repository/ContentService.php

-
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$#"
count: 1
path: src/contracts/Repository/ContentService.php

-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Decorator\\\\ContentServiceDecorator\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
count: 1
path: src/contracts/Repository/Decorator/ContentServiceDecorator.php

-
message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Decorator\\\\ContentServiceDecorator\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -8431,7 +8416,7 @@ parameters:
path: src/lib/Base/Utils/DeprecationWarnerInterface.php

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

Expand Down Expand Up @@ -18980,11 +18965,6 @@ parameters:
count: 1
path: src/lib/Repository/ContentService.php

-
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Repository/ContentService.php

-
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\ContentService\\:\\:loadContentByRemoteId\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -19036,7 +19016,7 @@ parameters:
path: src/lib/Repository/ContentService.php

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

Expand Down Expand Up @@ -19985,11 +19965,6 @@ parameters:
count: 1
path: src/lib/Repository/SettingService.php

-
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\SiteAccessAware\\\\ContentService\\:\\:loadContentByContentInfo\\(\\) has parameter \\$languages with no value type specified in iterable type array\\.$#"
count: 1
path: src/lib/Repository/SiteAccessAware/ContentService.php

-
message: "#^Method Ibexa\\\\Core\\\\Repository\\\\SiteAccessAware\\\\ContentService\\:\\:validate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
count: 1
Expand Down Expand Up @@ -26756,7 +26731,7 @@ parameters:
path: tests/integration/Core/Repository/ContentServiceTest.php

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

Expand Down Expand Up @@ -53606,7 +53581,7 @@ parameters:
path: tests/lib/Repository/Decorator/ContentServiceDecoratorTest.php

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

Expand Down
5 changes: 5 additions & 0 deletions src/contracts/Persistence/Content/Location/Handler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ public function create(CreateStruct $location);
*/
public function removeSubtree($locationId);

/**
* Removes all draft contents that have no location assigned to them under the given parent location.
*/
public function deleteChildrenDrafts(int $locationId): void;

/**
* Set section on all content objects in the subtree.
* Only main locations will be updated.
Expand Down
Loading

0 comments on commit f550ba1

Please sign in to comment.