From 1692a02c55ad23ecf9b4be079974ec829a699746 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Mon, 12 Dec 2016 18:02:52 +0100 Subject: [PATCH] CLENAUP: Remove some scrutinizer ci issues --- Classes/Connection/Elasticsearch.php | 15 ++++++++------- Classes/Hook/DataHandler.php | 4 +++- ...estCase.php => AbstractFunctionalTestCase.php} | 4 +++- Tests/Functional/Hooks/DataHandlerTest.php | 4 ++-- Tests/Functional/Indexing/IndexTcaTableTest.php | 4 ++-- 5 files changed, 18 insertions(+), 13 deletions(-) rename Tests/Functional/{FunctionalTestCase.php => AbstractFunctionalTestCase.php} (95%) diff --git a/Classes/Connection/Elasticsearch.php b/Classes/Connection/Elasticsearch.php index 82945a6..49d169b 100644 --- a/Classes/Connection/Elasticsearch.php +++ b/Classes/Connection/Elasticsearch.php @@ -84,8 +84,8 @@ class Elasticsearch implements Singleton, ConnectionInterface { $this->withType( $documentType, - function ($type) use($document) { - $type->addDocument($this->documentFactory->getDocument($documentType, $document)); + function ($type) use ($document) { + $type->addDocument($this->documentFactory->getDocument($type->getName(), $document)); } ); } @@ -104,8 +104,8 @@ class Elasticsearch implements Singleton, ConnectionInterface { $this->withType( $documentType, - function ($type) use($documentType) { - $type->updateDocument($this->documentFactory->getDocument($documentType, $document)); + function ($type) use ($document) { + $type->updateDocument($this->documentFactory->getDocument($type->getName(), $document)); } ); } @@ -120,8 +120,8 @@ class Elasticsearch implements Singleton, ConnectionInterface { $this->withType( $documentType, - function ($type) use($documents) { - $type->addDocuments($this->documentFactory->getDocuments($documentType, $documents)); + function ($type) use ($documents) { + $type->addDocuments($this->documentFactory->getDocuments($type->getName(), $documents)); } ); } @@ -141,7 +141,7 @@ class Elasticsearch implements Singleton, ConnectionInterface /** * @param SearchRequestInterface $searchRequest - * @return SearchResultInterface + * @return \Elastica\ResultSet */ public function search(SearchRequestInterface $searchRequest) { @@ -151,6 +151,7 @@ class Elasticsearch implements Singleton, ConnectionInterface $search->addIndex('typo3content'); // TODO: Return wrapped result to implement our interface. + // Also update php doc to reflect the change. return $search->search($searchRequest->getSearchTerm()); } diff --git a/Classes/Hook/DataHandler.php b/Classes/Hook/DataHandler.php index c085d90..a49b454 100644 --- a/Classes/Hook/DataHandler.php +++ b/Classes/Hook/DataHandler.php @@ -85,6 +85,7 @@ class DataHandler implements Singleton } $this->dataHandler->delete($table, $uid); + return true; } /** @@ -123,6 +124,7 @@ class DataHandler implements Singleton 'Database update not processed, cause status is unhandled.', [$status, $table, $uid, $fieldArray] ); + return true; } /** @@ -153,7 +155,7 @@ class DataHandler implements Singleton * * @param string $table * @param int $uid - * @return null|array + * @return null|array */ protected function getRecord($table, $uid) { diff --git a/Tests/Functional/FunctionalTestCase.php b/Tests/Functional/AbstractFunctionalTestCase.php similarity index 95% rename from Tests/Functional/FunctionalTestCase.php rename to Tests/Functional/AbstractFunctionalTestCase.php index a329ca4..743b4cc 100644 --- a/Tests/Functional/FunctionalTestCase.php +++ b/Tests/Functional/AbstractFunctionalTestCase.php @@ -27,7 +27,7 @@ use TYPO3\CMS\Core\Tests\FunctionalTestCase as CoreTestCase; * * It will take care of leaving a clean environment for next test. */ -abstract class FunctionalTestCase extends CoreTestCase +abstract class AbstractFunctionalTestCase extends CoreTestCase { protected $testExtensionsToLoad = ['typo3conf/ext/search_core']; @@ -54,7 +54,9 @@ abstract class FunctionalTestCase extends CoreTestCase public function tearDown() { // Delete everything so next test starts clean. + if ($this->client) { $this->client->getIndex('_all')->delete(); $this->client->getIndex('_all')->clearCache(); + } } } diff --git a/Tests/Functional/Hooks/DataHandlerTest.php b/Tests/Functional/Hooks/DataHandlerTest.php index 9ca4326..f64fbd6 100644 --- a/Tests/Functional/Hooks/DataHandlerTest.php +++ b/Tests/Functional/Hooks/DataHandlerTest.php @@ -21,14 +21,14 @@ namespace Leonmrni\SearchCore\Tests\Functional\Hooks; */ use Leonmrni\SearchCore\Hook\DataHandler as Hook; -use Leonmrni\SearchCore\Tests\Functional\FunctionalTestCase; +use Leonmrni\SearchCore\Tests\Functional\AbstractFunctionalTestCase; use TYPO3\CMS\Core\DataHandling\DataHandler as CoreDataHandler; use TYPO3\CMS\Extbase\Object\ObjectManager; /** * */ -class DataHandlerTest extends FunctionalTestCase +class DataHandlerTest extends AbstractFunctionalTestCase { public function setUp() { diff --git a/Tests/Functional/Indexing/IndexTcaTableTest.php b/Tests/Functional/Indexing/IndexTcaTableTest.php index fc2ce65..cbd195c 100644 --- a/Tests/Functional/Indexing/IndexTcaTableTest.php +++ b/Tests/Functional/Indexing/IndexTcaTableTest.php @@ -21,13 +21,13 @@ namespace Leonmrni\SearchCore\Tests\Functional\Indexing; */ use Leonmrni\SearchCore\Domain\Index\IndexerFactory; -use Leonmrni\SearchCore\Tests\Functional\FunctionalTestCase; +use Leonmrni\SearchCore\Tests\Functional\AbstractFunctionalTestCase; use TYPO3\CMS\Extbase\Object\ObjectManager; /** * */ -class IndexTcaTableTest extends FunctionalTestCase +class IndexTcaTableTest extends AbstractFunctionalTestCase { public function setUp() {