hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SearchEngine] Move SearchEngineInetrface::status to SearchEngineInterface::getStatus

Browse Source
This commit is contained in:
Romain Neutron
2012-11-06 11:03:50 +01:00
parent f8997a034c
commit 6e7bb37e7e
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php
View File

@@ -137,7 +137,7 @@ class Dashboard implements ControllerProviderInterface
'cache_flushed' => $request->query->get('flush_cache') === 'ok', 'cache_flushed' => $request->query->get('flush_cache') === 'ok',
'admins' => \User_Adapter::get_sys_admins($app), 'admins' => \User_Adapter::get_sys_admins($app),
'email_status' => $emailStatus, 'email_status' => $emailStatus,
'search_engine_status' => $app['phraseanet.SE']->status(), 'search_engine_status' => $app['phraseanet.SE']->getStatus(),
'php_version_constraints' => \setup::check_php_version(), 'php_version_constraints' => \setup::check_php_version(),
'writability_constraints' => \setup::check_writability($app['phraseanet.registry']), 'writability_constraints' => \setup::check_writability($app['phraseanet.registry']),
'binaries_constraints' => \setup::check_binaries($app['phraseanet.registry']), 'binaries_constraints' => \setup::check_binaries($app['phraseanet.registry']),

2
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
View File

@@ -184,7 +184,7 @@ class PhraseaEngine implements SearchEngineInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function status() public function getStatus()
{ {
$status = array(); $status = array();
foreach (phrasea_info() as $key => $value) { foreach (phrasea_info() as $key => $value) {

2
lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
View File

@@ -35,7 +35,7 @@ interface SearchEngineInterface
* @return array An array of key/value parameters * @return array An array of key/value parameters
* @throws RuntimeException if something is wrong * @throws RuntimeException if something is wrong
*/ */
public function status(); public function getStatus();
/** /**
* @return ConfigurationPanelInterface * @return ConfigurationPanelInterface

2
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
View File

@@ -143,7 +143,7 @@ class SphinxSearchEngine implements SearchEngineInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function status() public function getStatus()
{ {
if (false === $this->sphinx->Status()) { if (false === $this->sphinx->Status()) {
throw new RuntimeException(_('Sphinx server is offline')); throw new RuntimeException(_('Sphinx server is offline'));

2
lib/classes/API/V1/adapter.class.php
View File

@@ -325,7 +325,7 @@ class API_V1_adapter extends API_V1_Abstract
protected function get_gv_info(Application $app) protected function get_gv_info(Application $app)
{ {
try { try {
$SEStatus = $app['phraseanet.SE']->status(); $SEStatus = $app['phraseanet.SE']->getStatus();
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
$SEStatus = array('error' => $e->getMessage()); $SEStatus = array('error' => $e->getMessage());
} }

2
tests/Alchemy/Phrasea/SearchEngine/SearchEngineAbstractTest.php
View File

@@ -503,7 +503,7 @@ abstract class SearchEngineAbstractTest extends \PhraseanetPHPUnitAuthenticatedA
public function testStatus() public function testStatus()
{ {
foreach (self::$searchEngine->status() as $StatusKeyValue) { foreach (self::$searchEngine->getStatus() as $StatusKeyValue) {
$this->assertTrue(is_array($StatusKeyValue)); $this->assertTrue(is_array($StatusKeyValue));
$this->assertTrue(is_scalar($StatusKeyValue[0])); $this->assertTrue(is_scalar($StatusKeyValue[0]));
$this->assertTrue(is_scalar($StatusKeyValue[1])); $this->assertTrue(is_scalar($StatusKeyValue[1]));