IBX-8533: Dropped deprecated code

phpstan-baseline-7.4.neon

@@ -245,11 +245,6 @@ parameters:
 			count: 1
 			path: src/lib/Tab/LocationView/VersionsTab.php
 
-		-
-			message: "#^Parameter \\#1 \\$str of function strtolower expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/PolicyTranslationExtractor.php
-
 		-
 			message: "#^Parameter \\#1 \\$array_arg of function usort expects TArray of array\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ContentType\\\\ContentType\\>, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ContentType\\\\ContentType\\> given\\.$#"
 			count: 1
@@ -265,11 +260,6 @@ parameters:
 			count: 1
 			path: src/lib/UI/Config/Provider/ContentTypes.php
 
-		-
-			message: "#^Parameter \\#1 \\$input of function array_filter expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
 		-
 			message: "#^Parameter \\#2 \\$size of function array_chunk expects int\\<1, max\\>, int given\\.$#"
 			count: 1

phpstan-baseline-8.0.neon

@@ -165,11 +165,6 @@ parameters:
 			count: 1
 			path: src/lib/Tab/LocationView/ContentTab.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of function strtolower expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/PolicyTranslationExtractor.php
-
 		-
 			message: "#^Parameter \\#1 \\$array of function usort expects TArray of array\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ContentType\\\\ContentType\\>, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ContentType\\\\ContentType\\> given\\.$#"
 			count: 1
@@ -185,11 +180,6 @@ parameters:
 			count: 1
 			path: src/lib/UI/Config/Provider/ContentTypes.php
 
-		-
-			message: "#^Parameter \\#1 \\$array of function array_filter expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\VersionInfo\\> given\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
 		-
 			message: "#^Parameter \\#2 \\$length of function array_chunk expects int\\<1, max\\>, int given\\.$#"
 			count: 1

phpstan-baseline.neon

@@ -1575,16 +1575,6 @@ parameters:
 			count: 1
 			path: src/contracts/UniversalDiscovery/Provider.php
 
-		-
-			message: "#^Method Ibexa\\\\Contracts\\\\AdminUi\\\\UniversalDiscovery\\\\Provider\\:\\:getRestFormat\\(\\) has parameter \\$valueObject with no type specified\\.$#"
-			count: 1
-			path: src/contracts/UniversalDiscovery/Provider.php
-
-		-
-			message: "#^Method Ibexa\\\\Contracts\\\\AdminUi\\\\UniversalDiscovery\\\\Provider\\:\\:getRestFormat\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/contracts/UniversalDiscovery/Provider.php
-
 		-
 			message: "#^Method Ibexa\\\\Contracts\\\\AdminUi\\\\UniversalDiscovery\\\\Provider\\:\\:getSubitemContents\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -8575,11 +8565,6 @@ parameters:
 			count: 1
 			path: src/lib/Siteaccess/SiteaccessResolver.php
 
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Siteaccess\\\\SiteaccessResolver\\:\\:getSiteaccessesForLocation\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Siteaccess/SiteaccessResolver.php
-
 		-
 			message: "#^PHPDoc tag @param references unknown parameter\\: \\$siteAccesses$#"
 			count: 1
@@ -8685,16 +8670,6 @@ parameters:
 			count: 1
 			path: src/lib/Tab/Dashboard/MyMediaTab.php
 
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Tab\\\\Dashboard\\\\PagerContentToDataMapper\\:\\:map\\(\\) has parameter \\$pager with generic class Pagerfanta\\\\Pagerfanta but does not specify its types\\: T$#"
-			count: 1
-			path: src/lib/Tab/Dashboard/PagerContentToDataMapper.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Tab\\\\Dashboard\\\\PagerContentToDataMapper\\:\\:map\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Tab/Dashboard/PagerContentToDataMapper.php
-
 		-
 			message: "#^Method Ibexa\\\\AdminUi\\\\Tab\\\\Event\\\\Subscriber\\\\ConditionalTabSubscriber\\:\\:getSubscribedEvents\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -9025,26 +9000,6 @@ parameters:
 			count: 1
 			path: src/lib/Translation/Extractor/JavaScriptFileVisitor.php
 
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\LimitationTranslationExtractor\\:\\:__construct\\(\\) has parameter \\$policyMap with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/LimitationTranslationExtractor.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\LimitationTranslationExtractor\\:\\:extract\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/LimitationTranslationExtractor.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\LimitationTranslationExtractor\\:\\:getLimitationTypes\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/LimitationTranslationExtractor.php
-
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\LimitationTranslationExtractor\\:\\:\\$policyMap type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/LimitationTranslationExtractor.php
-
 		-
 			message: "#^Access to an undefined property PhpParser\\\\Node\\:\\:\\$args\\.$#"
 			count: 5
