diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index cdf41c8f7..148cbaa05 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -23,7 +23,7 @@ class ConfigController extends ActionController /** * The first allowed config action according to the user's permissions * - * @type string + * @var string */ protected $firstAllowedAction; diff --git a/application/forms/Security/RoleForm.php b/application/forms/Security/RoleForm.php index 85691de24..4b42cd88c 100644 --- a/application/forms/Security/RoleForm.php +++ b/application/forms/Security/RoleForm.php @@ -18,7 +18,7 @@ class RoleForm extends ConfigForm /** * Provided permissions by currently loaded modules * - * @type array + * @var array */ protected $providedPermissions = array( '*' => '*', @@ -33,7 +33,7 @@ class RoleForm extends ConfigForm /** * Provided restrictions by currently loaded modules * - * @type array + * @var array */ protected $providedRestrictions = array(); @@ -46,11 +46,11 @@ class RoleForm extends ConfigForm $helper = new Zend_Form_Element('bogus'); foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $module) { foreach ($module->getProvidedPermissions() as $permission) { - /** @type object $permission */ + /** @var object $permission */ $this->providedPermissions[$permission->name] = $permission->name . ': ' . $permission->description; } foreach ($module->getProvidedRestrictions() as $restriction) { - /** @type object $restriction */ + /** @var object $restriction */ $name = $helper->filterName($restriction->name); // Zend only permits alphanumerics, the underscore, // the circumflex and any ASCII character in range // \x7f to \xff (127 to 255) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 41df56d85..76efd4386 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -115,7 +115,7 @@ abstract class ApplicationBootstrap /** * Whether Icinga Web 2 requires setup * - * @type bool + * @var bool */ protected $requiresSetup = false; diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php index 73f0f8752..340c28945 100644 --- a/library/Icinga/Cli/Command.php +++ b/library/Icinga/Cli/Command.php @@ -17,7 +17,7 @@ abstract class Command protected $docs; /** - * @type Params + * @var Params */ protected $params; protected $screen; diff --git a/library/Icinga/Data/Tree/SimpleTree.php b/library/Icinga/Data/Tree/SimpleTree.php index 46a91135d..5b11e5200 100644 --- a/library/Icinga/Data/Tree/SimpleTree.php +++ b/library/Icinga/Data/Tree/SimpleTree.php @@ -14,14 +14,14 @@ class SimpleTree implements IteratorAggregate /** * Root node * - * @type TreeNode + * @var TreeNode */ protected $sentinel; /** * Nodes * - * @type array + * @var array */ protected $nodes = array(); diff --git a/library/Icinga/Data/Tree/TreeNode.php b/library/Icinga/Data/Tree/TreeNode.php index 200b3b9a6..975a33e76 100644 --- a/library/Icinga/Data/Tree/TreeNode.php +++ b/library/Icinga/Data/Tree/TreeNode.php @@ -10,7 +10,7 @@ class TreeNode implements Identifiable /** * The node's ID * - * @type mixed + * @var mixed */ protected $id; @@ -24,7 +24,7 @@ class TreeNode implements Identifiable /** * The node's children * - * @type array + * @var array */ protected $children = array(); diff --git a/library/Icinga/Data/Tree/TreeNodeIterator.php b/library/Icinga/Data/Tree/TreeNodeIterator.php index 753b338f6..76590398b 100644 --- a/library/Icinga/Data/Tree/TreeNodeIterator.php +++ b/library/Icinga/Data/Tree/TreeNodeIterator.php @@ -14,7 +14,7 @@ class TreeNodeIterator implements RecursiveIterator /** * The node's children * - * @type array + * @var array */ protected $children; diff --git a/library/Icinga/File/FileExtensionFilterIterator.php b/library/Icinga/File/FileExtensionFilterIterator.php index fd1d657b4..41efce0ad 100644 --- a/library/Icinga/File/FileExtensionFilterIterator.php +++ b/library/Icinga/File/FileExtensionFilterIterator.php @@ -33,7 +33,7 @@ class FileExtensionFilterIterator extends FilterIterator /** * The extension to filter for * - * @type string + * @var string */ protected $extension; @@ -58,7 +58,7 @@ class FileExtensionFilterIterator extends FilterIterator public function accept() { $current = $this->current(); - /** @type $current \SplFileInfo */ + /** @var $current \SplFileInfo */ if (! $current->isFile()) { return false; } diff --git a/library/Icinga/File/NonEmptyFileIterator.php b/library/Icinga/File/NonEmptyFileIterator.php index a57de3e23..03756ccd2 100644 --- a/library/Icinga/File/NonEmptyFileIterator.php +++ b/library/Icinga/File/NonEmptyFileIterator.php @@ -37,7 +37,7 @@ class NonEmptyFileIterator extends FilterIterator public function accept() { $current = $this->current(); - /** @type $current \SplFileInfo */ + /** @var $current \SplFileInfo */ if (! $current->isFile() || $current->getSize() === 0 ) { diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 0a1fe8ae4..03c5ba1b8 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -51,7 +51,7 @@ class ActionController extends Zend_Controller_Action /** * Authentication manager * - * @type Manager|null + * @var Manager|null */ private $auth; diff --git a/library/Icinga/Web/Dom/DomNodeIterator.php b/library/Icinga/Web/Dom/DomNodeIterator.php index 143c9c506..5c1542d5e 100644 --- a/library/Icinga/Web/Dom/DomNodeIterator.php +++ b/library/Icinga/Web/Dom/DomNodeIterator.php @@ -33,7 +33,7 @@ class DomNodeIterator implements RecursiveIterator /** * The node's children * - * @type IteratorIterator + * @var IteratorIterator */ protected $children; diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index 265da8420..3ff995028 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -145,7 +145,7 @@ class Form extends Zend_Form /** * Authentication manager * - * @type Manager|null + * @var Manager|null */ private $auth; diff --git a/library/Icinga/Web/Menu.php b/library/Icinga/Web/Menu.php index 8d62563be..92ec20607 100644 --- a/library/Icinga/Web/Menu.php +++ b/library/Icinga/Web/Menu.php @@ -18,7 +18,7 @@ class Menu implements RecursiveIterator /** * The id of this menu * - * @type string + * @var string */ protected $id; @@ -27,7 +27,7 @@ class Menu implements RecursiveIterator * * Used for sorting when priority is unset or equal to other items * - * @type string + * @var string */ protected $title; @@ -36,42 +36,42 @@ class Menu implements RecursiveIterator * * Used for sorting * - * @type int + * @var int */ protected $priority = 100; /** * The url of this menu * - * @type string + * @var string */ protected $url; /** * The path to the icon of this menu * - * @type string + * @var string */ protected $icon; /** * The sub menus of this menu * - * @type array + * @var array */ protected $subMenus = array(); /** * A custom item renderer used instead of the default rendering logic * - * @type MenuItemRenderer + * @var MenuItemRenderer */ protected $itemRenderer = null; /* * Parent menu * - * @type Menu + * @var Menu */ protected $parent; diff --git a/library/Icinga/Web/View.php b/library/Icinga/Web/View.php index 5201e9550..1265c7d21 100644 --- a/library/Icinga/Web/View.php +++ b/library/Icinga/Web/View.php @@ -39,7 +39,7 @@ class View extends Zend_View_Abstract /** * Authentication manager * - * @type \Icinga\Authentication\Manager|null + * @var \Icinga\Authentication\Manager|null */ private $auth; diff --git a/modules/doc/application/views/scripts/chapter.phtml b/modules/doc/application/views/scripts/chapter.phtml index eefe6f65f..fc5b3073b 100644 --- a/modules/doc/application/views/scripts/chapter.phtml +++ b/modules/doc/application/views/scripts/chapter.phtml @@ -1,6 +1,6 @@
- showOnlyCloseButton() ?> + showOnlyCloseButton() ?>
- +
diff --git a/modules/doc/application/views/scripts/index/index.phtml b/modules/doc/application/views/scripts/index/index.phtml index 65fa0b9d2..0b98623ac 100644 --- a/modules/doc/application/views/scripts/index/index.phtml +++ b/modules/doc/application/views/scripts/index/index.phtml @@ -1,5 +1,5 @@
- showOnlyCloseButton(); ?> + showOnlyCloseButton(); ?>

translate('Available documentations'); ?>

-
\ No newline at end of file + diff --git a/modules/doc/application/views/scripts/module/index.phtml b/modules/doc/application/views/scripts/module/index.phtml index e0c57ae79..a4d9276cc 100644 --- a/modules/doc/application/views/scripts/module/index.phtml +++ b/modules/doc/application/views/scripts/module/index.phtml @@ -1,5 +1,5 @@
- showOnlyCloseButton(); ?> + showOnlyCloseButton(); ?>

translate('Module documentations'); ?>

@@ -16,4 +16,4 @@ ); ?> -
\ No newline at end of file + diff --git a/modules/doc/application/views/scripts/pdf.phtml b/modules/doc/application/views/scripts/pdf.phtml index e76ded957..2666efb1c 100644 --- a/modules/doc/application/views/scripts/pdf.phtml +++ b/modules/doc/application/views/scripts/pdf.phtml @@ -1,5 +1,5 @@
-

- - +

+ +
diff --git a/modules/doc/application/views/scripts/search/index.phtml b/modules/doc/application/views/scripts/search/index.phtml index 272ab3a79..3311c47a1 100644 --- a/modules/doc/application/views/scripts/search/index.phtml +++ b/modules/doc/application/views/scripts/search/index.phtml @@ -1,5 +1,5 @@
- $search): ?> + $search): ?> isEmpty()): ?>

escape($title) ?>

diff --git a/modules/doc/application/views/scripts/toc.phtml b/modules/doc/application/views/scripts/toc.phtml index daec9b177..5a57e5bda 100644 --- a/modules/doc/application/views/scripts/toc.phtml +++ b/modules/doc/application/views/scripts/toc.phtml @@ -1,7 +1,7 @@
- showOnlyCloseButton() ?> -

+ showOnlyCloseButton() ?> +

- +
diff --git a/modules/doc/configuration.php b/modules/doc/configuration.php index fdbada7af..8ae28763f 100644 --- a/modules/doc/configuration.php +++ b/modules/doc/configuration.php @@ -1,7 +1,7 @@ menuSection($this->translate('Documentation'), array( 'title' => 'Documentation', diff --git a/modules/doc/library/Doc/DocIterator.php b/modules/doc/library/Doc/DocIterator.php index cbea037d6..430d25445 100644 --- a/modules/doc/library/Doc/DocIterator.php +++ b/modules/doc/library/Doc/DocIterator.php @@ -19,7 +19,7 @@ class DocIterator implements Countable, IteratorAggregate /** * Ordered files * - * @type array + * @var array */ protected $fileInfo; diff --git a/modules/doc/library/Doc/DocParser.php b/modules/doc/library/Doc/DocParser.php index 9077d3ef9..a35ebc05b 100644 --- a/modules/doc/library/Doc/DocParser.php +++ b/modules/doc/library/Doc/DocParser.php @@ -18,14 +18,14 @@ class DocParser /** * Path to the documentation * - * @type string + * @var string */ protected $path; /** * Iterator over documentation files * - * @type DocIterator + * @var DocIterator */ protected $docIterator; @@ -130,7 +130,7 @@ class DocParser $tree = new SimpleTree(); $stack = new SplStack(); foreach ($this->docIterator as $fileInfo) { - /** @type $fileInfo \SplFileInfo */ + /** @var $fileInfo \SplFileInfo */ $file = $fileInfo->openFile(); $lastLine = null; foreach ($file as $line) { @@ -143,7 +143,7 @@ class DocParser if ($id === null) { $path = array(); foreach ($stack as $section) { - /** @type $section DocSection */ + /** @var $section DocSection */ $path[] = $section->getTitle(); } $path[] = $title; diff --git a/modules/doc/library/Doc/DocSection.php b/modules/doc/library/Doc/DocSection.php index 4b97db282..4121fd69e 100644 --- a/modules/doc/library/Doc/DocSection.php +++ b/modules/doc/library/Doc/DocSection.php @@ -13,35 +13,35 @@ class DocSection extends TreeNode /** * Chapter the section belongs to * - * @type DocSection + * @var DocSection */ protected $chapter; /** * Content of the section * - * @type array + * @var array */ protected $content = array(); /** * Header level * - * @type int + * @var int */ protected $level; /** * Whether to instruct search engines to not index the link to the section * - * @type bool + * @var bool */ protected $noFollow; /** * Title of the section * - * @type string + * @var string */ protected $title; diff --git a/modules/doc/library/Doc/DocSectionFilterIterator.php b/modules/doc/library/Doc/DocSectionFilterIterator.php index 1087d1584..fa92583ca 100644 --- a/modules/doc/library/Doc/DocSectionFilterIterator.php +++ b/modules/doc/library/Doc/DocSectionFilterIterator.php @@ -19,7 +19,7 @@ class DocSectionFilterIterator extends RecursiveFilterIterator implements Counta /** * Chapter to filter for * - * @type string + * @var string */ protected $chapter; @@ -44,7 +44,7 @@ class DocSectionFilterIterator extends RecursiveFilterIterator implements Counta public function accept() { $section = $this->current(); - /** @type \Icinga\Module\Doc\DocSection $section */ + /** @var \Icinga\Module\Doc\DocSection $section */ if ($section->getChapter()->getId() === $this->chapter) { return true; } diff --git a/modules/doc/library/Doc/Renderer/DocRenderer.php b/modules/doc/library/Doc/Renderer/DocRenderer.php index 4d7ddd0ed..3574f24b0 100644 --- a/modules/doc/library/Doc/Renderer/DocRenderer.php +++ b/modules/doc/library/Doc/Renderer/DocRenderer.php @@ -16,21 +16,21 @@ abstract class DocRenderer extends RecursiveIteratorIterator /** * URL to replace links with * - * @type string + * @var string */ protected $url; /** * Additional URL parameters * - * @type array + * @var array */ protected $urlParams = array(); /** * View * - * @type View|null + * @var View|null */ protected $view; diff --git a/modules/doc/library/Doc/Renderer/DocSearchRenderer.php b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php index 31445dfc8..a89e49333 100644 --- a/modules/doc/library/Doc/Renderer/DocSearchRenderer.php +++ b/modules/doc/library/Doc/Renderer/DocSearchRenderer.php @@ -19,7 +19,7 @@ class DocSearchRenderer extends DocRenderer /** * The content to render * - * @type array + * @var array */ protected $content = array(); @@ -105,7 +105,7 @@ class DocSearchRenderer extends DocRenderer $path, array('highlight-search' => $this->getInnerIterator()->getSearch()->getInput()) ); - /** @type \Icinga\Web\Url $url */ + /** @var \Icinga\Web\Url $url */ $url->setAnchor($this->encodeAnchor($section->getId())); $urlAttributes = array( 'data-base-target' => '_next', diff --git a/modules/doc/library/Doc/Renderer/DocSectionRenderer.php b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php index e6f0ea186..088c5d617 100644 --- a/modules/doc/library/Doc/Renderer/DocSectionRenderer.php +++ b/modules/doc/library/Doc/Renderer/DocSectionRenderer.php @@ -26,28 +26,28 @@ class DocSectionRenderer extends DocRenderer /** * Content to render * - * @type array + * @var array */ protected $content = array(); /** * Search criteria to highlight * - * @type string + * @var string */ protected $highlightSearch; /** * Parsedown instance * - * @type Parsedown + * @var Parsedown */ protected $parsedown; /** * Documentation tree * - * @type SimpleTree + * @var SimpleTree */ protected $tree; @@ -169,7 +169,7 @@ class DocSectionRenderer extends DocRenderer $doc->loadHTML($match[0]); $xpath = new DOMXPath($doc); $blockquote = $xpath->query('//blockquote[1]')->item(0); - /** @type \DOMElement $blockquote */ + /** @var \DOMElement $blockquote */ if (strtolower(substr(trim($blockquote->nodeValue), 0, 5)) === 'note:') { $blockquote->setAttribute('class', 'note'); } @@ -189,7 +189,7 @@ class DocSectionRenderer extends DocRenderer $doc->loadHTML($match[0]); $xpath = new DOMXPath($doc); $img = $xpath->query('//img[1]')->item(0); - /** @type \DOMElement $img */ + /** @var \DOMElement $img */ $img->setAttribute('src', Url::fromPath($img->getAttribute('src'))->getAbsoluteUrl()); return substr_replace($doc->saveXML($img), '', -2, 1); // Replace '/>' with '>' } @@ -206,7 +206,7 @@ class DocSectionRenderer extends DocRenderer if (($section = $this->tree->getNode($this->decodeAnchor($match['fragment']))) === null) { return $match[0]; } - /** @type \Icinga\Module\Doc\DocSection $section */ + /** @var \Icinga\Module\Doc\DocSection $section */ $path = $this->getView()->getHelper('Url')->url( array_merge( $this->urlParams, @@ -219,7 +219,7 @@ class DocSectionRenderer extends DocRenderer false ); $url = $this->getView()->url($path); - /** @type \Icinga\Web\Url $url */ + /** @var \Icinga\Web\Url $url */ $url->setAnchor($this->encodeAnchor($section->getId())); return sprintf( 'url($path); - /** @type \Icinga\Web\Url $url */ + /** @var \Icinga\Web\Url $url */ $url->setAnchor($this->encodeAnchor($section->getId())); $urlAttributes = array( 'data-base-target' => '_next', diff --git a/modules/doc/library/Doc/Search/DocSearch.php b/modules/doc/library/Doc/Search/DocSearch.php index 36f249ed6..459cef208 100644 --- a/modules/doc/library/Doc/Search/DocSearch.php +++ b/modules/doc/library/Doc/Search/DocSearch.php @@ -11,14 +11,14 @@ class DocSearch /** * Search string * - * @type string + * @var string */ protected $input; /** * Search criteria * - * @type array + * @var array */ protected $search; diff --git a/modules/doc/library/Doc/Search/DocSearchIterator.php b/modules/doc/library/Doc/Search/DocSearchIterator.php index 66ccc8c37..b239254aa 100644 --- a/modules/doc/library/Doc/Search/DocSearchIterator.php +++ b/modules/doc/library/Doc/Search/DocSearchIterator.php @@ -19,14 +19,14 @@ class DocSearchIterator extends RecursiveFilterIterator /** * Search criteria * - * @type DocSearch + * @var DocSearch */ protected $search; /** * Current search matches * - * @type DocSearchMatch[]|null + * @var DocSearchMatch[]|null */ protected $matches; @@ -51,7 +51,7 @@ class DocSearchIterator extends RecursiveFilterIterator public function accept() { $section = $this->current(); - /** @type $section \Icinga\Module\Doc\DocSection */ + /** @var $section \Icinga\Module\Doc\DocSection */ $matches = array(); if (($match = $this->search->search($section->getTitle())) !== null) { $matches[] = $match->setMatchType(DocSearchMatch::MATCH_HEADER); diff --git a/modules/doc/library/Doc/Search/DocSearchMatch.php b/modules/doc/library/Doc/Search/DocSearchMatch.php index 4f067d43b..52bd528c9 100644 --- a/modules/doc/library/Doc/Search/DocSearchMatch.php +++ b/modules/doc/library/Doc/Search/DocSearchMatch.php @@ -15,56 +15,56 @@ class DocSearchMatch /** * CSS class for highlighting matches * - * @type string + * @var string */ const HIGHLIGHT_CSS_CLASS = 'search-highlight'; /** * Header match * - * @type int + * @var int */ const MATCH_HEADER = 1; /** * Content match * - * @type int + * @var int */ const MATCH_CONTENT = 2; /** * Line * - * @type string + * @var string */ protected $line; /** * Line number * - * @type int + * @var int */ protected $lineno; /** * Type of the match * - * @type int + * @var int */ protected $matchType; /** * Matches * - * @type array + * @var array */ protected $matches = array(); /** * View * - * @type View|null + * @var View|null */ protected $view; diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php index 62e3858a9..d89c6623f 100644 --- a/modules/monitoring/application/forms/Config/BackendConfigForm.php +++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php @@ -17,7 +17,7 @@ class BackendConfigForm extends ConfigForm /** * The available monitoring backend resources split by type * - * @type array + * @var array */ protected $resources; diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml index 639437a03..2a4e4b033 100644 --- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml +++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml @@ -1,6 +1,6 @@ getType() === $object::TYPE_HOST) { $isService = false; diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml index fa7d4606a..6a5ed4581 100644 --- a/modules/monitoring/application/views/scripts/show/components/comments.phtml +++ b/modules/monitoring/application/views/scripts/show/components/comments.phtml @@ -2,7 +2,7 @@ translate('Comments'); ?> hasPermission('monitoring/command/comment/add')) { - /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */ + /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ if ($object->getType() === $object::TYPE_HOST) { echo $this->qlink( $this->translate('Add comment'), diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml index 76a4be005..5a8da065d 100644 --- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml +++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml @@ -2,7 +2,7 @@ translate('Downtimes'); ?> hasPermission('monitoring/command/downtime/schedule')) { - /** @type \Icinga\Module\Monitoring\Object\MonitoredObject $object */ + /** @var \Icinga\Module\Monitoring\Object\MonitoredObject $object */ if ($object->getType() === $object::TYPE_HOST) { echo $this->qlink( $this->translate('Schedule downtime'), diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php index fa7732e10..797f1663e 100644 --- a/modules/monitoring/configuration.php +++ b/modules/monitoring/configuration.php @@ -1,7 +1,7 @@ providePermission( 'monitoring/command/*', diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php index 4baa7aa9b..aa354d85e 100644 --- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php +++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php @@ -120,7 +120,7 @@ abstract class MonitoredObject implements Filterable /** * Filter * - * @type Filter + * @var Filter */ protected $filter;