Fixes entity not being removed from ES

README.markdown

@@ -47,8 +47,8 @@ $searchManager = new Doctrine\Search\SearchManager(
 ```
 
 ## Mappings ##
-Basic entity mappings for index and type generation can be annotated as shown in the following example. Mappings 
-can be rendered into a format suitable for automatically generating indexes and types using a build script 
+Basic entity mappings for index and type generation can be annotated as shown in the following example. Mappings
+can be rendered into a format suitable for automatically generating indexes and types using a build script
 (advanced setup required).
 ```php
 <?php
@@ -64,7 +64,7 @@ use Doctrine\ORM\Mapping as ORM;
 class Post
 {
   /**
-   * @ORM\Id 
+   * @ORM\Id
    * @ORM\GeneratedValue(strategy="AUTO")
    * @MAP\ElasticField(type="integer", includeInAll=false)
    */
@@ -81,7 +81,7 @@ class Post
    * @MAP\ElasticField(type="string", includeInAll=true)
    */
   private $content;
-   
+
   /**
    * @MAP\ElasticField(name="tags", type="string", includeInAll=false, index="not_analyzed")
    */
@@ -92,37 +92,12 @@ class Post
 ```
 
 ## Indexing ##
-Documents can be serialized for indexing currently in the following ways. If required an event listener can 
+Documents can be serialized for indexing currently in the following ways. If required an event listener can
 be used with your ORM as shown in this example. If an event listener is not needed, entities can be persisted
 or removed directly using the search manager.
-```php
-<?php
-namespace Entities\Listener;
 
-use Doctrine\ORM\Event\LifecycleEventArgs;
-use Entities\Behaviour\SearchableEntityInterface;
+The repository contains `OrmSearchableListener`, which can be used for this.
 
-class SearchableListener implements
-{
-	  protected function getSearchManager() {	
-		    return $this->getDatabaseConnection('elasticsearch');
-	  }
-
-	  public function postPersist(LifecycleEventArgs $oArgs) {
-	    	$oEntity = $oArgs->getEntity();
-		    if($oEntity instanceof SearchableEntityInterface) {
-		  	    $this->getSearchManager()->persist($oEntity);
-	  	  }
-	  }
-
-    public function postRemove(LifecycleEventArgs $oArgs) {
-        $oEntity = $oArgs->getEntity();
-        if($oEntity instanceof SearchableEntityInterface) {
-            $this->getSearchManager()->remove($oEntity);
-        }
-    }
-}
-```
 
 ### CallbackSerializer ###
 This approach simply expects a `toArray()` method on the entity, although this method be configured as required.
@@ -132,7 +107,7 @@ entities that need to be persisted to the search engine (see above example).
 ...
 use Entities\Behaviour\SearchableEntityInterface
 
-class Post implements SearchableEntityInterface 
+class Post implements SearchableEntityInterface
 {
   ...
   public function toArray() {
@@ -147,7 +122,7 @@ class Post implements SearchableEntityInterface
 ```
 
 ### JMS Serializer ###
-You can alternatively use the advanced serialization power of the `JMS Serializer` to automatically handle 
+You can alternatively use the advanced serialization power of the `JMS Serializer` to automatically handle
 serialization for you based on annotations such as those shown in this example.
 ```php
 ...
@@ -169,11 +144,11 @@ class Post implements SearchableEntityInterface
    * @JMS\Groups({"public", "search"})
    */
   private $title;
-    
+
   /**
    * @ORM\Column(type="text")
    * @MAP\ElasticField(type="string", includeInAll=true)
-   * @JMS\Expose 
+   * @JMS\Expose
    * @JMS\Groups({"public", "search"})
    */
   private $content;
@@ -197,7 +172,7 @@ $hydrationQuery = $entityManager->createQueryBuilder()
 	->where('p.id IN (:ids)')
 	->orderBy('field')
 	->getQuery();
-	
+
 $query = $searchManager->createQuery()
   ->from('Entities\Post')
   ->searchWith(new Elastica\Query())

composer.json

@@ -16,16 +16,23 @@
         "doctrine/common": ">=2.3.0"
     },
     "suggest": {
-        "ruflin/Elastica": "Elastica version correlating to your ElasticSearch installation is required."
+        "ruflin/Elastica": "Elastica version correlating to your ElasticSearch installation is required.",
+        "nette/neon": "Neon is a developer friendly format for config files, similar to YAML."
     },
     "require-dev": {
         "doctrine/orm": "~2.4",
+        "jms/serializer": "~0.16",
+        "ruflin/elastica": "~1.3.0",
+        "nette/neon": "~2.2",
         "phpunit/phpunit": "~4.2"
     },
     "autoload": {
         "psr-0": {
             "Doctrine\\Search": "lib/"
-        }
+        },
+        "classmap": [
+            "lib/Doctrine/Search/exceptions.php"
+        ]
     },
     "autoload-dev": {
         "psr-0": {

demo/index.php

@@ -34,7 +34,7 @@
 echo PHP_EOL."*** Single lookup with no results ***".PHP_EOL;
 try {
     $user = $sm->find('Doctrine\Tests\Models\Comments\User', 'unknownid');
-} catch (Doctrine\Search\Exception\NoResultException $exception) {
+} catch (\Doctrine\Search\NoResultException $exception) {
     print_r($exception->getMessage());
     echo PHP_EOL;
 }

lib/Doctrine/Search/Configuration.php

@@ -38,6 +38,22 @@ class Configuration
      */
     private $attributes;
 
+    /**
+     * @param string $prefix
+     */
+    public function setIndexPrefix($prefix)
+    {
+        $this->attributes['indexPrefix'] = $prefix;
+    }
+
+    /**
+     * @return string|NULL
+     */
+    public function getIndexPrefix()
+    {
+        return isset($this->attributes['indexPrefix']) ? $this->attributes['indexPrefix'] : NULL;
+    }
+
     /**
      * Gets the cache driver implementation that is used for the mapping metadata.
      * (Annotation is the default)
@@ -46,11 +62,11 @@ class Configuration
      */
     public function getMetadataDriverImpl()
     {
-        if (!isset($this->attributes['concreteMetadataDriver'])) {
-            $this->attributes['concreteMetadataDriver'] = $this->newDefaultAnnotationDriver();
+        if (!isset($this->attributes['metadataDriver'])) {
+            $this->attributes['metadataDriver'] = $this->newDefaultAnnotationDriver();
         }
 
-        return $this->attributes['concreteMetadataDriver'];
+        return $this->attributes['metadataDriver'];
     }
 
     /**
@@ -60,7 +76,7 @@ public function getMetadataDriverImpl()
      */
     public function setMetadataDriverImpl(MappingDriver $concreteDriver)
     {
-        $this->attributes['concreteMetadataDriver'] = $concreteDriver;
+        $this->attributes['metadataDriver'] = $concreteDriver;
     }
 
     /**
@@ -94,9 +110,9 @@ public function getMetadataCacheImpl()
      */
     public function newDefaultAnnotationDriver(array $paths = array())
     {
-        $reader = new \Doctrine\Common\Annotations\AnnotationReader();
-
-        return new \Doctrine\Search\Mapping\Driver\AnnotationDriver($reader, $paths);
+        throw new NotImplementedException;
+//        $reader = new \Doctrine\Common\Annotations\AnnotationReader();
+//        return new \Doctrine\Search\Mapping\Driver\AnnotationDriver($reader, $paths);
     }
 
     /**
@@ -161,20 +177,21 @@ public function getEntitySerializer()
     }
 
     /**
-     * @param ObjectManager $entityManager
+     * @param ObjectManager $objectManager
      */
-    public function setEntityManager(ObjectManager $entityManager)
+    public function setObjectManager(ObjectManager $objectManager)
     {
-        $this->attributes['entityManager'] = $entityManager;
+        $this->attributes['objectManager'] = $objectManager;
     }
 
     /**
      * @return ObjectManager
      */
-    public function getEntityManager()
+    public function getObjectManager()
     {
-        if (isset($this->attributes['entityManager'])) {
-            return $this->attributes['entityManager'];
+        if (isset($this->attributes['objectManager'])) {
+            return $this->attributes['objectManager'];
         }
     }
+
 }