# HG changeset patch # User ymh # Date 1479819232 -3600 # Node ID 46b4d1971fee087602fd7dcd643c6a374d613e67 # Parent 4a0fc5c5f4207c601806c92aacdf880108ca0525 Correct filter Manager refactorisation into an object diff -r 4a0fc5c5f420 -r 46b4d1971fee server/src/app/Http/Controllers/Api/LexvoController.php --- a/server/src/app/Http/Controllers/Api/LexvoController.php Sat Nov 19 21:29:56 2016 +0100 +++ b/server/src/app/Http/Controllers/Api/LexvoController.php Tue Nov 22 13:53:52 2016 +0100 @@ -36,8 +36,9 @@ } } $lexvosNames = $this->lexvoResolver->getNames($ids); - $corpusNames = array_reduce($corpusIds, function($res,$cid) { - $cNode = CorpusFilterManager::getLanguageNode($cid); + $filterManager = new CorpusFilterManager(); + $corpusNames = array_reduce($corpusIds, function($res,$cid) use ($filterManager) { + $cNode = $filterManager->getLanguageNode($cid); if(is_null($cNode)) { $res[$cid] = null; } else { diff -r 4a0fc5c5f420 -r 46b4d1971fee server/src/app/Libraries/Filters/CorpusFilterManager.php --- a/server/src/app/Libraries/Filters/CorpusFilterManager.php Sat Nov 19 21:29:56 2016 +0100 +++ b/server/src/app/Libraries/Filters/CorpusFilterManager.php Tue Nov 22 13:53:52 2016 +0100 @@ -51,7 +51,7 @@ } private function getLanguageNodeChildren($nodeId) { - $node = self::getLanguageNode($nodeId); + $node = $this->getLanguageNode($nodeId); if(is_null($node)) { return []; } elseif (array_key_exists('values', $node)) { @@ -85,7 +85,7 @@ else if(Utils::startsWith($lang, config('corpusparole.lexvo_base_url'))) { array_push($resLanguage, $lang); } elseif(Utils::startsWith($lang, config('corpusparole.language_corpus_node_prefix'))) { - $resLanguage = array_merge($resLanguage, self::prepareLanguages(self::getLanguageNodeChildren($lang))); + $resLanguage = array_merge($resLanguage, $this->prepareLanguages($this->getLanguageNodeChildren($lang))); } else { array_push($resLanguage, config('corpusparole.lexvo_base_url').$lang); }