Commit ca232beb authored by Tobias Munk's avatar Tobias Munk

Merge branch 'master' into release/5.10.x

parents aaada562 11b8b083
Pipeline #85155 passed with stages
in 7 minutes and 39 seconds
# Changelog
### 5.9.0 (under development)
### 5.9.0
- updated base image to `yiisoftware/yii2-php:8.1-fpm-nginx`
- added debug-by-env variables `APP_DEBUG_KEY`, `APP_DEBUG_TOKEN`
- added Redis queue id sync event
- enabled debug module for CLI requests
### 5.8.0
......
......@@ -7,13 +7,12 @@ RUN apt-get update \
default-mysql-client \
cron \
procps # recommended for dmstr/yii2-resque-module \
&& pecl install mailparse \
&& docker-php-ext-enable mailparse \
&& apt-get remove -y $PHPIZE_DEPS \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN install-php-extensions \
mailparse \
ftp
ENV SUPERVISOR_START_CRON=true \
......
......@@ -15,6 +15,10 @@
- adjust `XDEBUG_MODE=develop,coverage`
- disable yii2-debug module, see https://github.com/yiisoft/yii2-debug/issues/372#issuecomment-498443036
### to 5.9
- set `XDEBUG_MODE=develop,coverage` in tests
### 5.4/5.5 to 5.6
- upgrade `"wikimedia/composer-merge-plugin": "~2.0"`
......
......@@ -371,6 +371,7 @@ $common = [
'ignoreLanguageUrlPatterns' => [
// route pattern => url pattern
'#^img/stream#' => '#^img/stream#',
'#^img/download#' => '#^img/download#',
'#^filefly/api#' => '#^filefly/api#'
],
'languages' => $languages,
......@@ -482,7 +483,8 @@ $common = [
],
'pages' => [
'class' => PagesModule::class,
'layout' => $boxLayout
'layout' => $boxLayout,
'pageUseFallbackPage' => false,
],
'prototype' => [
'class' => PrototypeModule::class,
......
This diff is collapsed.
......@@ -3,11 +3,12 @@
"bedezign/yii2-audit": "^1.2.4",
"2amigos/yii2-usuario": "^1.6.0",
"lajax/yii2-translate-manager": "^1.6.0",
"dmstr/lajax-yii2-translate-manager-addons": "^1.0.0",
"ckeditor/ckeditor": "dev-full/4.21.x as 4.999",
"codemix/yii2-localeurls": "^1.7.1",
"codemix/yii2-streamlog": "^1.2.1",
"dmstr/lajax-yii2-translate-manager-addons": "^1.0.0",
"dmstr/yii2-backend-module": "^2.2.5",
"dmstr/yii2-contact-module": "^2.0.0",
"dmstr/yii2-contact-module": "^3.0.3",
"dmstr/yii2-cookie-consent": "^1.4.3",
"dmstr/yii2-db": "^3.0.1",
"dmstr/yii2-helpers": ">=0.4.19",
......@@ -26,6 +27,7 @@
"loveorigami/yii2-notification-wrapper": "^6.7.2-patch1",
"omnilight/yii2-scheduling": "^1.1",
"pheme/yii2-settings": "^0.7.0",
"php-mime-mail-parser/php-mime-mail-parser": "^8.0",
"roave/security-advisories": "dev-master",
"schmunk42/yii2-markdocs-module": "^1.0.0",
"vlucas/phpdotenv": "^5.5",
......@@ -49,7 +51,8 @@
"codeception/module-webdriver": "^3.2.0",
"codeception/module-asserts": "^2.0.1",
"codeception/module-yii2": "^1.1.0",
"captbaritone/mailcatcher-codeception-module": "^3.0.0"
"captbaritone/mailcatcher-codeception-module": "^3.0.0",
"hoa/console": "^3.17"
},
"conflict": {
"bower-asset/yii2-pjax": "2.0.7",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment