Skip to content
Code-Schnipsel Gruppen Projekte
Commit 79304482 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

Merge branch 'main' into 'next-3.x'

Update 'next-3.x' with latest changes from 'main'

See merge request !23
Übergeordnete 8368b104 fd55142a
Branches next-3.x
Keine zugehörigen Tags gefunden
1 Merge Request!23Update 'next-3.x' with latest changes from 'main'
Pipeline-Nr. 15107 bestanden
parameters:
ignoreErrors:
-
message: "#^Method QUI\\\\Bricks\\\\Controls\\\\Slider\\\\PromosliderWallpaper2Content\\:\\:addMobileSlide\\(\\) invoked with 1 parameter, 3\\-5 required\\.$#"
count: 1
path: ajax/getWallpaperSlider.php
-
message: "#^Method QUI\\\\Bricks\\\\Controls\\\\Slider\\\\PromosliderWallpaper2Content\\:\\:addSlide\\(\\) invoked with 1 parameter, 3\\-6 required\\.$#"
count: 1
path: ajax/getWallpaperSlider.php
-
message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Projects\\\\Media\\\\File\\:\\:getImages\\(\\)\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference.php
-
message: "#^Method QUI\\\\Portfolio\\\\Controls\\\\Reference\\:\\:getList\\(\\) should return QUI\\\\Projects\\\\Site but returns QUI\\\\Interfaces\\\\Projects\\\\Site\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference.php
-
message: "#^Method QUI\\\\Portfolio\\\\Controls\\\\Reference\\:\\:getList\\(\\) should return QUI\\\\Projects\\\\Site but returns bool\\|QUI\\\\Interfaces\\\\Projects\\\\Site\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference.php
-
message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Projects\\\\Media\\\\File\\:\\:getImages\\(\\)\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference2022.php
-
message: "#^Call to an undefined method QUI\\\\Interfaces\\\\Projects\\\\Site\\:\\:__toString\\(\\)\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference2022.php
-
message: "#^Comparison operation \"\\>\" between 0\\|0\\.0\\|''\\|'0'\\|array\\{\\}\\|false\\|null and 0 results in an error\\.$#"
count: 2
path: src/QUI/Portfolio/Controls/Reference2022.php
-
message: "#^Method QUI\\\\Portfolio\\\\Controls\\\\Reference2022\\:\\:getList\\(\\) should return QUI\\\\Projects\\\\Site\\|null but returns QUI\\\\Interfaces\\\\Projects\\\\Site\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference2022.php
-
message: "#^Method QUI\\\\Portfolio\\\\Controls\\\\Reference2022\\:\\:getList\\(\\) should return QUI\\\\Projects\\\\Site\\|null but returns bool\\|QUI\\\\Interfaces\\\\Projects\\\\Site\\.$#"
count: 1
path: src/QUI/Portfolio/Controls/Reference2022.php
ignoreErrors:
\ No newline at end of file
......@@ -135,10 +135,9 @@ public function getImages(): array
try {
/* @var $Folder QUI\Projects\Media\Folder */
$Folder = QUI\Projects\Media\Utils::getMediaItemByUrl($imageFolder);
if (QUI\Projects\Media\Utils::isFolder($Folder)) {
if (QUI\Projects\Media\Utils::isFolder($Folder) && method_exists($Folder, 'getImages')) {
$images = $Folder->getImages();
}
} catch (QUI\Exception $Exception) {
......@@ -168,7 +167,7 @@ protected function getSite(): QUI\Interfaces\Projects\Site
/**
* Return the portfolio list
*
* @return QUI\Projects\Site
* @return QUI\Interfaces\Projects\Site
* @throws Exception
*/
public function getList(): QUI\Interfaces\Projects\Site
......
......@@ -171,16 +171,15 @@ public function getImages(): array
try {
/* @var $Folder QUI\Projects\Media\Folder */
$Folder = QUI\Projects\Media\Utils::getMediaItemByUrl($imageFolder);
if (QUI\Projects\Media\Utils::isFolder($Folder)) {
if (QUI\Projects\Media\Utils::isFolder($Folder) && method_exists($Folder, 'getImages')) {
$images = $Folder->getImages();
}
} catch (QUI\Exception $Exception) {
QUI\System\Log::addDebug($Exception->getMessage(), [
'control' => '\QUI\Portfolio\Controls\Reference',
'Site' => $this->getSite()->__toString()
'Site' => $this->getSite()->getId()
]);
}
......@@ -202,8 +201,6 @@ protected function getSite(): QUI\Interfaces\Projects\Site
/**
* Return the portfolio list
*
* @return null|QUI\Projects\Site
*/
public function getList(): QUI\Interfaces\Projects\Site|null
{
......@@ -235,17 +232,11 @@ public function getImageDimension(): array
return $dim;
}
if (
$List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageWidth') ||
$List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageWidth') > 0
) {
if ((int)$List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageWidth') > 0) {
$dim['width'] = $List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageWidth');
}
if (
$List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageHeight') ||
$List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageHeight') > 0
) {
if ((int)$List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageHeight') > 0) {
$dim['height'] = $List->getAttribute('quiqqer.portfolio2022.settings.children.maxImageHeight');
}
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren