From f051c35af49d45742d07dff4c3887682797f080d Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Mon, 11 Jul 2016 12:31:52 +0200 Subject: [PATCH] TASK: Make compatible with Flow 2.3 again --- .../Flowpack/ElasticSearch/Indexer/Object/ObjectIndexer.php | 5 ++--- composer.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Classes/Flowpack/ElasticSearch/Indexer/Object/ObjectIndexer.php b/Classes/Flowpack/ElasticSearch/Indexer/Object/ObjectIndexer.php index 5715e3d..f05b1bb 100644 --- a/Classes/Flowpack/ElasticSearch/Indexer/Object/ObjectIndexer.php +++ b/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; diff --git a/composer.json b/composer.json index de52796..7babcf6 100644 --- 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": "~3.0" + "typo3/flow": "~2.3" }, "autoload": { "psr-0": {