From 5e14f828ba6985f22e092852f6ae05a56f06e628 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Tue, 11 Jun 2013 11:09:28 +0200
Subject: [PATCH] Evaluate, Test and Move the items und library/Icinga/Web to
 the source tree

Fix PSR compliance.

refs #4256
---
 library/Icinga/Web/Form.php                   |  8 +++-
 library/Icinga/Web/Hook/Grapher.php           |  5 +--
 library/Icinga/Web/Hook/Toptray.php           | 40 +++++++++++++++++--
 library/Icinga/Web/ModuleActionController.php |  5 +--
 .../Web/Paginator/Adapter/QueryAdapter.php    |  3 ++
 .../ScrollingStyle/SlidingWithBorder.php      |  4 ++
 library/Icinga/Web/Widget/AbstractWidget.php  |  5 +--
 library/Icinga/Web/Widget/Form.php            |  5 +--
 library/Icinga/Web/Widget/Tab.php             | 32 ++++++++-------
 library/Icinga/Web/Widget/Tabs.php            |  5 +--
 .../Paginator/Adapter/QueryAdapterTest.php    | 17 ++++++--
 .../ScrollingStyle/SlidingWithBorderTest.php  |  2 +
 12 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index c7e538a19..5361a1868 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -1,4 +1,6 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web;
 
@@ -6,13 +8,17 @@ use Zend_Form;
 use Zend_Controller_Front as Front; // TODO: Get from App
 use Zend_Controller_Action_HelperBroker as ZfActionHelper;
 
+/**
+ * Class Form
+ * @package Icinga\Web
+ */
 class Form extends Zend_Form
 {
     protected $request;
 
     /**
-     * @param Zend_Controller_Request_Abstract $request
      * @param array $options[optional]
+     * @internal param \Icinga\Web\Zend_Controller_Request_Abstract $request
      */
     public function __construct($options = null)
     {
diff --git a/library/Icinga/Web/Hook/Grapher.php b/library/Icinga/Web/Hook/Grapher.php
index 6161f5d80..28de49604 100644
--- a/library/Icinga/Web/Hook/Grapher.php
+++ b/library/Icinga/Web/Hook/Grapher.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Icinga Web Grapher Hook
- */
 namespace Icinga\Web\Hook;
 
 /**
diff --git a/library/Icinga/Web/Hook/Toptray.php b/library/Icinga/Web/Hook/Toptray.php
index 1685049b4..f2753db44 100755
--- a/library/Icinga/Web/Hook/Toptray.php
+++ b/library/Icinga/Web/Hook/Toptray.php
@@ -1,30 +1,62 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Hook;
+
 use Icinga\Application\Logger as Logger;
 
-abstract class Toptray {
+/**
+ * Class Toptray
+ * @package Icinga\Web\Hook
+ */
+abstract class Toptray
+{
+    /**
+     *
+     */
     const ALIGN_LEFT = "pull-left";
+
+    /**
+     *
+     */
     const ALIGN_NONE = "";
-    const ALIGN_RIGHT =  "pull-right";
+
+    /**
+     *
+     */
+    const ALIGN_RIGHT = "pull-right";
+
+    /**
+     * @var string
+     */
     protected $align = self::ALIGN_NONE;
 
+    /**
+     * @param $align
+     */
     public function setAlignment($align)
     {
         $this->align = $align;
     }
 
+    /**
+     * @return string
+     */
     final public function getWidgetDOM()
     {
         try {
-            return '<ul class="nav '.$this->align.'" >'.$this->buildDOM().'</ul>';
+            return '<ul class="nav ' . $this->align . '" >' . $this->buildDOM() . '</ul>';
         } catch (\Exception $e) {
-            Logger::error("Could not create tray widget : %s",$e->getMessage());
+            Logger::error("Could not create tray widget : %s", $e->getMessage());
             return '';
         }
 
 
     }
 
+    /**
+     * @return mixed
+     */
     abstract protected function buildDOM();
 }
diff --git a/library/Icinga/Web/ModuleActionController.php b/library/Icinga/Web/ModuleActionController.php
index 3c6b47e4a..76aa9fe8a 100644
--- a/library/Icinga/Web/ModuleActionController.php
+++ b/library/Icinga/Web/ModuleActionController.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Module action controller
- */
 namespace Icinga\Web;
 
 use Icinga\Application\Config;
diff --git a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
index 541f903e6..d781cd4b2 100755
--- a/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
+++ b/library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
@@ -1,6 +1,9 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
 namespace Icinga\Web\Paginator\Adapter;
+
 /**
  * @see Zend_Paginator_Adapter_Interface
  */
diff --git a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
index 78afe6190..f929eb60c 100755
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@@ -1,4 +1,6 @@
 <?php
+// @codingStandardsIgnoreStart
+
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
@@ -65,3 +67,5 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
         return $range;
     }
 }
