Clear code first step (#1120)

ruflin · Jun 21, 2016 · 3e042da · 3e042da
1 parent 16339d4
commit 3e042da
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 32 deletions.
diff --git a/lib/Elastica/Cluster/Settings.php b/lib/Elastica/Cluster/Settings.php
@@ -154,13 +154,9 @@ public function setReadOnly($readOnly = true, $persistent = false)
     {
         $key = 'cluster.blocks.read_only';
 
-        if ($persistent) {
-            $response = $this->setPersistent($key, $readOnly);
-        } else {
-            $response = $this->setTransient($key, $readOnly);
-        }
-
-        return $response;
+        return $persistent
+            ? $this->setPersistent($key, $readOnly)
+            : $this->setTransient($key, $readOnly);
     }
 
     /**

diff --git a/lib/Elastica/Index/Settings.php b/lib/Elastica/Index/Settings.php
@@ -193,9 +193,9 @@ public function getBlocksMetadata()
             if (strpos($e->getMessage(), 'ClusterBlockException') !== false) {
                 // hacky way to test if the metadata is blocked since bug 9203 is not fixed
                 return true;
-            } else {
-                throw $e;
             }
+
+            throw $e;
         }
     }
 

diff --git a/lib/Elastica/Multi/ResultSet.php b/lib/Elastica/Multi/ResultSet.php
@@ -84,11 +84,9 @@ public function hasError()
      */
     public function current()
     {
-        if ($this->valid()) {
-            return $this->_resultSets[$this->key()];
-        } else {
-            return false;
-        }
+        return $this->valid()
+            ? $this->_resultSets[$this->key()]
+            : false;
     }
 
     /**

diff --git a/lib/Elastica/Query.php b/lib/Elastica/Query.php
@@ -348,10 +348,6 @@ public function addScriptField($name, AbstractScript $script)
      */
     public function addAggregation(AbstractAggregation $agg)
     {
-        if (!array_key_exists('aggs', $this->_params)) {
-            $this->_params['aggs'] = array();
-        }
-
         $this->_params['aggs'][] = $agg;
 
         return $this;

diff --git a/lib/Elastica/Query/SimpleQueryString.php b/lib/Elastica/Query/SimpleQueryString.php
@@ -18,7 +18,7 @@ class SimpleQueryString extends AbstractQuery
     public function __construct($query, array $fields = array())
     {
         $this->setQuery($query);
-        if (sizeof($fields)) {
+        if (count($fields)) {
             $this->setFields($fields);
         }
     }

diff --git a/lib/Elastica/Result.php b/lib/Elastica/Result.php
@@ -148,10 +148,10 @@ public function getVersion()
      */
     public function getData()
     {
-        if (isset($this->_hit['fields']) && !isset($this->_hit['_source'])) {
-            return $this->getFields();
-        } elseif (isset($this->_hit['fields']) && isset($this->_hit['_source'])) {
-            return array_merge($this->getFields(), $this->getSource());
+        if (isset($this->_hit['fields'])) {
+            return isset($this->_hit['_source'])
+                ? array_merge($this->getFields(), $this->getSource())
+                : $this->getFields();
         }
 
         return $this->getSource();

diff --git a/lib/Elastica/Search.php b/lib/Elastica/Search.php
@@ -235,10 +235,6 @@ public function addOption($key, $value)
     {
         $this->_validateOption($key);
 
-        if (!isset($this->_options[$key])) {
-            $this->_options[$key] = array();
-        }
-
         $this->_options[$key][] = $value;
 
         return $this;

diff --git a/lib/Elastica/Suggest/Phrase.php b/lib/Elastica/Suggest/Phrase.php
@@ -174,10 +174,6 @@ public function toArray()
             $keys = array_keys($generator);
             $values = array_values($generator);
 
-            if (!isset($array[$baseName][$keys[0]])) {
-                $array[$baseName][$keys[0]] = array();
-            }
-
             $array[$baseName][$keys[0]][] = $values[0];
         }
 

diff --git a/lib/Elastica/Type.php b/lib/Elastica/Type.php
@@ -545,6 +545,6 @@ public function exists()
         $response = $this->getIndex()->request($this->getName(), Request::HEAD);
         $info = $response->getTransferInfo();
 
-        return (bool) ($info['http_code'] == 200);
+        return $info['http_code'] == 200;
     }
 }