From 8a3db017b3848a4fa8b7b0ef105ee0888ac11ff2 Mon Sep 17 00:00:00 2001 From: Christian Achatz Date: Thu, 17 May 2018 20:23:36 +0200 Subject: [PATCH] ID#323: introduced type declaration for HTML header classes. --- extensions/htmlheader/biz/HeaderNode.php | 4 ++-- extensions/htmlheader/biz/HtmlNode.php | 4 ++-- .../htmlheader/pres/taglib/HtmlHeaderAddCssContentTag.php | 2 +- .../htmlheader/pres/taglib/HtmlHeaderAddCssImageTag.php | 2 +- extensions/htmlheader/pres/taglib/HtmlHeaderAddCssTag.php | 2 +- .../htmlheader/pres/taglib/HtmlHeaderAddJsContentTag.php | 2 +- extensions/htmlheader/pres/taglib/HtmlHeaderAddJsTags.php | 2 +- extensions/htmlheader/pres/taglib/HtmlHeaderAddPackageTag.php | 2 +- .../htmlheader/pres/taglib/HtmlHeaderAddStaticCssTag.php | 2 +- .../htmlheader/pres/taglib/HtmlHeaderAddStaticJsTag.php | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/htmlheader/biz/HeaderNode.php b/extensions/htmlheader/biz/HeaderNode.php index 5a960307e..b46fbae49 100644 --- a/extensions/htmlheader/biz/HeaderNode.php +++ b/extensions/htmlheader/biz/HeaderNode.php @@ -62,7 +62,7 @@ public function getChecksum(); * @version * Version 0.1, 09.05.2011
*/ - public function setPriority($priority); + public function setPriority(int $priority); /** * Returns the priority defined for the current header node. @@ -84,7 +84,7 @@ public function getPriority(); * @version * Version 0.1, 21.09.2011
*/ - public function setAppendToBody($value); + public function setAppendToBody(bool $value); /** * Defines if the tag should be placed in gethead- or getjsbody taglib. diff --git a/extensions/htmlheader/biz/HtmlNode.php b/extensions/htmlheader/biz/HtmlNode.php index 5e5f54602..5def9211e 100644 --- a/extensions/htmlheader/biz/HtmlNode.php +++ b/extensions/htmlheader/biz/HtmlNode.php @@ -52,7 +52,7 @@ public function getPriority() { return $this->priority; } - public function setPriority($priority) { + public function setPriority(int $priority) { $this->priority = intval($priority); // normalize priority to 0 for all faulty inputs return $this; } @@ -61,7 +61,7 @@ public function getAppendToBody() { return $this->appendToBody; } - public function setAppendToBody($value) { + public function setAppendToBody(bool $value) { $this->appendToBody = $value; return $this; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssContentTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssContentTag.php index b4628b5a3..6eca05dfe 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssContentTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssContentTag.php @@ -44,7 +44,7 @@ public function transform() { $header = $this->getServiceObject(HtmlHeaderManager::class); $node = new CssContentNode($this->getContent(), $this->getAttribute('media')); - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssImageTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssImageTag.php index 632785650..ab4767f27 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssImageTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssImageTag.php @@ -46,7 +46,7 @@ public function transform() { $type = $this->getAttribute('type'); $node = new CssImageNode($href, $rel, $type); - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssTag.php index e2d24250d..562f9485e 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddCssTag.php @@ -87,7 +87,7 @@ public function transform() { $node = new DynamicCssNode(null, $namespace, $filename, $fcaction, $media); } - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsContentTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsContentTag.php index c55563963..576ce91f9 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsContentTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsContentTag.php @@ -49,7 +49,7 @@ public function transform() { $node->setAppendToBody(true); } - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsTags.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsTags.php index 0bbd2df3a..de846aadd 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsTags.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddJsTags.php @@ -87,7 +87,7 @@ public function transform() { $node->setAppendToBody(true); } - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddPackageTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddPackageTag.php index 7d4518df4..324b8022e 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddPackageTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddPackageTag.php @@ -55,7 +55,7 @@ public function transform() { $node = new CssPackageNode($url, $name, $media); } - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticCssTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticCssTag.php index 552961078..c63c21b8c 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticCssTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticCssTag.php @@ -48,7 +48,7 @@ public function transform() { $node = new StaticCssNode($file, $this->getAttribute('media')); - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return ''; diff --git a/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticJsTag.php b/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticJsTag.php index 7e3452d55..5bbe35608 100644 --- a/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticJsTag.php +++ b/extensions/htmlheader/pres/taglib/HtmlHeaderAddStaticJsTag.php @@ -52,7 +52,7 @@ public function transform() { $node->setAppendToBody(true); } - $node->setPriority($this->getAttribute('priority')); + $node->setPriority(intval($this->getAttribute('priority'))); $header->addNode($node); return '';