+
+// @codingStandardsIgnoreEnd
\ No newline at end of file
diff --git a/library/Icinga/Web/Widget/AbstractWidget.php b/library/Icinga/Web/Widget/AbstractWidget.php
index 1698c3dc6..81c6b835c 100644
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Web Widget abstract class
- */
 namespace Icinga\Web\Widget;
 
 use Icinga\Exception\ProgrammingError;
diff --git a/library/Icinga/Web/Widget/Form.php b/library/Icinga/Web/Widget/Form.php
index 9313a3144..9719c4bf7 100644
--- a/library/Icinga/Web/Widget/Form.php
+++ b/library/Icinga/Web/Widget/Form.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Form
- */
 namespace Icinga\Web\Widget;
 
 /**
diff --git a/library/Icinga/Web/Widget/Tab.php b/library/Icinga/Web/Widget/Tab.php
index 943d19150..fa5ce64ed 100644
--- a/library/Icinga/Web/Widget/Tab.php
+++ b/library/Icinga/Web/Widget/Tab.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Single tab
- */
 namespace Icinga\Web\Widget;
 
 use Icinga\Exception\ProgrammingError;
@@ -40,18 +39,16 @@ class Tab extends AbstractWidget
      * @var array
      */
     protected $properties = array(
-        'name'      => null,
-        'title'     => '',
-        'url'       => null,
+        'name' => null,
+        'title' => '',
+        'url' => null,
         'urlParams' => array(),
-        'icon'      => null,
+        'icon' => null,
     );
 
     /**
      * Health check at initialization time
-     *
-     * @throws Icinga\Exception\ProgrammingError if tab name is missing
-     *
+     * @throws \Icinga\Exception\ProgrammingError if tab name is missing
      * @return void
      */
     protected function init()
@@ -75,7 +72,7 @@ class Tab extends AbstractWidget
      */
     public function setActive($active = true)
     {
-        $this->active = (bool) $active;
+        $this->active = (bool)$active;
         return $this;
     }
 
@@ -100,10 +97,15 @@ class Tab extends AbstractWidget
         $class = $this->isActive() ? ' class="active"' : '';
         $caption = $this->title;
         if ($this->icon !== null) {
-            $caption = $view->img($this->icon, array(
-                'width'  => 16,
-                'height' => 16
-            )) . ' ' . $caption;
+            $caption = $view->img(
+                $this->icon,
+                array(
+                    'width' => 16,
+                    'height' => 16
+                )
+            )
+            . ' '
+            . $caption;
         }
         if ($this->url !== null) {
             $tab = $view->qlink(
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index d3761e4ca..b3f4e9593 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Navigation tabs
- */
 namespace Icinga\Web\Widget;
 
 use Icinga\Exception\ProgrammingError;
diff --git a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
index 11276de8b..06ed34b13 100644
--- a/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
+++ b/test/php/library/Icinga/Web/Paginator/Adapter/QueryAdapterTest.php
@@ -56,15 +56,24 @@ class QueryAdapterTest extends \PHPUnit_Framework_TestCase
         $backend = new Statusdat($this->config);
         $query = $backend->select()->from('hostlist');
 
-        $paginator = new QueryAdapter($query);
+        $adapter = new QueryAdapter($query);
 
-        $this->assertEquals(30, $paginator->count());
+        $this->assertEquals(30, $adapter->count());
 
-        $data = $paginator->getItems(0, 10);
+        $data = $adapter->getItems(0, 10);
 
         $this->assertCount(10, $data);
 
-        $data = $paginator->getItems(10, 20);
+        $data = $adapter->getItems(10, 20);
         $this->assertCount(10, $data);
     }
+
+    public function testLimit2()
+    {
+        $backend = new Statusdat($this->config);
+        $query = $backend->select()->from('hostlist');
+
+        $adapter = new QueryAdapter($query);
+        $this->assertEquals(30, $adapter->count());
+    }
 }
\ No newline at end of file
diff --git a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
index 781c891eb..b68438644 100755
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@@ -27,6 +27,8 @@ require_once '../../library/Icinga/Protocol/AbstractQuery.php';
 require_once '../../library/Icinga/Protocol/Statusdat/IReader.php';
 require_once '../../library/Icinga/Protocol/Statusdat/Reader.php';
 require_once '../../library/Icinga/Protocol/Statusdat/Query.php';
+require_once '../../library/Icinga/Protocol/Statusdat/Parser.php';
+require_once '../../library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php';
 
 require_once '../../library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php';