Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
phd5-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dmstr
phd5-app
Commits
e5654c63
Commit
e5654c63
authored
Mar 23, 2023
by
Tobias Munk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into feature/php-8.1
parents
19189e54
e675dbf2
Pipeline
#85161
passed with stage
in 6 minutes and 46 seconds
Changes
11
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
491 additions
and
438 deletions
+491
-438
Dockerfile
Dockerfile
+3
-1
common.php
config/common.php
+1
-1
console.php
config/console.php
+15
-0
env-defaults
config/env-defaults
+3
-0
worker.conf
image-files/etc/supervisor/conf.d/worker.conf
+1
-1
composer.json
src/composer.json
+5
-1
composer.lock
src/composer.lock
+448
-433
composer.phd5.json
src/composer.phd5.json
+7
-0
codeception-module.php
tests/codeception/_config/codeception-module.php
+3
-0
test.php
tests/codeception/_config/test.php
+3
-0
AuditCept.php
tests/codeception/cli/AuditCept.php
+2
-1
No files found.
Dockerfile
View file @
e5654c63
...
...
@@ -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
View file @
e5654c63
...
...
@@ -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
View file @
e5654c63
...
...
@@ -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
View file @
e5654c63
...
...
@@ -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
View file @
e5654c63
[
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
View file @
e5654c63
...
...
@@ -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.lock
View file @
e5654c63
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/composer.phd5.json
View file @
e5654c63
...
...
@@ -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
View file @
e5654c63
...
...
@@ -18,6 +18,9 @@ return yii\helpers\ArrayHelper::merge(
[
'language'
=>
'en'
,
'components'
=>
[
'redis'
=>
[
'database'
=>
8
],
'request'
=>
[
'cookieValidationKey'
=>
'FUNCTIONAL_TESTING'
],
...
...
tests/codeception/_config/test.php
View file @
e5654c63
...
...
@@ -33,6 +33,9 @@ return [
'backend.iframe.name'
=>
'backend-test'
,
],
'components'
=>
[
'redis'
=>
[
'database'
=>
9
],
'user'
=>
[
'loginUrl'
=>
'/user/login'
]
...
...
tests/codeception/cli/AuditCept.php
View file @
e5654c63
...
...
@@ -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'
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment