Merge branch 'dev' into 'next'

Dev

See merge request !6

.gitlab-ci.yml

+include:
+  - project: 'quiqqer/stabilization/semantic-release'
+    file: '/ci-templates/.gitlab-ci.yml'

LICENSE

+Smarty: the PHP compiling template engine
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ See the GNU Lesser General Public License below for more details.
+
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
\ No newline at end of file

Quiqqer/Engine/plugins_qui/function.image.php

 <?php
 
+/**
+ * Smarty plugin
+ *
+ * @package    com.pcsg.pms.smarty
+ * @subpackage plugins
+ */
+
+use QUI\Projects\Media\Image;
+use QUI\Projects\Media\Video;
+
 /**
  * Smarty {image} function plugin
  *
@@ -7,17 +17,19 @@
  * Name:     image<br>
  *
  * @param array $params
- * @param Smarty $smarty
+ * @param Smarty_Internal_Template $smarty
  *
  * @return string
  *
+ * @throws Exception
+ *
  * @event onSmartyImageBegin [array &$params]
  * @event onSmartyImageEnd [string &$imageString]
  * @event onSmartyImageBeforeSource [string &$src]
- * @author www.pcsg.de (Henning Leutz)
  *
+ * @author www.pcsg.de (Henning Leutz)
  */