@@ -9125,26 +9080,6 @@ parameters:
 			count: 1
 			path: src/lib/Translation/Extractor/NotificationTranslationExtractor.php
 
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\PolicyTranslationExtractor\\:\\:__construct\\(\\) has parameter \\$policyMap with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/PolicyTranslationExtractor.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\PolicyTranslationExtractor\\:\\:createMessage\\(\\) never returns null so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/PolicyTranslationExtractor.php
-
-		-
-			message: "#^Parameter \\#1 \\$message of method JMS\\\\TranslationBundle\\\\Model\\\\MessageCatalogue\\:\\:add\\(\\) expects JMS\\\\TranslationBundle\\\\Model\\\\Message, JMS\\\\TranslationBundle\\\\Model\\\\Message\\\\XliffMessage\\|null given\\.$#"
-			count: 5
-			path: src/lib/Translation/Extractor/PolicyTranslationExtractor.php
-
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\PolicyTranslationExtractor\\:\\:\\$policyMap type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/Translation/Extractor/PolicyTranslationExtractor.php
-
 		-
 			message: "#^Method Ibexa\\\\AdminUi\\\\Translation\\\\Extractor\\\\SortingTranslationExtractor\\:\\:extract\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -9360,31 +9295,6 @@ parameters:
 			count: 1
 			path: src/lib/UI/Dataset/ContentDraftListDataset.php
 
-		-
-			message: "#^Cannot access offset int on iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\ContentType\\\\ContentType\\>\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\UI\\\\Dataset\\\\ContentDraftsDataset\\:\\:getContentDrafts\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\UI\\\\Dataset\\\\ContentDraftsDataset\\:\\:mapContentDraft\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\UI\\\\Dataset\\\\ContentDraftsDataset\\:\\:\\$data type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
-		-
-			message: "#^Property Ibexa\\\\AdminUi\\\\UI\\\\Dataset\\\\ContentDraftsDataset\\:\\:\\$locationService is never read, only written\\.$#"
-			count: 1
-			path: src/lib/UI/Dataset/ContentDraftsDataset.php
-
 		-
 			message: "#^Parameter \\#2 \\$array of function array_map expects array, iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\URLAlias\\> given\\.$#"
 			count: 1
@@ -9722,7 +9632,7 @@ parameters:
 
 		-
 			message: "#^PHPDoc tag @return with type Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Relation is not subtype of native type Ibexa\\\\AdminUi\\\\UI\\\\Value\\\\Content\\\\Relation\\.$#"
-			count: 2
+			count: 1
 			path: src/lib/UI/Value/ValueFactory.php
 
 		-
@@ -9925,16 +9835,6 @@ parameters:
 			count: 1
 			path: src/lib/UniversalDiscovery/UniversalDiscoveryProvider.php
 
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\UniversalDiscovery\\\\UniversalDiscoveryProvider\\:\\:getRestFormat\\(\\) has parameter \\$valueObject with no type specified\\.$#"
-			count: 1
-			path: src/lib/UniversalDiscovery/UniversalDiscoveryProvider.php
-
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\UniversalDiscovery\\\\UniversalDiscoveryProvider\\:\\:getRestFormat\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/lib/UniversalDiscovery/UniversalDiscoveryProvider.php
-
 		-
 			message: "#^Method Ibexa\\\\AdminUi\\\\UniversalDiscovery\\\\UniversalDiscoveryProvider\\:\\:getSortClause\\(\\) should return Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query\\\\SortClause but returns object\\.$#"
 			count: 1
@@ -9960,11 +9860,6 @@ parameters:
 			count: 1
 			path: src/lib/UniversalDiscovery/UniversalDiscoveryProvider.php
 
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
-			count: 1
-			path: src/lib/UniversalDiscovery/UniversalDiscoveryProvider.php
-
 		-
 			message: "#^Parameter \\#1 \\$query of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\SearchService\\:\\:findLocations\\(\\) expects Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\LocationQuery, Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Query given\\.$#"
 			count: 1
