From 746b51b74742e44e613b687522d54776f06813d4 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 5 Oct 2012 00:18:46 +0200 Subject: [PATCH] [SearchEngine] CS cleanup --- .../ConfigurationPanelInterface.php | 1 - .../Phrasea/ConfigurationPanel.php | 4 +--- .../SearchEngine/Phrasea/PhraseaEngine.php | 2 -- .../SearchEngine/SearchEngineInterface.php | 2 -- .../SearchEngine/SearchEngineOptions.php | 19 +++++++++++-------- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php b/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php index 74bca845a0..5f5630777b 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/ConfigurationPanelInterface.php @@ -7,7 +7,6 @@ use Symfony\Component\HttpFoundation\Request; interface ConfigurationPanelInterface { - public function get(Application $app, Request $request); public function post(Application $app, Request $request); diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php index 0400e152f2..e8b6863318 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/ConfigurationPanel.php @@ -2,8 +2,8 @@ namespace Alchemy\Phrasea\SearchEngine\Phrasea; +use Alchemy\Phrasea\Application; use Alchemy\Phrasea\SearchEngine\ConfigurationPanelInterface; -use Silex\Application; use Symfony\Component\HttpFoundation\Request; class ConfigurationPanel implements ConfigurationPanelInterface @@ -18,7 +18,6 @@ class ConfigurationPanel implements ConfigurationPanelInterface public function get(Application $app, Request $request) { - return $app['twig']->render('admin/search-engine/phrasea.html.twig', array()); } @@ -26,5 +25,4 @@ class ConfigurationPanel implements ConfigurationPanelInterface { } - } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php index 705303bfbb..788b9ed528 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php @@ -16,8 +16,6 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Alchemy\Phrasea\SearchEngine\SearchEngineResult; use Alchemy\Phrasea\Exception\RuntimeException; use Doctrine\Common\Collections\ArrayCollection; -use Silex\Application; -use Symfony\Component\HttpFoundation\Request; class PhraseaEngine implements SearchEngineInterface { diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index d9ad05606e..99445735db 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php @@ -15,8 +15,6 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Alchemy\Phrasea\SearchEngine\SearchEngineResult; use Alchemy\Phrasea\Exception\RuntimeException; use Doctrine\Common\Collections\ArrayCollection; -use Silex\Application; -use Symfony\Component\HttpFoundation\Request; interface SearchEngineInterface { diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php index 40fb317212..74e0ed1c65 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php @@ -186,7 +186,7 @@ class SearchEngineOptions implements \Serializable */ public function useStemming($boolean) { - $this->stemming = ! ! $boolean; + $this->stemming = !!$boolean; return $this; } @@ -285,15 +285,18 @@ class SearchEngineOptions implements \Serializable { $tmp = array(); foreach ($status as $n => $options) { - if (count($options) > 1) + if (count($options) > 1) { continue; + } if (isset($options['on'])) { - foreach ($options['on'] as $sbas_id) + foreach ($options['on'] as $sbas_id) { $tmp[$n][$sbas_id] = 1; + } } if (isset($options['off'])) { - foreach ($options['off'] as $sbas_id) + foreach ($options['off'] as $sbas_id) { $tmp[$n][$sbas_id] = 0; + } } } @@ -359,7 +362,7 @@ class SearchEngineOptions implements \Serializable */ public function setMinDate($min_date) { - if ( ! is_null($min_date) && trim($min_date) !== '') { + if (!is_null($min_date) && trim($min_date) !== '') { $this->date_min = DateTime::createFromFormat('Y/m/d H:i:s', $min_date . ' 00:00:00'); } @@ -382,8 +385,8 @@ class SearchEngineOptions implements \Serializable */ public function setMaxDate($max_date) { - if ( ! is_null($max_date) && trim($max_date) !== '') { - $this->date_max = DateTime::createFromFormat('Y/m/d H:i:s', $max_date . ' 23:59:59'); + if (!is_null($max_date) && trim($max_date) !== '') { + $this->date_max = \DateTime::createFromFormat('Y/m/d H:i:s', $max_date . ' 23:59:59'); } return $this; @@ -427,7 +430,7 @@ class SearchEngineOptions implements \Serializable { $ret = array(); foreach ($this as $key => $value) { - if ($value instanceof DateTime) { + if ($value instanceof \DateTime) { $value = $value->format('d-m-Y h:i:s'); } if (in_array($key, array('collections', 'business_fields'))) {