TASK: Merge branch '1.1' into master

Classes/Flowpack/ElasticSearch/Indexer/Object/ObjectIndexer.php

@@ -18,7 +18,6 @@
 use Flowpack\ElasticSearch\Domain\Model\GenericType;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Reflection\ObjectAccess;
-use TYPO3\Flow\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;

composer.json

@@ -5,7 +5,7 @@
     "description": "This package provides wrapper functionality for the Elasticsearch engine.",
     "require": {
         "ext-curl": "*",
-        "typo3/flow": "~3.0"
+        "typo3/flow": "~2.3|~3.0"
     },
     "autoload": {
         "psr-0": {