CS Fixes

refs #4868

library/Icinga/Data/BaseQuery.php

@@ -137,7 +137,6 @@ abstract class BaseQuery implements Filterable
      *
      * @param string $expression    Implementation specific search expression
      * @param mixed $parameters    Implementation specific search value to use for query placeholders
-
      * @return self                 Fluent interface
      */
     public function andWhere($expression, $parameters = null)
@@ -160,7 +159,6 @@ abstract class BaseQuery implements Filterable
      *
      * @param string $expression    Implementation specific search expression
      * @param mixed $parameters    Implementation specific search value to use for query placeholders
-
      * @return self                 Fluent interface
      */
     public function orWhere($expression, $parameters = null)

library/Icinga/Data/DataArray/Query.php

@@ -96,6 +96,4 @@ class Query extends BaseQuery
     {
         return null;
     }
-
-
 }

library/Icinga/Data/DatasourceInterface.php

@@ -11,5 +11,4 @@ interface DatasourceInterface
      * @return BaseQuery
      */
     public function select();
-
 }

library/Icinga/Data/Db/Query.php

@@ -170,7 +170,7 @@ class Query extends BaseQuery
         if ($this->useSubqueryCount) {
             $this->countQuery = $this->createCountAsSubquery();
         } else {
-            $this->countQuery =$this->createCustomCountQuery();
+            $this->countQuery = $this->createCustomCountQuery();
         }
     }
 
@@ -184,6 +184,7 @@ class Query extends BaseQuery
     {
 
     }
+
     /**
      * Create the Zend_Db select and count query objects for this instance
      */
@@ -318,6 +319,4 @@ class Query extends BaseQuery
         $parser->treeToSql($this->getFilter(), $this->baseQuery);
         $this->clearFilter();
     }
-
-
 }

library/Icinga/Data/Db/TreeToSqlParser.php

@@ -130,7 +130,8 @@ class TreeToSqlParser
         if ($this->query->isAggregateColumn($node->left)) {
             $this->type = 'HAVING';
         }
-        $queryString .= ' ' . (is_integer($node->right) ? $node->operator : $this->getSqlOperator($node->operator)) . ' ';
+        $queryString .= ' ' . (is_integer($node->right) ?
+                $node->operator : $this->getSqlOperator($node->operator)) . ' ';
         $queryString .= $this->getParameterValue($node);
         return $queryString;
     }
@@ -152,11 +153,8 @@ class TreeToSqlParser
         if ($this->query->isTimestamp($node->left)) {
             $node->context = Node::CONTEXT_TIMESTRING;
         }
-        switch($node->context) {
+        if ($node->context === Node::CONTEXT_TIMESTRING) {
-            case Node::CONTEXT_TIMESTRING:
             $value = strtotime($value);
-            default:
-                break;
         }
         return $this->query->getDatasource()->getConnection()->quote($value);
     }

library/Icinga/Web/Request.php

@@ -62,6 +62,4 @@ class Request extends Zend_Controller_Request_Http
     {
         return $this->user;
     }
-
-
 }

library/Icinga/Web/Widget/SortBox.php

@@ -34,7 +34,6 @@ use Zend_View_Abstract;
 use Icinga\Web\Form\Decorator\ConditionalHidden;
 use Zend_Form_Element_Submit;
 
