From 8dc9421a746a8922091b7d731143b5f977f5b791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petar=20=C5=A0panja?= <petar.spanja@gmail.com>
Date: Mon, 14 Jul 2014 17:07:52 +0200
Subject: [PATCH] Implement EZP-22564: LocationSearch powered by Solr search

This is a combination of 32 commits:
EZP-22564: fixed docblock missing return hint

EZP-22564: schema: added fields necessary for block documents

EZP-22564: adapt gateway for block documents

EZP-22564: adapt handler for indexing Locations

EZP-22564: adapt criterion visitors for block documents

EZP-22564: implement and configure aggregate visitors for Location search

EZP-22564: implement Location search handler and gateway

EZP-22564: configure Location search for legacy_solr

EZP-22564: implement and configure criterion visitors

EZP-22564: implement and configure sort clause visitors

EZP-22564: temp: disable skipping Location search tests

EZP-22564: add missing test fixtures

EZP-22564: remove redundant fields from Content documents

EZP-22564: add SPI Document

EZP-22564: add regression suite to legacy_solr tests

EZP-22564: use SPI Document

EZP-22564: denormalize: Content name in main language

EZP-22564: implement ContentName sort clause

EZP-22564: denormalize: Section name and identifier

EZP-22564: implement SectionName and SectionIdentifier sort clauses

EZP-22564: denormalize: modification and publication dates

EZP-22564: implement DatePublished sort clause

EZP-22564: implement DateModified sort clause

EZP-22564: fixed: wrong class configured

EZP-22564: fixed: field name conflicts when using parent filter

EZP-22564: fixed condition

EZP-22564: add Content id to Trash signal

EZP-22564: implement CreateLocation Solr slot

EZP-22564: added second param Content id to deleteLocation()

EZP-22564: adapt gatway for indexing document blocks

EZP-22564: adapt handler for indexing document blocks

EZP-22564: Fix misc rebase issues
---
 Search/Document.php | 32 ++++++++++++++++++++++++++++++++
 Search/Handler.php  |  3 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 Search/Document.php

diff --git a/Search/Document.php b/Search/Document.php
new file mode 100644
index 000000000..067ca3a11
--- /dev/null
+++ b/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();
+}
diff --git a/Search/Handler.php b/Search/Handler.php
index d24ead973..5a9874e07 100644
--- a/Search/Handler.php
+++ b/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 );
 }