@@ -10015,11 +9910,6 @@ parameters:
 			count: 1
 			path: src/lib/Validator/Constraints/FieldSettingsValidator.php
 
-		-
-			message: "#^Method Ibexa\\\\AdminUi\\\\Validator\\\\Constraints\\\\FieldTypeValidator\\:\\:processValidationErrors\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/lib/Validator/Constraints/FieldTypeValidator.php
-
 		-
 			message: "#^Property Ibexa\\\\AdminUi\\\\Validator\\\\Constraints\\\\LocationHasChildren\\:\\:\\$message has no type specified\\.$#"
 			count: 1
@@ -12621,11 +12511,6 @@ parameters:
 			count: 1
 			path: tests/lib/Tab/TabRegistryTest.php
 
-		-
-			message: "#^Method Ibexa\\\\Tests\\\\AdminUi\\\\Translation\\\\Extractor\\\\LimitationTranslationExtractorTest\\:\\:testExtract\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: tests/lib/Translation/Extractor/LimitationTranslationExtractorTest.php
-
 		-
 			message: "#^Method Ibexa\\\\Tests\\\\AdminUi\\\\UI\\\\Config\\\\Service\\\\ContentTypeIconResolverTest\\:\\:dataProviderForGetContentTypeIcon\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

src/bundle/Controller/Content/ContentTreeController.php

@@ -8,6 +8,7 @@
 
 namespace Ibexa\Bundle\AdminUi\Controller\Content;
 
+use Ibexa\AdminUi\Permission\LimitationResolverInterface;
 use Ibexa\AdminUi\Permission\LookupLimitationsTransformer;
 use Ibexa\AdminUi\REST\Value\ContentTree\LoadSubtreeRequestNode;
 use Ibexa\AdminUi\REST\Value\ContentTree\Node;
@@ -16,7 +17,6 @@
 use Ibexa\AdminUi\Siteaccess\SiteaccessResolverInterface;
 use Ibexa\AdminUi\Specification\ContentType\ContentTypeIsUser;
 use Ibexa\AdminUi\UI\Module\ContentTree\NodeFactory;
-use Ibexa\Contracts\AdminUi\Permission\PermissionCheckerInterface;
 use Ibexa\Contracts\Core\Limitation\Target;
 use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Core\Repository\PermissionResolver;
