diff --git a/src/bundle/Controller/BookmarkController.php b/src/bundle/Controller/BookmarkController.php index cdd3a5ce00..56a2fc2e81 100644 --- a/src/bundle/Controller/BookmarkController.php +++ b/src/bundle/Controller/BookmarkController.php @@ -17,7 +17,7 @@ use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\Core\Repository\BookmarkService; use Ibexa\Contracts\Core\Repository\LocationService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -39,7 +39,7 @@ class BookmarkController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/ContentController.php b/src/bundle/Controller/ContentController.php index e54ed35c63..b1c0f87286 100644 --- a/src/bundle/Controller/ContentController.php +++ b/src/bundle/Controller/ContentController.php @@ -37,9 +37,9 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Base\Exceptions\BadStateException; use Ibexa\Core\Helper\TranslationHelper; -use Ibexa\Core\MVC\ConfigResolverInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -81,7 +81,7 @@ class ContentController extends Controller /** @var \Ibexa\Core\Helper\TranslationHelper */ private $translationHelper; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\AdminUi\Siteaccess\SiteAccessNameGeneratorInterface */ diff --git a/src/bundle/Controller/ContentDraftController.php b/src/bundle/Controller/ContentDraftController.php index 80e695a50d..592f0c22d5 100644 --- a/src/bundle/Controller/ContentDraftController.php +++ b/src/bundle/Controller/ContentDraftController.php @@ -16,7 +16,7 @@ use Ibexa\AdminUi\UI\Value\Content\VersionId; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\Core\Repository\ContentService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -37,7 +37,7 @@ class ContentDraftController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/ContentOnTheFlyController.php b/src/bundle/Controller/ContentOnTheFlyController.php index 14c96f7c83..0c12560c4f 100644 --- a/src/bundle/Controller/ContentOnTheFlyController.php +++ b/src/bundle/Controller/ContentOnTheFlyController.php @@ -30,10 +30,10 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Base\Exceptions\BadStateException; use Ibexa\Core\Base\Exceptions\InvalidArgumentException; use Ibexa\Core\Base\Exceptions\UnauthorizedException; -use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\HttpFoundation\JsonResponse; @@ -68,7 +68,7 @@ class ContentOnTheFlyController extends Controller /** @var \Ibexa\AdminUi\Form\ActionDispatcher\CreateContentOnTheFlyDispatcher */ private $createContentActionDispatcher; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface */ diff --git a/src/bundle/Controller/ContentTypeController.php b/src/bundle/Controller/ContentTypeController.php index 670d8b2930..ed09a35570 100644 --- a/src/bundle/Controller/ContentTypeController.php +++ b/src/bundle/Controller/ContentTypeController.php @@ -35,7 +35,7 @@ use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeDraft; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; @@ -78,7 +78,7 @@ class ContentTypeController extends Controller private $contentTypeDraftMapper; /** - * @var \Ibexa\Core\MVC\ConfigResolverInterface + * @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; diff --git a/src/bundle/Controller/ContentTypeGroupController.php b/src/bundle/Controller/ContentTypeGroupController.php index 461eb4936f..45e3641522 100644 --- a/src/bundle/Controller/ContentTypeGroupController.php +++ b/src/bundle/Controller/ContentTypeGroupController.php @@ -18,7 +18,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; @@ -40,7 +40,7 @@ class ContentTypeGroupController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/ContentViewController.php b/src/bundle/Controller/ContentViewController.php index b530296395..45fd0b8ed0 100644 --- a/src/bundle/Controller/ContentViewController.php +++ b/src/bundle/Controller/ContentViewController.php @@ -37,7 +37,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Ibexa\Core\MVC\Symfony\View\ContentView; use Symfony\Component\Form\FormFactoryInterface; @@ -79,7 +79,7 @@ class ContentViewController extends Controller /** @var \Symfony\Component\Form\FormFactoryInterface */ private $sfFormFactory; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\Contracts\Core\Repository\Repository */ @@ -103,7 +103,7 @@ class ContentViewController extends Controller * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService * @param \Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver * @param \Ibexa\Contracts\Core\Repository\Repository $repository * @param \Ibexa\Contracts\Core\Repository\PermissionResolver $permissionResolver * @param \Ibexa\AdminUi\Permission\LookupLimitationsTransformer $lookupLimitationsTransformer diff --git a/src/bundle/Controller/LanguageController.php b/src/bundle/Controller/LanguageController.php index f0e50a944d..b3ea9324b8 100644 --- a/src/bundle/Controller/LanguageController.php +++ b/src/bundle/Controller/LanguageController.php @@ -17,7 +17,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\LanguageService; use Ibexa\Contracts\Core\Repository\Values\Content\Language; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; @@ -42,7 +42,7 @@ class LanguageController extends Controller /** @var \Ibexa\AdminUi\Form\Factory\FormFactory */ private $formFactory; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/NotificationController.php b/src/bundle/Controller/NotificationController.php index f6503325b7..85e6cdae38 100644 --- a/src/bundle/Controller/NotificationController.php +++ b/src/bundle/Controller/NotificationController.php @@ -13,7 +13,7 @@ use Ibexa\Bundle\AdminUi\View\Template\EzPagerfantaTemplate; use Ibexa\Contracts\AdminUi\Controller\Controller; use Ibexa\Contracts\Core\Repository\NotificationService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Notification\Renderer\Registry; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\JsonResponse; @@ -32,7 +32,7 @@ class NotificationController extends Controller /** @var \Symfony\Contracts\Translation\TranslatorInterface */ protected $translator; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/ObjectStateController.php b/src/bundle/Controller/ObjectStateController.php index 443042cd7d..f299440c08 100644 --- a/src/bundle/Controller/ObjectStateController.php +++ b/src/bundle/Controller/ObjectStateController.php @@ -26,7 +26,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState; use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Symfony\Component\Form\FormFactoryInterface; use Symfony\Component\HttpFoundation\Request; @@ -49,7 +49,7 @@ class ObjectStateController extends Controller /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/ObjectStateGroupController.php b/src/bundle/Controller/ObjectStateGroupController.php index 01443cfa53..cf749c3d08 100644 --- a/src/bundle/Controller/ObjectStateGroupController.php +++ b/src/bundle/Controller/ObjectStateGroupController.php @@ -18,7 +18,7 @@ use Ibexa\Contracts\AdminUi\Notification\TranslatableNotificationHandlerInterface; use Ibexa\Contracts\Core\Repository\ObjectStateService; use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -37,7 +37,7 @@ class ObjectStateGroupController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/PolicyController.php b/src/bundle/Controller/PolicyController.php index 99272fc989..2b4e9f824a 100644 --- a/src/bundle/Controller/PolicyController.php +++ b/src/bundle/Controller/PolicyController.php @@ -22,7 +22,7 @@ use Ibexa\Contracts\Core\Repository\RoleService; use Ibexa\Contracts\Core\Repository\Values\User\Policy; use Ibexa\Contracts\Core\Repository\Values\User\Role; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; @@ -50,7 +50,7 @@ class PolicyController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/RoleAssignmentController.php b/src/bundle/Controller/RoleAssignmentController.php index 26a2b1a7e8..04953a0b6b 100644 --- a/src/bundle/Controller/RoleAssignmentController.php +++ b/src/bundle/Controller/RoleAssignmentController.php @@ -21,7 +21,7 @@ use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation; use Ibexa\Contracts\Core\Repository\Values\User\Role; use Ibexa\Contracts\Core\Repository\Values\User\RoleAssignment; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; @@ -43,7 +43,7 @@ class RoleAssignmentController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/RoleController.php b/src/bundle/Controller/RoleController.php index 14f3bbcb8a..e61d9c5fab 100644 --- a/src/bundle/Controller/RoleController.php +++ b/src/bundle/Controller/RoleController.php @@ -24,7 +24,7 @@ use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; use Ibexa\Contracts\Core\Repository\RoleService; use Ibexa\Contracts\Core\Repository\Values\User\Role; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; @@ -55,7 +55,7 @@ class RoleController extends Controller /** @var \Ibexa\AdminUi\Form\SubmitHandler */ private $submitHandler; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/SectionController.php b/src/bundle/Controller/SectionController.php index db6abdcd89..ae5e690896 100644 --- a/src/bundle/Controller/SectionController.php +++ b/src/bundle/Controller/SectionController.php @@ -32,7 +32,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Core\Repository\Values\Content\Section; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\NewSectionLimitation; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Ibexa\Core\Pagination\Pagerfanta\ContentSearchAdapter; use Pagerfanta\Adapter\ArrayAdapter; @@ -80,7 +80,7 @@ class SectionController extends Controller /** @var \Ibexa\Contracts\AdminUi\Permission\PermissionCheckerInterface */ private $permissionChecker; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/bundle/Controller/TrashController.php b/src/bundle/Controller/TrashController.php index 240a0bd712..0254d951c0 100644 --- a/src/bundle/Controller/TrashController.php +++ b/src/bundle/Controller/TrashController.php @@ -27,7 +27,7 @@ use Ibexa\Contracts\Core\Repository\UserService; use Ibexa\Contracts\Core\Repository\Values\Content\TrashItem; use Ibexa\Contracts\Core\Repository\Values\User\User; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Pagerfanta\Pagerfanta; @@ -59,7 +59,7 @@ class TrashController extends Controller /** @var \Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface */ private $userLanguagePreferenceProvider; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\AdminUi\QueryType\TrashSearchQueryType */ diff --git a/src/lib/EventListener/RequestLocaleListener.php b/src/lib/EventListener/RequestLocaleListener.php index 2e2b4ac806..8b82e32d4c 100644 --- a/src/lib/EventListener/RequestLocaleListener.php +++ b/src/lib/EventListener/RequestLocaleListener.php @@ -9,7 +9,7 @@ namespace Ibexa\AdminUi\EventListener; use Ibexa\AdminUi\Specification\SiteAccess\IsAdmin; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Request; @@ -32,7 +32,7 @@ class RequestLocaleListener implements EventSubscriberInterface /** @var \Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface */ private $userLanguagePreferenceProvider; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @@ -40,7 +40,7 @@ class RequestLocaleListener implements EventSubscriberInterface * @param array $availableTranslations * @param \Symfony\Contracts\Translation\TranslatorInterface $translator * @param \Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct( array $siteAccessGroups, diff --git a/src/lib/EventListener/SearchViewFilterParametersListener.php b/src/lib/EventListener/SearchViewFilterParametersListener.php index bc41d8661a..46ab8a6ce2 100644 --- a/src/lib/EventListener/SearchViewFilterParametersListener.php +++ b/src/lib/EventListener/SearchViewFilterParametersListener.php @@ -9,7 +9,7 @@ use Ibexa\AdminUi\Form\Data\Content\Draft\ContentEditData; use Ibexa\AdminUi\Form\Type\Content\Draft\ContentEditType; use Ibexa\AdminUi\Specification\SiteAccess\IsAdmin; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\View\Event\FilterViewParametersEvent; use Ibexa\Core\MVC\Symfony\View\ViewEvents; use Ibexa\Search\View\SearchView; @@ -23,7 +23,7 @@ final class SearchViewFilterParametersListener implements EventSubscriberInterfa /** @var \Symfony\Component\Form\FormFactoryInterface */ private $formFactory; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Symfony\Component\HttpFoundation\RequestStack */ diff --git a/src/lib/EventListener/ViewTemplatesListener.php b/src/lib/EventListener/ViewTemplatesListener.php index 0a075008a9..88823ed2fa 100644 --- a/src/lib/EventListener/ViewTemplatesListener.php +++ b/src/lib/EventListener/ViewTemplatesListener.php @@ -10,7 +10,7 @@ use Ibexa\ContentForms\User\View\UserCreateView; use Ibexa\ContentForms\User\View\UserUpdateView; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Event\PreContentViewEvent; use Ibexa\Core\MVC\Symfony\MVCEvents; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -20,7 +20,7 @@ */ class ViewTemplatesListener implements EventSubscriberInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct(ConfigResolverInterface $configResolver) diff --git a/src/lib/Form/EventListener/BuildPathFromRootListener.php b/src/lib/Form/EventListener/BuildPathFromRootListener.php index 609728c562..a1580e289f 100644 --- a/src/lib/Form/EventListener/BuildPathFromRootListener.php +++ b/src/lib/Form/EventListener/BuildPathFromRootListener.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\Form\FormEvent; class BuildPathFromRootListener @@ -21,7 +21,7 @@ class BuildPathFromRootListener /** @var \Ibexa\Contracts\Core\Repository\URLAliasService */ private $urlAliasService; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/Form/Type/ChoiceList/Loader/ConfiguredLanguagesChoiceLoader.php b/src/lib/Form/Type/ChoiceList/Loader/ConfiguredLanguagesChoiceLoader.php index deee290ffd..14e0e6d611 100644 --- a/src/lib/Form/Type/ChoiceList/Loader/ConfiguredLanguagesChoiceLoader.php +++ b/src/lib/Form/Type/ChoiceList/Loader/ConfiguredLanguagesChoiceLoader.php @@ -9,7 +9,7 @@ namespace Ibexa\AdminUi\Form\Type\ChoiceList\Loader; use Ibexa\Contracts\Core\Repository\LanguageService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface; @@ -18,12 +18,12 @@ class ConfiguredLanguagesChoiceLoader implements ChoiceLoaderInterface /** @var \Ibexa\Contracts\Core\Repository\LanguageService */ private $languageService; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** * @param \Ibexa\Contracts\Core\Repository\LanguageService $languageService - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct(LanguageService $languageService, ConfigResolverInterface $configResolver) { diff --git a/src/lib/Form/Type/Trash/ChoiceList/Loader/SearchContentTypeChoiceLoader.php b/src/lib/Form/Type/Trash/ChoiceList/Loader/SearchContentTypeChoiceLoader.php index 45768684a4..f4bda31b48 100644 --- a/src/lib/Form/Type/Trash/ChoiceList/Loader/SearchContentTypeChoiceLoader.php +++ b/src/lib/Form/Type/Trash/ChoiceList/Loader/SearchContentTypeChoiceLoader.php @@ -12,14 +12,14 @@ use Ibexa\AdminUi\Specification\ContentType\ContentTypeIsUser; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\ChoiceList\ChoiceListInterface; class SearchContentTypeChoiceLoader extends ContentTypeChoiceLoader { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/Limitation/Templating/LimitationBlockRenderer.php b/src/lib/Limitation/Templating/LimitationBlockRenderer.php index 7a74e909bc..4b2ddec42b 100644 --- a/src/lib/Limitation/Templating/LimitationBlockRenderer.php +++ b/src/lib/Limitation/Templating/LimitationBlockRenderer.php @@ -13,7 +13,7 @@ use Ibexa\AdminUi\Limitation\LimitationValueMapperRegistryInterface; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Twig\Environment; class LimitationBlockRenderer implements LimitationBlockRendererInterface @@ -27,7 +27,7 @@ class LimitationBlockRenderer implements LimitationBlockRendererInterface /** @var \Twig\Environment */ private $twig; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/Menu/ContentRightSidebarBuilder.php b/src/lib/Menu/ContentRightSidebarBuilder.php index 167805340e..1318018810 100644 --- a/src/lib/Menu/ContentRightSidebarBuilder.php +++ b/src/lib/Menu/ContentRightSidebarBuilder.php @@ -22,7 +22,7 @@ use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\SearchService; use Ibexa\Contracts\Core\Repository\Values\Content\Location; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; @@ -49,7 +49,7 @@ class ContentRightSidebarBuilder extends AbstractBuilder implements TranslationC /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\AdminUi\UniversalDiscovery\ConfigResolver */ diff --git a/src/lib/Menu/MainMenuBuilder.php b/src/lib/Menu/MainMenuBuilder.php index cf1e0c1cb5..0cb50660b2 100644 --- a/src/lib/Menu/MainMenuBuilder.php +++ b/src/lib/Menu/MainMenuBuilder.php @@ -11,7 +11,7 @@ use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent; use Ibexa\Contracts\AdminUi\Menu\AbstractBuilder; use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use JMS\TranslationBundle\Model\Message; use JMS\TranslationBundle\Translation\TranslationContainerInterface; use Knp\Menu\ItemInterface; @@ -129,7 +129,7 @@ class MainMenuBuilder extends AbstractBuilder implements TranslationContainerInt ], ]; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ @@ -141,7 +141,7 @@ class MainMenuBuilder extends AbstractBuilder implements TranslationContainerInt /** * @param \Ibexa\AdminUi\Menu\MenuItemFactory $factory * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver * @param \Ibexa\Contracts\Core\Repository\PermissionResolver $permissionResolver */ public function __construct( diff --git a/src/lib/QueryType/SubtreeQueryType.php b/src/lib/QueryType/SubtreeQueryType.php index 57caa13cc3..956f5acd2d 100644 --- a/src/lib/QueryType/SubtreeQueryType.php +++ b/src/lib/QueryType/SubtreeQueryType.php @@ -8,7 +8,7 @@ use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\Values\Content\Query; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\QueryType\OptionsResolverBasedQueryType; use Ibexa\Core\QueryType\QueryType; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -18,7 +18,7 @@ abstract class SubtreeQueryType extends OptionsResolverBasedQueryType implements protected const OWNED_OPTION_NAME = 'owned'; protected const SUBTREE_OPTION_NAME = 'subtree'; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ diff --git a/src/lib/Resolver/IconPathResolver.php b/src/lib/Resolver/IconPathResolver.php index 8fd43a5e60..193e787f61 100644 --- a/src/lib/Resolver/IconPathResolver.php +++ b/src/lib/Resolver/IconPathResolver.php @@ -9,7 +9,7 @@ namespace Ibexa\AdminUi\Resolver; use Ibexa\Contracts\AdminUi\Resolver\IconPathResolverInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\Asset\Packages; /** @@ -17,7 +17,7 @@ */ final class IconPathResolver implements IconPathResolverInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Symfony\Component\Asset\Packages */ diff --git a/src/lib/Siteaccess/AbstractSiteaccessPreviewVoter.php b/src/lib/Siteaccess/AbstractSiteaccessPreviewVoter.php index 6737683621..fbcde4f75b 100644 --- a/src/lib/Siteaccess/AbstractSiteaccessPreviewVoter.php +++ b/src/lib/Siteaccess/AbstractSiteaccessPreviewVoter.php @@ -9,11 +9,11 @@ namespace Ibexa\AdminUi\Siteaccess; use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; abstract class AbstractSiteaccessPreviewVoter implements SiteaccessPreviewVoterInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; /** @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider */ diff --git a/src/lib/Tab/Dashboard/MyDraftsTab.php b/src/lib/Tab/Dashboard/MyDraftsTab.php index 8a40b68633..a2ba6dfb40 100644 --- a/src/lib/Tab/Dashboard/MyDraftsTab.php +++ b/src/lib/Tab/Dashboard/MyDraftsTab.php @@ -16,7 +16,7 @@ use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Pagerfanta\Pagerfanta; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Contracts\Translation\TranslatorInterface; @@ -41,7 +41,7 @@ class MyDraftsTab extends AbstractTab implements OrderedTabInterface, Conditiona /** @var \Symfony\Component\HttpFoundation\RequestStack */ private $requestStack; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/Tab/LocationView/ContentTab.php b/src/lib/Tab/LocationView/ContentTab.php index 7bdbee7ab5..551e010476 100644 --- a/src/lib/Tab/LocationView/ContentTab.php +++ b/src/lib/Tab/LocationView/ContentTab.php @@ -14,7 +14,7 @@ use Ibexa\Contracts\Core\Repository\LanguageService; use Ibexa\Contracts\Core\Repository\Values\Content\Content; use Ibexa\Contracts\Core\Repository\Values\Content\Language; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Twig\Environment; @@ -27,7 +27,7 @@ class ContentTab extends AbstractEventDispatchingTab implements OrderedTabInterf /** @var \Ibexa\Contracts\Core\Repository\LanguageService */ private $languageService; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/Tab/LocationView/LocationsTab.php b/src/lib/Tab/LocationView/LocationsTab.php index f110130ace..09aabe2cf9 100644 --- a/src/lib/Tab/LocationView/LocationsTab.php +++ b/src/lib/Tab/LocationView/LocationsTab.php @@ -22,7 +22,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery; use Ibexa\Contracts\Core\Repository\Values\Content\Query; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Pagination\Pagerfanta\LocationSearchAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -55,7 +55,7 @@ class LocationsTab extends AbstractEventDispatchingTab implements OrderedTabInte /** @var \Ibexa\AdminUi\UI\Value\Content\Location\Mapper */ private $locationToUILocationMapper; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @@ -68,7 +68,7 @@ class LocationsTab extends AbstractEventDispatchingTab implements OrderedTabInte * @param \Ibexa\Contracts\Core\Repository\SearchService $searchService * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack * @param \Ibexa\AdminUi\UI\Value\Content\Location\Mapper$locationToUILocationMapper - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct( Environment $twig, diff --git a/src/lib/Tab/LocationView/PoliciesTab.php b/src/lib/Tab/LocationView/PoliciesTab.php index 08332adaef..bffeb7e25e 100644 --- a/src/lib/Tab/LocationView/PoliciesTab.php +++ b/src/lib/Tab/LocationView/PoliciesTab.php @@ -16,7 +16,7 @@ use Ibexa\Contracts\AdminUi\Tab\ConditionalTabInterface; use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -33,7 +33,7 @@ class PoliciesTab extends AbstractEventDispatchingTab implements OrderedTabInter /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ protected $permissionResolver; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; public function __construct( diff --git a/src/lib/Tab/LocationView/RolesTab.php b/src/lib/Tab/LocationView/RolesTab.php index 4fc7725bd4..3907537ae8 100644 --- a/src/lib/Tab/LocationView/RolesTab.php +++ b/src/lib/Tab/LocationView/RolesTab.php @@ -16,7 +16,7 @@ use Ibexa\Contracts\AdminUi\Tab\ConditionalTabInterface; use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Pagerfanta; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -33,7 +33,7 @@ class RolesTab extends AbstractEventDispatchingTab implements OrderedTabInterfac /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ protected $permissionResolver; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; public function __construct( diff --git a/src/lib/Tab/URLManagement/URLWildcardsTab.php b/src/lib/Tab/URLManagement/URLWildcardsTab.php index 750c5b9990..690404bdc6 100644 --- a/src/lib/Tab/URLManagement/URLWildcardsTab.php +++ b/src/lib/Tab/URLManagement/URLWildcardsTab.php @@ -14,7 +14,7 @@ use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\URLWildcardService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Twig\Environment; @@ -25,7 +25,7 @@ class URLWildcardsTab extends AbstractTab implements OrderedTabInterface /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ protected $permissionResolver; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\Contracts\Core\Repository\URLWildcardService */ diff --git a/src/lib/UI/Config/Provider/FieldType/ImageAsset/Mapping.php b/src/lib/UI/Config/Provider/FieldType/ImageAsset/Mapping.php index e1a12ea8bf..e9705b4e52 100644 --- a/src/lib/UI/Config/Provider/FieldType/ImageAsset/Mapping.php +++ b/src/lib/UI/Config/Provider/FieldType/ImageAsset/Mapping.php @@ -9,18 +9,18 @@ namespace Ibexa\AdminUi\UI\Config\Provider\FieldType\ImageAsset; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; /** * Provide information about ImageAsset Field Type mappings. */ class Mapping implements ProviderInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct(ConfigResolverInterface $configResolver) { diff --git a/src/lib/UI/Config/Provider/IconPaths.php b/src/lib/UI/Config/Provider/IconPaths.php index b3cf179f08..6fd48e16f7 100644 --- a/src/lib/UI/Config/Provider/IconPaths.php +++ b/src/lib/UI/Config/Provider/IconPaths.php @@ -9,14 +9,14 @@ namespace Ibexa\AdminUi\UI\Config\Provider; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; /** * @internal */ final class IconPaths implements ProviderInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct(ConfigResolverInterface $configResolver) diff --git a/src/lib/UI/Config/Provider/Languages.php b/src/lib/UI/Config/Provider/Languages.php index ed8b669b96..6c6e33f90b 100644 --- a/src/lib/UI/Config/Provider/Languages.php +++ b/src/lib/UI/Config/Provider/Languages.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; use Ibexa\Contracts\Core\Repository\LanguageService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface; /** @@ -21,7 +21,7 @@ class Languages implements ProviderInterface /** @var \Ibexa\Contracts\Core\Repository\LanguageService */ private $languageService; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var string[] */ @@ -32,7 +32,7 @@ class Languages implements ProviderInterface /** * @param \Ibexa\Contracts\Core\Repository\LanguageService $languageService - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver * @param string[] */ public function __construct( diff --git a/src/lib/UI/Config/Provider/Locations.php b/src/lib/UI/Config/Provider/Locations.php index 044608abbd..af2f2e1457 100644 --- a/src/lib/UI/Config/Provider/Locations.php +++ b/src/lib/UI/Config/Provider/Locations.php @@ -9,7 +9,7 @@ namespace Ibexa\AdminUi\UI\Config\Provider; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; final class Locations implements ProviderInterface { @@ -17,7 +17,7 @@ final class Locations implements ProviderInterface private const CONTENT_STRUCTURE_IDENTIFIER = 'contentStructure'; private const USERS_IDENTIFIER = 'users'; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/UI/Config/Provider/Module/ContentTree.php b/src/lib/UI/Config/Provider/Module/ContentTree.php index 7fbe47a58c..2a2f4fcb9d 100644 --- a/src/lib/UI/Config/Provider/Module/ContentTree.php +++ b/src/lib/UI/Config/Provider/Module/ContentTree.php @@ -7,15 +7,15 @@ namespace Ibexa\AdminUi\UI\Config\Provider\Module; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; class ContentTree implements ProviderInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct( ConfigResolverInterface $configResolver diff --git a/src/lib/UI/Config/Provider/Notifications.php b/src/lib/UI/Config/Provider/Notifications.php index 05e0a1bd7b..fe16674bb8 100644 --- a/src/lib/UI/Config/Provider/Notifications.php +++ b/src/lib/UI/Config/Provider/Notifications.php @@ -9,7 +9,7 @@ namespace Ibexa\AdminUi\UI\Config\Provider; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; /** * Provides information about notifications. @@ -18,11 +18,11 @@ class Notifications implements ProviderInterface { public const NOTIFICATION_TYPES = ['error', 'warning', 'info', 'success']; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct(ConfigResolverInterface $configResolver) { diff --git a/src/lib/UI/Config/Provider/ScopeParameterBasedValue.php b/src/lib/UI/Config/Provider/ScopeParameterBasedValue.php index 0a8252ab70..549d7ae75b 100644 --- a/src/lib/UI/Config/Provider/ScopeParameterBasedValue.php +++ b/src/lib/UI/Config/Provider/ScopeParameterBasedValue.php @@ -9,11 +9,11 @@ namespace Ibexa\AdminUi\UI\Config\Provider; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; class ScopeParameterBasedValue implements ProviderInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; /** @var string */ diff --git a/src/lib/UI/Config/Provider/UserContentTypes.php b/src/lib/UI/Config/Provider/UserContentTypes.php index 73ea9b0221..2ea187b62a 100644 --- a/src/lib/UI/Config/Provider/UserContentTypes.php +++ b/src/lib/UI/Config/Provider/UserContentTypes.php @@ -9,15 +9,15 @@ namespace Ibexa\AdminUi\UI\Config\Provider; use Ibexa\Contracts\AdminUi\UI\Config\ProviderInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; class UserContentTypes implements ProviderInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver */ public function __construct(ConfigResolverInterface $configResolver) { diff --git a/src/lib/UI/Dataset/DatasetFactory.php b/src/lib/UI/Dataset/DatasetFactory.php index 0aed543e7d..3b5c5c516a 100644 --- a/src/lib/UI/Dataset/DatasetFactory.php +++ b/src/lib/UI/Dataset/DatasetFactory.php @@ -18,7 +18,7 @@ use Ibexa\Contracts\Core\Repository\RoleService; use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Contracts\Core\Repository\UserService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; class DatasetFactory { @@ -52,7 +52,7 @@ class DatasetFactory /** @var \Ibexa\Contracts\Core\Repository\BookmarkService */ private $bookmarkService; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/UI/Module/ContentTree/NodeFactory.php b/src/lib/UI/Module/ContentTree/NodeFactory.php index de46638fec..4e250460c8 100644 --- a/src/lib/UI/Module/ContentTree/NodeFactory.php +++ b/src/lib/UI/Module/ContentTree/NodeFactory.php @@ -20,9 +20,9 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult; use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Base\Exceptions\InvalidArgumentException; use Ibexa\Core\Helper\TranslationHelper; -use Ibexa\Core\MVC\ConfigResolverInterface; /** * @internal @@ -44,7 +44,7 @@ final class NodeFactory /** @var \Ibexa\Core\Helper\TranslationHelper */ private $translationHelper; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var int */ diff --git a/src/lib/UI/Service/ContentTypeIconResolver.php b/src/lib/UI/Service/ContentTypeIconResolver.php index 1768ff6bc0..1ac1a4f3af 100644 --- a/src/lib/UI/Service/ContentTypeIconResolver.php +++ b/src/lib/UI/Service/ContentTypeIconResolver.php @@ -8,7 +8,7 @@ namespace Ibexa\AdminUi\UI\Service; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\Asset\Packages; final class ContentTypeIconResolver @@ -18,14 +18,14 @@ final class ContentTypeIconResolver private const ICON_KEY = 'thumbnail'; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Symfony\Component\Asset\Packages */ private $packages; /** - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver * @param \Symfony\Component\Asset\Packages $packages */ public function __construct(ConfigResolverInterface $configResolver, Packages $packages) @@ -48,7 +48,7 @@ public function getContentTypeIcon(string $identifier): string $fragment = null; if (strpos($icon, '#') !== false) { - list($icon, $fragment) = explode('#', $icon); + [$icon, $fragment] = explode('#', $icon); } return $this->packages->getUrl($icon) . ($fragment ? '#' . $fragment : ''); diff --git a/src/lib/UniversalDiscovery/ConfigResolver.php b/src/lib/UniversalDiscovery/ConfigResolver.php index 1d50a879d9..1a6707203a 100644 --- a/src/lib/UniversalDiscovery/ConfigResolver.php +++ b/src/lib/UniversalDiscovery/ConfigResolver.php @@ -9,7 +9,7 @@ namespace Ibexa\AdminUi\UniversalDiscovery; use Ibexa\AdminUi\UniversalDiscovery\Event\ConfigResolveEvent; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class ConfigResolver @@ -21,11 +21,11 @@ class ConfigResolver /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcher; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; /** - * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher */ public function __construct( diff --git a/src/lib/UniversalDiscovery/Event/Subscriber/UserSelectionAllowedContentTypes.php b/src/lib/UniversalDiscovery/Event/Subscriber/UserSelectionAllowedContentTypes.php index 221720ba82..e2ac04b38e 100644 --- a/src/lib/UniversalDiscovery/Event/Subscriber/UserSelectionAllowedContentTypes.php +++ b/src/lib/UniversalDiscovery/Event/Subscriber/UserSelectionAllowedContentTypes.php @@ -9,12 +9,12 @@ namespace Ibexa\AdminUi\UniversalDiscovery\Event\Subscriber; use Ibexa\AdminUi\UniversalDiscovery\Event\ConfigResolveEvent; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class UserSelectionAllowedContentTypes implements EventSubscriberInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ protected $configResolver; public function __construct(ConfigResolverInterface $configResolver) diff --git a/src/lib/UserSetting/AutosaveInterval.php b/src/lib/UserSetting/AutosaveInterval.php index 2dc191fe78..a77e9ec303 100644 --- a/src/lib/UserSetting/AutosaveInterval.php +++ b/src/lib/UserSetting/AutosaveInterval.php @@ -8,9 +8,9 @@ namespace Ibexa\AdminUi\UserSetting; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Contracts\User\UserSetting\FormMapperInterface; use Ibexa\Contracts\User\UserSetting\ValueDefinitionInterface; -use Ibexa\Core\MVC\ConfigResolverInterface; use JMS\TranslationBundle\Annotation\Desc; use Symfony\Component\Form\Extension\Core\Type\NumberType; use Symfony\Component\Form\FormBuilderInterface; @@ -21,7 +21,7 @@ class AutosaveInterval implements ValueDefinitionInterface, FormMapperInterface /** @var \Symfony\Contracts\Translation\TranslatorInterface */ private $translator; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/Validator/Constraints/LocationIsWithinCopySubtreeLimitValidator.php b/src/lib/Validator/Constraints/LocationIsWithinCopySubtreeLimitValidator.php index e38051a235..610a7d254c 100644 --- a/src/lib/Validator/Constraints/LocationIsWithinCopySubtreeLimitValidator.php +++ b/src/lib/Validator/Constraints/LocationIsWithinCopySubtreeLimitValidator.php @@ -11,7 +11,7 @@ use Ibexa\AdminUi\Specification\Location\IsWithinCopySubtreeLimit; use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Contracts\Core\Repository\SearchService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; @@ -20,7 +20,7 @@ class LocationIsWithinCopySubtreeLimitValidator extends ConstraintValidator /** @var \Ibexa\Contracts\Core\Repository\SearchService */ private $searchService; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; public function __construct( diff --git a/src/lib/View/Filter/AdminSearchViewFilter.php b/src/lib/View/Filter/AdminSearchViewFilter.php index 856c27a64c..445647a853 100644 --- a/src/lib/View/Filter/AdminSearchViewFilter.php +++ b/src/lib/View/Filter/AdminSearchViewFilter.php @@ -14,7 +14,7 @@ use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Core\Repository\SectionService; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\View\Event\FilterViewBuilderParametersEvent; use Ibexa\Core\MVC\Symfony\View\ViewEvents; use Ibexa\Search\View\SearchViewFilter; @@ -25,7 +25,7 @@ class AdminSearchViewFilter implements EventSubscriberInterface { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Symfony\Component\Form\FormFactoryInterface */ diff --git a/tests/bundle/Templating/Twig/LimitationValueRenderingExtensionTest.php b/tests/bundle/Templating/Twig/LimitationValueRenderingExtensionTest.php index 13ed9ccf9a..f9ba8f96df 100644 --- a/tests/bundle/Templating/Twig/LimitationValueRenderingExtensionTest.php +++ b/tests/bundle/Templating/Twig/LimitationValueRenderingExtensionTest.php @@ -12,7 +12,7 @@ use Ibexa\AdminUi\Limitation\Templating\LimitationBlockRenderer; use Ibexa\Bundle\AdminUi\Templating\Twig\LimitationValueRenderingExtension; use Ibexa\Contracts\Core\Repository\Values\User\Limitation; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Tests\Core\MVC\Symfony\Templating\Twig\Extension\FileSystemTwigIntegrationTestCase; use PHPUnit\Framework\MockObject\MockObject; use ReflectionProperty; diff --git a/tests/lib/EventListener/RequestLocaleListenerTest.php b/tests/lib/EventListener/RequestLocaleListenerTest.php index 8be3f273ed..da870b3f19 100644 --- a/tests/lib/EventListener/RequestLocaleListenerTest.php +++ b/tests/lib/EventListener/RequestLocaleListenerTest.php @@ -10,7 +10,7 @@ use Ibexa\AdminUi\EventListener\RequestLocaleListener; use Ibexa\AdminUi\Exception\InvalidArgumentException; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface; use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute; use Ibexa\Core\MVC\Symfony\SiteAccess; @@ -40,7 +40,7 @@ class RequestLocaleListenerTest extends TestCase /** @var \Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface */ private $userLanguagePreferenceProvider; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ private $configResolver; protected function setUp(): void diff --git a/tests/lib/Menu/MainMenuBuilerTest.php b/tests/lib/Menu/MainMenuBuilerTest.php index 8a82dc5030..0590b765b7 100644 --- a/tests/lib/Menu/MainMenuBuilerTest.php +++ b/tests/lib/Menu/MainMenuBuilerTest.php @@ -11,7 +11,7 @@ use Ibexa\AdminUi\Menu\MainMenuBuilder; use Ibexa\AdminUi\Menu\MenuItemFactory; use Ibexa\Contracts\Core\Repository\PermissionResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\MVC\Symfony\Security\UserInterface; use Knp\Menu\FactoryInterface; use Knp\Menu\MenuItem; @@ -28,7 +28,7 @@ class MainMenuBuilerTest extends TestCase /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */ private $eventDispatcher; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ diff --git a/tests/lib/Resolver/IconPathResolverTest.php b/tests/lib/Resolver/IconPathResolverTest.php index 592effc1f3..ddd799326e 100644 --- a/tests/lib/Resolver/IconPathResolverTest.php +++ b/tests/lib/Resolver/IconPathResolverTest.php @@ -9,13 +9,13 @@ namespace Ibexa\Tests\AdminUi\Resolver; use Ibexa\AdminUi\Resolver\IconPathResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\Asset\Packages; final class IconPathResolverTest extends TestCase { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ private $configResolver; /** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Asset\Packages */ diff --git a/tests/lib/Siteaccess/AdminSiteaccessPreviewVoterTest.php b/tests/lib/Siteaccess/AdminSiteaccessPreviewVoterTest.php index 86b4d8e8ab..bb13260321 100644 --- a/tests/lib/Siteaccess/AdminSiteaccessPreviewVoterTest.php +++ b/tests/lib/Siteaccess/AdminSiteaccessPreviewVoterTest.php @@ -12,7 +12,7 @@ use Ibexa\AdminUi\Siteaccess\SiteaccessPreviewVoterContext; use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider; use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use Ibexa\Core\Repository\Values\Content\Location; use Ibexa\Core\Repository\Values\Content\VersionInfo; use PHPUnit\Framework\TestCase; @@ -21,7 +21,7 @@ class AdminSiteaccessPreviewVoterTest extends TestCase { private const LANGUAGE_CODE = 'eng-GB'; - /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface */ private $configResolver; /** @var \Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider */ diff --git a/tests/lib/UI/Config/Service/ContentTypeIconResolverTest.php b/tests/lib/UI/Config/Service/ContentTypeIconResolverTest.php index 2ce70bd625..60839cbba4 100644 --- a/tests/lib/UI/Config/Service/ContentTypeIconResolverTest.php +++ b/tests/lib/UI/Config/Service/ContentTypeIconResolverTest.php @@ -9,13 +9,13 @@ namespace Ibexa\Tests\AdminUi\UI\Config\Service; use Ibexa\AdminUi\UI\Service\ContentTypeIconResolver; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\Asset\Packages; class ContentTypeIconResolverTest extends TestCase { - /** @var \Ibexa\Core\MVC\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ private $configResolver; /** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Asset\Packages */ diff --git a/tests/lib/Validator/Constraint/LocationIsWithinCopySubtreeLimitValidatorTest.php b/tests/lib/Validator/Constraint/LocationIsWithinCopySubtreeLimitValidatorTest.php index cdc49d73ba..5bdbb7d93c 100644 --- a/tests/lib/Validator/Constraint/LocationIsWithinCopySubtreeLimitValidatorTest.php +++ b/tests/lib/Validator/Constraint/LocationIsWithinCopySubtreeLimitValidatorTest.php @@ -13,7 +13,7 @@ use Ibexa\Contracts\Core\Repository\SearchService; use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult; -use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; use PHPUnit\Framework\TestCase; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface;