Merge remote-tracking branch 'upstream/master'

ezpublishlegacy · Dec 10, 2018 · 201c4ab · 201c4ab
2 parents be1b5e8 + 59a0ea5
commit 201c4ab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/Persistence/Content/Type.php b/Persistence/Content/Type.php
@@ -11,7 +11,7 @@
 use eZ\Publish\SPI\Persistence\ValueObject;
 
 /**
- * @todo What about sort_field and sort_order?
+ * SPI Persistence Content\Type value object.
  */
 class Type extends ValueObject
 {
@@ -173,14 +173,17 @@ class Type extends ValueObject
     public $groupIds = array();
 
     /**
-     * Content fields in this type.
+     * Definitions for Content fields in this type.
      *
      * @var \eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition[]
      */
     public $fieldDefinitions = array();
 
     /**
-     * @todo: Document.
+     * Defines if content objects should have always available enabled or not by default.
+     *
+     * Always available (when enabled) means main language is always available, and works as a editorial fallback
+     * language on load operations when translation filter is provided but no match is found.
      *
      * @var bool
      */

diff --git a/Persistence/Content/Type/Handler.php b/Persistence/Content/Type/Handler.php
@@ -81,6 +81,18 @@ public function loadAllGroups();
      */
     public function loadContentTypes($groupId, $status = Type::STATUS_DEFINED);
 
+    /**
+     * Return list of unique Content Types, with type id as key.
+     *
+     * Missing items (NotFound) will be missing from the array and not cause an exception, it's up
+     * to calling logic to determine if this should cause exception or not.
+     *
+     * @param array $contentTypeIds
+     *
+     * @return \eZ\Publish\SPI\Persistence\Content\Type[]
+     */
+    public function loadContentTypeList(array $contentTypeIds): array;
+
     /**
      * Loads a content type by id and status.
      *