Merge branch 'bugfix/get-rid-of-line-based-annotations-6091'

fixes #6091
2014-06-30 14:01:35 +02:00 · 2014-06-30 14:01:35 +02:00 · 6a8152ce09
parent 9a1b7179e1 7eb0f3c472
commit 6a8152ce09
84 changed files with 54 additions and 179 deletions
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Clicommands;

@ -118,4 +117,3 @@ class AutocompleteCommand extends Command
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Clicommands;

@ -41,4 +40,3 @@ class HelpCommand extends Command
        );
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Clicommands;

@ -212,4 +211,3 @@ class ModuleCommand extends Command
        $this->fail("Not implemented yet");
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/clicommands/WebCommand.php
+++ b/application/clicommands/WebCommand.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Clicommands;

@ -81,4 +80,3 @@ class WebCommand extends Command
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/AuthenticationController.php
+++ b/application/controllers/AuthenticationController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -159,4 +158,3 @@ class AuthenticationController extends ActionController
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -549,4 +548,3 @@ class ConfigController extends BaseConfigController
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -191,4 +190,3 @@ class DashboardController extends ActionController
        return true;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -78,4 +77,3 @@ class ErrorController extends ActionController
        $this->view->request = $error->request;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -117,4 +116,3 @@ class FilterController extends ActionController
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -56,4 +55,3 @@ class IndexController extends ActionController
    {
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/InstallController.php
+++ b/application/controllers/InstallController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

@ -107,5 +106,3 @@ class InstallController extends ActionController
        $session->write();
    }
 }
-
-// @codeCoverageIgnoreEnd
--- a/application/controllers/LayoutController.php
+++ b/application/controllers/LayoutController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

@ -43,4 +42,3 @@ class LayoutController extends ActionController
        $this->renderScript('parts/topbar.phtml');
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/ListController.php
+++ b/application/controllers/ListController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -79,4 +78,3 @@ class ListController extends Controller
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -83,4 +82,3 @@ class PreferenceController extends BasePreferenceController
        $this->view->form = $form;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/SearchController.php
+++ b/application/controllers/SearchController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 use Icinga\Web\Controller\ActionController;
 use Icinga\Application\Icinga;
@ -57,4 +56,3 @@ class SearchController extends ActionController
        $this->view->tabs = $dashboard->getTabs();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/controllers/StaticController.php
+++ b/application/controllers/StaticController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -188,4 +187,3 @@ class StaticController extends ActionController
        $lessCompiler->printStack();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -93,4 +92,3 @@ class ConfirmRemovalForm extends Form
        );
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -295,4 +294,3 @@ class GeneralForm extends Form
        return $cfg;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -202,4 +201,3 @@ class LoggingForm extends Form
        return new Zend_Config($cfg);
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -165,4 +164,3 @@ class AddUrlForm extends Form
        $this->setSubmitLabel("Add To Dashboard");
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/forms/Install/LoggingPage.php
+++ b/application/forms/Install/LoggingPage.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

@ -64,4 +63,3 @@ class LoggingPage extends Page
        return $this->createForm()->getConfig();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -175,4 +174,3 @@ class GeneralForm extends Form
        );
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/views/helpers/FormDateTime.php
+++ b/application/views/helpers/FormDateTime.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -94,4 +93,3 @@ class Zend_View_Helper_FormDateTime extends Zend_View_Helper_FormElement
        return $xhtml;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -54,4 +53,3 @@ class Zend_View_Helper_FormNumber extends \Zend_View_Helper_FormText
             . $this->getClosingBracket();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/views/helpers/FormTriStateCheckbox.php
+++ b/application/views/helpers/FormTriStateCheckbox.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -63,4 +62,3 @@ class Zend_View_Helper_FormTriStateCheckbox extends Zend_View_Helper_FormElement
        return $xhtml . '</div>';
    }
 }
-// @codeCoverageIgnoreEnd
--- a/application/views/helpers/Util.php
+++ b/application/views/helpers/Util.php
@ -1,6 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
-
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -142,5 +140,3 @@ class Zend_View_Helper_Util extends Zend_View_Helper_Abstract
        return sprintf('OUT OF BOUND (%d)' . $state, (int) $state);
    }
 }
-
-// @codingStandardsIgnoreStop
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -495,4 +494,3 @@ abstract class ApplicationBootstrap
        return $this;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Application/Benchmark.php
+++ b/library/Icinga/Application/Benchmark.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -318,4 +317,3 @@ class Benchmark
    {
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -191,4 +190,3 @@ class Cli extends ApplicationBootstrap
        throw new ProgrammingError('Icinga is not running on CLI');
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Application/EmbeddedWeb.php
+++ b/library/Icinga/Application/EmbeddedWeb.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -30,9 +29,7 @@

 namespace Icinga\Application;

-// @codingStandardsIgnoreStart
 require_once dirname(__FILE__) . '/ApplicationBootstrap.php';
-// @codingStandardsIgnoreStop

 use Icinga\Exception\ProgrammingError;

@ -62,4 +59,3 @@ class EmbeddedWeb extends ApplicationBootstrap
            ->loadEnabledModules();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Application/LegacyWeb.php
+++ b/library/Icinga/Application/LegacyWeb.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -56,4 +55,3 @@ class LegacyWeb extends Web
        return $this->legacyBasedir;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Application/Platform.php
+++ b/library/Icinga/Application/Platform.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -93,4 +92,3 @@ class Platform
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -376,4 +375,3 @@ class Web extends ApplicationBootstrap
        return $this;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Chart/Inline/Inline.php
+++ b/library/Icinga/Chart/Inline/Inline.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -120,4 +119,4 @@ class Inline {
        }

    }
-}
+}
--- a/library/Icinga/Chart/Inline/PieChart.php
+++ b/library/Icinga/Chart/Inline/PieChart.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
--- a/library/Icinga/Logger/Writer/SyslogWriter.php
+++ b/library/Icinga/Logger/Writer/SyslogWriter.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

@ -107,4 +106,3 @@ class SyslogWriter extends LogWriter
        closelog();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/User/Message.php
+++ b/library/Icinga/User/Message.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\User;

@ -56,4 +55,3 @@ class Message
        return $this->level;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -477,4 +476,3 @@ class ActionController extends Zend_Controller_Action
        return parent::__call($name, $params);
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Controller/BaseConfigController.php
+++ b/library/Icinga/Web/Controller/BaseConfigController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -85,4 +84,3 @@ class BaseConfigController extends ActionController
        return array();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Controller/BasePreferenceController.php
+++ b/library/Icinga/Web/Controller/BasePreferenceController.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -92,4 +91,3 @@ class BasePreferenceController extends ActionController
        $store->save($currentPreferences);
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Controller/ControllerTabCollector.php
+++ b/library/Icinga/Web/Controller/ControllerTabCollector.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -123,4 +122,3 @@ class ControllerTabCollector
        return array();
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Form/Decorator/BootstrapForm.php
+++ b/library/Icinga/Web/Form/Decorator/BootstrapForm.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -104,4 +103,3 @@ class BootstrapForm extends Zend_Form_Decorator_Abstract
               . '</div>';
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
+++ b/library/Icinga/Web/Form/Decorator/ConditionalHidden.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -60,4 +59,3 @@ class ConditionalHidden extends Zend_Form_Decorator_Abstract
        return $content;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Form/Decorator/HelpText.php
+++ b/library/Icinga/Web/Form/Decorator/HelpText.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -61,4 +60,3 @@ class HelpText extends Zend_Form_Decorator_Abstract
        return $content;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Form/Validator/DateFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateFormatValidator.php
@ -61,11 +61,9 @@ class DateFormatValidator extends Zend_Validate_Abstract
     *
     * @see Zend_Validate_Abstract::$_messageTemplates
     */
-    // @codingStandardsIgnoreStart
    protected $_messageTemplates = array(
        'INVALID_CHARACTERS' => 'Invalid date format'
    );
-    // @codingStandardsIgnoreEnd

    /**
     * Validate the input value
--- a/library/Icinga/Web/Form/Validator/DateTimeValidator.php
+++ b/library/Icinga/Web/Form/Validator/DateTimeValidator.php
@ -60,9 +60,7 @@ class DateTimeValidator extends Zend_Validate_Abstract
     *
     * @see Zend_Validate_Abstract::$_messageTemplates
     */
-    // @codingStandardsIgnoreStart
    protected $_messageTemplates = array();
-    // @codingStandardsIgnoreEnd

    /**
     * Create this validator
--- a/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
+++ b/library/Icinga/Web/Form/Validator/TimeFormatValidator.php
@ -58,11 +58,9 @@ class TimeFormatValidator extends Zend_Validate_Abstract
     * @var array
     * @see Zend_Validate_Abstract::$_messageTemplates
     */
-    // @codingStandardsIgnoreStart
    protected $_messageTemplates = array(
        'INVALID_CHARACTERS' => 'Invalid time format'
    );
