Merge remote-tracking branch 'upstream/master'

Search/Document.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * File containing the eZ\Publish\SPI\Persistence\Content\Search\Document class
+ *
+ * @copyright Copyright (C) eZ Systems AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ * @version //autogentag//
+ */
+
+namespace eZ\Publish\SPI\Search;
+
+use eZ\Publish\API\Repository\Values\ValueObject;
+
+/**
+ * Base class for documents.
+ */
+class Document extends ValueObject
+{
+    /**
+     * An array of fields
+     *
+     * @var \eZ\Publish\SPI\Search\Field[]
+     */
+    public $fields = array();
+
+    /**
+     * An array of sub-documents
+     *
+     * @var \eZ\Publish\SPI\Search\Document[]
+     */
+    public $documents = array();
+}

Search/Handler.php

@@ -83,6 +83,7 @@ public function deleteContent( $contentId, $versionId = null );
      * Deletes a location from the index
      *
      * @param mixed $locationId
+     * @param mixed $contentId
      */
-    public function deleteLocation( $locationId );
+    public function deleteLocation( $locationId, $contentId );
 }