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
3dd60dc1
Commit
3dd60dc1
authored
Nov 28, 2023
by
Tobias Munk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/php-8.2' into 'feature/toggable-s3-fs'
# Conflicts: # config/common.php
parents
1e4398ec
6153710d
Pipeline
#81893
passed with stage
in 8 minutes and 16 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
50 deletions
+48
-50
common-dev.php
config/common-dev.php
+1
-1
common.php
config/common.php
+15
-17
docker-compose.test.yml
docker/docker-compose.test.yml
+1
-0
composer.lock
src/composer.lock
+29
-25
composer.phd5.json
src/composer.phd5.json
+2
-7
No files found.
config/common-dev.php
View file @
3dd60dc1
...
...
@@ -16,7 +16,7 @@ return [
'view'
=>
[
'renderers'
=>
[
'twig'
=>
[
'extensions'
=>
(
getenv
(
'TWIG_DEBUG_MODE'
))
?
[
new
Twig_Extension_Debug
()]
:
null
,
'extensions'
=>
(
getenv
(
'TWIG_DEBUG_MODE'
))
?
[
new
\Twig\Extension\DebugExtension
()]
:
null
,
'options'
=>
[
'debug'
=>
(
getenv
(
'TWIG_DEBUG_MODE'
))
?
true
:
false
,
],
...
...
config/common.php
View file @
3dd60dc1
...
...
@@ -124,8 +124,20 @@ SQL;
return
$event
;
});
// Enable S3 component, if ENVs are set (BC)
$s3Enabled
=
class_exists
(
'League\Flysystem\AwsS3v3\AwsS3Adapter'
)
&&
getenv
(
'AMAZON_S3_BUCKET_PUBLIC_KEY'
)
&&
getenv
(
'AMAZON_S3_BUCKET_SECRET_KEY'
)
&&
getenv
(
'AMAZON_S3_BUCKET_NAME'
)
&&
getenv
(
'AMAZON_S3_BUCKET_REGION'
);
// Default db translation config
$i18nTranslation
=
[
'class'
=>
DbMessageSource
::
class
,
'db'
=>
'db'
,
'sourceLanguage'
=>
'xx-XX'
,
'sourceMessageTable'
=>
'{{%language_source}}'
,
'messageTable'
=>
'{{%language_translate}}'
,
'cachingDuration'
=>
86400
,
'enableCaching'
=>
!
YII_ENV_DEV
];
// Basic configuration, used in web and console applications
$common
=
[
'id'
=>
'app'
,
...
...
@@ -279,23 +291,9 @@ $common = [
],
'i18n'
=>
[
'translations'
=>
[
'*'
=>
[
'class'
=>
DbMessageSource
::
class
,
'db'
=>
'db'
,
'sourceLanguage'
=>
'xx-XX'
,
'sourceMessageTable'
=>
'{{%language_source}}'
,
'messageTable'
=>
'{{%language_translate}}'
,
'cachingDuration'
=>
86400
,
'enableCaching'
=>
!
YII_ENV_DEV
],
'noty'
=>
[
'class'
=>
DbMessageSource
::
class
,
'sourceLanguage'
=>
'xx-XX'
,
'sourceMessageTable'
=>
'{{%language_source}}'
,
'messageTable'
=>
'{{%language_translate}}'
,
'cachingDuration'
=>
86400
,
'enableCaching'
=>
!
YII_ENV_DEV
]
'*'
=>
$i18nTranslation
,
'app'
=>
$i18nTranslation
,
'noty'
=>
$i18nTranslation
]
],
'log'
=>
[
...
...
docker/docker-compose.test.yml
View file @
3dd60dc1
...
...
@@ -35,6 +35,7 @@ services:
volumes
:
# Re-use local composer cache via host-volume
-
$HOME/.composer-docker/cache:/root/.composer/cache:delegated
-
./config:/app/config
-
./src:/app/src
-
./tests:/app/tests
-
./vendor-dev:/app/vendor
...
...
src/composer.lock
View file @
3dd60dc1
...
...
@@ -1379,16 +1379,16 @@
},
{
"name": "dmstr/yii2-backend-module",
"version": "2.2.
4
",
"version": "2.2.
5
",
"source": {
"type": "git",
"url": "https://github.com/dmstr/yii2-backend-module.git",
"reference": "
a7818584570ec84ab992d9c56dd15f81e6f0bd00
"
"reference": "
78077a88424cb1fb404833ddb4bcdada4f651256
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmstr/yii2-backend-module/zipball/
a7818584570ec84ab992d9c56dd15f81e6f0bd00
",
"reference": "
a7818584570ec84ab992d9c56dd15f81e6f0bd00
",
"url": "https://api.github.com/repos/dmstr/yii2-backend-module/zipball/
78077a88424cb1fb404833ddb4bcdada4f651256
",
"reference": "
78077a88424cb1fb404833ddb4bcdada4f651256
",
"shasum": ""
},
"require": {
...
...
@@ -1433,9 +1433,9 @@
],
"support": {
"issues": "https://github.com/dmstr/yii2-backend-module/issues",
"source": "https://github.com/dmstr/yii2-backend-module/tree/2.2.
4
"
"source": "https://github.com/dmstr/yii2-backend-module/tree/2.2.
5
"
},
"time": "202
2-05-25T08:36:25
+00:00"
"time": "202
3-11-28T14:59:28
+00:00"
},
{
"name": "dmstr/yii2-bootstrap",
...
...
@@ -5540,12 +5540,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "
2b23329e299c9a6cd98a82f5137ab4909c8e506d
"
"reference": "
5cfed3056826da5ee547ebb4b58e39bc4ca14d6e
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/
2b23329e299c9a6cd98a82f5137ab4909c8e506d
",
"reference": "
2b23329e299c9a6cd98a82f5137ab4909c8e506d
",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/
5cfed3056826da5ee547ebb4b58e39bc4ca14d6e
",
"reference": "
5cfed3056826da5ee547ebb4b58e39bc4ca14d6e
",
"shasum": ""
},
"conflict": {
...
...
@@ -5593,7 +5593,7 @@
"baserproject/basercms": "<4.8",
"bassjobsen/bootstrap-3-typeahead": ">4.0.2",
"bigfork/silverstripe-form-capture": ">=3,<3.1.1",
"billz/raspap-webgui": "<
=2.9.2
",
"billz/raspap-webgui": "<
2.9.5
",
"bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3",
"bmarshall511/wordpress_zero_spam": "<5.2.13",
"bolt/bolt": "<3.7.2",
...
...
@@ -5892,9 +5892,12 @@
"openmage/magento-lts": "<=19.5|>=20,<=20.1",
"opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2",
"orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5",
"oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1",
"oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1",
"oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
"oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8",
"oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1",
"oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1",
"oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8",
"oxid-esales/oxideshop-ce": "<4.5",
"packbackbooks/lti-1-3-php-library": "<5",
"padraic/humbug_get_contents": "<1.1.2",
...
...
@@ -5926,7 +5929,7 @@
"phpxmlrpc/extras": "<0.6.1",
"phpxmlrpc/phpxmlrpc": "<4.9.2",
"pi/pi": "<=2.5",
"pimcore/admin-ui-classic-bundle": "<1.2.
1
",
"pimcore/admin-ui-classic-bundle": "<1.2.
2
",
"pimcore/customer-management-framework-bundle": "<3.4.2",
"pimcore/data-hub": "<1.2.4",
"pimcore/demo": "<10.3",
...
...
@@ -6235,7 +6238,7 @@
"type": "tidelift"
}
],
"time": "2023-11-2
3T04:04:3
2+00:00"
"time": "2023-11-2
8T00:14:4
2+00:00"
},
{
"name": "schmunk42/retry",
...
...
@@ -9089,27 +9092,27 @@
},
{
"name": "captbaritone/mailcatcher-codeception-module",
"version": "
dev-piotrknapik
",
"version": "
3.0.0
",
"source": {
"type": "git",
"url": "https://github.com/
dmstr-forks/captbaritone-
codeception-mailcatcher-module.git",
"reference": "
cb375cdd8563093d96556200ac94083a388d9224
"
"url": "https://github.com/
captbaritone/
codeception-mailcatcher-module.git",
"reference": "
f9a10ba26043eeac4a3829632a3e3684cdfe1d32
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/
dmstr-forks/captbaritone-codeception-mailcatcher-module/zipball/cb375cdd8563093d96556200ac94083a388d9224
",
"reference": "
cb375cdd8563093d96556200ac94083a388d9224
",
"url": "https://api.github.com/repos/
captbaritone/codeception-mailcatcher-module/zipball/f9a10ba26043eeac4a3829632a3e3684cdfe1d32
",
"reference": "
f9a10ba26043eeac4a3829632a3e3684cdfe1d32
",
"shasum": ""
},
"require": {
"codeception/codeception": "^
3.0 || ^
4.0 || ^5.0",
"codeception/codeception": "^4.0 || ^5.0",
"ext-json": "*",
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"php": "^7.4 || ^8.0
|| ^8.1
",
"php": "^7.4 || ^8.0",
"zbateson/mail-mime-parser": "^1.2"
},
"require-dev": {
"codeception/module-asserts": "^1.1",
"codeception/module-asserts": "^1.1
|| ^2
",
"phpmailer/phpmailer": "^6.1.6"
},
"suggest": {
...
...
@@ -9121,6 +9124,7 @@
"Codeception\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
...
...
@@ -9136,9 +9140,10 @@
],
"description": "Test emails in your Codeception acceptance tests",
"support": {
"source": "https://github.com/dmstr-forks/captbaritone-codeception-mailcatcher-module/tree/piotrknapik"
"issues": "https://github.com/captbaritone/codeception-mailcatcher-module/issues",
"source": "https://github.com/captbaritone/codeception-mailcatcher-module/tree/3.0.0"
},
"time": "202
2-09-09T06:06:52
+00:00"
"time": "202
3-08-08T13:01:13
+00:00"
},
{
"name": "cmrcx/phptidy",
...
...
@@ -14301,8 +14306,7 @@
"stability-flags": {
"wikimedia/composer-merge-plugin": 20,
"roave/security-advisories": 20,
"schmunk42/yii2-giiant": 10,
"captbaritone/mailcatcher-codeception-module": 20
"schmunk42/yii2-giiant": 10
},
"prefer-stable": true,
"prefer-lowest": false,
...
...
src/composer.phd5.json
View file @
3dd60dc1
...
...
@@ -6,7 +6,7 @@
"dmstr/lajax-yii2-translate-manager-addons"
:
"^1.0.0"
,
"codemix/yii2-localeurls"
:
"^1.7.1"
,
"codemix/yii2-streamlog"
:
"^1.2.1"
,
"dmstr/yii2-backend-module"
:
"^2.
1.0
"
,
"dmstr/yii2-backend-module"
:
"^2.
2.5
"
,
"dmstr/yii2-contact-module"
:
"^2.0.0"
,
"dmstr/yii2-cookie-consent"
:
"^1.4.3"
,
"dmstr/yii2-db"
:
"^3.0.1"
,
...
...
@@ -49,7 +49,7 @@
"codeception/module-webdriver"
:
"^3.2.0"
,
"codeception/module-asserts"
:
"^2.0.1"
,
"codeception/module-yii2"
:
"^1.1.0"
,
"captbaritone/mailcatcher-codeception-module"
:
"
dev-piotrknapik#cb375cdd8563093d96556200ac94083a388d9224
"
"captbaritone/mailcatcher-codeception-module"
:
"
^3.0.0
"
},
"conflict"
:
{
"bower-asset/yii2-pjax"
:
"2.0.7"
,
...
...
@@ -71,11 +71,6 @@
"type"
:
"vcs"
,
"url"
:
"https://github.com/dmstr-forks/loveorigami-yii2-notification-wrapper.git"
},
"captbaritone/codeception-mailcatcher-module"
:
{
"name"
:
"dmstr-forks/loveorigami-yii2-notification-wrapper"
,
"type"
:
"vcs"
,
"url"
:
"https://github.com/dmstr-forks/captbaritone-codeception-mailcatcher-module.git"
},
"bedezign/yii2-audit"
:
{
"name"
:
"dmstr-forks/bedezign-yii2-audit"
,
"type"
:
"vcs"
,
...
...
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