Commit ad2cd1d6 authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.18.0'

parents 1ef2fd54 b18e641e
...@@ -3,17 +3,13 @@ sudo: required ...@@ -3,17 +3,13 @@ sudo: required
dist: trusty dist: trusty
group: edge group: edge
php: php:
- 5.6
- 7.0.8
- 7.1 - 7.1
- nightly - nightly
- hhvm
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: nightly - php: nightly
- php: hhvm
addons: addons:
code_climate: code_climate:
...@@ -41,25 +37,25 @@ deploy: ...@@ -41,25 +37,25 @@ deploy:
skip_cleanup: true skip_cleanup: true
on: on:
tags: true tags: true
condition: "$TRAVIS_PHP_VERSION = 7.0*" condition: "$TRAVIS_PHP_VERSION = 7.1*"
- provider: script - provider: script
script: ./build/travis/update_module_repositories.sh ${TRAVIS_TAG} script: ./build/travis/update_module_repositories.sh ${TRAVIS_TAG}
skip_cleanup: true skip_cleanup: true
on: on:
tags: true tags: true
condition: "$TRAVIS_PHP_VERSION = 7.0*" condition: "$TRAVIS_PHP_VERSION = 7.1*"
- provider: script - provider: script
script: ./build/travis/update_version_check.sh ${TRAVIS_TAG} script: ./build/travis/update_version_check.sh ${TRAVIS_TAG}
skip_cleanup: true skip_cleanup: true
on: on:
tags: true tags: true
condition: "$TRAVIS_PHP_VERSION = 7.0*" condition: "$TRAVIS_PHP_VERSION = 7.1*"
- provider: script - provider: script
script: ./build/travis/generate_api_docs.sh script: ./build/travis/generate_api_docs.sh
skip_cleanup: true skip_cleanup: true
on: on:
branch: master branch: master
condition: "$TRAVIS_PHP_VERSION = 7.0*" condition: "$TRAVIS_PHP_VERSION = 7.1*"
cache: cache:
directories: directories:
......
...@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface ...@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/** /**
* Contains the current ACP3 version string * Contains the current ACP3 version string
*/ */
const VERSION = '4.17.0'; const VERSION = '4.18.0';
/** /**
* Performs some startup checks * Performs some startup checks
......
...@@ -65,7 +65,7 @@ class MoveToBottom extends AbstractMoveElementFilter ...@@ -65,7 +65,7 @@ class MoveToBottom extends AbstractMoveElementFilter
{ {
$minifyJs = ''; $minifyJs = '';
if (!$this->request->isXmlHttpRequest()) { if (!$this->request->isXmlHttpRequest()) {
$minifyJs = '<script type="text/javascript" src="' . $this->minifier->getURI() . '"></script>' . "\n"; $minifyJs = '<script src="' . $this->minifier->getURI() . '"></script>' . "\n";
} }
return $minifyJs; return $minifyJs;
} }
......
...@@ -67,7 +67,7 @@ class IncludeJs extends AbstractFunction ...@@ -67,7 +67,7 @@ class IncludeJs extends AbstractFunction
$this->alreadyIncluded[$key] = true; $this->alreadyIncluded[$key] = true;
return sprintf( return sprintf(
'<script type="text/javascript" src="%s"></script>', '<script defer src="%s"></script>',
$this->resolvePath($params) . '?v=' . Core\Application\BootstrapInterface::VERSION $this->resolvePath($params) . '?v=' . Core\Application\BootstrapInterface::VERSION
); );
} }
......
imports: imports:
- { resource: ../Blocks/config/services.yml } - { resource: ../*/config/services.yml }
- { resource: ../Filters/config/services.yml }
- { resource: ../Functions/config/services.yml }
- { resource: ../Modifiers/config/services.yml }
- { resource: ../Resources/config/services.yml }
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
"issues": "https://github.com/ACP3/cms/issues" "issues": "https://github.com/ACP3/cms/issues"
}, },
"require": { "require": {
"php": ">=5.6.0", "php": "^7.1",
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"doctrine/dbal": "^2.5", "doctrine/dbal": "^2.5",
"doctrine/cache": "^1.6", "doctrine/cache": "^1.6",
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
"phpmailer/phpmailer": "^5.2", "phpmailer/phpmailer": "^5.2",
"smarty/smarty": "^3.1", "smarty/smarty": "^3.1",
"cocur/slugify": "^2.3", "cocur/slugify": "^2.3",
"symfony/config": "^3.1", "symfony/config": "^3.3",
"symfony/dependency-injection": "^3.1", "symfony/dependency-injection": "^3.3",
"symfony/http-foundation": "^3.1", "symfony/event-dispatcher": "^3.3",
"symfony/http-kernel": "^3.1", "symfony/http-foundation": "^3.3",
"symfony/yaml": "^3.1", "symfony/http-kernel": "^3.3",
"symfony/event-dispatcher": "^3.1", "symfony/yaml": "^3.3",
"friendsofsymfony/http-cache": "~1.0" "friendsofsymfony/http-cache": "~1.0"
}, },
"autoload": { "autoload": {
......
imports: imports:
- { resource: cache.yml } - { resource: cache.yml }
- { resource: ../../config.yml } - { resource: ../../config.yml }
- { resource: components/application.yml } - { resource: components/*.yml }
- { resource: components/assets.yml }
- { resource: components/authentication.yml }
- { resource: components/breadcrumb.yml }
- { resource: components/cache.yml }
- { resource: components/controller.yml }
- { resource: components/database.yml }
- { resource: components/datagrid.yml }
- { resource: components/date.yml }
- { resource: components/helpers.yml }
- { resource: components/http.yml }
- { resource: components/installer.yml }
- { resource: components/language.yml }
- { resource: components/logger.yml }
- { resource: components/mailer.yml }
- { resource: components/model.yml }
- { resource: components/modules.yml }
- { resource: components/validation.yml }
- { resource: components/view.yml }
- { resource: components/wysiwyg.yml }
- { resource: ../../Modules/ACP3/Permissions/Resources/config/services.yml } - { resource: ../../Modules/ACP3/Permissions/Resources/config/services.yml }
- { resource: ../../Modules/ACP3/System/Resources/config/services.yml } - { resource: ../../Modules/ACP3/System/Resources/config/services.yml }
- { resource: ../../Modules/ACP3/Users/Resources/config/services.yml } - { resource: ../../Modules/ACP3/Users/Resources/config/services.yml }
......
imports: imports:
- { resource: components/controllers.yml } - { resource: components/*.yml }
- { resource: components/events.yml }
- { resource: components/installer.yml }
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
imports: imports:
- { resource: components/cache.yml } - { resource: components/*.yml }
- { resource: components/controllers.yml }
- { resource: components/events.yml }
- { resource: components/extensions.yml }
- { resource: components/installer.yml }
- { resource: components/models.yml }
- { resource: components/validation.yml }
services: services:
articles.helpers: articles.helpers:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"suggest": { "suggest": {
"acp3/module-seo": "Provides additional SEO capabilities" "acp3/module-seo": "Provides additional SEO capabilities"
......
{javascripts} {javascripts}
{include_js module="captcha" file="partials/recaptcha.onload"} {include_js module="captcha" file="partials/recaptcha.onload"}
<script type="text/javascript" <script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&amp;render=explicit&amp;hl={$recaptcha.lang}"
src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&amp;render=explicit&amp;hl={$recaptcha.lang}"
async async
defer></script> defer></script>
{/javascripts} {/javascripts}
imports: imports:
- { resource: components/controllers.yml } - { resource: components/*.yml }
- { resource: components/events.yml }
- { resource: components/extensions.yml }
- { resource: components/installer.yml }
- { resource: components/validation.yml }
services: services:
captcha.helpers: captcha.helpers:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0", "acp3/module-users": "^4.18.0",
"google/recaptcha": "^1.1.0" "google/recaptcha": "^1.1.0"
}, },
"autoload": { "autoload": {
......
imports: imports:
- { resource: components/cache.yml } - { resource: components/*.yml }
- { resource: components/controllers.yml }
- { resource: components/events.yml }
- { resource: components/installer.yml }
- { resource: components/models.yml }
- { resource: components/validation.yml }
services: services:
categories.helpers: categories.helpers:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
imports: imports:
- { resource: components/controllers.yml } - { resource: components/*.yml }
- { resource: components/installer.yml }
- { resource: components/models.yml }
- { resource: components/validation.yml }
services: services:
comments.helpers: comments.helpers:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"suggest": { "suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots." "acp3/module-captcha": "Provides basic protection against spam bots."
......
imports: imports:
- { resource: components/controllers.yml } - { resource: components/*.yml }
- { resource: components/extensions.yml }
- { resource: components/installer.yml }
- { resource: components/models.yml }
- { resource: components/validation.yml }
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"suggest": { "suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots." "acp3/module-captcha": "Provides basic protection against spam bots."
......
imports: imports:
- { resource: components/cache.yml } - { resource: components/*.yml }
- { resource: components/controllers.yml }
- { resource: components/events.yml }
- { resource: components/installer.yml }
- { resource: components/models.yml }
- { resource: components/validation.yml }
services: services:
emoticons.helpers: emoticons.helpers:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
imports: imports:
- { resource: components/controllers.yml } - { resource: components/*.yml }
- { resource: components/installer.yml }
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
imports: imports:
- { resource: components/controllers.yml } - { resource: components/*.yml }
- { resource: components/events.yml }
- { resource: components/installer.yml }
- { resource: components/validation.yml }
services: services:
feeds.view.renderer.feedgenerator: feeds.view.renderer.feedgenerator:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0", "acp3/module-users": "^4.18.0",
"mibe/feedwriter": "^1.0" "mibe/feedwriter": "^1.0"
}, },
"autoload": { "autoload": {
......
imports: imports:
- { resource: components/installer.yml } - { resource: components/*.yml }
services: services:
filemanager.helpers: filemanager.helpers:
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0" "acp3/module-users": "^4.18.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
......
imports: imports:
- { resource: components/cache.yml } - { resource: components/*.yml }
- { resource: components/controllers.yml }
- { resource: components/events.yml }
- { resource: components/extensions.yml }
- { resource: components/installer.yml }
- { resource: components/models.yml }
- { resource: components/validation.yml }
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"acp3/composer-installer": "^1.0", "acp3/composer-installer": "^1.0",
"acp3/core": "^4.17.0", "acp3/core": "^4.18.0",
"acp3/setup": "^4.17.0", "acp3/setup": "^4.18.0",
"acp3/module-errors": "^4.17.0", "acp3/module-errors": "^4.18.0",
"acp3/module-permissions": "^4.17.0", "acp3/module-permissions": "^4.18.0",
"acp3/module-system": "^4.17.0", "acp3/module-system": "^4.18.0",
"acp3/module-users": "^4.17.0", "acp3/module-users": "^4.18.0",
"acp3/module-categories": "^4.17.0"