Merge pull request #804 from ezsystems/undeprecated_criteria

Un-deprecate working Location based Content criteria

Author: andrerom

doc/bc/changes-5.3.md

@@ -86,6 +86,10 @@ Changes affecting version compatibility with former or future versions.
 * In semantic configuration, `ezpublish.system.<siteAccessName>.session_name` is deprecated.
   Use `ezpublish.system.<siteAccessName>.session.name` instead.
 
+* All Location based SortClauses, as well as PriorityCriterion and DepthCriterion has been
+  deprecated for content search use since their behaviour is unpredictable by design when
+  content has several locations. Instead use same functionality on new Location Search API.
+
 No further changes are known in this release at the time of writing.
 See online on your corresponding eZ Publish version for
 updated list of known issues (missing features, breaks and errata).

eZ/Publish/API/Repository/Values/Content/Query/Criterion/LocationId.php

@@ -21,8 +21,6 @@
  * Supported operators:
  * - IN: matches against a list of location ids
  * - EQ: matches against a unique location id
- *
- * @deprecated Since 5.3, use Location search instead
  */
 class LocationId extends Criterion implements CriterionInterface
 {
@@ -33,8 +31,6 @@ class LocationId extends Criterion implements CriterionInterface
      *
      * @throws \InvalidArgumentException if a non numeric id is given
      * @throws \InvalidArgumentException if the value type doesn't match the operator
-     *
-     * @deprecated Since 5.3, use Location search instead
      */
     public function __construct( $value )
     {

eZ/Publish/API/Repository/Values/Content/Query/Criterion/LocationRemoteId.php

@@ -19,8 +19,6 @@
  * Supported operators:
  * - IN: will match from a list of location remote IDs
  * - EQ: will match against one location remote ID
- *
- * @deprecated Since 5.3, use Location search instead
  */
 class LocationRemoteId extends Criterion implements CriterionInterface
 {
@@ -31,8 +29,6 @@ class LocationRemoteId extends Criterion implements CriterionInterface
      *
      * @throws \InvalidArgumentException if a non numeric id is given
      * @throws \InvalidArgumentException if the value type doesn't match the operator
-     *
-     * @deprecated Since 5.3, use Location search instead
      */
     public function __construct( $value  )
     {

eZ/Publish/API/Repository/Values/Content/Query/Criterion/ParentLocationId.php

@@ -21,8 +21,6 @@
  * Supported operators:
  * - IN: matches against a list of location ids
  * - EQ: matches against a unique location id
- *
- * @deprecated Since 5.3, use Location search instead
  */
 class ParentLocationId extends Criterion implements CriterionInterface
 {
@@ -33,8 +31,6 @@ class ParentLocationId extends Criterion implements CriterionInterface
      *
      * @throws \InvalidArgumentException if a non numeric id is given
      * @throws \InvalidArgumentException if the value type doesn't match the operator
-     *
-     * @deprecated Since 5.3, use Location search instead
      */
     public function __construct( $value )
     {

eZ/Publish/API/Repository/Values/Content/Query/Criterion/Subtree.php

@@ -18,8 +18,6 @@
  * Criterion that matches content that belongs to a given (list of) Subtree(s)
  *
  * Content will be matched if it is part of at least one of the given subtree path strings
- *
- * @deprecated Since 5.3, use Location search instead
  */
 class Subtree extends Criterion implements CriterionInterface
 {
@@ -30,8 +28,6 @@ class Subtree extends Criterion implements CriterionInterface
      *
      * @throws InvalidArgumentException if a non path string is given
      * @throws InvalidArgumentException if the value type doesn't match the operator
-     *
-     * @deprecated Since 5.3, use Location search instead
      */
     public function __construct( $value )
     {

eZ/Publish/API/Repository/Values/Content/Query/Criterion/Visibility.php

@@ -17,7 +17,9 @@
 /**
  * A criterion that matches content based on its visibility
  *
- * @deprecated Since 5.3, use Location search instead
+ * @warning This Criterion acts on all locations of a Content, so it will include hidden
+ * content within the tree you are searching for if content has visible location elsewhere.
+ * This is intentional and you should rather use LocationSearch if this is not the behaviour you want.
  */
 class Visibility extends Criterion implements CriterionInterface
 {
@@ -37,8 +39,6 @@ class Visibility extends Criterion implements CriterionInterface
      * @param int $value Visibility: self::VISIBLE, self::HIDDEN
      *
      * @throws \InvalidArgumentException
-     *
-     * @deprecated Since 5.3, use Location search instead
      */
     public function __construct( $value )
     {

eZ/Publish/API/Repository/Values/Content/Query/FacetBuilder/LocationFacetBuilder.php

@@ -22,8 +22,6 @@
  * @todo: check hierarchical facets
  *
  * @package eZ\Publish\API\Repository\Values\Content\Query
- *
- * @deprecated Since 5.3, use Location search instead
  */
 class LocationFacetBuilder extends FacetBuilder
 {