-    // @codingStandardsIgnoreEnd

    /**
     * Validate the input value
--- a/library/Icinga/Web/Form/Validator/WritablePathValidator.php
+++ b/library/Icinga/Web/Form/Validator/WritablePathValidator.php
@ -44,12 +44,10 @@ class WritablePathValidator extends Zend_Validate_Abstract
     *
     * @see Zend_Validate_Abstract::$_messageTemplates‚
     */
-    // @codingStandardsIgnoreStart
    protected $_messageTemplates = array(
        'NOT_WRITABLE'      =>  'Path is not writable',
        'DOES_NOT_EXIST'    =>  'Path does not exist'
    );
-    // @codingStandardsIgnoreEnd

    /**
     * When true, the file or directory must exist
--- a/library/Icinga/Web/Hook/Grapher.php
+++ b/library/Icinga/Web/Hook/Grapher.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -113,4 +112,3 @@ class Grapher
        throw new Exception('This backend has no images');
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Hook/Ticket.php
+++ b/library/Icinga/Web/Hook/Ticket.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 /**
 * Icinga Web Ticket Hook
@ -43,4 +42,3 @@ abstract class Ticket
    abstract public function createLink($match);

 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/JavaScript.php
+++ b/library/Icinga/Web/JavaScript.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Web;

@ -94,4 +93,3 @@ class JavaScript
        echo $out;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/LessCompiler.php
+++ b/library/Icinga/Web/LessCompiler.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -195,4 +194,3 @@ class LessCompiler
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
+++ b/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
@ -1,6 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
-
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -105,5 +103,3 @@ class Icinga_Web_Paginator_ScrollingStyle_SlidingWithBorder implements Zend_Pagi
        return $range;
    }
 }
-
-// @codingStandardsIgnoreEnd
--- a/library/Icinga/Web/Request.php
+++ b/library/Icinga/Web/Request.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -65,4 +64,3 @@ class Request extends Zend_Controller_Request_Http
        return $this->user;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Session.php
+++ b/library/Icinga/Web/Session.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -79,4 +78,3 @@ class Session
        return self::$session;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Web;

@ -69,4 +68,3 @@ class StyleSheet

    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/View.php
+++ b/library/Icinga/Web/View.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -172,7 +171,6 @@ class View extends Zend_View_Abstract
        }
    }

-    // @codingStandardsIgnoreStart
    /**
     * Use to include the view script in a scope that only allows public
     * members.
@ -193,7 +191,6 @@ class View extends Zend_View_Abstract
            include func_get_arg(0);
        }
    }
-    // @codingStandardsIgnoreEnd

    /**
     * Accesses a helper object from within a script
@ -212,4 +209,3 @@ class View extends Zend_View_Abstract
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 /**
 * Web widget class
@ -51,4 +50,3 @@ class Widget
        return $widget;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/AbstractWidget.php
+++ b/library/Icinga/Web/Widget/AbstractWidget.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Web\Widget;

@ -122,4 +121,3 @@ abstract class AbstractWidget
        return (string) $html;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/AlertMessageBox.php
+++ b/library/Icinga/Web/Widget/AlertMessageBox.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart

 namespace Icinga\Web\Widget;

@ -129,4 +128,3 @@ class AlertMessageBox extends AbstractWidget
        return $html;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
+++ b/library/Icinga/Web/Widget/Chart/HistoryColorGrid.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -344,4 +343,3 @@ class HistoryColorGrid extends AbstractWidget {
        return $this->renderVertical($grid);
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/Chart/InlinePie.php
+++ b/library/Icinga/Web/Widget/Chart/InlinePie.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -426,4 +425,3 @@ EOD;
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/SortBox.php
+++ b/library/Icinga/Web/Widget/SortBox.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -164,4 +163,3 @@ class SortBox extends AbstractWidget
        return $form;
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/Tabextension/BasketAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/BasketAction.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -59,4 +58,3 @@ class BasketAction implements Tabextension
        );
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -60,4 +59,3 @@ class DashboardAction implements Tabextension
        );
    }
 }
-// @codeCoverageIgnoreEnd
--- a/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
+++ b/library/Icinga/Web/Widget/Tabextension/OutputFormat.php
@ -1,5 +1,4 @@
 <?php
-// @codeCoverageIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -125,4 +124,3 @@ class OutputFormat implements Tabextension
        }
    }
 }
-// @codeCoverageIgnoreEnd
--- a/modules/doc/application/controllers/IndexController.php
+++ b/modules/doc/application/controllers/IndexController.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

@ -34,4 +33,3 @@ class Doc_IndexController extends DocController
        $this->populateView();
    }
 }
-// @codingStandardsIgnoreEnd
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}

@ -44,4 +43,3 @@ class Doc_ModuleController extends DocController
        $this->_helper->redirector->gotoSimpleAndExit('view', null, null, array('name' => $moduleName));
    }
 }
-// @codingStandardsIgnoreEnd
--- a/modules/monitoring/application/controllers/CommandController.php
+++ b/modules/monitoring/application/controllers/CommandController.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -1118,4 +1117,3 @@ class Monitoring_CommandController extends Controller
        }
    }
 }
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/application/controllers/ConfigController.php
+++ b/modules/monitoring/application/controllers/ConfigController.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -285,4 +284,3 @@ class Monitoring_ConfigController extends ModuleActionController
        return $instanceCfg && $instanceCfg->get($instance);
    }
 }
-// @codingStandardsIgnoreEnd
--- a/modules/monitoring/application/controllers/ProcessController.php
+++ b/modules/monitoring/application/controllers/ProcessController.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -103,5 +102,3 @@ class Monitoring_ProcessController extends MonitoringController
            ->getQuery()->fetchAll();
    }
 }
-
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@ -27,7 +27,6 @@
 */
 // {{{ICINGA_LICENSE_HEADER}}}

