Merge branch 'master' of https://github.com/Flowpack/Flowpack.Elastic…

…Search into apply-core-migrations Conflicts: Classes/Indexer/Object/ObjectIndexer.php composer.json
Flowpack · Dec 21, 2016 · 72d0f08 · 72d0f08
2 parents 25241f3 + 0573327
commit 72d0f08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Classes/Indexer/Object/ObjectIndexer.php b/Classes/Indexer/Object/ObjectIndexer.php
@@ -18,7 +18,6 @@
 use Flowpack\ElasticSearch\Domain\Model\GenericType;
 use Neos\Flow\Annotations as Flow;
 use Neos\Utility\ObjectAccess;
-use Neos\Utility\TypeHandling;
 
 /**
  * This serves functionality for indexing objects
@@ -95,7 +94,7 @@ public function indexObject($object, $signalInformation = null, Client $client =
      */
     protected function getIndexablePropertiesAndValuesFromObject($object)
     {
-        $className = TypeHandling::getTypeForValue($object);
+        $className = $this->reflectionService->getClassNameByObject($object);
         $data = [];
         foreach ($this->indexInformer->getClassProperties($className) as $propertyName) {
             if (ObjectAccess::isPropertyGettable($object, $propertyName) === false) {
@@ -171,7 +170,7 @@ protected function getIndexTypeForObject($object, Client $client = null)
         if ($client === null) {
             $client = $this->client;
         }
-        $className = TypeHandling::getTypeForValue($object);
+        $className = $this->reflectionService->getClassNameByObject($object);
         $indexAnnotation = $this->indexInformer->getClassAnnotation($className);
         if ($indexAnnotation === null) {
             return null;

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "description": "This package provides wrapper functionality for the Elasticsearch engine.",
     "require": {
         "ext-curl": "*",
-        "typo3/flow": "~4.0 || dev-master"
+        "neos/flow": "~4.0 | dev-master"
     },
     "autoload": {
         "psr-4": {
@@ -71,4 +71,4 @@
             "Neos.Flow-20161125124112"
         ]
     }
-}
+}