Commit 5a783832 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.11.0'

parents 2792ec5e 120b9b0a
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.10.1';
const VERSION = '4.11.0';
/**
* Performs some startup checks
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......@@ -31,7 +31,7 @@ class Libraries
'enabled' => false,
'dependencies' => ['jquery'],
'css' => 'jquery.fancybox.css',
'js' => 'jquery.fancybox.pack.js'
'js' => 'jquery.fancybox.min.js'
],
'bootstrap' => [
'enabled' => false,
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......@@ -13,6 +13,8 @@ use ACP3\Core\Environment\ApplicationPath;
use ACP3\Core\Modules;
use ACP3\Core\Settings\SettingsInterface;
use ACP3\Modules\ACP3\System\Installer\Schema;
use JSMin\JSMin;
use Psr\Log\LoggerInterface;
abstract class AbstractMinifier implements MinifierInterface
{
......@@ -60,8 +62,13 @@ abstract class AbstractMinifier implements MinifierInterface
* @var string
*/
protected $assetGroup = '';
/**
* @var LoggerInterface
*/
private $logger;
/**
* @param LoggerInterface $logger
* @param \ACP3\Core\Assets $assets
* @param \ACP3\Core\Environment\ApplicationPath $appPath
* @param \ACP3\Core\Cache $systemCache
......@@ -71,6 +78,7 @@ abstract class AbstractMinifier implements MinifierInterface
* @param string $environment
*/
public function __construct(
LoggerInterface $logger,
Assets $assets,
ApplicationPath $appPath,
Cache $systemCache,
......@@ -86,6 +94,7 @@ abstract class AbstractMinifier implements MinifierInterface
$this->modules = $modules;
$this->fileResolver = $fileResolver;
$this->environment = $environment;
$this->logger = $logger;
}
/**
......@@ -157,15 +166,20 @@ abstract class AbstractMinifier implements MinifierInterface
}
/**
* @param array $files
* @param array $files
* @param string $path
*/
protected function saveMinifiedAsset(array $files, $path)
{
$options = [];
$options['minifiers']['text/css'] = ['Minify_CSSmin', 'minify'];
$options = [
'options' => [
\Minify::TYPE_CSS => [\Minify_CSSmin::class, 'minify'],
\Minify::TYPE_JS => [JSMin::class, 'minify'],
]
];
$content = \Minify::combine($files, $options);
$minify = new \Minify(new \Minify_Cache_Null(), $this->logger);
$content = $minify->combine($files, $options);
if (!is_dir($this->appPath->getUploadsDir() . 'assets')) {
@mkdir($this->appPath->getUploadsDir() . 'assets', 0755);
......@@ -176,10 +190,10 @@ abstract class AbstractMinifier implements MinifierInterface
}
/**
* @param bool $debug
* @param bool $debug
* @param string $group
* @param string $filenameHash
* @param int $lastGenerated
* @param int $lastGenerated
*
* @return string
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2017 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2017 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......@@ -44,6 +44,10 @@ class Title
* @var string
*/
protected $siteTitle = '';
/**
* @var string|null
*/
private $siteSubtitle;
/**
* Title constructor.
......@@ -77,6 +81,25 @@ class Title
return $this;
}
/**
* @return string
*/
public function getSiteSubtitle()
{
return $this->siteSubtitle;
}
/**
* @param string $siteSubtitle
* @return $this
*/
public function setSiteSubtitle($siteSubtitle)
{
$this->siteSubtitle = $siteSubtitle;
return $this;
}
/**
* @return string
*/
......@@ -180,6 +203,9 @@ class Title
if (!empty($this->getSiteTitle())) {
$title .= ' | ' . $this->getSiteTitle();
}
if (!empty($this->getSiteSubtitle())) {
$title .= $separator . $this->getSiteSubtitle();
}
return $title;
}
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......@@ -33,7 +33,7 @@ trait CacheResponseTrait
abstract protected function getSettings();
/**
* @param int $lifetime
* @param int $lifetime Cache TTL in seconds
*/
public function setCacheResponseCacheable($lifetime = 60)
{
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.
* See the LICENCE file at the top-level module directory for licencing details.
*/
......
<?php
/**
* Copyright (c) 2016 by the ACP3 Developers.
* Copyright (c) by the ACP3 Developers.