diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php b/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php index 5a06abc282..ebbca3f635 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php @@ -137,7 +137,7 @@ class Dashboard implements ControllerProviderInterface 'cache_flushed' => $request->query->get('flush_cache') === 'ok', 'admins' => \User_Adapter::get_sys_admins($app), 'email_status' => $emailStatus, - 'search_engine_status' => $app['phraseanet.SE']->status(), + 'search_engine_status' => $app['phraseanet.SE']->getStatus(), 'php_version_constraints' => \setup::check_php_version(), 'writability_constraints' => \setup::check_writability($app['phraseanet.registry']), 'binaries_constraints' => \setup::check_binaries($app['phraseanet.registry']), diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php index d6080639d4..1ddbdb4dce 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php @@ -184,7 +184,7 @@ class PhraseaEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function status() + public function getStatus() { $status = array(); foreach (phrasea_info() as $key => $value) { diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index 4118fb7d86..462a530cd5 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php @@ -35,7 +35,7 @@ interface SearchEngineInterface * @return array An array of key/value parameters * @throws RuntimeException if something is wrong */ - public function status(); + public function getStatus(); /** * @return ConfigurationPanelInterface diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php index 6d33d51790..2d2cc16c65 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php @@ -143,7 +143,7 @@ class SphinxSearchEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function status() + public function getStatus() { if (false === $this->sphinx->Status()) { throw new RuntimeException(_('Sphinx server is offline')); diff --git a/lib/classes/API/V1/adapter.class.php b/lib/classes/API/V1/adapter.class.php index a4d75ef86d..6a30a55e22 100644 --- a/lib/classes/API/V1/adapter.class.php +++ b/lib/classes/API/V1/adapter.class.php @@ -325,7 +325,7 @@ class API_V1_adapter extends API_V1_Abstract protected function get_gv_info(Application $app) { try { - $SEStatus = $app['phraseanet.SE']->status(); + $SEStatus = $app['phraseanet.SE']->getStatus(); } catch (\RuntimeException $e) { $SEStatus = array('error' => $e->getMessage()); } diff --git a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php b/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php index 3a320ed901..2d2a68e65b 100644 --- a/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php +++ b/tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php @@ -503,7 +503,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA public function testStatus() { - foreach (self::$searchEngine->status() as $StatusKeyValue) { + foreach (self::$searchEngine->getStatus() as $StatusKeyValue) { $this->assertTrue(is_array($StatusKeyValue)); $this->assertTrue(is_scalar($StatusKeyValue[0])); $this->assertTrue(is_scalar($StatusKeyValue[1]));