-// @codingStandardsIgnoreStart
 use Icinga\Application\Benchmark;
 use Icinga\Web\Hook;
 use Icinga\Web\Widget\Tabs;
@ -190,4 +189,3 @@ class Monitoring_ShowController extends Controller
            ->extend(new DashboardAction());
    }
 }
-// @codingStandardsIgnoreEnd
--- a/modules/monitoring/application/views/helpers/CheckPerformance.php
+++ b/modules/monitoring/application/views/helpers/CheckPerformance.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -75,4 +74,3 @@ class Zend_View_Helper_CheckPerformance extends Zend_View_Helper_Abstract
        return $out;
    }
 }
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/application/views/helpers/CommandForm.php
+++ b/modules/monitoring/application/views/helpers/CommandForm.php
@ -1,6 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
-
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -204,5 +202,3 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
        return $out;
    }
 }
-
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/application/views/helpers/MonitoringProperties.php
+++ b/modules/monitoring/application/views/helpers/MonitoringProperties.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -308,4 +307,3 @@ class Zend_View_Helper_MonitoringProperties extends Zend_View_Helper_Abstract
        return $type;
    }
 }
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/application/views/helpers/RuntimeVariables.php
+++ b/modules/monitoring/application/views/helpers/RuntimeVariables.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -63,4 +62,3 @@ class Zend_View_Helper_RuntimeVariables extends Zend_View_Helper_Abstract
        return $out;
    }
 }
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -103,5 +102,3 @@ class GroupSummaryQuery extends IdoQuery
        );
    }
 }
-// @codingStandardsIgnoreStop
-
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -538,4 +537,3 @@ class StatusQuery extends IdoQuery
        );
    }
 }
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
+++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusSummaryQuery.php
@ -1,5 +1,4 @@
 <?php
-// @codingStandardsIgnoreStart
 // {{{ICINGA_LICENSE_HEADER}}}
 /**
 * This file is part of Icinga Web 2.
@ -186,4 +185,3 @@ class StatusSummaryQuery extends IdoQuery
        );
    }
 }
-// @codingStandardsIgnoreStop
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringFlagsTest.php
@ -7,9 +7,7 @@ namespace Tests\Icinga\Module\Monitoring\Application\Views\Helpers;
 use \Zend_View_Helper_MonitoringFlags;
 use Icinga\Test\BaseTestCase;

-// @codingStandardsIgnoreStart
 require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/MonitoringFlags.php');
-// @codingStandardsIgnoreEnd

 class MonitoringFlagsTest extends BaseTestCase
 {
--- a/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php
@ -7,9 +7,7 @@ namespace Test\Modules\Monitoring\Application\Views\Helpers;
 use \Zend_View_Helper_MonitoringProperties;
 use Icinga\Test\BaseTestCase;

-// @codingStandardsIgnoreStart
 require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/MonitoringProperties.php');
-// @codingStandardsIgnoreEnd

 class HostStruct4Properties
 {
--- a/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
+++ b/modules/monitoring/test/php/application/views/helpers/ResolveMacrosTest.php
@ -8,9 +8,7 @@ use \Mockery;
 use \Zend_View_Helper_ResolveMacros;
 use Icinga\Test\BaseTestCase;

-// @codingStandardsIgnoreStart
 require_once realpath(BaseTestCase::$moduleDir . '/monitoring/application/views/helpers/ResolveMacros.php');
-// @codingStandardsIgnoreEnd

 class ResolveMacrosTest extends BaseTestCase
 {
--- a/modules/test/phpunit.xml
+++ b/modules/test/phpunit.xml
@ -27,9 +27,61 @@
            <directory suffix=".php">../../library/Icinga</directory>
            <directory suffix=".php">../../modules</directory>
            <exclude>
+                <!-- application/clicommands -->
+                <directory suffix=".php">../../application/clicommands</directory>
+                <!-- application/controllers -->
+                <directory suffix=".php">../../application/controllers</directory>
+                <!-- application/forms -->
+                <file>../../application/forms/Config/GeneralForm.php</file>
+                <file>../../application/forms/Config/LoggingForm.php</file>
+                <file>../../application/forms/Config/ConfirmRemovalForm.php</file>
+                <directory suffix=".php">../../application/forms/Authentication</directory>
+                <directory suffix=".php">../../application/forms/Install</directory>
+                <directory suffix=".php">../../application/forms/Dashboard</directory>
+                <directory suffix=".php">../../application/forms/Preference</directory>
+                <!-- application/views -->
+                <file>../../application/views/helpers/FormNumber.php</file>
+                <file>../../application/views/helpers/FormDateTime.php</file>
+                <file>../../application/views/helpers/FormTriStateCheckbox.php</file>
+                <!-- library/Icinga/Logger -->
+                <file>../../library/Icinga/Logger/Writer/SyslogWriter.php</file>
+                <!-- library/Icinga/User -->
+                <file>../../library/Icinga/User/Message.php</file>
+                <!-- library/Icinga/Application -->
+                <file>../../library/Icinga/Application/ApplicationBootstrap.php</file>
+                <file>../../library/Icinga/Application/Benchmark.php</file>
+                <file>../../library/Icinga/Application/Cli.php</file>
+                <file>../../library/Icinga/Application/EmbeddedWeb.php</file>
+                <file>../../library/Icinga/Application/LegacyWeb.php</file>
+                <file>../../library/Icinga/Application/Platform.php</file>
+                <file>../../library/Icinga/Application/Web.php</file>
                <file>../../library/Icinga/Application/functions.php</file>
                <file>../../library/Icinga/Application/webrouter.php</file>
-                <directory>../../library/Icinga/Web/View/helpers</directory>
+                <!-- library/Icinga/Web -->
+                <file>../../library/Icinga/Web/JavaScript.php</file>
+                <file>../../library/Icinga/Web/LessCompiler.php</file>
+                <file>../../library/Icinga/Web/Request.php</file>
+                <file>../../library/Icinga/Web/Response.php</file>
+                <file>../../library/Icinga/Web/Session.php</file>
+                <file>../../library/Icinga/Web/StyleSheet.php</file>
+                <file>../../library/Icinga/Web/View.php</file>
+                <file>../../library/Icinga/Web/ViewStream.php</file>
+                <file>../../library/Icinga/Web/Widget.php</file>
+                <!-- library/Icinga/Web/Widget -->
+                <file>../../library/Icinga/Web/Widget/AbstractWidget.php</file>
+                <file>../../library/Icinga/Web/Widget/AlertMessageBox.php</file>
+                <file>../../library/Icinga/Web/Widget/SortBox.php</file>
+                <directory suffix=".php">../../library/Icinga/Web/Widget/Chart</directory>
+                <directory suffix=".php">../../library/Icinga/Web/Widget/Tabextension</directory>
+                <!-- library/Icinga/Web/Hook -->
+                <file>../../library/Icinga/Web/Hook/Ticket.php</file>
+                <file>../../library/Icinga/Web/Hook/Grapher.php</file>
+                <!-- library/Icinga/Web/Controller -->
+                <directory suffix=".php">../../library/Icinga/Web/Controller</directory>
+                <!-- library/Icinga/Web/Form -->
+                <directory suffix=".php">../../library/Icinga/Web/Form/Decorator</directory>
+                <!-- library/Icinga/Web/View -->
+                <directory suffix=".php">../../library/Icinga/Web/View/helpers</directory>
            </exclude>
        </whitelist>
    </filter>
--- a/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
+++ b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
@ -4,9 +4,7 @@

 namespace Tests\Icinga\Web\Paginator\ScrollingStyle;

-// @codingStandardsIgnoreStart
 require_once realpath(ICINGA_LIBDIR . '/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php');
-// @codingStandardsIgnoreEnd

 use \Mockery;
 use \Zend_Config;