From 7e5e2c19df0f7a8fde153eaf3f553c9be35c90f4 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Tue, 16 Jan 2018 14:38:22 +0100
Subject: [PATCH] fix: quiqqer/package-bricks#76
---
src/QUI/Bricks/Events.php | 4 +++-
src/QUI/Bricks/Manager.php | 13 +++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/QUI/Bricks/Events.php b/src/QUI/Bricks/Events.php
index 751ea05..ec68e4b 100644
--- a/src/QUI/Bricks/Events.php
+++ b/src/QUI/Bricks/Events.php
@@ -24,6 +24,7 @@ class Events
* Create site brick cache, for inheritance
*
* @param Site|Edit $Site
+ * @throws QUI\Exception
*/
public static function onSiteSave($Site)
{
@@ -164,6 +165,7 @@ public static function onSiteSave($Site)
* add new brickarea function
*
* @param \Smarty $Smarty
+ * @throws \SmartyException
*/
public static function onSmartyInit($Smarty)
{
@@ -219,7 +221,7 @@ public static function onPackageSetup(QUI\Package\Package $Package)
if ($Package->getName() !== 'quiqqer/bricks') {
return;
}
-
+
$php = 'php';
if (defined('PHP_BINARY')) {
diff --git a/src/QUI/Bricks/Manager.php b/src/QUI/Bricks/Manager.php
index 65db808..5d0af28 100644
--- a/src/QUI/Bricks/Manager.php
+++ b/src/QUI/Bricks/Manager.php
@@ -106,6 +106,8 @@ public static function getUIDTable()
* @param Brick $Brick
*
* @return integer - Brick-ID
+ *
+ * @throws QUI\Exception
*/
public function createBrickForProject(Project $Project, Brick $Brick)
{
@@ -133,10 +135,12 @@ public function createBrickForProject(Project $Project, Brick $Brick)
* @param Site $Site
* @param array $brickData
* @return string - Unique ID
+ *
+ * @throws QUI\Exception
*/
public function createUniqueSiteBrick(Site $Site, $brickData = array())
{
- if (isset($brickData['uid']) || empty($brickData['uid'])) {
+ if (!empty($brickData['uid'])) {
$uid = $brickData['uid'];
if ($this->existsUniqueBrickId($uid) === false) {
@@ -172,6 +176,8 @@ public function createUniqueSiteBrick(Site $Site, $brickData = array())
* @param integer $brickId - Brick ID
* @param Site $Site - Current Site
* @return bool
+ *
+ * @throws QUI\Exception
*/
protected function createUniqueBrickId($brickId, $Site)
{
@@ -222,6 +228,7 @@ public function clearCache()
* Delete the brick
*
* @param integer $brickId - Brick-ID
+ * @throws QUI\Exception
*/
public function deleteBrick($brickId)
{
@@ -687,8 +694,9 @@ public function getBricksByArea($brickArea, QUI\Interfaces\Projects\Site $Site)
* Return a list with \QUI\Bricks\Brick which are assigned to a project
*
* @param Project $Project
- *
* @return array
+ *
+ * @throws QUI\Exception
*/
public function getBricksFromProject(Project $Project)
{
@@ -712,6 +720,7 @@ public function getBricksFromProject(Project $Project)
/**
* @param string|integer $brickId - Brick-ID
* @param array $brickData - Brick data
+ * @throws QUI\Exception
*/
public function saveBrick($brickId, array $brickData)
{
--
GitLab