-
 /**
  *  Sortbox widget
  *

library/Icinga/Web/Widget/Tab.php

@@ -238,7 +238,8 @@ class Tab implements Widget
                     $tagParams .= ' ' . $key . '="' . $value . '"';
                 }
             }
-            $tab = '<a' . $tagParams .' href="' . $this->url->getAbsoluteUrl() . '" data-icinga-target="self">' . $caption . '</a>';
+            $tab = '<a' . $tagParams .' href="' . $this->url->getAbsoluteUrl()
+                . '" data-icinga-target="self">' . $caption . '</a>';
         } else {
             $tab = $caption;
         }

modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php

@@ -19,4 +19,3 @@ class CommenthistoryQuery extends IdoQuery
         )
     );
 }
-

modules/monitoring/library/Monitoring/Controller.php

@@ -80,8 +80,7 @@ class Controller extends ActionController
             exit;
         }
         if ($this->_getParam('format') === 'json'
-            || $this->_request->getHeader('Accept') === 'application/json')
+            || $this->_request->getHeader('Accept') === 'application/json') {
-        {
             header('Content-type: application/json');
             echo json_encode($query->fetchAll());
             exit;

modules/monitoring/library/Monitoring/DataView/Hostgroup.php

@@ -71,5 +71,4 @@ class Hostgroup extends DataView
             )
         );
     }
-
 }

modules/monitoring/library/Monitoring/DataView/Servicegroup.php

@@ -65,6 +65,4 @@ class Servicegroup extends DataView
             )
         );
     }
-
-
 }

modules/monitoring/library/Monitoring/Filter/Registry.php

@@ -105,7 +105,8 @@ class Registry implements FilterRegistry
             FilterAttribute::create(StatusFilter::createForHost())
                 ->setField('host_state')
             )->registerAttribute(
-                FilterAttribute::create(new BooleanFilter(
+                FilterAttribute::create(
+                    new BooleanFilter(
                         array(
                             'host_is_flapping' => 'Flapping',
                             'host_problem' => 'In Problem State',
@@ -115,7 +116,8 @@ class Registry implements FilterRegistry
                             'host_handled' => 'Handled',
                             'host_in_downtime' => 'In Downtime',
                         )
-                ))
+                    )
+                )
             )->registerAttribute(
                 FilterAttribute::create(self::getLastCheckFilterType())
                     ->setHandledAttributes('Last Check', 'Check')
@@ -149,7 +151,8 @@ class Registry implements FilterRegistry
                     ->setHandledAttributes('Host')
                     ->setField('host_state')
             )->registerAttribute(
-                FilterAttribute::create(new BooleanFilter(
+                FilterAttribute::create(
+                    new BooleanFilter(
                         array(
                             'service_is_flapping' => 'Flapping',
                             'service_problem' => 'In Problem State',
@@ -160,7 +163,8 @@ class Registry implements FilterRegistry
                             'service_in_downtime' => 'In Downtime',
                             'host_in_downtime' => 'In Host Downtime'
                         )
-                    ))
+                    )
+                )
             )->registerAttribute(
                 FilterAttribute::create(self::getLastCheckFilterType())
                     ->setHandledAttributes('Last Check', 'Check')
@@ -226,5 +230,4 @@ class Registry implements FilterRegistry
         $urlString .= $urlParser->fromTree($filter);
         return '/' . $urlString;
     }
-
 }

modules/monitoring/library/Monitoring/Filter/UrlViewFilter.php

@@ -26,10 +26,8 @@
  */
 // {{{ICINGA_LICENSE_HEADER}}}
 
-
 namespace Icinga\Module\Monitoring\Filter;
 
-
 use Icinga\Filter\Filterable;
 use Icinga\Filter\Query\Tree;
 use Icinga\Filter\Query\Node;
@@ -117,7 +115,7 @@ class UrlViewFilter
 
     public function fromRequest($request)
     {
-        if($request->getParam('query')) {
+        if ($request->getParam('query')) {
             return $this->parseUrl(urldecode($request->getParam('query')));
         } else {
             return $this->parseUrl(parse_url($request->getBaseUrl(), PHP_URL_QUERY));

modules/monitoring/library/Monitoring/Object/AbstractObject.php

@@ -181,7 +181,7 @@ abstract class AbstractObject
     {
         if ($request->has('service') && $request->has('host')) {
             return new Service($request);
-        } else if ($request->has('host')) {
+        } elseif ($request->has('host')) {
             return new Host($request);
         }
     }

modules/monitoring/library/Monitoring/Object/Host.php

@@ -27,5 +27,4 @@ class Host extends AbstractObject
         $this->view = HostStatus::fromRequest($this->getRequest());
         return $this->view->getQuery()->fetchRow();
     }
-
 }