Merge branch 'master' into feature/php-8.1

Dockerfile

@@ -3,6 +3,7 @@ ARG BUILD_NO_INSTALL
 
 RUN apt-get update \
  && apt-get install -y $PHPIZE_DEPS \
+        ssh \
         default-mysql-client \
         cron \
         procps # recommended for dmstr/yii2-resque-module \
@@ -14,7 +15,8 @@ RUN apt-get update \
 
 ENV SUPERVISOR_START_CRON=true \
     SUPERVISOR_START_WORKER=true \
-    SUPERVISOR_START_EXPORT_ENV=true
+    SUPERVISOR_START_EXPORT_ENV=true \
+    SUPERVISOR_WORKER_CMD_OPTS=""
 
 # System files
 COPY ./image-files /

config/common.php

@@ -407,7 +407,7 @@ return [
                 ],
                 'audit/mail' => [
                     'class' => MailPanel::class,
-                    'maxAge' => null
+                    'maxAge' => 30
                 ],
                 // Links the extra error reporting functions (`exception()` and `errorMessage()`)
                 'audit/error' => [

config/console.php

@@ -83,6 +83,21 @@ return [
                 ],
             ],
         ],
+        'dbSystem' => [
+            'on ' . yii\db\Connection::EVENT_AFTER_OPEN => function ($event) {
+                if ($event->sender->driverName === 'mysql') {
+                    // set session wait_timeout for this connection to mysql default value to prevent connection-timeouts
+                    // in e.g. audit module while exec long-running CLI processes
+                    $event->sender->createCommand(
+                        'SET SESSION wait_timeout = :timeout;',
+                        [
+                            ':timeout' => (int)getenv('DB_ENV_MYSQL_CLI_WAIT_TIMEOUT') ?: 28800
+                        ]
+                    )->execute();
+                }
+            },
+        ],
+
     ],
     'modules' => [
         'user' => [

config/env-defaults

@@ -116,6 +116,9 @@ DATABASE_USER=${DB_ENV_MYSQL_USER}
 DATABASE_PASSWORD=${DB_ENV_MYSQL_PASSWORD}
 DATABASE_TABLE_PREFIX=app_
 
+# set session wait_timeout for cli dbSystem mysql connection to prevent connection-timeouts
+DB_ENV_MYSQL_CLI_WAIT_TIMEOUT=28800
+
 
 # Cache
 # -----

image-files/etc/supervisor/conf.d/worker.conf

 [program:worker]
-command=yii queue/listen
+command=yii queue/listen %(ENV_SUPERVISOR_WORKER_CMD_OPTS)s
 autostart=%(ENV_SUPERVISOR_START_WORKER)s
 autorestart=true
 priority=70

src/composer.json

@@ -7,10 +7,14 @@
         "ap": {
             "type": "composer",
             "url": "https://asset-packagist.org"
+        },
+        "merge-plugin": {
+            "type": "vcs",
+            "url": "https://github.com/schmunk42/composer-merge-plugin.git"
         }
     },
     "require": {
-        "wikimedia/composer-merge-plugin": "~2.0"
+        "wikimedia/composer-merge-plugin": "dev-feature/respect-lockdown"
     },
     "extra": {
         "merge-plugin": {

src/composer.phd5.json

@@ -58,5 +58,12 @@
         "dmstr/yii2-active-record-permissions": "<1.2.2",
         "fxp/composer-asset-plugin": "*",
         "dmstr/yii2-web": "<1.1.1"
+    },
+    "repositories": {
+        "2amigos/yii2-ckeditor-widget": {
+            "name": "dmstr-forks/2amigos-yii2-ckeditor-widget",
+            "type": "vcs",
+            "url": "https://github.com/dmstr-forks/2amigos-yii2-ckeditor-widget"
+        }
     }
 }

tests/codeception/_config/codeception-module.php

@@ -18,6 +18,9 @@ return yii\helpers\ArrayHelper::merge(
     [
         'language' => 'en',
         'components' => [
+            'redis' => [
+                'database' => 8
+            ],
             'request' => [
                 'cookieValidationKey' => 'FUNCTIONAL_TESTING'
             ],

tests/codeception/_config/test.php

@@ -33,6 +33,9 @@ return [
         'backend.iframe.name' => 'backend-test',
     ],
     'components' => [
+        'redis' => [
+            'database' => 9
+        ],
         'user' => [
             'loginUrl' => '/user/login'
         ]

tests/codeception/cli/AuditCept.php

@@ -6,5 +6,6 @@ $I = new CliTester($scenario);
 
 $I->runShellCommand('yii audit/cleanup --interactive=0');
 $I->seeInShellOutput('skipped audit/trail');
-$I->seeInShellOutput('skipped audit/mail');
+$I->seeInShellOutput('cleaned audit/mail');
+$I->seeInShellOutput('cleaned audit/error');
 $I->seeInShellOutput('Cleanup was successful');