-function smarty_function_image($params, $smarty)
+function smarty_function_image(array $params, Smarty_Internal_Template $smarty): string
 {
     // defaults
     if (!isset($params['type'])) {
@@ -70,8 +82,12 @@ function smarty_function_image($params, $smarty)
 
         // Image Params
         if (strpos($params['src'], 'image.php') === false) {
-            if ((isset($params['onlyicon']) || !isset($params['onlyicon']) && !isset($params['onlysrc']) ||
-                    isset($params['onlysrc']) && !$params['onlysrc'])
+            $onlySrcCheck = (isset($params['onlyicon'])
+                || !isset($params['onlyicon']) && !isset($params['onlysrc'])
+                || isset($params['onlysrc']) && !$params['onlysrc']);
+
+            if (
+                $onlySrcCheck
                 && QUI\Icons\Handler::getInstance()->isIcon($params['src'])
             ) {
                 return smarty_plugin_image_assign(
@@ -90,7 +106,7 @@ function smarty_function_image($params, $smarty)
                 QUI\System\Log::LEVEL_WARNING,
                 [
                     'smarty' => '{image}',
-                    'image'  => $params['src']
+                    'image' => $params['src']
                 ]
             );
 
@@ -101,7 +117,7 @@ function smarty_function_image($params, $smarty)
             return smarty_plugin_image_assign($params, '', $smarty);
         }
 
-        $src        = str_replace('&amp;', '&', $params['src']);
+        $src = str_replace('&amp;', '&', $params['src']);
         $attributes = QUI\Utils\StringHelper::getUrlAttributes($src);
 
         if (!isset($attributes['id']) || !isset($attributes['project'])) {
@@ -118,9 +134,9 @@ function smarty_function_image($params, $smarty)
 
         try {
             $Project = QUI::getProject($attributes['project']);
-            $Media   = $Project->getMedia();
+            $Media = $Project->getMedia();
 
-            /* @param $Image \QUI\Projects\Media\Image */
+            /* @param $Image Image */
             $Image = $Media->get((int)$attributes['id']);
         } catch (Exception $Exception) {
             QUI\System\Log::addNotice(
@@ -155,8 +171,7 @@ function smarty_function_image($params, $smarty)
         return smarty_plugin_image_assign($params, '', $smarty);
     }
 
-    /* @var $Image \QUI\Projects\Media\Image */
-
+    /* @var $Image Image */
     // Falls das Objekt gewünscht ist
     if (isset($params['assign']) && isset($params['object'])) {
         $smarty->assign($params['assign'], $Image);
@@ -164,18 +179,17 @@ function smarty_function_image($params, $smarty)
         return '';
     }
 
-    if ($Image->getType() != 'QUI\Projects\Media\Image') {
-        // @todo video type einführen
+    if ($Image->getType() !== Image::class || $Image->getType() === Video::class) {
         $mimeType = $Image->getAttribute('mime_type');
-        $html     = '';
+        $html = '';
 
         if (strpos($mimeType, 'video/') === 0) {
-            $width       = '';
-            $height      = '';
-            $controls    = '';
-            $autoplay    = '';
-            $loop        = '';
-            $muted       = '';
+            $width = '';
+            $height = '';
+            $controls = '';
+            $autoplay = '';
+            $loop = '';
+            $muted = '';
             $playsinline = '';
             $style = '';
 
@@ -208,10 +222,10 @@ function smarty_function_image($params, $smarty)
             }
 
             if (!empty($params['style'])) {
-                $style = 'style="' . $params['style'] .'"';
+                $style = 'style="' . $params['style'] . '"';
             }
 
-            $src  = $Image->getUrl(true);
+            $src = $Image->getUrl(true);
             $type = '';
 
             if (strpos($src, '.mp4')) {
@@ -223,8 +237,8 @@ function smarty_function_image($params, $smarty)
             }
 
             $html = '
-                <video width="'.$width.'" height="'.$height.'" '.$controls.' '.$autoplay.' '.$loop.' '.$muted.' '.$playsinline.' '.$style.' >
-                  <source src="'.$src.'" type="'.$type.'" />
+                <video width="' . $width . '" height="' . $height . '" ' . $controls . ' ' . $autoplay . ' ' . $loop . ' ' . $muted . ' ' . $playsinline . ' ' . $style . ' >
+                  <source src="' . $src . '" type="' . $type . '" />
                     Your browser does not support the video tag.
                 </video>
             ';
@@ -241,12 +255,12 @@ function smarty_function_image($params, $smarty)
         $params['width'] = false;
     }
 
-    $maxWidth  = '';
+    $maxWidth = '';
     $maxHeight = '';
     $ratio = false;
 
     try {
-        $maxWidth  = $Image->getWidth();
+        $maxWidth = $Image->getWidth();
         $maxHeight = $Image->getHeight();
 
         if ($maxWidth && $maxHeight) {
@@ -279,7 +293,7 @@ function smarty_function_image($params, $smarty)
         default:
         case 'resize':
             try {
-                $src        = $Image->createResizeCache($params['width'], $params['height']);
+                $src = $Image->createResizeCache($params['width'], $params['height']);
                 $resizeData = $Image->getResizeSize($params['width'], $params['height']);
 
                 if ($resizeData['width'] < $params['width']) {
@@ -355,12 +369,12 @@ function smarty_function_image($params, $smarty)
         return smarty_plugin_image_assign($params, $src, $smarty);
     }
 
-    $src  = str_replace(CMS_DIR, URL_DIR, $src);
+    $src = str_replace(CMS_DIR, URL_DIR, $src);
     $host = false;
 
     if (isset($params['host']) && $params['host'] == 1) {
         $host = $Image->getMedia()->getProject()->getVHost(true, true);
-        $src  = $host . $src;
+        $src = $host . $src;
     }
 
     if (isset($params['onlysrc'])) {
@@ -379,7 +393,7 @@ function smarty_function_image($params, $smarty)
     }
 
     $attributes = [];
-    $filter     = \array_flip([
+    $filter = array_flip([
         'src',
         'type',
         'reflection',
@@ -425,11 +439,11 @@ function smarty_function_image($params, $smarty)
  *
  * @param array $params
  * @param string $str
- * @param Smarty $smarty
+ * @param Smarty_Internal_Template $smarty
  *
  * @return string
  */
-function smarty_plugin_image_assign($params, $str, $smarty)
+function smarty_plugin_image_assign(array $params, string $str, Smarty_Internal_Template $smarty): string
 {
     if (!isset($params['assign'])) {
         return $str;

README.md

+QUIQQER Smarty 3
+========
+
+This is the Smarty3 Bridge for QUIQQER. This module integrates the Smarty3 template engine to QUIQQER.
+Additionally some QUIQQER typical Smarty features are provided.
+
+Package Name:
+
+    quiqqer/smarty3
+
+Features
+--------
+
+Several important QUIQQER Smarty Functions:
+
+- {array}
+- {array_sort}
+- {birthday}
+- {control}
+- {image}
+- {json_decode}
+- {json_encode}
+- {locale}
+- {locale_date}
+- {site}
+- {url}
+- {url_linked}
+
+Installation
+------------
+The Package Name is: quiqqer/smarty3
+
+Contribute
+----------
+
+- Project: https://dev.quiqqer.com/quiqqer/package-smarty
+- Issue Tracker: https://dev.quiqqer.com/quiqqer/package-smarty/issues
+- Source Code: https://dev.quiqqer.com/quiqqer/package-smarty/tree/master
+
+Support
+-------
+If you found any errors or have wishes or suggestions for improvement,
+please contact us by email at support@pcsg.de.
+
+We will transfer your message to the responsible developers.
+
+License
+-------
+
+- LGPL-3.0
\ No newline at end of file

composer.json

 {
     "name": "quiqqer\/smarty3",
-    "type": "quiqqer-library",
+    "type": "quiqqer-plugin",
     "description": "Smarty Extensions for the QUIQQER CMS",
+    "license": "LGPL-3.0-or-later",
     "authors": [
         {
             "name": "Henning Leutz",
@@ -16,7 +17,7 @@
     "require": {
         "php": "5.*|7.*|8.*",
         "smarty\/smarty": "3.*",
-        "quiqqer\/quiqqer": "^1.4.3|dev-master|dev-dev",
+        "quiqqer\/quiqqer": "^1.9|dev-master|dev-dev",
         "quiqqer\/utils": "^1.4|dev-master|dev-dev",
         "quiqqer\/bricks": "^1.3|*@dev"
     },

package.xml

+<quiqqer>
+    <package>
+        <title>
+            <locale group="quiqqer/smarty3" var="package.title"/>
+        </title>
+
+        <description>
+            <locale group="quiqqer/smarty3" var="package.description"/>
+        </description>
+
+        <support>
+            <email><![CDATA[support@pcsg.de]]></email>
+            <forum><![CDATA[https://community.quiqqer.com]]></forum>
+            <source><![CDATA[https://dev.quiqqer.com/quiqqer/package-smarty]]></source>
+            <issues><![CDATA[https://dev.quiqqer.com/quiqqer/package-smarty/issues]]></issues>
+            <wiki><![CDATA[https://dev.quiqqer.com/quiqqer/package-smarty/wikis/home]]></wiki>
+        </support>
+
+        <copyright>
+            <name><![CDATA[PCSG - Computer & Internet Service OHG]]></name>
+            <license><![CDATA[LGPL-3.0]]></license>
+        </copyright>
+    </package>
+</quiqqer>
\ No newline at end of file