Commit 45ca368b authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'hotfix/v4.28.2'

parents 8e23cf9c c60c2cb2
Pipeline #28225063 passed with stages
in 9 minutes and 5 seconds
......@@ -16,7 +16,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string.
*/
const VERSION = '4.28.1';
const VERSION = '4.28.2';
/**
* Performs some startup checks.
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"google/recaptcha": "^1.2.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/module-categories": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"acp3/module-categories": "^4.28.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/module-categories": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"acp3/module-categories": "^4.28.2"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"heise/shariff": "^7.1"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-users": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-users": "^4.28.2"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1"
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"ckeditor/ckeditor": "dev-full/4.10.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "^1.0",
"acp3/core": "^4.28.1",
"acp3/setup": "^4.28.1",
"acp3/module-errors": "^4.28.1",
"acp3/module-permissions": "^4.28.1",
"acp3/module-system": "^4.28.1",
"acp3/module-users": "^4.28.1",
"acp3/core": "^4.28.2",
"acp3/setup": "^4.28.2",
"acp3/module-errors": "^4.28.2",
"acp3/module-permissions": "^4.28.2",
"acp3/module-system": "^4.28.2",
"acp3/module-users": "^4.28.2",
"tinymce/tinymce": "^4.8"
},
"autoload": {
......
......@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [4.28.1] - 2018-08-20
## [4.28.2] - 2018-08-20
### Fixed
- Fixed the installation and update wizard
......@@ -656,7 +656,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- It should be possible again to save ACL roles
- Silenced a possible PHP warning when trying to login with incorrect credentials
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.28.1...HEAD
[Unreleased]: https://gitlab.com/ACP3/cms/compare/v4.28.2...HEAD
[4.28.2]: https://gitlab.com/ACP3/cms/compare/v4.28.1...v4.28.2
[4.28.1]: https://gitlab.com/ACP3/cms/compare/v4.28.0...v4.28.1
[4.28.0]: https://gitlab.com/ACP3/cms/compare/v4.27.3...v4.28.0
[4.27.3]: https://gitlab.com/ACP3/cms/compare/v4.27.2...v4.27.3
......
......@@ -13,3 +13,8 @@ services:
class: ACP3\Installer\Core\I18n\DictionaryCache
arguments:
- '@core.environment.application_path'
core.i18n.country_list:
class: ACP3\Core\I18n\CountryList
arguments:
- '@core.i18n.translator'
......@@ -2,14 +2,5 @@ parameters:
default_request: 'update'
imports:
- { resource: ../../../../ACP3/config.yml }
- { resource: ../../../../ACP3/Core/config/components/cache.yml }
- { resource: ../../../../ACP3/Core/config/components/database.yml }
- { resource: ../../../../ACP3/Core/config/components/model.yml }
- { resource: ../../../../ACP3/Core/config/components/modules.yml }
- { resource: ../../../../ACP3/Modules/ACP3/Permissions/Resources/config/components/cache.yml }
- { resource: ../../../../ACP3/Modules/ACP3/Permissions/Resources/config/components/models.yml }
- { resource: ../../../../ACP3/Modules/ACP3/Permissions/Resources/config/components/nested_set.yml }
- { resource: ../../../../ACP3/Modules/ACP3/System/Resources/config/components/models.yml }
- { resource: services.yml }
- { resource: ../../Modules/Update/Resources/config/services.yml }
......@@ -53,9 +53,11 @@ class Index extends Core\Controller\AbstractInstallerAction
* @throws \Doctrine\DBAL\ConnectionException
* @throws \MJS\TopSort\CircularDependencyException
* @throws \MJS\TopSort\ElementNotFoundException
* @throws \Exception
*/
protected function executePost()
{
$this->schemaUpdateModel->updateContainer($this->request);
$results = $this->schemaUpdateModel->updateModules();
\ksort($results);
......
......@@ -7,9 +7,12 @@
namespace ACP3\Installer\Modules\Update\Model;
use ACP3\Core\Installer\MigrationRegistrar;
use ACP3\Core\Installer\SchemaRegistrar;
use ACP3\Core\Http\RequestInterface;
use ACP3\Core\Modules;
use ACP3\Installer\Core\DependencyInjection\ServiceContainerBuilder;
use ACP3\Installer\Core\Environment\ApplicationPath;
use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
class SchemaUpdateModel
{
......@@ -18,40 +21,56 @@ class SchemaUpdateModel
*/
protected $modules;
/**
* @var Modules\SchemaUpdater
* @var array
*/
protected $schemaUpdater;
protected $results = [];
/**
* @var SchemaRegistrar
* @var \Symfony\Component\DependencyInjection\ContainerInterface
*/
private $schemaRegistrar;
private $container;
/**
* @var MigrationRegistrar
* @var \ACP3\Installer\Core\Environment\ApplicationPath
*/
private $migrationRegistrar;
private $appPath;
/**
* @var array
* @var \Psr\Log\LoggerInterface
*/
protected $results = [];
private $logger;
/**
* ModuleUpdateModel constructor.
*
* @param SchemaRegistrar $schemaRegistrar
* @param MigrationRegistrar $migrationRegistrar
* @param Modules $modules
* @param Modules\SchemaUpdater $schemaUpdater
* @param \ACP3\Installer\Core\Environment\ApplicationPath $appPath
* @param \Psr\Log\LoggerInterface $logger
* @param \Symfony\Component\DependencyInjection\ContainerInterface $container
* @param Modules $modules
*/
public function __construct(
SchemaRegistrar $schemaRegistrar,
MigrationRegistrar $migrationRegistrar,
Modules $modules,
Modules\SchemaUpdater $schemaUpdater
ApplicationPath $appPath,
LoggerInterface $logger,
ContainerInterface $container,
Modules $modules
) {
$this->modules = $modules;
$this->schemaUpdater = $schemaUpdater;
$this->schemaRegistrar = $schemaRegistrar;
$this->migrationRegistrar = $migrationRegistrar;
$this->container = $container;
$this->appPath = $appPath;
$this->logger = $logger;
}
/**
* @param RequestInterface $request
*
* @throws \Exception
*/
public function updateContainer(RequestInterface $request)
{
$this->container = ServiceContainerBuilder::create(
$this->logger,
$this->appPath,
$request->getSymfonyRequest(),
$this->container->getParameter('core.environment'),
true
);
}
/**
......@@ -84,14 +103,19 @@ class SchemaUpdateModel
{
$result = false;
$schemaRegistrar = $this->container->get('core.installer.schema_registrar');
$migrationRegistrar = $this->container->get('core.installer.migration_registrar');
$serviceIdMigration = $moduleName . '.installer.migration';
if ($this->schemaRegistrar->has($moduleName) === true &&
$this->migrationRegistrar->has($serviceIdMigration) === true
if ($schemaRegistrar->has($moduleName) === true &&
$migrationRegistrar->has($serviceIdMigration) === true
) {