@@ -36,8 +36,6 @@ class ContentTreeController extends RestController
 {
     private LocationService $locationService;
 
-    private PermissionCheckerInterface $permissionChecker;
-
     private LookupLimitationsTransformer $lookupLimitationsTransformer;
 
     private NodeFactory $contentTreeNodeFactory;
@@ -48,22 +46,24 @@ class ContentTreeController extends RestController
 
     private SiteaccessResolverInterface $siteaccessResolver;
 
+    private LimitationResolverInterface $limitationResolver;
+
     public function __construct(
         LocationService $locationService,
-        PermissionCheckerInterface $permissionChecker,
         LookupLimitationsTransformer $lookupLimitationsTransformer,
         NodeFactory $contentTreeNodeFactory,
         PermissionResolver $permissionResolver,
         ConfigResolverInterface $configResolver,
-        SiteaccessResolverInterface $siteaccessResolver
+        SiteaccessResolverInterface $siteaccessResolver,
+        LimitationResolverInterface $limitationResolver
     ) {
         $this->locationService = $locationService;
-        $this->permissionChecker = $permissionChecker;
         $this->lookupLimitationsTransformer = $lookupLimitationsTransformer;
         $this->contentTreeNodeFactory = $contentTreeNodeFactory;
         $this->permissionResolver = $permissionResolver;
         $this->configResolver = $configResolver;
         $this->siteaccessResolver = $siteaccessResolver;
+        $this->limitationResolver = $limitationResolver;
     }
 
     /**
@@ -171,8 +171,8 @@ public function loadNodeExtendedInfoAction(Location $location): NodeExtendedInfo
      */
     private function getLocationPermissionRestrictions(Location $location): array
     {
-        $lookupCreateLimitationsResult = $this->permissionChecker->getContentCreateLimitations($location);
-        $lookupUpdateLimitationsResult = $this->permissionChecker->getContentUpdateLimitations($location);
+        $lookupCreateLimitationsResult = $this->limitationResolver->getContentCreateLimitations($location);
+        $lookupUpdateLimitationsResult = $this->limitationResolver->getContentUpdateLimitations($location);
 
         $createLimitationsValues = $this->lookupLimitationsTransformer->getGroupedLimitationValues(
             $lookupCreateLimitationsResult,

src/bundle/DependencyInjection/Configuration/Parser/AdminUiForms.php

@@ -21,8 +21,9 @@
  *   system:
  *      admin_group: # configuration per SiteAccess or SiteAccess group
  *          admin_ui_forms:
- *              content_edit_form_templates:
- *                  - { template: 'template.html.twig', priority: 0 }
+ *              content_edit:
+ *                  form_templates:
+ *                      - { template: 'template.html.twig', priority: 0 }
  * ```
  */
 class AdminUiForms extends AbstractParser
@@ -46,28 +47,12 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
         $nodeBuilder
             ->arrayNode('admin_ui_forms')
                 ->info('Admin UI forms configuration settings')
-                ->beforeNormalization()
-                    ->always(static function (array $array): array {
-                        // handle deprecated config
-                        if (isset($array['content_edit_form_templates'])) {
-                            $array['content_edit']['form_templates'] = $array['content_edit_form_templates'];
-                            unset($array['content_edit_form_templates']);
-                        }
-
-                        return $array;
-                    })
-                ->end()
                 ->children()
                     ->arrayNode('content_edit')
                         ->info('Content Edit form configuration')
                         ->children()
                             ->arrayNode('form_templates')
                                 ->info('A list of Content Edit (and create) default Twig form templates')
-                                ->setDeprecated(
-                                    'ibexa/admin-ui',
-                                    '4.2.0',
-                                    'Setting "admin_ui.content_edit_form_templates" is deprecated. Use "admin_ui.content_edit.form_templates" instead.'
-                                )
                                 ->arrayPrototype()
                                     ->children()
                                         ->scalarNode('template')->end()

src/bundle/DependencyInjection/Configuration/Parser/Pagination.php

@@ -21,7 +21,6 @@
  *   system:
  *      default: # configuration per siteaccess or siteaccess group
  *          pagination:
- *              search_limit: 10
  *              trash_limit: 10
  *              section_limit: 10
  *              language_limit: 10
@@ -40,10 +39,6 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
             ->arrayNode('pagination')
                 ->info('System pagination configuration')
                 ->children()
-                    ->scalarNode('search_limit')
-                        ->isRequired()
-                        ->setDeprecated('ezsystems/ezplatform-admin-ui', '2.1', 'The child node "%node%" at path "%path%" is deprecated. Use "search.pagination.limit" instead.')
-                    ->end()
                     ->scalarNode('trash_limit')->isRequired()->end()
                     ->scalarNode('section_limit')->isRequired()->end()
                     ->scalarNode('language_limit')->isRequired()->end()
@@ -76,7 +71,6 @@ public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerIn
 
         $settings = $scopeSettings['pagination'];
         $keys = [
-            'search_limit',
             'trash_limit',
             'section_limit',
             'language_limit',

src/bundle/DependencyInjection/IbexaAdminUiExtension.php

@@ -21,24 +21,12 @@ class IbexaAdminUiExtension extends Extension implements PrependExtensionInterfa
     private const WEBPACK_CONFIG_NAMES = [
         'ibexa.config.js' => [
             'ibexa.config.js' => [],
-            'ez.config.js' => [
-                'deprecated' => true,
-                'alternative' => 'ibexa.config.js',
-            ],
         ],
         'ibexa.config.manager.js' => [
             'ibexa.config.manager.js' => [],
-            'ez.config.manager.js' => [
-                'deprecated' => true,
-                'alternative' => 'ibexa.config.manager.js',
-            ],
         ],
         'ibexa.webpack.custom.config.js' => [
             'ibexa.webpack.custom.config.js' => [],
-            'ez.webpack.custom.config.js' => [
-                'deprecated' => true,
-                'alternative' => 'ibexa.webpack.custom.config.js',
-            ],
         ],
         'ibexa.config.setup.js' => [
             'ibexa.config.setup.js' => [],