Merge branch '1.5' into 2.3

# Conflicts: # src/bundle/Resources/views/dashboard/tab/all_content.html.twig # src/bundle/Resources/views/dashboard/tab/all_media.html.twig # src/bundle/Resources/views/dashboard/tab/my_content.html.twig # src/bundle/Resources/views/dashboard/tab/my_media.html.twig # src/lib/Form/Type/ChoiceList/Loader/ContentEditTranslationChoiceLoader.php
ezsystems · Nov 9, 2021 · 359299a · 359299a
2 parents 1129740 + 35ce913
commit 359299a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/lib/Tab/Dashboard/PagerContentToDataMapper.php b/src/lib/Tab/Dashboard/PagerContentToDataMapper.php
@@ -39,6 +39,7 @@ class PagerContentToDataMapper extends AbstractPagerContentToDataMapper
      * @param \eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider
      * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
      * @param \eZ\Publish\API\Repository\LanguageService $languageService
+     * @param \eZ\Publish\Core\Repository\LocationResolver\LocationResolver $locationResolver
      */
     public function __construct(
         ContentService $contentService,
@@ -67,6 +68,10 @@ public function __construct(
      * @param \Pagerfanta\Pagerfanta $pager
      *
      * @return array
+     *
+     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException
+     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
      */
     public function map(Pagerfanta $pager): array
     {