EZP-31651: Moved deprecacation time to version 3.2

ezsystems · Jun 22, 2020 · 84289be · 84289be
1 parent a5f26a0
commit 84289be
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 16 deletions.
diff --git a/src/bundle/Resources/config/services/query_types.yaml b/src/bundle/Resources/config/services/query_types.yaml
@@ -11,5 +11,6 @@ services:
     EzSystems\EzPlatformAdminUi\QueryType\MediaSubtreeQueryType: ~
 
     EzSystems\EzPlatformAdminUi\QueryType\SearchQueryType:
+        deprecated: 'Service "%service_id%" is deprecated since 3.1 and will be removed in 3.2. Use "Ibexa\Platform\Search\QueryType\SearchQueryType" instead'
         arguments:
             $searchService: '@ezpublish.api.service.search'
diff --git a/src/lib/Form/Data/Search/SearchData.php b/src/lib/Form/Data/Search/SearchData.php
@@ -17,7 +17,7 @@ class_alias(
 
 if (false) {
     /**
-     * @deprecated since 3.1, to be removed in 4.0.
+     * @deprecated since 3.1, to be removed in 3.2.
      * Use \Ibexa\Platform\Bundle\SearchBundle\Form\Data\SearchData instead
      */
     class SearchData extends \Ibexa\Platform\Bundle\SearchBundle\Form\Data\SearchData

diff --git a/src/lib/Form/Type/Date/DateIntervalType.php b/src/lib/Form/Type/Date/DateIntervalType.php
@@ -14,9 +14,6 @@
 
 class DateIntervalType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder

diff --git a/src/lib/Form/Type/Search/DateIntervalType.php b/src/lib/Form/Type/Search/DateIntervalType.php
@@ -15,7 +15,7 @@ class_alias(
 
 if (false) {
     /**
-     * @deprecated since 3.1, to be removed in 4.0.
+     * @deprecated since 3.1, to be removed in 3.2.
      * Use \EzSystems\EzPlatformAdminUi\Form\Type\Date\DateIntervalType instead
      */
     class DateIntervalType extends \EzSystems\EzPlatformAdminUi\Form\Type\Date\DateIntervalType

diff --git a/src/lib/Form/Type/Search/SearchType.php b/src/lib/Form/Type/Search/SearchType.php
@@ -15,7 +15,7 @@ class_alias(
 
 if (false) {
     /**
-     * @deprecated since 3.1, to be removed in 4.0.
+     * @deprecated since 3.1, to be removed in 3.2.
      * Use \Ibexa\Platform\Bundle\SearchBundle\Form\Type\SearchType instead
      */
     class SearchType extends \Ibexa\Platform\Bundle\SearchBundle\Form\Type\SearchType

diff --git a/src/lib/Pagination/Mapper/AbstractPagerContentToDataMapper.php b/src/lib/Pagination/Mapper/AbstractPagerContentToDataMapper.php
@@ -37,13 +37,6 @@ abstract class AbstractPagerContentToDataMapper
     /** @var \eZ\Publish\API\Repository\LanguageService */
     private $languageService;
 
-    /**
-     * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService
-     * @param \eZ\Publish\API\Repository\UserService $userService
-     * @param \eZ\Publish\Core\MVC\Symfony\Locale\UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider
-     * @param \eZ\Publish\Core\Helper\TranslationHelper $translationHelper
-     * @param \eZ\Publish\API\Repository\LanguageService $languageService
-     */
     public function __construct(
         ContentTypeService $contentTypeService,
         UserService $userService,

diff --git a/src/lib/QueryType/SearchQueryType.php b/src/lib/QueryType/SearchQueryType.php
@@ -17,7 +17,7 @@ class_alias(
 
 if (false) {
     /**
-     * @deprecated since 3.1, to be removed in 4.0.
+     * @deprecated since 3.1, to be removed in 3.2.
      * Use \Ibexa\Platform\Search\QueryType\SearchQueryType instead
      */
     class SearchQueryType extends \Ibexa\Platform\Search\QueryType\SearchQueryType

diff --git a/src/lib/Search/AbstractPagerContentToDataMapper.php b/src/lib/Search/AbstractPagerContentToDataMapper.php
@@ -17,7 +17,7 @@ class_alias(
 
 if (false) {
     /**
-     * @deprecated since 3.1, to be removed in 4.0.
+     * @deprecated since 3.1, to be removed in 3.2.
      * Use \EzSystems\EzPlatformAdminUi\Pagination\Mapper\AbstractPagerContentToDataMapper instead
      */
     abstract class AbstractPagerContentToDataMapper extends \EzSystems\EzPlatformAdminUi\Pagination\Mapper\AbstractPagerContentToDataMapper

diff --git a/src/lib/Search/PagerSearchContentToDataMapper.php b/src/lib/Search/PagerSearchContentToDataMapper.php
@@ -17,7 +17,7 @@ class_alias(
 
 if (false) {
     /**
-     * @deprecated since 3.1, to be removed in 4.0.
+     * @deprecated since 3.1, to be removed in 3.2.
      * Use \Ibexa\Platform\Search\Mapper\PagerSearchContentToDataMapper instead
      */
     class PagerSearchContentToDataMapper extends \Ibexa\Platform\Search\Mapper\PagerSearchContentToDataMapper