Merge pull request #229 from martiis/issue-228

Implemented Repository#getManager method

Author: Martynas Sudintas

ORM/Repository.php

@@ -73,7 +73,7 @@ public function __construct($manager, $repositories)
     protected function getTypes()
     {
         $types = [];
-        $meta = $this->manager->getBundlesMapping($this->namespaces);
+        $meta = $this->getManager()->getBundlesMapping($this->namespaces);
 
         foreach ($meta as $namespace => $metadata) {
             $types[] = $metadata->getType();
@@ -94,16 +94,16 @@ public function find($id)
     {
         if (count($this->types) == 1) {
             $params = [
-                'index' => $this->manager->getConnection()->getIndexName(),
+                'index' => $this->getManager()->getConnection()->getIndexName(),
                 'type' => $this->types[0],
                 'id' => $id,
             ];
 
-            $result = $this->manager->getConnection()->getClient()->get($params);
+            $result = $this->getManager()->getConnection()->getClient()->get($params);
 
             $converter = new Converter(
-                $this->manager->getTypesMapping(),
-                $this->manager->getBundlesMapping()
+                $this->getManager()->getTypesMapping(),
+                $this->getManager()->getBundlesMapping()
             );
 
             return $converter->convertToDocument($result);
@@ -192,7 +192,7 @@ public function scan(
         $scrollDuration = Search::SCROLL_DURATION,
         $resultsType = self::RESULTS_OBJECT
     ) {
-        $results = $this->manager->getConnection()->scroll($scrollId, $scrollDuration);
+        $results = $this->getManager()->getConnection()->scroll($scrollId, $scrollDuration);
 
         return $this->parseResult($results, $resultsType, $scrollDuration);
     }
@@ -215,7 +215,7 @@ public function suggest($suggesters)
         foreach ($suggesters as $suggester) {
             $body = array_merge($suggester->toArray(), $body);
         }
-        $results = $this->manager->getConnection()->getClient()->suggest(['body' => $body]);
+        $results = $this->getManager()->getConnection()->getClient()->suggest(['body' => $body]);
         unset($results['_shards']);
 
         return new SuggestionIterator($results);
@@ -233,12 +233,12 @@ public function remove($id)
     {
         if (count($this->types) == 1) {
             $params = [
-                'index' => $this->manager->getConnection()->getIndexName(),
+                'index' => $this->getManager()->getConnection()->getIndexName(),
                 'type' => $this->types[0],
                 'id' => $id,
             ];
 
-            $response = $this->manager->getConnection()->getClient()->delete($params);
+            $response = $this->getManager()->getConnection()->getClient()->delete($params);
 
             return $response;
         } else {
@@ -262,7 +262,7 @@ private function checkFields($searchArray, $fields = ['_parent', '_ttl'])
 
         // Checks if cache is loaded.
         if (empty($this->fieldsCache)) {
-            foreach ($this->manager->getBundlesMapping($this->namespaces) as $ns => $properties) {
+            foreach ($this->getManager()->getBundlesMapping($this->namespaces) as $ns => $properties) {
                 $this->fieldsCache = array_unique(
                     array_merge(
                         $this->fieldsCache,
@@ -306,8 +306,8 @@ private function parseResult($raw, $resultsType, $scrollDuration)
                 if (isset($raw['_scroll_id'])) {
                     $iterator = new DocumentScanIterator(
                         $raw,
-                        $this->manager->getTypesMapping(),
-                        $this->manager->getBundlesMapping()
+                        $this->getManager()->getTypesMapping(),
+                        $this->getManager()->getBundlesMapping()
                     );
                     $iterator
                         ->setRepository($this)
@@ -319,8 +319,8 @@ private function parseResult($raw, $resultsType, $scrollDuration)
 
                 return new DocumentIterator(
                     $raw,
-                    $this->manager->getTypesMapping(),
-                    $this->manager->getBundlesMapping()
+                    $this->getManager()->getTypesMapping(),
+                    $this->getManager()->getBundlesMapping()
                 );
             case self::RESULTS_ARRAY:
                 return $this->convertToNormalizedArray($raw);
@@ -381,8 +381,18 @@ public function createDocument()
             );
         }
 
-        $class = $this->manager->getBundlesMapping()[reset($this->namespaces)]->getProxyNamespace();
+        $class = $this->getManager()->getBundlesMapping()[reset($this->namespaces)]->getProxyNamespace();
 
         return new $class();
     }
+
+    /**
+     * Returns elasticsearch manager used in this repository for getting/setting documents.
+     *
+     * @return Manager
+     */
+    public function getManager()
+    {
+        return $this->manager;
+    }
 }

Tests/Functional/ORM/RepositoryTest.php

@@ -554,6 +554,16 @@ public function testGetRepositoryWithDoucmentSuffix()
         );
     }
 
+    /**
+     * Tests if repository returns same manager as it was original.
+     */
+    public function testGetManager()
+    {
+        $manager = $this->getManager();
+        $repository = $manager->getRepository('AcmeTestBundle:Color');
+        $this->assertEquals($manager, $repository->getManager());
+    }
+
     /**
      * Assert suggestion score is set.
      *