diff --git a/.phive/phars.xml b/.phive/phars.xml
index 5bfa092bfad10dad9d23240281a5a2041acb815b..cccdab55e6792f5161b502854bef53c1667a4add 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
- <phar name="phpstan" version="1.11.8" installed="1.11.8" location="./tools/phpstan" copy="false"/>
+ <phar name="phpstan" version="1.*" installed="1.12.13" location="./tools/phpstan" copy="false"/>
<phar name="phpunit" version="^10.5.20" installed="10.5.20" location="./tools/phpunit" copy="false"/>
<phar name="phpcs" version="^3.10.1" installed="3.10.1" location="./tools/phpcs" copy="false"/>
<phar name="phpcbf" version="^3.10.1" installed="3.10.1" location="./tools/phpcbf" copy="false"/>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 21535088260aa3415906fbab59b8c921aec9b5dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,26 +0,0 @@
-parameters:
- ignoreErrors:
- -
- message: "#^Strict comparison using \\=\\=\\= between mixed and '' will always evaluate to false\\.$#"
- count: 1
- path: src/QUI/Menu/Bricks/Submenu.php
-
- -
- message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Projects\\\\Site\\:\\:getCachePath\\(\\)\\.$#"
- count: 1
- path: src/QUI/Menu/DropDownMenu.php
-
- -
- message: "#^Parameter \\#1 \\$menuId of static method QUI\\\\Menu\\\\Independent\\\\Handler\\:\\:getMenu\\(\\) expects int, string\\|false given\\.$#"
- count: 1
- path: src/QUI/Menu/Independent/Factory.php
-
- -
- message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Projects\\\\Site\\:\\:getCachePath\\(\\)\\.$#"
- count: 1
- path: src/QUI/Menu/MegaMenu.php
-
- -
- message: "#^Variable \\$Site in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$data, \\$dataSet$#"
- count: 1
- path: src/QUI/Menu/NavTabs.php
diff --git a/src/QUI/Menu/Bricks/Submenu.php b/src/QUI/Menu/Bricks/Submenu.php
index 9e8b1399dd4edf267239905630550de2190107e1..c8d9308f2f603b5644fa94ba574a605ee7490ff2 100644
--- a/src/QUI/Menu/Bricks/Submenu.php
+++ b/src/QUI/Menu/Bricks/Submenu.php
@@ -32,19 +32,27 @@ public function __construct(array $attributes = [])
// defaults values
$this->setAttributes([
'class' => 'quiqqer-menu-bricks-submenu',
- 'startId' => false, // id or site link
- 'menuId' => false, // id of an independent menu
- 'template' => 'list-buttonStyle', // 'list-buttonStyle', 'list-simple', 'box-imageTop', 'box-imageOverlay'
+ 'startId' => false,
+ // id or site link
+ 'menuId' => false,
+ // id of an independent menu
+ 'template' => 'list-buttonStyle',
+ // 'list-buttonStyle', 'list-simple', 'box-imageTop', 'box-imageOverlay'
'controlBgColor' => '',
'controlBgPadding' => '1rem',
'linkColor' => '',
'linkColorHover' => '',
- 'itemsAlignment' => 'center', // 'start', 'center', 'end', 'space-between', 'space-around'
- 'showImages' => true, // if true, icons or images will be displayed
- 'imageFitMode' => 'cover', // any valid css property for image-fit attribute , i.e. 'cover', 'contain', 'scale-down'
- 'imageContainerHeight' => '',// any valid css property (with unit!) for height attribute, i.e. '150px', '10vw' or even clamp() function (if no value passed the container will be a square)
+ 'itemsAlignment' => 'center',
+ // 'start', 'center', 'end', 'space-between', 'space-around'
+ 'showImages' => true,
+ // if true, icons or images will be displayed
+ 'imageFitMode' => 'cover',
+ // any valid css property for image-fit attribute , i.e. 'cover', 'contain', 'scale-down'
+ 'imageContainerHeight' => '',
+ // any valid css property (with unit!) for height attribute, i.e. '150px', '10vw' or even clamp() function (if no value passed the container will be a square)
'boxBgColor' => '#f5f5f6',
- 'boxWidth' => '250px'// any valid css property (with unit!) for height attribute, i.e. '250px', '10vw' or even clamp() function
+ 'boxWidth' => '250px'
+ // any valid css property (with unit!) for height attribute, i.e. '250px', '10vw' or even clamp() function
]);
parent::__construct($attributes);
@@ -52,12 +60,6 @@ public function __construct(array $attributes = [])
$this->setAttribute('cacheable', false);
}
- /**
- * (non-PHPdoc)
- *
- * @throws Exception
- * @see \QUI\Control::create()
- */
public function getBody(): string
{
$Engine = QUI::getTemplateManager()->getEngine();
@@ -70,7 +72,7 @@ public function getBody(): string
$linkColorHover = $this->getAttribute('linkColorHover');
- if ($linkColor === '') {
+ if (empty($linkColor)) {
$linkColorHover = 'inherit';
}
diff --git a/src/QUI/Menu/DropDownMenu.php b/src/QUI/Menu/DropDownMenu.php
index 9b65eecd33709ea721644a38fb8fe5fe5290f58c..61535a976c03b3acb5a1c5a79e91cb4231c3f623 100644
--- a/src/QUI/Menu/DropDownMenu.php
+++ b/src/QUI/Menu/DropDownMenu.php
@@ -48,16 +48,18 @@ public function __construct(array $attributes = [])
public function getBody(): string
{
$cache = EventHandler::menuCacheName() . '/dropDownMenu/';
+ $siteCachePath = '';
$attributes = $this->getAttributes();
$attributes = array_filter($attributes, function ($entry) {
return is_object($entry) === false;
});
- $cache .= md5(
- $this->getSite()->getCachePath() .
- serialize($attributes)
- );
+ if (method_exists($this->getSite(), 'getCachePath')) {
+ $siteCachePath = $this->getSite()->getCachePath();
+ }
+
+ $cache .= md5($siteCachePath . serialize($attributes));
try {
return QUI\Cache\Manager::get($cache);
diff --git a/src/QUI/Menu/Independent/Factory.php b/src/QUI/Menu/Independent/Factory.php
index 884af3be92d3b77ae6ff4a0569615edfbd2c7ac5..2a456aa25bf5e67a69dddae32eba3b7fa7d2bd07 100644
--- a/src/QUI/Menu/Independent/Factory.php
+++ b/src/QUI/Menu/Independent/Factory.php
@@ -24,8 +24,7 @@ public static function createMenu(): Menu
'data' => ''
]);
- $lastId = QUI::getPDO()->lastInsertId();
-
+ $lastId = (int)QUI::getPDO()->lastInsertId();
$Menu = Handler::getMenu($lastId);
try {
diff --git a/src/QUI/Menu/Independent/Handler.php b/src/QUI/Menu/Independent/Handler.php
index 8e7668785d4fe2c26fc39b535c0b034fba6c8a8e..a341696e381aead50f44d5017c3f0eb7984cc7fe 100644
--- a/src/QUI/Menu/Independent/Handler.php
+++ b/src/QUI/Menu/Independent/Handler.php
@@ -36,8 +36,10 @@ public static function getMenu(int $menuId): Menu
* @param QUI\Projects\Project|null $Project
* @return string
*/
- public static function getMenuCacheName(bool|int $menuId = false, QUI\Projects\Project $Project = null): string
- {
+ public static function getMenuCacheName(
+ bool | int $menuId = false,
+ null | QUI\Projects\Project $Project = null
+ ): string {
if ($Project) {
$project = $Project->getName();
$lang = $Project->getLang();
diff --git a/src/QUI/Menu/Independent/Items/AbstractMenuItem.php b/src/QUI/Menu/Independent/Items/AbstractMenuItem.php
index c8317f63c1fb05cb9a3d50e21d4a231150077e46..96bbc9b7d4baa4ffbfc20614a51fbadd678dffab 100644
--- a/src/QUI/Menu/Independent/Items/AbstractMenuItem.php
+++ b/src/QUI/Menu/Independent/Items/AbstractMenuItem.php
@@ -32,7 +32,7 @@ public function __construct(array $attributes = [])
* @param ?Locale $Locale
* @return string
*/
- public function getTitle(Locale $Locale = null): string
+ public function getTitle(null | Locale $Locale = null): string
{
if ($Locale === null) {
$Locale = QUI::getLocale();
@@ -56,7 +56,7 @@ public function getTitle(Locale $Locale = null): string
* @param ?Locale $Locale
* @return string
*/
- public function getShort(Locale $Locale = null): string
+ public function getShort(null | Locale $Locale = null): string
{
if ($Locale === null) {
$Locale = QUI::getLocale();
@@ -86,7 +86,7 @@ public function getShort(Locale $Locale = null): string
* @param Locale|null $Locale
* @return string
*/
- public function getName(Locale $Locale = null): string
+ public function getName(null | Locale $Locale = null): string
{
if ($Locale === null) {
$Locale = QUI::getLocale();
@@ -117,7 +117,7 @@ public function getName(Locale $Locale = null): string
* @param Locale|null $Locale
* @return string
*/
- public function getTitleAttribute(Locale $Locale = null): string
+ public function getTitleAttribute(null | Locale $Locale = null): string
{
return $this->getName($Locale);
}
@@ -222,7 +222,7 @@ public function getCustomData(): mixed
* @param Locale|null $Locale
* @return string
*/
- public function getHTML(QUI\Locale $Locale = null): string
+ public function getHTML(null | Locale $Locale = null): string
{
if ($Locale === null) {
$Locale = QUI::getLocale();
diff --git a/src/QUI/Menu/Independent/Items/Site.php b/src/QUI/Menu/Independent/Items/Site.php
index 3d49d1243b7e1ce8d91ef04ae28575a5188cc399..502dab062092d584f6d6ec5ecd0a65196477c9e7 100644
--- a/src/QUI/Menu/Independent/Items/Site.php
+++ b/src/QUI/Menu/Independent/Items/Site.php
@@ -102,7 +102,7 @@ public function getIcon(): string
* @param Locale|null $Locale
* @return string
*/
- public function getName(Locale $Locale = null): string
+ public function getName(null | Locale $Locale = null): string
{
$Site = $this->getSite();
@@ -114,10 +114,10 @@ public function getName(Locale $Locale = null): string
}
/**
- * @param QUI\Locale|null $Locale
+ * @param Locale|null $Locale
* @return string
*/
- public function getTitle(QUI\Locale $Locale = null): string
+ public function getTitle(null | Locale $Locale = null): string
{
$Site = $this->getSite();
diff --git a/src/QUI/Menu/Independent/Menu.php b/src/QUI/Menu/Independent/Menu.php
index 9f9d1dfc347defcb715128cd18afa4ba973e7cde..b901fa056dbe5238f66ecaf3a698619f1962831c 100644
--- a/src/QUI/Menu/Independent/Menu.php
+++ b/src/QUI/Menu/Independent/Menu.php
@@ -34,7 +34,7 @@ class Menu
* @throws QUI\Exception
* @throws QUI\Database\Exception
*/
- public function __construct(int|array $menuId)
+ public function __construct(int | array $menuId)
{
if (is_numeric($menuId)) {
$data = Handler::getMenuData($menuId);
@@ -93,7 +93,7 @@ public function __construct(int|array $menuId)
* @param array $children
* @return void
*/
- protected function buildChildren(AbstractMenuItem|Menu $Parent, array $children): void
+ protected function buildChildren(AbstractMenuItem | Menu $Parent, array $children): void
{
foreach ($children as $item) {
$type = $item['type'];
@@ -180,7 +180,7 @@ public function getId(): int
* @param QUI\Locale|null $Locale
* @return string
*/
- public function getTitle(QUI\Locale $Locale = null): string
+ public function getTitle(null | QUI\Locale $Locale = null): string
{
if ($this->title === null) {
return '';
@@ -203,7 +203,7 @@ public function getTitle(QUI\Locale $Locale = null): string
* @param QUI\Locale|null $Locale
* @return string
*/
- public function getWorkingTitle(QUI\Locale $Locale = null): string
+ public function getWorkingTitle(null | QUI\Locale $Locale = null): string
{
if ($this->workingTitle === null) {
return '';
diff --git a/src/QUI/Menu/MegaMenu.php b/src/QUI/Menu/MegaMenu.php
index 542a515918728ce5532589bf46742ac8879b7579..9b2ee22c1cf598b278f1f1e4601d5da0a20d16b5 100644
--- a/src/QUI/Menu/MegaMenu.php
+++ b/src/QUI/Menu/MegaMenu.php
@@ -26,7 +26,7 @@ class MegaMenu extends AbstractMenu
/**
* @var SlideOut|SlideOutAdvanced|null
*/
- protected SlideOutAdvanced|null|SlideOut $Mobile = null;
+ protected SlideOutAdvanced | null | SlideOut $Mobile = null;
/**
* @var array
@@ -101,17 +101,18 @@ public function __construct(array $attributes = [])
public function getBody(): string
{
$cache = EventHandler::menuCacheName() . '/megaMenu/';
+ $siteCachePath = '';
$attributes = $this->getAttributes();
$attributes = array_filter($attributes, function ($entry) {
return is_object($entry) === false;
});
- $cache .= md5(
- $this->getSite()->getCachePath() .
- serialize($attributes)
- );
+ if (method_exists($this->getSite(), 'getCachePath')) {
+ $siteCachePath = $this->getSite()->getCachePath();
+ }
+ $cache .= md5($siteCachePath . serialize($attributes));
$childControl = $this->getMenuControl($this->getAttribute('display'));
$showMenuDelay = 0;
@@ -245,7 +246,7 @@ public function getStart(): QUI\Interfaces\Projects\Site
* @param $control
* @return false|string
*/
- public function getMenuControl($control): bool|string
+ public function getMenuControl($control): bool | string
{
switch ($control) {
case 'Image':
@@ -333,7 +334,7 @@ protected function getSite(): QUI\Interfaces\Projects\Site
* @throws QUI\Exception
* @throws Exception
*/
- protected function getMobileMenu($slideOutParam): SlideOut|SlideOutAdvanced
+ protected function getMobileMenu($slideOutParam): SlideOut | SlideOutAdvanced
{
if ($this->getProject()->getConfig('mobileMenu.settings.type') == 'slideoutAdvanced') {
$Menu = new QUI\Menu\SlideOutAdvanced($slideOutParam);
diff --git a/src/QUI/Menu/NavTabs.php b/src/QUI/Menu/NavTabs.php
index 3f65adab298094070a54610024edfdcbb8d1d602..4cf3bb16c903708ebfc21b7a85681bf2246183a1 100644
--- a/src/QUI/Menu/NavTabs.php
+++ b/src/QUI/Menu/NavTabs.php
@@ -86,7 +86,7 @@ public function getBody(): string
* @return array|string
* @throws QUI\Exception
*/
- private function getChildrenFromParent(): array|string
+ private function getChildrenFromParent(): array | string
{
$ParentSite = null;
@@ -152,7 +152,6 @@ public function setData(array $data)
$entries = [];
- /** @var QUI\Projects\Site $Site */
foreach ($data as $dataSet) {
if (count($dataSet) < 2) {
continue;